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

[Felix Yan]

    Date: Wednesday, May 25, 2016 @ 06:51:55
  Author: fyan
Revision: 176532

upgpkg: haskell-polyparse 1.12-2

rebuild with MissingH-1.3.0.2, ShellCheck-0.4.4, cabal-helper-0.7.1.0, cryptohash-sha256-0.11.100.0, graphviz-2999.18.1.0, hakyll-4.8.3.1, idris-0.11.2, monad-journal-0.7.2, pandoc-crossref-0.2.1.3, simple-sendfile-0.2.22

Modified:
  haskell-polyparse/trunk/PKGBUILD
Deleted:
  haskell-polyparse/trunk/haskell-polyparse.install

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-25 04:48:33 UTC (rev 176531)
+++ PKGBUILD	2016-05-25 04:51:55 UTC (rev 176532)
@@ -5,15 +5,13 @@
 _hkgname=polyparse
 pkgname=haskell-polyparse
 pkgver=1.12
-pkgrel=1
+pkgrel=2
 pkgdesc="A variety of alternative parser combinator libraries."
 url="http://code.haskell.org/~malcolm/polyparse/"
 license=("LGPL")
 arch=('i686' 'x86_64')
-depends=("ghc=7.10.3" "haskell-text")
-options=('staticlibs')
+depends=("ghc=8.0.1" "haskell-text")
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install="${pkgname}.install"
 sha256sums=('f54c63584ace968381de4a06bd7328b6adc3e1a74fd336e18449e0dd7650be15')
 
 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-polyparse.install
===================================================================
--- haskell-polyparse.install	2016-05-25 04:48:33 UTC (rev 176531)
+++ haskell-polyparse.install	2016-05-25 04:51:55 UTC (rev 176532)
@@ -1,18 +0,0 @@
-HS_DIR=/usr/share/haskell/haskell-polyparse
-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)
-}