[arch-commits] Commit in xmonad-contrib/trunk (PKGBUILD xmonad-contrib.install)

[Felix Yan]

    Date: Wednesday, May 25, 2016 @ 18:23:47
  Author: fyan
Revision: 177032

upgpkg: xmonad-contrib 0.12-3

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:
  xmonad-contrib/trunk/PKGBUILD
Deleted:
  xmonad-contrib/trunk/xmonad-contrib.install

------------------------+
 PKGBUILD               |   11 +++++------
 xmonad-contrib.install |   17 -----------------
 2 files changed, 5 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-25 16:18:51 UTC (rev 177031)
+++ PKGBUILD	2016-05-25 16:23:47 UTC (rev 177032)
@@ -5,14 +5,12 @@
 
 pkgname=xmonad-contrib
 pkgver=0.12
-pkgrel=2
+pkgrel=3
 pkgdesc="Add-ons for xmonad"
 arch=('i686' 'x86_64')
 url="http://xmonad.org/"
 license=('BSD')
-depends=('ghc=7.10.3' 'xmonad=0.12' 'sh' 'haskell-x11=1.6.1.2' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string' 'haskell-random=1.1' 'haskell-old-time')
-install='xmonad-contrib.install'
-options=('staticlibs')
+depends=('ghc=8.0.1' 'xmonad=0.12' 'sh' 'haskell-x11' 'haskell-x11-xft' 'haskell-utf8-string' 'haskell-random' 'haskell-old-time')
 source=("https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz")
 
 build() {
@@ -24,13 +22,14 @@
   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/$pkgname-$pkgver
-  install -D -m744 register.sh $pkgdir/usr/share/haskell/$pkgname/register.sh
-  install -m744 unregister.sh $pkgdir/usr/share/haskell/$pkgname/unregister.sh
+  install -D -m744 register.sh   "${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -D -m744 unregister.sh "${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
   runhaskell Setup.lhs copy --destdir=$pkgdir
   install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
   ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$pkgname"

Deleted: xmonad-contrib.install
===================================================================
--- xmonad-contrib.install	2016-05-25 16:18:51 UTC (rev 177031)
+++ xmonad-contrib.install	2016-05-25 16:23:47 UTC (rev 177032)
@@ -1,17 +0,0 @@
-HS_DIR=usr/share/haskell/xmonad-contrib
-
-post_install() {
-  ${HS_DIR}/register.sh
-}
-
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-
-post_upgrade() {
-  ${HS_DIR}/register.sh
-}
-
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}