[arch-commits] Commit in haskell-wai-logger/trunk (2 files)

[Felix Yan]

    Date: Tuesday, May 24, 2016 @ 18:23:35
  Author: fyan
Revision: 176417

upgpkg: haskell-wai-logger 2.2.7-3

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.2 -> 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, wai-3.2.1.1

Modified:
  haskell-wai-logger/trunk/PKGBUILD
Deleted:
  haskell-wai-logger/trunk/haskell-wai-logger.install

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-24 16:23:26 UTC (rev 176416)
+++ PKGBUILD	2016-05-24 16:23:35 UTC (rev 176417)
@@ -5,17 +5,15 @@
 _hkgname=wai-logger
 pkgname=haskell-wai-logger
 pkgver=2.2.7
-pkgrel=2
+pkgrel=3
 pkgdesc="A logging system for WAI"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=("custom:BSD3")
 arch=('i686' 'x86_64')
-depends=("ghc=7.10.3" "haskell-blaze-builder" "haskell-byteorder" "haskell-case-insensitive"
+depends=("ghc=8.0.1" "haskell-blaze-builder" "haskell-byteorder" "haskell-case-insensitive"
          "haskell-fast-logger" "haskell-http-types" "haskell-network" "haskell-unix-time"
          "haskell-wai")
-options=('staticlibs')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install="${pkgname}.install"
 sha256sums=('f4718c7661373b6a93fb7ac4b4662617f9e161f6b9297d0f665f71391e489607')
 
 build() {
@@ -28,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
 }
 
@@ -34,8 +33,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-wai-logger.install
===================================================================
--- haskell-wai-logger.install	2016-05-24 16:23:26 UTC (rev 176416)
+++ haskell-wai-logger.install	2016-05-24 16:23:35 UTC (rev 176417)
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-wai-logger
-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)
-}