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

[Felix Yan]

    Date: Wednesday, May 25, 2016 @ 11:42:57
  Author: fyan
Revision: 176778

upgpkg: haskell-regex-compat 0.95.1-5

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

Modified:
  haskell-regex-compat/trunk/PKGBUILD
Deleted:
  haskell-regex-compat/trunk/haskell-regex-compat.install

------------------------------+
 PKGBUILD                     |   13 ++++++-------
 haskell-regex-compat.install |   18 ------------------
 2 files changed, 6 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-25 09:42:46 UTC (rev 176777)
+++ PKGBUILD	2016-05-25 09:42:57 UTC (rev 176778)
@@ -6,7 +6,7 @@
 _hkgname=regex-compat
 pkgname=haskell-regex-compat
 pkgver=0.95.1
-pkgrel=4
+pkgrel=5
 pkgdesc='Replaces and enhances Text.Regex'
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
@@ -13,8 +13,6 @@
 arch=('x86_64' 'i686')
 depends=('ghc' 'haskell-regex-base' 'haskell-regex-posix')
 source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz")
-install="$pkgname.install"
-options=('staticlibs')
 sha256sums=('d57cb1a5a4d66753b18eaa37a1621246f660472243b001894f970037548d953b')
 
 build() {
@@ -26,14 +24,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 "$_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-regex-compat.install
===================================================================
--- haskell-regex-compat.install	2016-05-25 09:42:46 UTC (rev 176777)
+++ haskell-regex-compat.install	2016-05-25 09:42:57 UTC (rev 176778)
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-regex-compat
-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)
-}