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

[Rémy Oudompheng]

    Date: Saturday, October 30, 2010 @ 06:41:16
  Author: remy
Revision: 97441

upgpkg: haskell-deepseq 1.1.0.1-1
Minor version bump

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

-------------------------+
 PKGBUILD                |   23 +++++++++++++----------
 haskell-deepseq.install |    3 +--
 2 files changed, 14 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-10-30 10:35:45 UTC (rev 97440)
+++ PKGBUILD	2010-10-30 10:41:16 UTC (rev 97441)
@@ -1,33 +1,36 @@
 # Maintainer: Vesa Kaihlavirta <vesa at archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell at haskell.org>
-# Package generated by cabal2arch 0.7.5
+# Package generated by cabal2arch 0.7.6
+_hkgname=deepseq
 pkgname=haskell-deepseq
-pkgver=1.1.0.0
-pkgrel=5
+pkgver=1.1.0.1
+pkgrel=1
 pkgdesc="Fully evaluate data structures"
-url="http://hackage.haskell.org/package/deepseq"
+url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
 depends=(ghc=6.12.3 sh)
 options=('strip')
-source=(http://hackage.haskell.org/packages/archive/deepseq/$pkgver/deepseq-$pkgver.tar.gz)
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
-md5sums=('41194f8633be8e30cacad88146dbf7c2')
+md5sums=('92345996b47a85112bbecad6d43d420f')
 
 build() {
-    cd ${srcdir}/deepseq-${pkgver}
-    runhaskell Setup configure -p --enable-split-objs --enable-shared --prefix=/usr --docdir=/usr/share/doc/${pkgname}
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr --docdir=/usr/share/doc/${pkgname}
     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}/deepseq-${pkgver}
+    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/deepseq
+    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-deepseq.install
===================================================================
--- haskell-deepseq.install	2010-10-30 10:35:45 UTC (rev 97440)
+++ haskell-deepseq.install	2010-10-30 10:41:16 UTC (rev 97441)
@@ -4,8 +4,7 @@
   (cd /usr/share/doc/ghc/html/libraries; ./gen_contents_index)
 }
 pre_upgrade() {
-  ${HS_DIR}/unregister.sh &> /dev/null
-  exit 0
+  ${HS_DIR}/unregister.sh
 }
 post_upgrade() {
   ${HS_DIR}/register.sh