[arch-commits] Commit in haskell-base64-bytestring/trunk (2 files)

[Felix Yan]

    Date: Tuesday, May 24, 2016 @ 16:53:22
  Author: fyan
Revision: 176269

upgpkg: haskell-base64-bytestring 1.0.0.1-6

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

-----------------------------------+
 PKGBUILD                          |   14 +++++++-------
 haskell-base64-bytestring.install |   23 -----------------------
 2 files changed, 7 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-24 14:52:02 UTC (rev 176268)
+++ PKGBUILD	2016-05-24 14:53:22 UTC (rev 176269)
@@ -8,16 +8,14 @@
 _hkgname=base64-bytestring
 pkgname=haskell-base64-bytestring
 pkgver=1.0.0.1
-pkgrel=5
+pkgrel=6
 pkgdesc="Fast base64 encoding and decoding for ByteStrings"
 url="https://github.com/bos/base64-bytestring"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.10.3')
+depends=('ghc=8.0.1')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install="$pkgname.install"
 sha256sums=('ab25abf4b00a2f52b270bc3ed43f1d59f16c8eec9d7dffb14df1e9265b233b50')
-options=("staticlibs")
 
 build() {
   cd "$srcdir/$_hkgname-$pkgver"
@@ -28,13 +26,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 -Dm744 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-base64-bytestring.install
===================================================================
--- haskell-base64-bytestring.install	2016-05-24 14:52:02 UTC (rev 176268)
+++ haskell-base64-bytestring.install	2016-05-24 14:53:22 UTC (rev 176269)
@@ -1,23 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-base64-bytestring
-
-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)
-}