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

[Rémy Oudompheng]

    Date: Saturday, October 30, 2010 @ 05:10:46
  Author: remy
Revision: 97418

upgpkg: haskell-network 2.2.1.10-1
Minor update to 2.2.1.10

Modified:
  haskell-network/trunk/PKGBUILD
  haskell-network/trunk/haskell-network.install

-------------------------+
 PKGBUILD                |   17 +++++++++--------
 haskell-network.install |    3 +--
 2 files changed, 10 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-10-30 09:10:04 UTC (rev 97417)
+++ PKGBUILD	2010-10-30 09:10:46 UTC (rev 97418)
@@ -3,33 +3,34 @@
 # Package generated by cabal2arch 0.7.6
 _hkgname=network
 pkgname=haskell-network
-pkgver=2.2.1.7
-pkgrel=5
+pkgver=2.2.1.10
+pkgrel=1
 pkgdesc="Networking-related facilities"
 url="http://hackage.haskell.org/package/network"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=(ghc=6.12.3 sh 'haskell-parsec=2.1.0.1')
+depends=(ghc=6.12.3 sh 'haskell-parsec=3.1.0')
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/network/${pkgver}/network-${pkgver}.tar.gz)
 install=${pkgname}.install
-md5sums=('566cfeef09ff4d2e52110ec4a9a9879b')
+md5sums=('6c8e05473f85e6131de99ffdb13d4d21')
 
 build() {
-    cd ${srcdir}/network-$pkgver
-    runhaskell Setup configure -p --enable-split-objs --enable-shared --prefix=/usr --docdir=/usr/share/doc/${pkgname}
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr --docdir=/usr/share/doc/${pkgname}
     runhaskell Setup build
     runhaskell Setup haddock
     runhaskell Setup register   --gen-script
     runhaskell Setup unregister --gen-script
+    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
 }
 
 package() {
-    cd ${srcdir}/network-${pkgver}
+    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
     install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/network
+    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
     runhaskell Setup copy --destdir=${pkgdir}
     install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
     rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE

Modified: haskell-network.install
===================================================================
--- haskell-network.install	2010-10-30 09:10:04 UTC (rev 97417)
+++ haskell-network.install	2010-10-30 09:10:46 UTC (rev 97418)
@@ -4,8 +4,7 @@
   (cd /usr/share/doc/ghc/html/libraries; ./gen_contents_index)
 }
 pre_upgrade() {
-  ${HS_DIR}/unregister.sh &>/dev/null
-  exit 0
+  ${HS_DIR}/unregister.sh
 }
 post_upgrade() {
   ${HS_DIR}/register.sh