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

[Rémy Oudompheng]

    Date: Friday, October 22, 2010 @ 07:11:40
  Author: remy
Revision: 96568

upgpkg: haskell-cgi 3001.1.7.3-2
Rebuild with correct sources.

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

---------------------+
 PKGBUILD            |   23 +++++++++++++++--------
 haskell-cgi.install |    3 ++-
 2 files changed, 17 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-10-22 11:05:22 UTC (rev 96567)
+++ PKGBUILD	2010-10-22 11:11:40 UTC (rev 96568)
@@ -1,29 +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.1
+# 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
-pkgrel=1
 pkgver=3001.1.7.3
+pkgrel=2
 pkgdesc="A library for writing CGI programs"
 url="http://hackage.haskell.org/package/cgi"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
 makedepends=()
-depends=('ghc=6.12.3' 'haskell-mtl=1.1.0.2' 'haskell-network' 'haskell-old-locale' 'haskell-old-time' '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=2.1.0.1' 'haskell-xhtml=3000.2.0.1')
 options=('strip')
-source=(http://hackage.haskell.org/packages/archive/cgi/3001.1.7.2/cgi-3001.1.7.2.tar.gz)
-install=haskell-cgi.install
+source=(http://hackage.haskell.org/packages/archive/cgi/${pkgver}/cgi-${pkgver}.tar.gz)
+install=${pkgname}.install
+md5sums=('1a6aa04d9b41d925d35bd1df704d1dc4')
+
 build() {
-    cd ${srcdir}/cgi-3001.1.7.2
-    runhaskell Setup configure --prefix=/usr --docdir=/usr/share/doc/${pkgname}
+    cd ${srcdir}/cgi-${pkgver}
+    runhaskell Setup configure -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
+}
+
+package() {
+    cd ${srcdir}/cgi-${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
@@ -32,4 +40,3 @@
     install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
     rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
 }
-md5sums=('8f6a72d74561520d6ad9fb19b126c7e4')

Modified: haskell-cgi.install
===================================================================
--- haskell-cgi.install	2010-10-22 11:05:22 UTC (rev 96567)
+++ haskell-cgi.install	2010-10-22 11:11:40 UTC (rev 96568)
@@ -4,7 +4,8 @@
   (cd /usr/share/doc/ghc/html/libraries; ./gen_contents_index)
 }
 pre_upgrade() {
-  ${HS_DIR}/unregister.sh
+  ${HS_DIR}/unregister.sh &> /dev/null
+  exit 0
 }
 post_upgrade() {
   ${HS_DIR}/register.sh