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

[Vesa Kaihlavirta]

    Date: Thursday, March 17, 2011 @ 05:19:07
  Author: vesa
Revision: 115149

ghc-7.0.2-2 upgrade

Modified:
  haddock/trunk/PKGBUILD
  haddock/trunk/haddock.install

-----------------+
 PKGBUILD        |   19 ++++++++++---------
 haddock.install |   14 +++++++-------
 2 files changed, 17 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-03-17 09:14:33 UTC (rev 115148)
+++ PKGBUILD	2011-03-17 09:19:07 UTC (rev 115149)
@@ -3,19 +3,19 @@
 # As generated by cabal2arch 0.7.6
 pkgname=haddock
 pkgver=2.9.2
-pkgrel=2
-pkgdesc="Monadic parser combinators"
-url="http://hackage.haskell.org/package/${_hkgname}"
+pkgrel=1
+pkgdesc="Documentation-generation tool for Haskell libraries"
+url="http://hackage.haskell.org/package/${pkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=(ghc=7.0.2-2 sh 'haskell-mtl=2.0.1.0')
+makedepends=(alex happy)
+depends=(ghc sh 'haskell-mtl' 'haskell-xhtml' 'haskell-ghc-paths') # cannot have more strict deps here
 options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+source=(http://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
-md5sums=('3d5500847cac09f6f658db825b6c5df8')
 
 build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
+    cd ${srcdir}/${pkgname}-${pkgver}
     runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
       --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
     runhaskell Setup build
@@ -26,13 +26,14 @@
 }
 
 package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
+    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 -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${pkgname}
     runhaskell Setup copy --destdir=${pkgdir}
     install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
     rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
 }
 
+md5sums=('04928e132827a1da20ace52babb43e47')

Modified: haddock.install
===================================================================
--- haddock.install	2011-03-17 09:14:33 UTC (rev 115148)
+++ haddock.install	2011-03-17 09:19:07 UTC (rev 115149)
@@ -1,18 +1,18 @@
 HS_DIR=usr/share/haskell/haddock
 post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+  ${HS_DIR}/register.sh &> /dev/null
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) &> /dev/null
 }
 pre_upgrade() {
-  ${HS_DIR}/unregister.sh
+  ${HS_DIR}/unregister.sh &> /dev/null
 }
 post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+  ${HS_DIR}/register.sh &> /dev/null
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) &> /dev/null
 }
 pre_remove() {
-  ${HS_DIR}/unregister.sh
+  ${HS_DIR}/unregister.sh &> /dev/null
 }
 post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) &> /dev/null
 }