update to 0.1.4.2

3 files changed, 34 insertions, 55 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 045efe16868c..a06fc67fb23d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,14 @@
 pkgbase = haskell-al
 	pkgdesc = OpenAL haskell raw API
-	pkgver = 0.1.3.2
+	pkgver = 0.1.4.2
 	pkgrel = 1
-	url = https://hackage.haskell.org/package/al
-	install = haskell-al.install
-	arch = any
+	url = https://hackage.haskell.org/package/
+	arch = x86_64
 	license = custom:BSD3
-	makedepends = ghc<7.11
-	depends = openal<1.17
-	depends = haskell-mtl>=2.1
-	depends = haskell-mtl<2.3
-	source = http://hackage.haskell.org/package/al-0.1.3.2/al-0.1.3.2.tar.gz
-	md5sums = 2a68d1fa2afb93c9d37a3d324226f00a
+	makedepends = ghc
+	makedepends = c2hs
+	depends = openal
+	source = http://hackage.haskell.org/package/al-0.1.4.2/al-0.1.4.2.tar.gz
+	md5sums = f606d4f6d35f86ac56c0cc3444d2d19b
 
 pkgname = haskell-al
-
diff --git a/PKGBUILD b/PKGBUILD
index ae1c9bd1e25a..b2a951b6a1a7 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,38 @@
-# Maintainer: Dimitri Sabadie <dimitri.sabadie@gmail.com>
+# Contributor: Dimitri Sabadie <dimitri.sabadie@gmail.com>
 
-_hspkgname=al
+_hkgname=al
 pkgname=haskell-al
-pkgver=0.1.3.2
+pkgver=0.1.4.2
 pkgrel=1
 pkgdesc='OpenAL haskell raw API'
-arch=('any')
+arch=('x86_64')
 url=https://hackage.haskell.org/package/$_hspkgname
 license=('custom:BSD3')
-depends=('openal<1.17' 'haskell-mtl>=2.1' 'haskell-mtl<2.3')
-makedepends=('ghc<7.11')
-install=$pkgname.install
-source=("http://hackage.haskell.org/package/$_hspkgname-$pkgver/$_hspkgname-$pkgver.tar.gz")
-md5sums=('2a68d1fa2afb93c9d37a3d324226f00a')
+depends=('openal')
+makedepends=('ghc' 'c2hs')
+source=("http://hackage.haskell.org/package/$_hkgname-$pkgver/$_hkgname-$pkgver.tar.gz")
+md5sums=('f606d4f6d35f86ac56c0cc3444d2d19b')
 
 build() {
-  cd $_hspkgname-$pkgver
-  runhaskell Setup configure -O2 \
-    --enable-shared \
-    --prefix=/usr \
-    --docdir=/usr/share/doc/$pkgname
-  runhaskell Setup build
-  runhaskell Setup haddock --hyperlink-source
-  runhaskell Setup register --gen-script
-  runhaskell Setup unregister --gen-script
+	cd "${srcdir}/${_hkgname}-${pkgver}"
+	runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \
+        --prefix=/usr --docdir="/usr/share/doc/${pkgname}" --datasubdir="$pkgname" \
+        --dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
+    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/$_hspkgname-$pkgver
-
-  install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-  install -D -m744 CHANGELOG.md $pkgdir/usr/share/$pkgname/CHANGELOG.md
-
-  install -D -m744 register.sh $pkgdir/usr/share/$pkgname/register.sh
-  install -D -m744 unregister.sh $pkgdir/usr/share/$pkgname/unregister.sh
-
-  runhaskell Setup copy --destdir=$pkgdir
+    cd ${_hkgname}-${pkgver}
+    install -D -m744 register.sh   "${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+    install -D -m744 unregister.sh "${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+    install -d -m755 "${pkgdir}/usr/share/doc/ghc/html/libraries"
+    ln -s /usr/share/doc/${pkgname}/html "${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}"
+    runhaskell Setup copy --destdir="${pkgdir}"
+    install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
 }
diff --git a/haskell-al.install b/haskell-al.install
deleted file mode 100755
index 023c853e65e8..000000000000
--- a/haskell-al.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=haskell-al
-
-post_install() {
-  /usr/share/$pkgname/register.sh
-}
-
-pre_upgrade() {
-  /usr/share/$pkgname/unregister.sh
-}
-
-post_upgrade() {
-  /usr/share/$pkgname/register.sh
-}
-
-pre_remove() {
-  /usr/share/$pkgname/unregister.sh
-}