[arch-commits] Commit in haskell-transformers/trunk (2 files)

[Thomas Dziedzic]

    Date: Wednesday, April 24, 2013 @ 06:18:48
  Author: td123
Revision: 183585

upgpkg: haskell-transformers 0.3.0.0-4

bump

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2013-04-24 04:17:41 UTC (rev 183584)
+++ PKGBUILD    2013-04-24 04:18:48 UTC (rev 183585)
@@ -1,39 +1,49 @@
-# $Id$
-
 # Maintainer: Thomas Dziedzic <gos...@gmail.com>
-# Contributor: Rémy Oudompheng <r...@archlinux.org>
 
 _hkgname=transformers
 pkgname=haskell-transformers
 pkgver=0.3.0.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Concrete functor and monad transformers"
 url="http://hackage.haskell.org/package/${_hkgname}";
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.6.2-1' 'sh')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz";)
+depends=('ghc=7.6.3-1' 'sh')
+source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz";)
 install=${pkgname}.install
 md5sums=('852dc0b79cc2bcb39136287d3dd385e5')
 
 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-transformers.install
===================================================================
--- haskell-transformers.install        2013-04-24 04:17:41 UTC (rev 183584)
+++ haskell-transformers.install        2013-04-24 04:18:48 UTC (rev 183585)
@@ -1,18 +1,35 @@
-HS_DIR=usr/share/haskell/haskell-transformers
-post_install() {
-  ${HS_DIR}/register.sh
+pkgname=haskell-transformers
+
+_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
 }