updated for ghc8 packageing changes + div cleanup

2 files changed, 17 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ef04dab886c7..08474b273861 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xmonad-contrib-git
 	pkgdesc = Add-ons for xmonad
-	pkgver = v0.13.r9.g4c00eb5
+	pkgver = v0.13.r49.g12227d3
 	pkgrel = 1
 	url = http://xmonad.org/
 	install = xmonad-contrib.install
diff --git a/PKGBUILD b/PKGBUILD
index e140121da2a1..48ddca1f94f4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: orbisvicis <gmail.com>
 
 pkgname=xmonad-contrib-git
-pkgver=v0.13.r9.g4c00eb5
+pkgver=v0.13.r49.g12227d3
 pkgrel=1
 pkgdesc="Add-ons for xmonad"
 arch=('i686' 'x86_64')
@@ -32,20 +32,27 @@ pkgver() {
 }
 
 build() {
-  cd $srcdir/${pkgname/-git}
+  cd "$srcdir"/${pkgname/-git}
 
-  runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr -fuse_xft \
-             --libsubdir=\$compiler/site-local/\$pkgid
+  runhaskell Setup.lhs configure -O --enable-shared --enable-executable-dynamic \
+             --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid \
+             --docdir=/usr/share/doc/${pkgname}
   runhaskell Setup build
+  runhaskell Setup haddock
   runhaskell Setup register --gen-script
   runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
   sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
 }
 
 package() {
-  cd $srcdir/${pkgname/-git}
-  install -D -m744 register.sh $pkgdir/usr/share/haskell/${pkgname/-git}/register.sh
-  install -m744 unregister.sh $pkgdir/usr/share/haskell/${pkgname/-git}/unregister.sh
-  runhaskell Setup.lhs copy --destdir=$pkgdir
-  install -D LICENSE $pkgdir/usr/share/licenses/xmonad-contrib/LICENSE
+  cd "$srcdir"/${pkgname/-git}
+  install -D -m744 register.sh "$pkgdir"/usr/share/haskell/${pkgname/-git}/register.sh
+  install -D -m744 unregister.sh "$pkgdir"/usr/share/haskell/${pkgname/-git}/unregister.sh
+  runhaskell Setup.lhs copy --destdir="$pkgdir"
+  install -D LICENSE "$pkgdir"/usr/share/licenses/xmonad-contrib/LICENSE
+  install -d -m755 "$pkgdir"/usr/share/doc/ghc/html/libraries
+  ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$pkgname"
+
+  find "$pkgdir"/usr/lib -name "*.a" -delete
 }