[arch-commits] Commit in haskell-x11/trunk (PKGBUILD hsmod.install)

[Felix Yan]

    Date: Wednesday, May 25, 2016 @ 11:37:08
  Author: fyan
Revision: 176762

upgpkg: haskell-x11 1.6.1.2-8

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

---------------+
 PKGBUILD      |   15 +++++++--------
 hsmod.install |   18 ------------------
 2 files changed, 7 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-25 09:35:09 UTC (rev 176761)
+++ PKGBUILD	2016-05-25 09:37:08 UTC (rev 176762)
@@ -6,17 +6,14 @@
 _hkgname=X11
 pkgname=haskell-x11
 pkgver=1.6.1.2
-pkgrel=7
+pkgrel=8
 pkgdesc="A Haskell binding to the X11 graphics library."
 arch=(i686 x86_64)
 url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11"
 license=('custom:BSD3')
-options=('strip')
-depends=("ghc=7.10.3" "libx11" "libxinerama" "libxrandr" "haskell-data-default")
+depends=("ghc=8.0.1" "libx11" "libxinerama" "libxrandr" "haskell-data-default")
 conflicts=(haskell-x11-extras)
-install=hsmod.install
 source=(http://hackage.haskell.org/packages/archive/X11/$pkgver/X11-$pkgver.tar.gz)
-options=('staticlibs')
 md5sums=('d7c94a65ce4b140e97cce835e8682ac3')
 
 build() {
@@ -27,13 +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 ${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: hsmod.install
===================================================================
--- hsmod.install	2016-05-25 09:35:09 UTC (rev 176761)
+++ hsmod.install	2016-05-25 09:37:08 UTC (rev 176762)
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-x11
-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)
-}