Mon Apr 29 00:34:20 PDT 2013

2 files changed, 56 insertions, 27 deletions

diff --git a/extra/haskell-random/PKGBUILD b/extra/haskell-random/PKGBUILD
index 4bb275bec..649d2bd84 100644
--- a/extra/haskell-random/PKGBUILD
+++ b/extra/haskell-random/PKGBUILD
@@ -3,35 +3,47 @@
 _hkgname=random
 pkgname=haskell-random
 pkgver=1.0.1.1
-pkgrel=4
-pkgdesc="A basic random number generation library"
+pkgrel=5
+pkgdesc="random number library"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.6.2-1' 'sh')
+depends=('ghc=7.6.3-1' 'sh')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install=${pkgname}.install
 md5sums=('9a249cfa7ff6793cbf2be06e9fcd7538')
 
 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-random/haskell-random.install b/extra/haskell-random/haskell-random.install
index b6d807e1a..0dc80227b 100644
--- a/extra/haskell-random/haskell-random.install
+++ b/extra/haskell-random/haskell-random.install
@@ -1,18 +1,35 @@
-HS_DIR=usr/share/haskell/haskell-random
-post_install() {
-  ${HS_DIR}/register.sh
+pkgname=haskell-random
+
+_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
 }