Date: Tuesday, December 30, 2014 @ 23:25:07 Author: spupykin Revision: 125044
Modified: haddock/trunk/PKGBUILD haddock/trunk/haddock.install haskell-haddock-api/trunk/PKGBUILD haskell-haddock-library/trunk/PKGBUILD haskell-haddock-library/trunk/haskell-haddock-library.install ---------------------------------------------------------------+ haddock/trunk/PKGBUILD | 28 +++++++--- haddock/trunk/haddock.install | 2 haskell-haddock-api/trunk/PKGBUILD | 11 --- haskell-haddock-library/trunk/PKGBUILD | 2 haskell-haddock-library/trunk/haskell-haddock-library.install | 8 -- 5 files changed, 26 insertions(+), 25 deletions(-) Modified: haddock/trunk/PKGBUILD =================================================================== --- haddock/trunk/PKGBUILD 2014-12-30 21:55:43 UTC (rev 125043) +++ haddock/trunk/PKGBUILD 2014-12-30 22:25:07 UTC (rev 125044) @@ -4,7 +4,7 @@ # Contributor: Arch Haskell Team <[email protected]> pkgname=haddock -pkgver=2.14.3 +pkgver=2.15.0.1 pkgrel=1 pkgdesc='Tool for generating documentation for Haskell libraries' url='http://hackage.haskell.org/package/haddock/' @@ -11,11 +11,11 @@ license=('custom:BSD3') arch=('x86_64' 'i686') makedepends=('alex' 'happy') -depends=('ghc=7.8.3-2' 'haskell-ghc-paths') +depends=('ghc' 'haskell-ghc-paths' 'haskell-haddock-api') install="$pkgname.install" +options=('staticlibs') source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz";) -sha256sums=('d454f64ed0ea79ec9a94d4d79c8635be74d752d028b737dbe3b5deb9749e310c') -options=('staticlibs') +sha256sums=('b7b9e357060e99a68996aca3e3921b2e99bcb5a7669bf7cbad33bac91486705f') build() { cd "$pkgname-$pkgver" @@ -30,11 +30,25 @@ sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh } +_update_deps() { + _ver=`pacman -Q $1 | cut -f2 -d\ | cut -f1 -d-` + for i in `seq 0 $(expr ${#depends[@]} - 1)`; do + if [ ${depends[$i]} == $1 ]; then + depends[$i]="$1=${_ver}" + fi + done +} + + package() { cd "$pkgname-$pkgver" - - install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh" - install -m744 unregister.sh \ + + _update_deps ghc + _update_deps haskell-ghc-paths + _update_deps haskell-haddock-api + +# install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh" + install -Dm744 unregister.sh \ "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries" ln -s "/usr/share/doc/$pkgname/html" \ Modified: haddock/trunk/haddock.install =================================================================== --- haddock/trunk/haddock.install 2014-12-30 21:55:43 UTC (rev 125043) +++ haddock/trunk/haddock.install 2014-12-30 22:25:07 UTC (rev 125044) @@ -2,7 +2,7 @@ HS_DIR=usr/share/haskell/haddock post_upgrade() { - ${HS_DIR}/register.sh &> /dev/null +# ${HS_DIR}/register.sh &> /dev/null post_remove } Modified: haskell-haddock-api/trunk/PKGBUILD =================================================================== --- haskell-haddock-api/trunk/PKGBUILD 2014-12-30 21:55:43 UTC (rev 125043) +++ haskell-haddock-api/trunk/PKGBUILD 2014-12-30 22:25:07 UTC (rev 125044) @@ -17,15 +17,6 @@ install="${pkgname}.install" sha256sums=("551b4485663f86528ebc8c9a268eee97342f83ff07e863226449cdd2a6e745e8") -# PKGBUILD functions - -prepare() { - cd "${srcdir}/haddock-api-${pkgver}" - - # no cabal patch - # no source patch -} - build() { cd "${srcdir}/haddock-api-${pkgver}" @@ -53,6 +44,8 @@ cd "${srcdir}/haddock-api-${pkgver}" _update_deps ghc + _update_deps haskell-ghc-paths + _update_deps haskell-haddock-library install -D -m744 register.sh "${pkgdir}/usr/share/haskell/${pkgname}/register.sh" install -m744 unregister.sh "${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh" Modified: haskell-haddock-library/trunk/PKGBUILD =================================================================== --- haskell-haddock-library/trunk/PKGBUILD 2014-12-30 21:55:43 UTC (rev 125043) +++ haskell-haddock-library/trunk/PKGBUILD 2014-12-30 22:25:07 UTC (rev 125044) @@ -3,7 +3,7 @@ pkgname=haskell-haddock-library pkgver=1.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="A documentation-generation tool for Haskell libraries" url="http://www.haskell.org/haddock/"; license=("BSD3") Modified: haskell-haddock-library/trunk/haskell-haddock-library.install =================================================================== --- haskell-haddock-library/trunk/haskell-haddock-library.install 2014-12-30 21:55:43 UTC (rev 125043) +++ haskell-haddock-library/trunk/haskell-haddock-library.install 2014-12-30 22:25:07 UTC (rev 125044) @@ -1,11 +1,10 @@ # custom variables -pkgname=haskell-haddock-api +pkgname=haskell-haddock-library HS_DIR=usr/share/haskell/${pkgname} # functions post_install() { ${HS_DIR}/register.sh - /usr/share/doc/ghc/html/libraries/arch-gen-contents-index } pre_upgrade() { @@ -14,13 +13,8 @@ post_upgrade() { ${HS_DIR}/register.sh - /usr/share/doc/ghc/html/libraries/arch-gen-contents-index } pre_remove() { ${HS_DIR}/unregister.sh } - -post_remove() { - /usr/share/doc/ghc/html/libraries/arch-gen-contents-index -}
