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

[Felix Yan]

    Date: Wednesday, May 25, 2016 @ 12:20:08
  Author: fyan
Revision: 176838

upgpkg: haskell-path-io 1.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.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-path-io/trunk/PKGBUILD
Deleted:
  haskell-path-io/trunk/haskell-path-io.install

-------------------------+
 PKGBUILD                |   14 +++++++-------
 haskell-path-io.install |   23 -----------------------
 2 files changed, 7 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-25 10:20:01 UTC (rev 176837)
+++ PKGBUILD	2016-05-25 10:20:08 UTC (rev 176838)
@@ -6,14 +6,12 @@
 pkgname=haskell-path-io
 _hkgname=path-io
 pkgver=1.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Interface to ‘directory’ package for users of ‘path’"
 url="https://github.com/mrkkrp/path-io"
 license=("custom:BSD3")
 arch=('i686' 'x86_64')
-depends=("ghc=7.10.3" 'haskell-exceptions' 'haskell-path' 'haskell-temporary')
-options=('staticlibs')
-install=$pkgname.install
+depends=("ghc=8.0.1" 'haskell-exceptions' 'haskell-path' 'haskell-temporary')
 source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-${pkgver}.tar.gz")
 md5sums=('189dafe7e56ade1165eb708e5abd821b')
 
@@ -27,13 +25,15 @@
   LC_CTYPE=en_US.UTF-8 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() {
-  cd "$srcdir/$_hkgname-$pkgver"
-  install -Dm744 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 -dm755 "$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-path-io.install
===================================================================
--- haskell-path-io.install	2016-05-25 10:20:01 UTC (rev 176837)
+++ haskell-path-io.install	2016-05-25 10:20:08 UTC (rev 176838)
@@ -1,23 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-path-io
-
-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)
-}