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

[Felix Yan]

    Date: Tuesday, May 24, 2016 @ 17:30:20
  Author: fyan
Revision: 176321

upgpkg: haskell-dlist 0.7.1.2-3

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

-----------------------+
 PKGBUILD              |   14 +++++++-------
 haskell-dlist.install |   26 --------------------------
 2 files changed, 7 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-24 15:30:10 UTC (rev 176320)
+++ PKGBUILD	2016-05-24 15:30:20 UTC (rev 176321)
@@ -7,17 +7,15 @@
 pkgver=0.7.1.2
 _hkgname=dlist
 _licensefile=LICENSE
-pkgrel=2
+pkgrel=3
 pkgdesc="Differences lists"
 url="https://hackage.haskell.org/package/dlist"
 license=('BSD')
 arch=('i686' 'x86_64')
-depends=('ghc=7.10.3')
+depends=('ghc=8.0.1')
 options=('strip')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 sha256sums=('332d21f16fd30d2534b6ab96c98830a14266d8f368cff21f6a47469fb3493783')
-install="${pkgname}.install"
-options=('staticlibs')
 
 build() {
     cd ${_hkgname}-${pkgver}
@@ -29,13 +27,15 @@
     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
 }
 
 package() {
-    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
+    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}

Deleted: haskell-dlist.install
===================================================================
--- haskell-dlist.install	2016-05-24 15:30:10 UTC (rev 176320)
+++ haskell-dlist.install	2016-05-24 15:30:20 UTC (rev 176321)
@@ -1,26 +0,0 @@
-# custom variables
-pkgname=haskell-dlist
-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)
-}