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

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


    Date: Monday, November 29, 2010 @ 18:18:26
  Author: remy
Revision: 101622

Rebuild with documentation.

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

-------------------------------------------+
 extra-i686/PKGBUILD                       |   34 ++++++++++++++++++----------
 extra-i686/haskell-regex-compat.install   |    7 ++++-
 extra-x86_64/PKGBUILD                     |   34 ++++++++++++++++++----------
 extra-x86_64/haskell-regex-compat.install |    7 ++++-
 4 files changed, 56 insertions(+), 26 deletions(-)

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2010-11-29 23:13:24 UTC (rev 101621)
+++ extra-i686/PKGBUILD	2010-11-29 23:18:26 UTC (rev 101622)
@@ -1,26 +1,36 @@
 # Maintainer: Vesa Kaihlavirta <vesa at archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+_hkgname=regex-compat
 pkgname=haskell-regex-compat
-pkgrel=1
 pkgver=0.93.1
+pkgrel=1.1
 pkgdesc="Replaces and enhances Text.Regex"
-url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/regex-compat"
+url="http://hackage.haskell.org/package/regex-compat"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
 depends=(ghc=6.12.3 sh 'haskell-regex-base' 'haskell-regex-posix')
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/regex-compat/$pkgver/regex-compat-$pkgver.tar.gz)
 install=haskell-regex-compat.install
+md5sums=('d6becec95ea8098cab663116fdce60a5')
 
 build() {
-    cd $srcdir/regex-compat-$pkgver
-    runhaskell Setup configure -p --enable-split-objs --enable-shared --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=('d6becec95ea8098cab663116fdce60a5')
+
+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-compat.install
===================================================================
--- extra-i686/haskell-regex-compat.install	2010-11-29 23:13:24 UTC (rev 101621)
+++ extra-i686/haskell-regex-compat.install	2010-11-29 23:18:26 UTC (rev 101622)
@@ -1,13 +1,18 @@
-HS_DIR=/usr/share/haskell/haskell-regex-compat
+HS_DIR=usr/share/haskell/haskell-regex-compat
 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 23:13:24 UTC (rev 101621)
+++ extra-x86_64/PKGBUILD	2010-11-29 23:18:26 UTC (rev 101622)
@@ -1,26 +1,36 @@
 # Maintainer: Vesa Kaihlavirta <vesa at archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+_hkgname=regex-compat
 pkgname=haskell-regex-compat
-pkgrel=1
 pkgver=0.93.1
+pkgrel=1.1
 pkgdesc="Replaces and enhances Text.Regex"
-url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/regex-compat"
+url="http://hackage.haskell.org/package/regex-compat"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
 depends=(ghc=6.12.3 sh 'haskell-regex-base' 'haskell-regex-posix')
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/regex-compat/$pkgver/regex-compat-$pkgver.tar.gz)
 install=haskell-regex-compat.install
+md5sums=('d6becec95ea8098cab663116fdce60a5')
 
 build() {
-    cd $srcdir/regex-compat-$pkgver
-    runhaskell Setup configure -p --enable-split-objs --enable-shared --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=('d6becec95ea8098cab663116fdce60a5')
+
+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-compat.install
===================================================================
--- extra-x86_64/haskell-regex-compat.install	2010-11-29 23:13:24 UTC (rev 101621)
+++ extra-x86_64/haskell-regex-compat.install	2010-11-29 23:18:26 UTC (rev 101622)
@@ -1,13 +1,18 @@
-HS_DIR=/usr/share/haskell/haskell-regex-compat
+HS_DIR=usr/share/haskell/haskell-regex-compat
 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