[arch-commits] Commit in haskell-hunit/repos (4 files)
Rémy Oudompheng
remy at archlinux.org
Mon Nov 29 19:36:48 UTC 2010
Date: Monday, November 29, 2010 @ 14:36:48
Author: remy
Revision: 101610
Rebuild with documentation.
Modified:
haskell-hunit/repos/extra-i686/PKGBUILD
haskell-hunit/repos/extra-i686/haskell-hunit.install
haskell-hunit/repos/extra-x86_64/PKGBUILD
haskell-hunit/repos/extra-x86_64/haskell-hunit.install
------------------------------------+
extra-i686/PKGBUILD | 36 ++++++++++++++++++++++-------------
extra-i686/haskell-hunit.install | 7 +++++-
extra-x86_64/PKGBUILD | 36 ++++++++++++++++++++++-------------
extra-x86_64/haskell-hunit.install | 7 +++++-
4 files changed, 58 insertions(+), 28 deletions(-)
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2010-11-29 19:32:22 UTC (rev 101609)
+++ extra-i686/PKGBUILD 2010-11-29 19:36:48 UTC (rev 101610)
@@ -1,26 +1,36 @@
# Maintainer: Vesa Kaihlavirta <vesa at archlinux.org>
# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+_hkgname=HUnit
pkgname=haskell-hunit
pkgver=1.2.2.1
-pkgrel=3
+pkgrel=3.1
pkgdesc="A unit testing framework for Haskell"
-url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/HUnit"
+url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/${_hkgname}"
license=('custom:BSD3')
arch=('i686' 'x86_64')
depends=(ghc=6.12.3 sh)
options=('strip')
source=(http://hackage.haskell.org/packages/archive/HUnit/$pkgver/HUnit-$pkgver.tar.gz)
-install=$pkgname.install
+install=${pkgname}.install
+md5sums=('2634e94c27486f8e8feeb778f78c663f')
build() {
- cd $srcdir/HUnit-$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}/HUnit-$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
+ sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
}
-md5sums=('2634e94c27486f8e8feeb778f78c663f')
+
+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-hunit.install
===================================================================
--- extra-i686/haskell-hunit.install 2010-11-29 19:32:22 UTC (rev 101609)
+++ extra-i686/haskell-hunit.install 2010-11-29 19:36:48 UTC (rev 101610)
@@ -1,6 +1,7 @@
-HS_DIR=/usr/share/haskell/haskell-hunit
+HS_DIR=usr/share/haskell/haskell-hunit
post_install() {
${HS_DIR}/register.sh
+ (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
}
pre_upgrade() {
${HS_DIR}/unregister.sh &> /dev/null
@@ -8,7 +9,11 @@
}
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:32:22 UTC (rev 101609)
+++ extra-x86_64/PKGBUILD 2010-11-29 19:36:48 UTC (rev 101610)
@@ -1,26 +1,36 @@
# Maintainer: Vesa Kaihlavirta <vesa at archlinux.org>
# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+_hkgname=HUnit
pkgname=haskell-hunit
pkgver=1.2.2.1
-pkgrel=3
+pkgrel=3.1
pkgdesc="A unit testing framework for Haskell"
-url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/HUnit"
+url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/${_hkgname}"
license=('custom:BSD3')
arch=('i686' 'x86_64')
depends=(ghc=6.12.3 sh)
options=('strip')
source=(http://hackage.haskell.org/packages/archive/HUnit/$pkgver/HUnit-$pkgver.tar.gz)
-install=$pkgname.install
+install=${pkgname}.install
+md5sums=('2634e94c27486f8e8feeb778f78c663f')
build() {
- cd $srcdir/HUnit-$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}/HUnit-$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
+ sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
}
-md5sums=('2634e94c27486f8e8feeb778f78c663f')
+
+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-hunit.install
===================================================================
--- extra-x86_64/haskell-hunit.install 2010-11-29 19:32:22 UTC (rev 101609)
+++ extra-x86_64/haskell-hunit.install 2010-11-29 19:36:48 UTC (rev 101610)
@@ -1,6 +1,7 @@
-HS_DIR=/usr/share/haskell/haskell-hunit
+HS_DIR=usr/share/haskell/haskell-hunit
post_install() {
${HS_DIR}/register.sh
+ (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
}
pre_upgrade() {
${HS_DIR}/unregister.sh &> /dev/null
@@ -8,7 +9,11 @@
}
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