From cdc73ac802a1af7a5e797e2789db591b244787be Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Sun, 18 Nov 2012 21:11:10 -0300 Subject: Upgrade - noticed --bibliography isn't working It looks like it's like this since 1.9.4 --- ~fauno/pandoc/PKGBUILD | 71 +++++++++++++++++++++++++------------------------- ~fauno/pandoc/SRCBUILD | 15 ++++++----- 2 files changed, 45 insertions(+), 41 deletions(-) diff --git a/~fauno/pandoc/PKGBUILD b/~fauno/pandoc/PKGBUILD index 3d7d1fa9f..d3b88d3a0 100755 --- a/~fauno/pandoc/PKGBUILD +++ b/~fauno/pandoc/PKGBUILD @@ -4,8 +4,8 @@ # Run `makepkg -srp SRCBUILD` if you want to update the source tarball pkgname=pandoc -pkgver=1.9.4.2 -pkgrel=2 +pkgver=1.9.4.5 +pkgrel=3 pkgdesc='Conversion between markup formats (no Haskell libs)' url='http://johnmacfarlane.net/pandoc/' license=('GPL') @@ -15,53 +15,54 @@ options=(strip !makeflags !distcc) source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig} SRCBUILD) conflicts=('haskell-pandoc') optdepends=('texlive-most: for pdf creation') -md5sums=('15f522c6bd0e26c709579b0a0fcfdcea' - 'e86da5aad2a7dfc6d53d2a2a0c562baa' - '415bbf263863c5cbc7c672ec1f497893') # PKGBUILD functions build() { mkdir -p ${srcdir}/{build,${pkgname}-${pkgver}} cd ${srcdir}/${pkgname}-${pkgver} - for _hkpkg in $(grep -v ${pkgname}-${pkgver} BUILDORDER); do - pushd ${srcdir}/${pkgname}-${pkgver}/${_hkpkg} - - HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal install --flags="embed_data_files" --prefix=${srcdir}/build/usr - - popd - done - - cd ${srcdir}/${pkgname}-${pkgver}/${pkgname}-${pkgver} - - HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal configure --prefix=/usr --libdir=${srcdir}/build/usr/lib --flags="-library embed_data_files" - HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal build + while read _hkpkg; do + pushd ${srcdir}/${pkgname}-${pkgver}/${_hkpkg} >/dev/null + + extra="--prefix=${srcdir}/build/usr" + case $_hkpkg in + $pkgname-$pkgver) + extra="--flags=\"executable -library\" --prefix=/usr --libdir=${srcdir}/build/usr/lib -v" ;; + citeproc-hs-*) + extra="--flags=\"embed_data_files\" --prefix=${srcdir}/build/usr -v" ;; + esac + + msg2 "Configuring $_hkpkg with $extra" + if [ "$_hkpkg" != "$pkgname-$pkgver" ]; then + HOME=${srcdir}/${pkgname}-${pkgver} \ + cabal install $extra + else + HOME=${srcdir}/${pkgname}-${pkgver} \ + cabal configure $extra + HOME=${srcdir}/${pkgname}-${pkgver} \ + cabal build + fi + + popd >/dev/null + done > BUILDORDER + cabal install --dry-run file-embed citeproc-hs-${_citeproc} ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER } package() { export PKGEXT=.src.tar.xz - export PKGDEST=${startdir} + export PKGDEST=${SRCDEST} mkdir -p ${pkgdir}/${pkgname}-${pkgver} cd ${pkgdir}/${pkgname}-${pkgver} - find ${srcdir} -iname '*.tar.?z' -a \! -iname '00-index.tar.gz' -exec \ + find ${srcdir}/${pkgname}-${pkgver} -iname '*.tar.?z' -a \! -iname '00-index.tar.gz' -exec \ bsdtar xvf '{}' \; cp ${srcdir}/${pkgname}-${pkgver}/BUILDORDER . -- cgit v1.2.3