Fri Nov 18 23:15:18 UTC 2011

2 files changed, 49 insertions, 37 deletions

diff --git a/community/haddock/PKGBUILD b/community/haddock/PKGBUILD
index c52029b85..c9263a8b2 100644
--- a/community/haddock/PKGBUILD
+++ b/community/haddock/PKGBUILD
@@ -1,40 +1,45 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
+# $Id: PKGBUILD 58668 2011-11-17 12:39:33Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# As generated by cabal2arch 0.7.6
 pkgname=haddock
 pkgver=2.9.2
-pkgrel=2
-pkgdesc="Documentation-generation tool for Haskell libraries"
-url="http://hackage.haskell.org/package/${pkgname}"
+pkgrel=3
+pkgdesc="Tool for generating documentation for Haskell libraries"
+url="http://hackage.haskell.org/package/$pkgname"
 license=('custom:BSD3')
-arch=('i686' 'x86_64')
-makedepends=(alex happy)
-depends=(ghc=7.0.3-2 sh 'haskell-mtl=2.0.1.0-3.1' 'haskell-xhtml=3000.2.0.1-7.1' 'haskell-ghc-paths=0.1.0.8-4.1') 
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
+arch=('x86_64' 'i686')
+makedepends=('alex' 'happy')
+depends=('ghc' 'haskell-mtl' 'haskell-xhtml>=3000.2' 'haskell-ghc-paths') 
+options=(strip)
+install=haddock.install
+source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz")
+md5sums=('04928e132827a1da20ace52babb43e47')
 
 build() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    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
+  cd "$srcdir/$pkgname-$pkgver"
+  
+  #sed -i 's:ghc >= 7.2 && < 7.4:ghc:' haddock.cabal
+  runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
+    --docdir=/usr/share/doc/"$pkgname" --libsubdir=\$compiler/site-local/\$pkgid
+  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}/${pkgname}-${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/${pkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-    mv $pkgdir/usr/bin/haddock $pkgdir/usr/bin/haddock-cabal
+  cd "$srcdir/$pkgname-$pkgver"
+  
+  install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
+  install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
+  install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries"
+  ln -s "/usr/share/doc/$pkgname/html" "$pkgdir/usr/share/doc/ghc/html/libraries/$pkgname"
+  runhaskell Setup copy --destdir="$pkgdir"
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
+  mv "$pkgdir/usr/bin/haddock" "$pkgdir/usr/bin/haddock-cabal"
 }
 
-md5sums=('04928e132827a1da20ace52babb43e47')
+# vim:set ts=2 sw=2 et:
diff --git a/community/haddock/haddock.install b/community/haddock/haddock.install
index 278da355e..97cdaefdc 100644
--- a/community/haddock/haddock.install
+++ b/community/haddock/haddock.install
@@ -1,18 +1,25 @@
+pkgname=haddock
 HS_DIR=usr/share/haskell/haddock
-post_install() {
+
+post_upgrade() {
   ${HS_DIR}/register.sh &> /dev/null
   (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) &> /dev/null
 }
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh &> /dev/null
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh &> /dev/null
+
+post_remove() {
   (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) &> /dev/null
 }
+
 pre_remove() {
   ${HS_DIR}/unregister.sh &> /dev/null
 }
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) &> /dev/null
+
+post_install() {
+	post_upgrade
+}
+
+pre_upgrade() {
+	pre_remove
 }
+
+# vim:set ts=2 sw=2 et: