Fri Nov 11 23:15:00 UTC 2011

2 files changed, 39 insertions, 26 deletions

diff --git a/community/haskell-tar/PKGBUILD b/community/haskell-tar/PKGBUILD
index 459f288bd..401074d56 100644
--- a/community/haskell-tar/PKGBUILD
+++ b/community/haskell-tar/PKGBUILD
@@ -1,37 +1,44 @@
+# $Id: PKGBUILD 58293 2011-11-10 12:03:04Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-_hkgname=tar
 pkgname=haskell-tar
 pkgver=0.3.1.0
-pkgrel=4.2
+pkgrel=5
 pkgdesc="Reading, writing and manipulating \".tar\" archive files."
 url="http://hackage.haskell.org/package/tar"
 license=('custom:BSD3')
-arch=('i686' 'x86_64')
+arch=('x86_64' 'i686')
 depends=('ghc=7.0.3-2' sh)
 options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
+source=("http://hackage.haskell.org/packages/archive/tar/$pkgver/tar-$pkgver.tar.gz")
+install=haskell-tar.install
 md5sums=('10b54856495f9ef0a42aa270085c7d5e')
 
 build() {
-    cd ${srcdir}/${_hkgname}-${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/tar-$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
 }
 
 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
+  cd "$srcdir/tar-$pkgver"
+
+  install -Dm 744 register.sh \
+	  "$pkgdir/usr/share/haskell/$pkgname/register.sh"
+  install -m 744 unregister.sh \
+	  "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
+  install -dm 755 "$pkgdir/usr/share/doc/ghc/html/libraries"
+  ln -s "/usr/share/doc/$pkgname/html" \
+	  "$pkgdir/usr/share/doc/ghc/html/libraries/tar"
+  runhaskell Setup copy --destdir="$pkgdir"
+  install -Dm 644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
 }
+# vim:set ts=2 sw=2 et:
diff --git a/community/haskell-tar/haskell-tar.install b/community/haskell-tar/haskell-tar.install
index e8c2f6293..7e0383621 100644
--- a/community/haskell-tar/haskell-tar.install
+++ b/community/haskell-tar/haskell-tar.install
@@ -1,18 +1,24 @@
 HS_DIR=usr/share/haskell/haskell-tar
+
 post_install() {
   ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+	post_remove
 }
+
 pre_upgrade() {
   ${HS_DIR}/unregister.sh
 }
+
 post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+	post_install
 }
+
 pre_remove() {
-  ${HS_DIR}/unregister.sh
+	pre_upgrade
 }
+
 post_remove() {
   (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
 }
+
+# vim:set ts=2 sw=2 et: