[arch-commits] Commit in haskell-unix-compat/trunk (2 files)

[Felix Yan]

    Date: Wednesday, May 25, 2016 @ 06:05:53
  Author: fyan
Revision: 176484

upgpkg: haskell-unix-compat 0.4.1.4-4

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

-----------------------------+
 PKGBUILD                    |   12 ++++++------
 haskell-unix-compat.install |   26 --------------------------
 2 files changed, 6 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-25 04:05:06 UTC (rev 176483)
+++ PKGBUILD	2016-05-25 04:05:53 UTC (rev 176484)
@@ -7,17 +7,15 @@
 pkgname=haskell-unix-compat
 _hkgname=unix-compat
 pkgver=0.4.1.4
-pkgrel=3
+pkgrel=4
 pkgdesc="Portable POSIX-compatibility layer."
 url="http://hackage.haskell.org/package/unix-compat"
 license=('BSD3')
 arch=('i686' 'x86_64')
 makedepends=('ghc')
-depends=('ghc=7.10.3' 'haskell-old-time')
-options=('staticlibs')
+depends=('ghc=8.0.1' 'haskell-old-time')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 sha256sums=('fafa1a9eefc93287c028cc61f17a91f886f164b3f64392f1756f8a7f8b3cb34b')
-install="${pkgname}.install"
 
 build() {
     cd "${srcdir}/${_hkgname}-${pkgver}"
@@ -29,13 +27,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 -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-unix-compat.install
===================================================================
--- haskell-unix-compat.install	2016-05-25 04:05:06 UTC (rev 176483)
+++ haskell-unix-compat.install	2016-05-25 04:05:53 UTC (rev 176484)
@@ -1,26 +0,0 @@
-# custom variables
-pkgname=haskell-unix-compat
-HS_DIR=usr/share/haskell/${pkgname}
-
-# functions
-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)
-}