Date: Monday, November 29, 2010 @ 14:18:01 Author: remy Revision: 101598
Enable shared libraries + fix install scriptlet. Modified: haskell-tar/repos/extra-i686/PKGBUILD haskell-tar/repos/extra-i686/haskell-tar.install haskell-tar/repos/extra-x86_64/PKGBUILD haskell-tar/repos/extra-x86_64/haskell-tar.install ----------------------------------+ extra-i686/PKGBUILD | 25 +++++++++++++------------ extra-i686/haskell-tar.install | 11 ++++------- extra-x86_64/PKGBUILD | 25 +++++++++++++------------ extra-x86_64/haskell-tar.install | 11 ++++------- 4 files changed, 34 insertions(+), 38 deletions(-) Modified: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2010-11-29 19:13:59 UTC (rev 101597) +++ extra-i686/PKGBUILD 2010-11-29 19:18:01 UTC (rev 101598) @@ -4,35 +4,36 @@ # Your package tool should understand 'provides' syntax # pkgname=haskell-tar -pkgrel=2.1 +pkgrel=2.2 pkgver=0.3.1.0 pkgdesc="Reading, writing and manipulating \".tar\" archive files." url="http://hackage.haskell.org/package/tar" license=('custom:BSD3') arch=('i686' 'x86_64') makedepends=() -depends=('ghc' 'haskell-cabal' 'haskell-bytestring' 'haskell-directory' 'haskell-filepath' 'haskell-old-time') +depends=('ghc=6.12.3' 'haskell-cabal' 'haskell-bytestring' 'haskell-directory' 'haskell-filepath' 'haskell-old-time') options=('strip') -source=(http://hackage.haskell.org/packages/archive/tar/0.3.1.0/tar-0.3.1.0.tar.gz) +source=(http://hackage.haskell.org/packages/archive/tar/${pkgver}/tar-0.3.1.0.tar.gz) install=haskell-tar.install md5sums=('10b54856495f9ef0a42aa270085c7d5e') + build() { - cd ${srcdir}/tar-0.3.1.0 - runhaskell Setup configure -O -p --prefix=/usr --docdir=/usr/share/doc/${pkgname} || return 1 - runhaskell Setup build || return 1 - runhaskell Setup haddock || return 1 - runhaskell Setup register --gen-script || return 1 - runhaskell Setup unregister --gen-script || return 1 + cd ${srcdir}/tar-${pkgver} + runhaskell Setup configure -O -p --enable-shared --enable-split-objs --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}/tar-0.3.1.0 + cd ${srcdir}/tar-${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/tar - runhaskell Setup copy --destdir=${pkgdir} || return 1 - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE || return 1 + runhaskell Setup copy --destdir=${pkgdir} + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE } Modified: extra-i686/haskell-tar.install =================================================================== --- extra-i686/haskell-tar.install 2010-11-29 19:13:59 UTC (rev 101597) +++ extra-i686/haskell-tar.install 2010-11-29 19:18:01 UTC (rev 101598) @@ -1,21 +1,18 @@ -HS_DIR=/usr/share/haskell/haskell-tar +HS_DIR=usr/share/haskell/haskell-tar post_install() { ${HS_DIR}/register.sh - (cd /usr/share/doc/ghc/html/libraries; ./gen_contents_index) + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) } pre_upgrade() { ${HS_DIR}/unregister.sh } post_upgrade() { ${HS_DIR}/register.sh - (cd /usr/share/doc/ghc/html/libraries; ./gen_contents_index) + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) } pre_remove() { ${HS_DIR}/unregister.sh } post_remove() { - (cd /usr/share/doc/ghc/html/libraries; ./gen_contents_index) + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) } -op=$1 -shift -$op $* Modified: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2010-11-29 19:13:59 UTC (rev 101597) +++ extra-x86_64/PKGBUILD 2010-11-29 19:18:01 UTC (rev 101598) @@ -4,35 +4,36 @@ # Your package tool should understand 'provides' syntax # pkgname=haskell-tar -pkgrel=2.1 +pkgrel=2.2 pkgver=0.3.1.0 pkgdesc="Reading, writing and manipulating \".tar\" archive files." url="http://hackage.haskell.org/package/tar" license=('custom:BSD3') arch=('i686' 'x86_64') makedepends=() -depends=('ghc' 'haskell-cabal' 'haskell-bytestring' 'haskell-directory' 'haskell-filepath' 'haskell-old-time') +depends=('ghc=6.12.3' 'haskell-cabal' 'haskell-bytestring' 'haskell-directory' 'haskell-filepath' 'haskell-old-time') options=('strip') -source=(http://hackage.haskell.org/packages/archive/tar/0.3.1.0/tar-0.3.1.0.tar.gz) +source=(http://hackage.haskell.org/packages/archive/tar/${pkgver}/tar-0.3.1.0.tar.gz) install=haskell-tar.install md5sums=('10b54856495f9ef0a42aa270085c7d5e') + build() { - cd ${srcdir}/tar-0.3.1.0 - runhaskell Setup configure -O -p --prefix=/usr --docdir=/usr/share/doc/${pkgname} || return 1 - runhaskell Setup build || return 1 - runhaskell Setup haddock || return 1 - runhaskell Setup register --gen-script || return 1 - runhaskell Setup unregister --gen-script || return 1 + cd ${srcdir}/tar-${pkgver} + runhaskell Setup configure -O -p --enable-shared --enable-split-objs --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}/tar-0.3.1.0 + cd ${srcdir}/tar-${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/tar - runhaskell Setup copy --destdir=${pkgdir} || return 1 - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE || return 1 + runhaskell Setup copy --destdir=${pkgdir} + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE } Modified: extra-x86_64/haskell-tar.install =================================================================== --- extra-x86_64/haskell-tar.install 2010-11-29 19:13:59 UTC (rev 101597) +++ extra-x86_64/haskell-tar.install 2010-11-29 19:18:01 UTC (rev 101598) @@ -1,21 +1,18 @@ -HS_DIR=/usr/share/haskell/haskell-tar +HS_DIR=usr/share/haskell/haskell-tar post_install() { ${HS_DIR}/register.sh - (cd /usr/share/doc/ghc/html/libraries; ./gen_contents_index) + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) } pre_upgrade() { ${HS_DIR}/unregister.sh } post_upgrade() { ${HS_DIR}/register.sh - (cd /usr/share/doc/ghc/html/libraries; ./gen_contents_index) + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) } pre_remove() { ${HS_DIR}/unregister.sh } post_remove() { - (cd /usr/share/doc/ghc/html/libraries; ./gen_contents_index) + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) } -op=$1 -shift -$op $*