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

[Felix Yan]

    Date: Wednesday, May 25, 2016 @ 18:10:57
  Author: fyan
Revision: 177022

upgpkg: xmonad 0.12-4

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

----------------+
 PKGBUILD       |   14 +++++++-------
 xmonad.install |   19 -------------------
 2 files changed, 7 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-25 16:10:29 UTC (rev 177021)
+++ PKGBUILD	2016-05-25 16:10:57 UTC (rev 177022)
@@ -6,18 +6,16 @@
 
 pkgname=xmonad
 pkgver=0.12
-pkgrel=3
+pkgrel=4
 pkgdesc="Lightweight X11 tiled window manager written in Haskell"
 arch=('i686' 'x86_64')
 url="http://xmonad.org/"
 license=('BSD')
-depends=('ghc=7.10.3' 'gmp' 'haskell-x11=1.6.1.2' 'sh' 'haskell-mtl=2.2.1'
+depends=('ghc=8.0.1' 'gmp' 'haskell-x11=1.6.1.2' 'sh' 'haskell-mtl=2.2.1'
          'haskell-utf8-string' 'haskell-extensible-exceptions=0.1.1.4'
          'haskell-data-default' 'haskell-setlocale')
 makedepends=('gendesk')
 optdepends=('xorg-xmessage: for displaying visual error messages')
-install='xmonad.install'
-options=('staticlibs')
 source=("https://github.com/xmonad/xmonad/archive/v${pkgver}.tar.gz"
         "xmonad.svg")
 
@@ -37,13 +35,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/$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
+  cd "${srcdir}/${pkgname}-${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"
 
   runhaskell Setup.lhs copy --destdir=$pkgdir
 

Deleted: xmonad.install
===================================================================
--- xmonad.install	2016-05-25 16:10:29 UTC (rev 177021)
+++ xmonad.install	2016-05-25 16:10:57 UTC (rev 177022)
@@ -1,19 +0,0 @@
-HS_DIR=/usr/share/haskell/xmonad
-
-post_install() {
-    ${HS_DIR}/register.sh
-    echo "xmonad now has dynamic configuration via ~/.xmonad/xmonad.hs"
-    echo "See http://haskell.org/haskellwiki/Xmonad/Config_archive for examples"
-}
-
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-
-post_upgrade() {
-  ${HS_DIR}/register.sh
-}
-
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}