[arch-commits] Commit in haskell-regex-base/repos (4 files)

Rémy Oudompheng remy at archlinux.org
Mon Nov 29 20:00:55 UTC 2010


    Date: Monday, November 29, 2010 @ 15:00:55
  Author: remy
Revision: 101611

Rebuild with documentation.

Modified:
  haskell-regex-base/repos/extra-i686/PKGBUILD
  haskell-regex-base/repos/extra-i686/haskell-regex-base.install
  haskell-regex-base/repos/extra-x86_64/PKGBUILD
  haskell-regex-base/repos/extra-x86_64/haskell-regex-base.install

-----------------------------------------+
 extra-i686/PKGBUILD                     |   32 +++++++++++++++++++-----------
 extra-i686/haskell-regex-base.install   |    7 +++++-
 extra-x86_64/PKGBUILD                   |   32 +++++++++++++++++++-----------
 extra-x86_64/haskell-regex-base.install |    7 +++++-
 4 files changed, 54 insertions(+), 24 deletions(-)

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2010-11-29 19:36:48 UTC (rev 101610)
+++ extra-i686/PKGBUILD	2010-11-29 20:00:55 UTC (rev 101611)
@@ -1,7 +1,8 @@
 # Maintainer: Vesa Kaihlavirta <vesa at archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+_hkgname=regex-base
 pkgname=haskell-regex-base
-pkgrel=1
+pkgrel=1.1
 pkgver=0.93.2
 pkgdesc="Interface API for regex-posix,pcre,parsec,tdfa,dfa"
 url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/regex-base"
@@ -11,16 +12,25 @@
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/regex-base/$pkgver/regex-base-$pkgver.tar.gz)
 install=haskell-regex-base.install
+md5sums=('e7b93b0b17eff8d3068ecb2f5d5f6ea3')
 
 build() {
-    cd $srcdir/regex-base-$pkgver
-    runhaskell Setup configure -p --enable-shared --enable-split-objs --prefix=/usr || return 1
-    runhaskell Setup build                   || return 1
-    runhaskell Setup register   --gen-script || return 1
-    runhaskell Setup unregister --gen-script || return 1
-    install -D -m744 register.sh   $pkgdir/usr/share/haskell/$pkgname/register.sh
-    install    -m744 unregister.sh $pkgdir/usr/share/haskell/$pkgname/unregister.sh
-    runhaskell Setup copy --destdir=$pkgdir || return 1
-    install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE || return 1
+    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
 }
-md5sums=('e7b93b0b17eff8d3068ecb2f5d5f6ea3')
+
+package() {
+    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
+}

Modified: extra-i686/haskell-regex-base.install
===================================================================
--- extra-i686/haskell-regex-base.install	2010-11-29 19:36:48 UTC (rev 101610)
+++ extra-i686/haskell-regex-base.install	2010-11-29 20:00:55 UTC (rev 101611)
@@ -1,13 +1,18 @@
-HS_DIR=/usr/share/haskell/haskell-regex-base
+HS_DIR=usr/share/haskell/haskell-regex-base
 post_install() {
   ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
 }
 pre_upgrade() {
   ${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)
+}

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2010-11-29 19:36:48 UTC (rev 101610)
+++ extra-x86_64/PKGBUILD	2010-11-29 20:00:55 UTC (rev 101611)
@@ -1,7 +1,8 @@
 # Maintainer: Vesa Kaihlavirta <vesa at archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+_hkgname=regex-base
 pkgname=haskell-regex-base
-pkgrel=1
+pkgrel=1.1
 pkgver=0.93.2
 pkgdesc="Interface API for regex-posix,pcre,parsec,tdfa,dfa"
 url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/regex-base"
@@ -11,16 +12,25 @@
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/regex-base/$pkgver/regex-base-$pkgver.tar.gz)
 install=haskell-regex-base.install
+md5sums=('e7b93b0b17eff8d3068ecb2f5d5f6ea3')
 
 build() {
-    cd $srcdir/regex-base-$pkgver
-    runhaskell Setup configure -p --enable-shared --enable-split-objs --prefix=/usr || return 1
-    runhaskell Setup build                   || return 1
-    runhaskell Setup register   --gen-script || return 1
-    runhaskell Setup unregister --gen-script || return 1
-    install -D -m744 register.sh   $pkgdir/usr/share/haskell/$pkgname/register.sh
-    install    -m744 unregister.sh $pkgdir/usr/share/haskell/$pkgname/unregister.sh
-    runhaskell Setup copy --destdir=$pkgdir || return 1
-    install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE || return 1
+    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
 }
-md5sums=('e7b93b0b17eff8d3068ecb2f5d5f6ea3')
+
+package() {
+    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
+}

Modified: extra-x86_64/haskell-regex-base.install
===================================================================
--- extra-x86_64/haskell-regex-base.install	2010-11-29 19:36:48 UTC (rev 101610)
+++ extra-x86_64/haskell-regex-base.install	2010-11-29 20:00:55 UTC (rev 101611)
@@ -1,13 +1,18 @@
-HS_DIR=/usr/share/haskell/haskell-regex-base
+HS_DIR=usr/share/haskell/haskell-regex-base
 post_install() {
   ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
 }
 pre_upgrade() {
   ${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)
+}




More information about the arch-commits mailing list