[arch-commits] Commit in haskell-data-default-instances-base/trunk (2 files)

[Felix Yan]

    Date: Tuesday, May 24, 2016 @ 17:41:09
  Author: fyan
Revision: 176341

upgpkg: haskell-data-default-instances-base 0.1.0-2

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-data-default-instances-base/trunk/PKGBUILD
Deleted:
  haskell-data-default-instances-base/trunk/haskell-data-default-instances-base.install

---------------------------------------------+
 PKGBUILD                                    |   17 ++++++++---------
 haskell-data-default-instances-base.install |   18 ------------------
 2 files changed, 8 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-24 15:41:00 UTC (rev 176340)
+++ PKGBUILD	2016-05-24 15:41:09 UTC (rev 176341)
@@ -2,18 +2,14 @@
 _hkgname=data-default-instances-base
 pkgname=haskell-data-default-instances-base
 pkgver=0.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Default instances for types in base"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-makedepends=()
-depends=('ghc=7.10.3' 'haskell-data-default-class')
-options=('strip')
+depends=('ghc=8.0.1' 'haskell-data-default-class')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
 md5sums=('d48abc2ae015173a5c69f7a39350c82a')
-options=('staticlibs')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
@@ -24,12 +20,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
+    cd "${srcdir}/${_hkgname}-${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 -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-data-default-instances-base.install
===================================================================
--- haskell-data-default-instances-base.install	2016-05-24 15:41:00 UTC (rev 176340)
+++ haskell-data-default-instances-base.install	2016-05-24 15:41:09 UTC (rev 176341)
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-data-default-instances-base
-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)
-}