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

Rémy Oudompheng remy at archlinux.org
Mon Nov 29 23:13:25 UTC 2010


    Date: Monday, November 29, 2010 @ 18:13:24
  Author: remy
Revision: 101621

Rebuild with documentation.

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

------------------------------------------+
 extra-i686/PKGBUILD                      |   32 +++++++++++++++++++----------
 extra-i686/haskell-regex-posix.install   |   10 ++++++---
 extra-x86_64/PKGBUILD                    |   32 +++++++++++++++++++----------
 extra-x86_64/haskell-regex-posix.install |   10 ++++++---
 4 files changed, 56 insertions(+), 28 deletions(-)

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2010-11-29 23:09:41 UTC (rev 101620)
+++ extra-i686/PKGBUILD	2010-11-29 23:13:24 UTC (rev 101621)
@@ -1,8 +1,9 @@
 # Maintainer: Vesa Kaihlavirta <vesa at archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+_hkgname=regex-posix
 pkgname=haskell-regex-posix
-pkgrel=1
 pkgver=0.94.2
+pkgrel=1.1
 pkgdesc="The posix regex backend for regex-base"
 url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/regex-posix"
 license=('custom:BSD3')
@@ -11,16 +12,25 @@
 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 || 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=('e3ebbd6b66fdb2f8c4f0ad95c4580852')
+
+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-posix.install
===================================================================
--- extra-i686/haskell-regex-posix.install	2010-11-29 23:09:41 UTC (rev 101620)
+++ extra-i686/haskell-regex-posix.install	2010-11-29 23:13:24 UTC (rev 101621)
@@ -1,14 +1,18 @@
-HS_DIR=/usr/share/haskell/haskell-regex-posix
+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)
+}

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2010-11-29 23:09:41 UTC (rev 101620)
+++ extra-x86_64/PKGBUILD	2010-11-29 23:13:24 UTC (rev 101621)
@@ -1,8 +1,9 @@
 # Maintainer: Vesa Kaihlavirta <vesa at archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+_hkgname=regex-posix
 pkgname=haskell-regex-posix
-pkgrel=1
 pkgver=0.94.2
+pkgrel=1.1
 pkgdesc="The posix regex backend for regex-base"
 url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/regex-posix"
 license=('custom:BSD3')
@@ -11,16 +12,25 @@
 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 || 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=('e3ebbd6b66fdb2f8c4f0ad95c4580852')
+
+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-posix.install
===================================================================
--- extra-x86_64/haskell-regex-posix.install	2010-11-29 23:09:41 UTC (rev 101620)
+++ extra-x86_64/haskell-regex-posix.install	2010-11-29 23:13:24 UTC (rev 101621)
@@ -1,14 +1,18 @@
-HS_DIR=/usr/share/haskell/haskell-regex-posix
+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)
+}




More information about the arch-commits mailing list