[arch-commits] Commit in haskell-zlib/trunk (PKGBUILD haskell-zlib.install)

[Felix Yan]

    Date: Tuesday, May 24, 2016 @ 17:25:53
  Author: fyan
Revision: 176311

upgpkg: haskell-zlib 0.6.1.1-3

rebuild with ghc-8.0.1, base-prelude-1.0.1.1, cabal-install-1.24.0.0, cairo-0.13.2.0, cmark-0.5.2.1, data-default-0.7.0, data-default-class-0.1.0, extra-1.4.7, generic-trie-0.3.0.2, glib-0.13.3.0, gtk3 0.14.2 -> 0.14.3, haddock-api-2.17.2, haddock-library-1.4.1, js-jquery-1.12.4, memory-0.13, microlens-0.4.4.0, network-multicast-0.1.1, pango-0.13.2.0, simple-sendfile-0.2.24, stack-1.1.2, wai-3.2.1.1

Modified:
  haskell-zlib/trunk/PKGBUILD
Deleted:
  haskell-zlib/trunk/haskell-zlib.install

----------------------+
 PKGBUILD             |   12 ++++++------
 haskell-zlib.install |   18 ------------------
 2 files changed, 6 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-24 15:24:30 UTC (rev 176310)
+++ PKGBUILD	2016-05-24 15:25:53 UTC (rev 176311)
@@ -4,7 +4,7 @@
 
 pkgname=haskell-zlib
 pkgver=0.6.1.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Compression and decompression in the gzip and zlib formats"
 url="http://hackage.haskell.org/package/zlib"
 license=('custom:BSD3')
@@ -11,8 +11,6 @@
 arch=('i686' 'x86_64')
 makedepends=()
 depends=('ghc' 'zlib')
-options=('strip' 'staticlibs')
-install=${pkgname}.install
 source=(http://hackage.haskell.org/packages/archive/zlib/${pkgver}/zlib-${pkgver}.tar.gz)
 md5sums=('d841c86562542a55dd086df69764ee17')
 
@@ -26,13 +24,15 @@
     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}/zlib-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+    cd "${srcdir}/zlib-${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/zlib
     runhaskell Setup copy --destdir=${pkgdir}

Deleted: haskell-zlib.install
===================================================================
--- haskell-zlib.install	2016-05-24 15:24:30 UTC (rev 176310)
+++ haskell-zlib.install	2016-05-24 15:25:53 UTC (rev 176311)
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-zlib
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}