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

[Felix Yan]

    Date: Tuesday, May 24, 2016 @ 16:41:39
  Author: fyan
Revision: 176260

upgpkg: haskell-primitive 0.6.1.0-2

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-primitive/trunk/PKGBUILD
Deleted:
  haskell-primitive/trunk/haskell-primitive.install

---------------------------+
 PKGBUILD                  |   16 +++++++++++-----
 haskell-primitive.install |   26 --------------------------
 2 files changed, 11 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-24 14:41:27 UTC (rev 176259)
+++ PKGBUILD	2016-05-24 14:41:39 UTC (rev 176260)
@@ -3,17 +3,22 @@
 
 pkgname=haskell-primitive
 pkgver=0.6.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Wrappers for primitive operations"
 url="http://hackage.haskell.org/package/primitive"
 license=("custom:BSD3")
 arch=('i686' 'x86_64')
 depends=("ghc")
-options=('staticlibs')
-install="${pkgname}.install"
 source=("http://hackage.haskell.org/packages/archive/primitive/${pkgver}/primitive-${pkgver}.tar.gz")
 sha256sums=('93731fa72eaf74e8e83453f080828e18cec9fbc82bee91b49ba8b61c043d38c8')
 
+prepare() {
+  sed -e 's/base >= 4.3 && < 4.9/base >= 4.3 \&\& < 4.10/' \
+      -e 's/ghc-prim >= 0.2 && < 0.5/ghc-prim >= 0.2 \&\& < 0.6/' \
+      -e 's/transformers >= 0.2 && < 0.5/transformers >= 0.2 \&\& < 0.6/' \
+      -i ${srcdir}/primitive-${pkgver}/primitive.cabal
+}
+
 build() {
   cd ${srcdir}/primitive-${pkgver}
   runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
@@ -23,6 +28,7 @@
   runhaskell Setup haddock
   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
 }
 
@@ -31,8 +37,8 @@
   depends=("ghc=${_ghcver}")
 
   cd ${srcdir}/primitive-${pkgver}
-  install -Dm744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-  install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+  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 -dm755 ${pkgdir}/usr/share/doc/ghc/html/libraries
   ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/primitive
   runhaskell Setup copy --destdir=${pkgdir}

Deleted: haskell-primitive.install
===================================================================
--- haskell-primitive.install	2016-05-24 14:41:27 UTC (rev 176259)
+++ haskell-primitive.install	2016-05-24 14:41:39 UTC (rev 176260)
@@ -1,26 +0,0 @@
-# custom variables
-pkgname=haskell-primitive
-HS_DIR=/usr/share/haskell/${pkgname}
-
-# functions
-post_install() {
-    ${HS_DIR}/register.sh
-    (cd /usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
-    ${HS_DIR}/unregister.sh
-}
-
-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)
-}