Tue Mar 13 00:01:30 UTC 2012

2 files changed, 53 insertions, 27 deletions

diff --git a/~fauno/pandoc/PKGBUILD b/~fauno/pandoc/PKGBUILD
index d5ecf698c..875e6bb0a 100644
--- a/~fauno/pandoc/PKGBUILD
+++ b/~fauno/pandoc/PKGBUILD
@@ -1,13 +1,9 @@
 # Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
 # Based on haskell-pandoc
-# custom variables
-_hkgname=pandoc
-_licensefile=COPYING
 
-# PKGBUILD options/directives
 pkgname=pandoc
 pkgver=1.9.1.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Conversion between markup formats (no Haskell libs)'
 url='http://johnmacfarlane.net/pandoc/'
 license=('GPL')
@@ -16,27 +12,48 @@ makedepends=('ghc' 'sh' 'cabal-install')
 options=('strip')
 source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-${pkgrel}-any.src.tar.xz{,.sig})
 conflicts=('haskell-pandoc')
-md5sums=('8b71e4a113f5b3bf456cf335d4f365f1'
-         '01f99b7d67d0726fe6b80396ead780d1')
 
 # PKGBUILD functions
 build() {
-    mkdir -p ${srcdir}/{build,${_hkgname}-${pkgver}}
-    cd ${srcdir}/${_hkgname}-${pkgver}
+    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 --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"
+   HOME=${srcdir}/${pkgname}-${pkgver} \
+   cabal build
 
-    HOME=${srcdir}/${_hkgname}-${pkgver} \
-    cabal install --prefix=${srcdir}/build/usr \
-                  --enable-shared \
-                  ${_hkgname}-${pkgver}
 }
 
 package() {
+
+   cd ${srcdir}/${pkgname}-${pkgver}/${pkgname}-${pkgver}
+
+   runghc Setup.hs copy --destdir=${pkgdir}/
+
+#   runghc Setup.hs configure --prefix=DIR --bindir=DIR --libdir=DIR \
+#   --datadir=DIR --libsubdir=DIR --datasubdir=DIR --docdir=DIR \
+#   --htmldir=DIR --program-prefix=PREFIX --program-suffix=SUFFIX \
+#   --mandir=DIR --flags=FLAGSPEC
+
 # Copy everything, but remove docs and haskell-libs
-    cp -a ${srcdir}/build/usr ${pkgdir}/
-    rm -r ${pkgdir}/usr/{lib,share/*}
+#   rm -r ${pkgdir}/usr/{lib,share/*}
 
-    cp -a ${srcdir}/build/usr/share/man ${pkgdir}/usr/share/
-    cp -a ${srcdir}/build/usr/share/doc ${pkgdir}/usr/share/
+#   cp -a ${srcdir}/build/usr/share/man ${pkgdir}/usr/share/
+#   cp -a ${srcdir}/build/usr/share/doc ${pkgdir}/usr/share/
     find ${pkgdir}/usr/share -type f -exec chmod 644 {} \;
     find ${pkgdir}/usr/share -type d -exec chmod 755 {} \;
 }
+md5sums=('f377f51be658821876e49e5485d47219'
+         'd08ee033440f16c30b2b8b6b80ae12c7')
diff --git a/~fauno/pandoc/SRCBUILD b/~fauno/pandoc/SRCBUILD
index fd2172ffc..09b154d7a 100644
--- a/~fauno/pandoc/SRCBUILD
+++ b/~fauno/pandoc/SRCBUILD
@@ -1,13 +1,9 @@
 # Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
 # Based on haskell-pandoc
-# custom variables
-_hkgname=pandoc
-_licensefile=COPYING
 
-# PKGBUILD options/directives
 pkgname=pandoc
 pkgver=1.9.1.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Conversion between markup formats (no Haskell libs)'
 url='http://johnmacfarlane.net/pandoc/'
 license=('GPL')
@@ -17,17 +13,30 @@ source=()
 
 # PKGBUILD functions
 build() {
-    mkdir -p ${srcdir}/{build,${_hkgname}-${pkgver}}
-    cd ${srcdir}/${_hkgname}-${pkgver}
+    mkdir -p ${srcdir}/{build,${pkgname}-${pkgver}}
+    cd ${srcdir}/${pkgname}-${pkgver}
 
-    HOME=${srcdir}/${_hkgname}-${pkgver} cabal --verbose=3 update
+    HOME=${srcdir}/${pkgname}-${pkgver} \
+    cabal --verbose=3 update
 
-    HOME=${srcdir}/${_hkgname}-${pkgver} cabal --verbose=3 fetch ${_hkgname}-${pkgver}
+    HOME=${srcdir}/${pkgname}-${pkgver} \
+    cabal --verbose=3 fetch ${pkgname}-${pkgver}
+
+    msg2 "Getting the dependency build order"
+# Ignore the cabal messages
+    HOME=${srcdir}/${pkgname}-${pkgver} \
+    cabal install --dry-run ${pkgname}-${pkgver} | tail -n+3 > BUILDORDER
 }
 
 package() {
   export PKGEXT=.src.tar.xz
   export PKGDEST=${startdir}
 
-  mv ${srcdir}/${_hkgname}-${pkgver} ${pkgdir}/
+  mkdir -p ${pkgdir}/${pkgname}-${pkgver}
+  cd ${pkgdir}/${pkgname}-${pkgver}
+
+  find ${srcdir} -iname '*.tar.?z' -a \! -iname '00-index.tar.gz' -exec \
+      bsdtar xvf '{}' \;
+
+  cp ${srcdir}/${pkgname}-${pkgver}/BUILDORDER .
 }