[arch-commits] Commit in haskell-mtl/trunk (PKGBUILD haskell-mtl.install)

[Felix Yan]

    Date: Tuesday, May 24, 2016 @ 16:52:02
  Author: fyan
Revision: 176268

upgpkg: haskell-mtl 2.2.1-6

rebuild with ghc-8.0.1, base-prelude-1.0.1.1, cabal-install-1.24.0.0, cairo-0.13.2.0, cmark-0.5.2.1, data-default-0.7.0, data-default-class-0.1.0, extra-1.4.7, generic-trie-0.3.0.2, glib-0.13.3.0, gtk3 0.14.2 -> 0.14.3, haddock-api-2.17.2, haddock-library-1.4.1, js-jquery-1.12.4, memory-0.13, microlens-0.4.4.0, network-multicast-0.1.1, pango-0.13.2.0, simple-sendfile-0.2.24, stack-1.1.2, wai-3.2.1.1

Modified:
  haskell-mtl/trunk/PKGBUILD
Deleted:
  haskell-mtl/trunk/haskell-mtl.install

---------------------+
 PKGBUILD            |   72 +++++++++++++++++++-------------------------------
 haskell-mtl.install |   35 ------------------------
 2 files changed, 28 insertions(+), 79 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-24 14:51:53 UTC (rev 176267)
+++ PKGBUILD	2016-05-24 14:52:02 UTC (rev 176268)
@@ -1,61 +1,45 @@
-# Maintainer: Thomas Dziedzic <gostrc at gmail.com>
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Thomas Dziedzic <gostrc at gmail.com>
 
 _hkgname=mtl
 pkgname=haskell-mtl
 pkgver=2.2.1
-pkgrel=5
+pkgrel=6
 pkgdesc="Monad classes, using functional dependencies"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-options=('staticlibs')
-depends=('ghc' 'sh')
+depends=('ghc=8.0.1' 'sh')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install=${pkgname}.install
 md5sums=('96a2f12b94ea8d7cb0aea999cd2e3802')
 
-build() {
-  cd ${_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
+prepare() {
+    sed -i 's/transformers == 0.4.\*/transformers >= 0.4.*/' ${_hkgname}-${pkgver}/${_hkgname}.cabal
 }
 
-_update_deps() {
-    _ver=`pacman -Q $1 | cut -f2 -d\  | cut -f1 -d-`
-    for i in `seq 0 $(expr ${#depends[@]} - 1)`; do
-        if [ ${depends[$i]} == $1 ]; then
-            depends[$i]="$1=${_ver}"
-        fi
-    done
+build() {
+    cd "${srcdir}/${_hkgname}-${pkgver}"
+    
+    runhaskell Setup configure -O --enable-library-profiling --enable-shared \
+        --prefix=/usr --docdir="/usr/share/doc/${pkgname}" \
+        --libsubdir=\$compiler/site-local/\$pkgid
+    runhaskell Setup build
+    runhaskell Setup haddock --hoogle --html
+    runhaskell Setup register --gen-script
+    runhaskell Setup unregister --gen-script
+    sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
 }
 
 package() {
-  _update_deps ghc
-
-  cd ${_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}/${_hkgname}-${pkgver}"
+    
+    install -D -m744 register.sh   "${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+    install -D -m744 unregister.sh "${pkgdir}/usr/share/haskell/unregister/${pkgname}.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"
 }
-

Deleted: haskell-mtl.install
===================================================================
--- haskell-mtl.install	2016-05-24 14:51:53 UTC (rev 176267)
+++ haskell-mtl.install	2016-05-24 14:52:02 UTC (rev 176268)
@@ -1,35 +0,0 @@
-pkgname=haskell-mtl
-
-_register() {
-  usr/share/haskell/${pkgname}/register.sh
-}
-
-_unregister() {
-  usr/share/haskell/${pkgname}/unregister.sh
-}
-
-_gen_contents() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-post_install() {
-  _register
-  _gen_contents
-}
-
-pre_upgrade() {
-  _unregister
-}
-
-post_upgrade() {
-  _register
-  _gen_contents
-}
-
-pre_remove() {
-  _unregister
-}
-
-post_remove() {
-  _gen_contents
-}