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

[Thomas Dziedzic]

    Date: Wednesday, April 24, 2013 @ 06:14:21
  Author: td123
Revision: 183579

upgpkg: haskell-parsec 3.1.3-3

bump

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

------------------------+
 PKGBUILD               |   54 +++++++++++++++++++++++++++--------------------
 haskell-parsec.install |   33 +++++++++++++++++++++-------
 2 files changed, 57 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-04-24 04:13:45 UTC (rev 183578)
+++ PKGBUILD	2013-04-24 04:14:21 UTC (rev 183579)
@@ -1,39 +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>
-# As generated by cabal2arch 0.7.6
 
 _hkgname=parsec
 pkgname=haskell-parsec
 pkgver=3.1.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Monadic parser combinators"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.6.2-1' 'sh' 'haskell-mtl=2.1.2-2' 'haskell-text=0.11.2.3-2')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+depends=('ghc=7.6.3-1' 'sh' 'haskell-mtl=2.1.2-3' 'haskell-text=0.11.2.3-3')
+source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install=${pkgname}.install
 md5sums=('d72fc94b81153132c61125a1ec52a4a5')
 
 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
 }
+

Modified: haskell-parsec.install
===================================================================
--- haskell-parsec.install	2013-04-24 04:13:45 UTC (rev 183578)
+++ haskell-parsec.install	2013-04-24 04:14:21 UTC (rev 183579)
@@ -1,18 +1,35 @@
-HS_DIR=usr/share/haskell/haskell-parsec
-post_install() {
-  ${HS_DIR}/register.sh
+pkgname=haskell-parsec
+
+_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
 }