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

[Felix Yan]

    Date: Wednesday, May 25, 2016 @ 16:12:22
  Author: fyan
Revision: 176920

upgpkg: haskell-x11-xft 0.3.1-18

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-25 14:12:11 UTC (rev 176919)
+++ PKGBUILD	2016-05-25 14:12:22 UTC (rev 176920)
@@ -4,16 +4,13 @@
 _hkgname=X11-xft
 pkgname=haskell-x11-xft
 pkgver=0.3.1
-pkgrel=17
+pkgrel=18
 pkgdesc="Bindings to the Xft, X Free Type interface library, and some Xrender parts"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('LGPL')
 arch=('i686' 'x86_64')
-depends=('ghc=7.10.3' 'haskell-x11=1.6.1.2' 'haskell-utf8-string' 'libxft')
-options=('strip')
-install=haskell-x11-xft.install
+depends=('ghc=8.0.1' 'haskell-x11=1.6.1.2' 'haskell-utf8-string' 'libxft')
 source=(http://hackage.haskell.org/packages/archive/X11-xft/$pkgver/X11-xft-$pkgver.tar.gz)
-options=('staticlibs')
 md5sums=('ad885150a59f63de328e73abe5ffc79e')
 
 build() {
@@ -24,13 +21,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-x11-xft.install
===================================================================
--- haskell-x11-xft.install	2016-05-25 14:12:11 UTC (rev 176919)
+++ haskell-x11-xft.install	2016-05-25 14:12:22 UTC (rev 176920)
@@ -1,18 +0,0 @@
-HS_DIR=/usr/share/haskell/haskell-x11-xft
-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)
-}