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

[Rémy Oudompheng]

    Date: Saturday, October 30, 2010 @ 05:12:27
  Author: remy
Revision: 97423

upgpkg: haskell-cgi 3001.1.7.3-3
Rebuild for haskell-parsec update.

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

---------------------+
 PKGBUILD            |   22 +++++++++-------------
 haskell-cgi.install |    3 +--
 2 files changed, 10 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-10-30 09:11:46 UTC (rev 97422)
+++ PKGBUILD	2010-10-30 09:12:27 UTC (rev 97423)
@@ -1,41 +1,37 @@
 # Maintainer: Rémy Oudompheng <remy at archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell at haskell.org>
 # Package generated by cabal2arch 0.7.6
-# Note: we list all package dependencies.
-# Your package tool should understand 'provides' syntax
-#
-# Keep up to date on http://archhaskell.wordpress.com/
-#
 _hkgname=cgi
 pkgname=haskell-cgi
 pkgver=3001.1.7.3
-pkgrel=2
+pkgrel=3
 pkgdesc="A library for writing CGI programs"
-url="http://hackage.haskell.org/package/cgi"
+url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
 makedepends=()
-depends=('ghc=6.12.3' 'haskell-mtl=1.1.0.2' 'haskell-network' 'haskell-parsec=2.1.0.1' 'haskell-xhtml=3000.2.0.1')
+depends=('ghc=6.12.3' 'haskell-mtl=1.1.0.2' 'haskell-network' 'haskell-parsec=3.1.0' 'haskell-xhtml=3000.2.0.1')
 options=('strip')
-source=(http://hackage.haskell.org/packages/archive/cgi/${pkgver}/cgi-${pkgver}.tar.gz)
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
 md5sums=('1a6aa04d9b41d925d35bd1df704d1dc4')
 
 build() {
-    cd ${srcdir}/cgi-${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}/cgi-${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/cgi
+    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-cgi.install
===================================================================
--- haskell-cgi.install	2010-10-30 09:11:46 UTC (rev 97422)
+++ haskell-cgi.install	2010-10-30 09:12:27 UTC (rev 97423)
@@ -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