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

[Felix Yan]

    Date: Wednesday, May 25, 2016 @ 11:46:08
  Author: fyan
Revision: 176784

upgpkg: haskell-ghc-paths 0.1.0.9-12

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

---------------------------+
 PKGBUILD                  |   17 +++++++----------
 haskell-ghc-paths.install |   18 ------------------
 2 files changed, 7 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-25 09:46:01 UTC (rev 176783)
+++ PKGBUILD	2016-05-25 09:46:08 UTC (rev 176784)
@@ -4,15 +4,13 @@
 
 pkgname=haskell-ghc-paths
 pkgver=0.1.0.9
-pkgrel=11
+pkgrel=12
 pkgdesc="Knowledge of GHC's installation directories"
 url='http://hackage.haskell.org/package/ghc-paths'
 license=('custom:BSD3')
 arch=('x86_64' 'i686')
-depends=('ghc=7.10.3')
+depends=('ghc=8.0.1')
 source=("http://hackage.haskell.org/packages/archive/ghc-paths/$pkgver/ghc-paths-$pkgver.tar.gz")
-install="$pkgname.install"
-options=('staticlibs')
 sha256sums=('afa68fb86123004c37c1dc354286af2d87a9dcfb12ddcb80e8bd0cd55bc87945')
 
 build() {
@@ -25,16 +23,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 "ghc-paths-$pkgver"
-
-  install -Dm 744 register.sh \
-    "$pkgdir/usr/share/haskell/$pkgname/register.sh"
-  install -m 744 unregister.sh \
-    "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
+  cd "${srcdir}/ghc-paths-${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 -dm 755 "$pkgdir/usr/share/doc/ghc/html/libraries"
   ln -s "/usr/share/doc/$pkgname/html" \
     "$pkgdir/usr/share/doc/ghc/html/libraries/ghc-paths"

Deleted: haskell-ghc-paths.install
===================================================================
--- haskell-ghc-paths.install	2016-05-25 09:46:01 UTC (rev 176783)
+++ haskell-ghc-paths.install	2016-05-25 09:46:08 UTC (rev 176784)
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-ghc-paths
-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)
-}