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

[Felix Yan]

    Date: Wednesday, May 25, 2016 @ 12:12:37
  Author: fyan
Revision: 176822

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-25 10:10:59 UTC (rev 176821)
+++ PKGBUILD	2016-05-25 10:12:37 UTC (rev 176822)
@@ -6,17 +6,15 @@
 pkgname=haskell-hpack
 _hkgname=hpack
 pkgver=0.14.0
-pkgrel=1
+pkgrel=2
 pkgdesc="An alternative format for Haskell packages"
 url="https://github.com/sol/hpack#readme"
 license=("MIT")
 arch=('i686' 'x86_64')
 makedepends=('ghc')
-depends=("ghc=7.10.3" 'haskell-aeson' 'haskell-base-compat' 'haskell-glob' 'haskell-text'
+depends=("ghc=8.0.1" 'haskell-aeson' 'haskell-base-compat' 'haskell-glob' 'haskell-text'
          'haskell-unordered-containers' 'haskell-yaml')
 source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-${pkgver}.tar.gz")
-options=('staticlibs')
-install=$pkgname.install
 md5sums=('372110971c5d0878d03529351e80690b')
 
 build() {
@@ -28,13 +26,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/$_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-hpack.install
===================================================================
--- haskell-hpack.install	2016-05-25 10:10:59 UTC (rev 176821)
+++ haskell-hpack.install	2016-05-25 10:12:37 UTC (rev 176822)
@@ -1,23 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-hpack
-
-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)
-}