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

[Rémy Oudompheng]

    Date: Friday, November 26, 2010 @ 16:30:21
  Author: remy
Revision: 100960

upgpkg: haskell-regex-posix 0.94.2-2
Rebuild for ghc-7.0.1, add documentation

Modified:
  haskell-regex-posix/trunk/PKGBUILD
  haskell-regex-posix/trunk/haskell-regex-posix.install

-----------------------------+
 PKGBUILD                    |   18 ++++++++++++------
 haskell-regex-posix.install |    8 ++++++--
 2 files changed, 18 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2010-11-26 21:23:12 UTC (rev 100959)
+++ PKGBUILD    2010-11-26 21:30:21 UTC (rev 100960)
@@ -1,30 +1,36 @@
 # Maintainer: Vesa Kaihlavirta <v...@archlinux.org>
 # Contributor: Arch Haskell Team <arch-hask...@haskell.org>
+_hkgname=regex-posix
 pkgname=haskell-regex-posix
-pkgrel=1
 pkgver=0.94.2
+pkgrel=2
 pkgdesc="The posix regex backend for regex-base"
 url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/regex-posix";
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=(ghc=6.12.3 sh 'haskell-regex-base=0.93.2')
+depends=(ghc=7.0.1 sh 'haskell-regex-base=0.93.2')
 options=('strip')
 
source=(http://hackage.haskell.org/packages/archive/regex-posix/$pkgver/regex-posix-$pkgver.tar.gz)
 install=haskell-regex-posix.install
+md5sums=('e3ebbd6b66fdb2f8c4f0ad95c4580852')
 
 build() {
-    cd ${srcdir}/regex-posix-$pkgver
-    runhaskell Setup configure -p --enable-shared --enable-split-objs 
--prefix=/usr
+    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}/regex-posix-$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/${_hkgname}
     runhaskell Setup copy --destdir=${pkgdir}
     install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
 }
-md5sums=('e3ebbd6b66fdb2f8c4f0ad95c4580852')

Modified: haskell-regex-posix.install
===================================================================
--- haskell-regex-posix.install 2010-11-26 21:23:12 UTC (rev 100959)
+++ haskell-regex-posix.install 2010-11-26 21:30:21 UTC (rev 100960)
@@ -1,14 +1,18 @@
 HS_DIR=usr/share/haskell/haskell-regex-posix
 post_install() {
   ${HS_DIR}/register.sh
+  (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
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
 }
 pre_remove() {
   ${HS_DIR}/unregister.sh
 }
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}