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

[Felix Yan]

    Date: Wednesday, May 25, 2016 @ 16:02:05
  Author: fyan
Revision: 176898

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-25 14:01:54 UTC (rev 176897)
+++ PKGBUILD	2016-05-25 14:02:05 UTC (rev 176898)
@@ -5,12 +5,12 @@
 pkgbase=hlint
 pkgname=(hlint haskell-hlint)
 pkgver=1.9.32
-pkgrel=4
+pkgrel=5
 pkgdesc="Source code suggestions"
 url="http://community.haskell.org/~ndm/hlint/"
 license=("custom:BSD3")
 arch=('i686' 'x86_64')
-makedepends=("ghc=7.10.3" "haskell-ansi-terminal" "haskell-cmdargs" "haskell-cpphs"
+makedepends=("ghc=8.0.1" "haskell-ansi-terminal" "haskell-cmdargs" "haskell-cpphs"
              "haskell-extra" "haskell-src-exts" "haskell-hscolour" "haskell-uniplate"
              "haskell-refact")
 source=("http://hackage.haskell.org/packages/archive/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.gz")
@@ -26,6 +26,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
 }
 
@@ -41,12 +42,10 @@
 package_haskell-hlint() {
     pkgdesc="Source code suggestions (docs and libraries)"
     depends=("${makedepends[@]}" 'hlint')
-    install="haskell-hlint.install"
 
     cd "${srcdir}/${pkgbase}-${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/${pkgbase}/html" "${pkgdir}/usr/share/doc/ghc/html/libraries/${pkgbase}"
     runhaskell Setup copy --destdir="${pkgdir}"

Deleted: haskell-hlint.install
===================================================================
--- haskell-hlint.install	2016-05-25 14:01:54 UTC (rev 176897)
+++ haskell-hlint.install	2016-05-25 14:02:05 UTC (rev 176898)
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-hlint
-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)
-}