Mon Apr 29 00:34:20 PDT 2013

2 files changed, 60 insertions, 34 deletions

diff --git a/extra/haskell-network/PKGBUILD b/extra/haskell-network/PKGBUILD
index 40816956a..70bbb8aa9 100644
--- a/extra/haskell-network/PKGBUILD
+++ b/extra/haskell-network/PKGBUILD
@@ -1,40 +1,49 @@
 # Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
 
 _hkgname=network
 pkgname=haskell-network
-pkgver=2.4.1.0
+pkgver=2.4.1.2
 pkgrel=1
-pkgdesc="Networking-related facilities"
-url="http://hackage.haskell.org/package/network"
+pkgdesc="Low-level networking interface"
+url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.6.2-1' 'sh' 'haskell-parsec=3.1.3-2')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+depends=('ghc=7.6.3-1' 'sh' 'haskell-parsec=3.1.3-3')
+source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install=${pkgname}.install
-md5sums=('45255ad17b04bb2d43c411ab41b727d5')
+md5sums=('032075c35dea5d23923af3928f9a5511')
 
 build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    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
+  cd ${_hkgname}-${pkgver}
+
+  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
 }
 
 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
 }
+
diff --git a/extra/haskell-network/haskell-network.install b/extra/haskell-network/haskell-network.install
index a56c31d0a..e6177f643 100644
--- a/extra/haskell-network/haskell-network.install
+++ b/extra/haskell-network/haskell-network.install
@@ -1,18 +1,35 @@
-HS_DIR=usr/share/haskell/haskell-network
-post_install() {
-  ${HS_DIR}/register.sh
+pkgname=haskell-network
+
+_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
 }