Mon Apr 29 00:34:20 PDT 2013

2 files changed, 21 insertions, 38 deletions

diff --git a/community/haskell-data-default/PKGBUILD b/community/haskell-data-default/PKGBUILD
index a67fb8d44..819635eaf 100644
--- a/community/haskell-data-default/PKGBUILD
+++ b/community/haskell-data-default/PKGBUILD
@@ -1,37 +1,28 @@
-# Contributor: Lex Black <autumn-wind at web dot de>
-# Contributor: Don Stewart <dons@galois.com>
-
-pkgname=haskell-data-default
+# Maintainer: Jelle van der Waa <jelle@vdwaa.nl>
 _hkgname=data-default
-_licensefile=LICENSE
-pkgver=0.5.1
-pkgrel=2
+pkgname=haskell-data-default
+pkgver=0.5.3
+pkgrel=1
 pkgdesc="A class for types with a default value"
 url="http://hackage.haskell.org/package/${_hkgname}"
-license=('BSD')
+license=('custom:BSD3')
 arch=('i686' 'x86_64')
-makedepends=('ghc')
-depends=('haskell-containers' 'haskell-dlist' 'haskell-old-locale')
+makedepends=()
+depends=('ghc=7.6.3' 'haskell-data-default-class' 'haskell-data-default-instances-base' 'haskell-data-default-instances-containers' 'haskell-data-default-instances-dlist' 'haskell-data-default-instances-old-locale')
 options=('strip')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-sha256sums=('fb56f34f820379df4881bcccbcb065389200e20778321e2d6e8c92dad94af717')
-install="${pkgname}.install"
-
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+install=${pkgname}.install
+md5sums=('03a98d999273ad20d5bc0c711bf1c533')
 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 configure -O ${PKGBUILD_HASKELL_ENABLE_PROFILING:+-p } --enable-split-objs --enable-shared \
-    #    --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-    #    --libsubdir=\$compiler/site-local/\$pkgid
+    runhaskell Setup configure -O ${PKGBUILD_HASKELL_ENABLE_PROFILING:+-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 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
diff --git a/community/haskell-data-default/haskell-data-default.install b/community/haskell-data-default/haskell-data-default.install
index d6fa72e16..0b0a72558 100644
--- a/community/haskell-data-default/haskell-data-default.install
+++ b/community/haskell-data-default/haskell-data-default.install
@@ -1,26 +1,18 @@
-# custom variables
-pkgname=haskell-data-default
-HS_DIR=/usr/share/haskell/${pkgname}
-
-# functions
+HS_DIR=usr/share/haskell/haskell-data-default
 post_install() {
-    ${HS_DIR}/register.sh
-    (cd /usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
 }
-
 pre_upgrade() {
-    ${HS_DIR}/unregister.sh
+  ${HS_DIR}/unregister.sh
 }
-
 post_upgrade() {
-    ${HS_DIR}/register.sh
-    (cd /usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
 }
-
 pre_remove() {
-    ${HS_DIR}/unregister.sh
+  ${HS_DIR}/unregister.sh
 }
-
 post_remove() {
-    (cd /usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
 }