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

[Thomas Dziedzic]

    Date: Wednesday, April 24, 2013 @ 06:19:59
  Author: td123
Revision: 183587

upgpkg: haskell-zlib 0.5.4.1-1

bump

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

----------------------+
 PKGBUILD             |   58 ++++++++++++++++++++++++++-----------------------
 haskell-zlib.install |   33 +++++++++++++++++++++------
 2 files changed, 56 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-04-24 04:19:23 UTC (rev 183586)
+++ PKGBUILD	2013-04-24 04:19:59 UTC (rev 183587)
@@ -1,45 +1,49 @@
 # Maintainer: Thomas Dziedzic <gostrc at gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa at archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
-# Package originally generated by cabal2arch 0.7.6
 
 _hkgname=zlib
 pkgname=haskell-zlib
-pkgver=0.5.4.0
+pkgver=0.5.4.1
 pkgrel=1
 pkgdesc="Compression and decompression in the gzip and zlib formats"
-url="http://hackage.haskell.org/package/zlib"
+url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.6.2-1' 'zlib' 'sh')
+depends=('ghc=7.6.3-1' 'sh' 'zlib')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install=${pkgname}.install
-md5sums=('eb5984b936a7c37a0cdaa357149176b2')
+md5sums=('d0d10786d2bbd1d401a8b28a83e88475')
 
 build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
+  cd ${_hkgname}-${pkgver}
 
-    # ghc 7.6 includes bytestring 0.10
-    # TODO on the next rebuild, verify that we do not need this anymore
-    #sed 's/bytestring == 0.9.*/bytestring == 0.10.*/' -i zlib.cabal
+  runhaskell Setup configure -O -p \
+    --enable-split-objs \
+    --enable-shared \
+    --prefix=/usr \
+    --docdir=/usr/share/doc/${pkgname} \
+    --libsubdir=\$compiler/site-local/\$pkgid
 
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --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.*unregister[^ ]* |&'--force' |" unregister.sh
+  runhaskell Setup build
+
+  runhaskell Setup haddock
+
+  runhaskell Setup register   --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
 }
 
 package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.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
+  cd ${_hkgname}-${pkgver}
+
+  install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+  install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.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
 }
+

Modified: haskell-zlib.install
===================================================================
--- haskell-zlib.install	2013-04-24 04:19:23 UTC (rev 183586)
+++ haskell-zlib.install	2013-04-24 04:19:59 UTC (rev 183587)
@@ -1,18 +1,35 @@
-HS_DIR=usr/share/haskell/haskell-zlib
-post_install() {
-  ${HS_DIR}/register.sh
+pkgname=haskell-zlib
+
+_register() {
+  usr/share/haskell/${pkgname}/register.sh
+}
+
+_unregister() {
+  usr/share/haskell/${pkgname}/unregister.sh
+}
+
+_gen_contents() {
   (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
 }
+
+post_install() {
+  _register
+  _gen_contents
+}
+
 pre_upgrade() {
-  ${HS_DIR}/unregister.sh
+  _unregister
 }
+
 post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+  _register
+  _gen_contents
 }
+
 pre_remove() {
-  ${HS_DIR}/unregister.sh
+  _unregister
 }
+
 post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+  _gen_contents
 }