Updated for ghc8 packaging changes

2 files changed, 13 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9cae637e11b6..d2084804e18a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xmonad-git
 	pkgdesc = Lightweight X11 tiled window manager written in Haskell
-	pkgver = v0.13.r0.g76f4a16
+	pkgver = v0.13.r5.g2e63127
 	pkgrel = 1
 	url = http://xmonad.org/
 	install = xmonad.install
diff --git a/PKGBUILD b/PKGBUILD
index 8f0d0d45f09f..a877495d01c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: shild <shildv@gmail.com>
 
 pkgname=xmonad-git
-pkgver=v0.13.r0.g76f4a16
+pkgver=v0.13.r5.g2e63127
 pkgrel=1
 pkgdesc="Lightweight X11 tiled window manager written in Haskell"
 arch=('i686' 'x86_64')
@@ -34,34 +34,32 @@ pkgver() {
   git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-build() {
-  cd "$srcdir"
-  ghc-pkg list
+prepare() {
   gendesk --pkgname "${pkgname/-git}" --pkgdesc "$pkgdesc"
+}
 
-  cd $srcdir/${pkgname/-git}
-
-  runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr \
-             --libsubdir=\$compiler/site-local/\$pkgid
+build() {
+  cd "$srcdir"/${pkgname/-git}
+  runhaskell Setup configure -O --enable-shared --enable-executable-dynamic \
+    --prefix=/usr --docdir="/usr/share/doc/${pkgname}" \
+    --libsubdir=\$compiler/site-local/\$pkgid
   runhaskell Setup build
   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}
+  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
 
-  #runhaskell util/GenerateManpage.hs
-
   install -D -m644 man/xmonad.1 $pkgdir/usr/share/man/man1/xmonad.1
-
   install -D -m644 LICENSE $pkgdir/usr/share/licenses/xmonad/LICENSE
-
   install -D -m644 $srcdir/xmonad.svg $pkgdir/usr/share/pixmaps/xmonad.svg
-
   install -D -m644 $srcdir/xmonad.desktop $pkgdir/usr/share/xsessions/xmonad.desktop
+
+  find "$pkgdir"/usr/lib -name "*.a" -delete
 }