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

[Felix Yan]

    Date: Wednesday, May 25, 2016 @ 08:18:30
  Author: fyan
Revision: 176655

upgpkg: haskell-sha 1.6.4.2-5

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.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, texmath-0.8.6.3, wai-3.2.1.1

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-25 06:17:42 UTC (rev 176654)
+++ PKGBUILD	2016-05-25 06:18:30 UTC (rev 176655)
@@ -5,7 +5,7 @@
 
 pkgname=haskell-sha
 pkgver=1.6.4.2
-pkgrel=4
+pkgrel=5
 pkgdesc="Implementations of the SHA suite of message digest functions"
 url="http://hackage.haskell.org/package/SHA"
 license=('BSD3')
@@ -12,7 +12,6 @@
 arch=('i686' 'x86_64')
 depends=('ghc')
 options=('strip')
-install="${pkgname}.install"
 source=("http://hackage.haskell.org/packages/archive/SHA/${pkgver}/SHA-${pkgver}.tar.gz")
 sha256sums=('c470176f63cbe49fd0502a1b32ef22bc01b1af42385583b8be94547750958a8c')
 
@@ -25,13 +24,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 ${srcdir}/SHA-${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}/SHA-${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/SHA
     runhaskell Setup copy --destdir=${pkgdir}

Deleted: haskell-sha.install
===================================================================
--- haskell-sha.install	2016-05-25 06:17:42 UTC (rev 176654)
+++ haskell-sha.install	2016-05-25 06:18:30 UTC (rev 176655)
@@ -1,26 +0,0 @@
-# custom variables
-pkgname=haskell-sha
-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)
-}