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

[Felix Yan]

    Date: Tuesday, May 24, 2016 @ 18:11:34
  Author: fyan
Revision: 176393

upgpkg: haskell-stm-chans 3.0.0.4-4

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

---------------------------+
 PKGBUILD                  |   11 +++++------
 haskell-stm-chans.install |   18 ------------------
 2 files changed, 5 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-24 16:11:21 UTC (rev 176392)
+++ PKGBUILD	2016-05-24 16:11:34 UTC (rev 176393)
@@ -5,15 +5,13 @@
 _hkgname=stm-chans
 pkgname=haskell-stm-chans
 pkgver=3.0.0.4
-pkgrel=3
+pkgrel=4
 pkgdesc="Additional types of channels for STM."
 url="http://code.haskell.org/~wren/"
 license=("custom:BSD3")
 arch=('i686' 'x86_64')
-depends=("ghc=7.10.3" "haskell-stm")
-options=('staticlibs')
+depends=("ghc=8.0.1" "haskell-stm")
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install="${pkgname}.install"
 sha256sums=('2344fc5bfa33d565bad7b009fc0e2c5a7a595060ba149c661f44419fc0d54738')
 
 build() {
@@ -26,6 +24,7 @@
     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
 }
 
@@ -32,8 +31,8 @@
 package() {
     cd "${srcdir}/${_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 -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-stm-chans.install
===================================================================
--- haskell-stm-chans.install	2016-05-24 16:11:21 UTC (rev 176392)
+++ haskell-stm-chans.install	2016-05-24 16:11:34 UTC (rev 176393)
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-stm-chans
-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)
-}