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

[Rémy Oudompheng]

    Date: Friday, November 26, 2010 @ 04:52:55
  Author: remy
Revision: 100892

upgpkg: haskell-packedstring 0.1.0.1-4
Rebuild for ghc-7.0.1

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

------------------------------+
 PKGBUILD                     |   14 ++++++++------
 haskell-packedstring.install |    3 +--
 2 files changed, 9 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-11-26 09:47:58 UTC (rev 100891)
+++ PKGBUILD	2010-11-26 09:52:55 UTC (rev 100892)
@@ -1,34 +1,36 @@
 # Maintainer: Rémy Oudompheng <remy at archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell at haskell.org>
 # Package generated by cabal2arch 0.7.6
+_hkgname=packedstring
 pkgname=haskell-packedstring
 pkgver=0.1.0.1
-pkgrel=3
+pkgrel=4
 pkgdesc="(Deprecated) Packed Strings."
 url="http://hackage.haskell.org/package/packedstring"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=(ghc=6.12.3 sh)
+depends=(ghc=7.0.1 sh)
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/packedstring/${pkgver}/packedstring-${pkgver}.tar.gz)
 install=${pkgname}.install
 md5sums=('ea0bdcb92f4c5bd78ac8bb7a654fcfb2')
 
 build() {
-    cd ${srcdir}/packedstring-${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}/packedstring-${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/packedstring
+    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-packedstring.install
===================================================================
--- haskell-packedstring.install	2010-11-26 09:47:58 UTC (rev 100891)
+++ haskell-packedstring.install	2010-11-26 09:52:55 UTC (rev 100892)
@@ -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