Updated cmdargs, mtlparse, numeric-prelude, regexpr, and texmath from…

… Hackage.

Bumped halipeto, hledger-lib, hledger, pandoc, etc. because they depend
on (at least) one of the updated packages.

These files have been generated with the latest tool-chain, which comes
with several updates:

 * the cabal name of the package is available as ${_hkgname},

 * the generated uninstall.sh hook uses --force to avoid warnings during
   updates, and

 * our attribution header of choice these days is "Maintainer:".

haskell-archlinux/PKGBUILD

@@ -1,37 +1,33 @@
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.5
-# Note: we list all package dependencies.
-# Your package tool should understand 'provides' syntax
-#
-# Keep up to date on http://archhaskell.wordpress.com/
-#
+# Maintainer: Arch Haskell Team <arch-haskell@haskell.org>
+_hkgname=archlinux
 pkgname=haskell-archlinux
-pkgrel=1
 pkgver=0.3.4
+pkgrel=1
 pkgdesc="Support for working with Arch Linux packages."
-url="http://hackage.haskell.org/package/archlinux"
+url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
 makedepends=()
-depends=('ghc' 'haskell-cabal' 'haskell-cabal>=1.6' 'haskell-bytestring' 'haskell-containers' 'haskell-directory' 'haskell-filepath' 'haskell-pretty' 'haskell-tar')
+depends=('ghc' 'haskell-cabal>=1.6' 'haskell-tar')
 options=('strip')
-source=(http://hackage.haskell.org/packages/archive/archlinux/0.3.4/archlinux-0.3.4.tar.gz)
-install=haskell-archlinux.install
-md5sums=(0c72c97d260c7688af6d7a071bc13f23)
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+install=${pkgname}.install
+md5sums=('0c72c97d260c7688af6d7a071bc13f23')
 build() {
-    cd ${srcdir}/archlinux-0.3.4
-    runhaskell Setup configure --prefix=/usr --docdir=/usr/share/doc/${pkgname}
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    runhaskell Setup configure --prefix=/usr --docdir=/usr/share/doc/${pkgname} -O --enable-split-objs
     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}/archlinux-0.3.4
+    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/archlinux
+    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

haskell-archlinux/haskell-archlinux.install

@@ -16,6 +16,3 @@ pre_remove() {
 post_remove() {
   (cd /usr/share/doc/ghc/html/libraries; ./gen_contents_index)
 }
-op=$1
-shift
-$op $*

haskell-cmdargs/PKGBUILD

@@ -1,35 +1,34 @@
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.3
-# Note: we list all package dependencies.
-# Your package tool should understand 'provides' syntax
-#
-# Keep up to date on http://archhaskell.wordpress.com/
-#
+# Maintainer: Arch Haskell Team <arch-haskell@haskell.org>
+_hkgname=cmdargs
 pkgname=haskell-cmdargs
+pkgver=0.6.1
 pkgrel=1
-pkgver=0.6
 pkgdesc="Command line argument processing"
-url="http://hackage.haskell.org/package/cmdargs"
+url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
 makedepends=()
-depends=('ghc' 'haskell-cabal' 'haskell-filepath' 'haskell-mtl')
+depends=('ghc' 'haskell-mtl')
 options=('strip')
-source=(http://hackage.haskell.org/packages/archive/cmdargs/0.6/cmdargs-0.6.tar.gz)
-install=haskell-cmdargs.install
-md5sums=('af698e16cd4c245f275686cf6aa99528')
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+install=${pkgname}.install
+md5sums=('de2d6783a3148b043864455233cdb661')
 build() {
-    cd ${srcdir}/cmdargs-0.6
-    runhaskell Setup configure --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
-    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/cmdargs
-    runhaskell Setup copy --destdir=${pkgdir} || return 1
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE || return 1
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    runhaskell Setup configure --prefix=/usr --docdir=/usr/share/doc/${pkgname} -O --enable-split-objs
+    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}/${_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/${_hkgname}
+    runhaskell Setup copy --destdir=${pkgdir}
+    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
     rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
 }

haskell-cmdargs/haskell-cmdargs.install

@@ -16,6 +16,3 @@ pre_remove() {
 post_remove() {
   (cd /usr/share/doc/ghc/html/libraries; ./gen_contents_index)
 }
-op=$1
-shift
-$op $*

haskell-csv/PKGBUILD

@@ -1,31 +1,32 @@
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7
-# Note: we list all package dependencies.
-# Your package tool should understand 'provides' syntax
-#
+# Maintainer: Arch Haskell Team <arch-haskell@haskell.org>
+_hkgname=csv
 pkgname=haskell-csv
-pkgrel=1
 pkgver=0.1.1
+pkgrel=1
 pkgdesc="CSV loader and dumper"
-url="http://hackage.haskell.org/package/csv"
+url="http://hackage.haskell.org/package/${_hkgname}"
 license=('LGPL')
 arch=('i686' 'x86_64')
 makedepends=()
-depends=('ghc' 'haskell-cabal' 'haskell-filepath' 'haskell-parsec')
+depends=('ghc' 'haskell-parsec')
 options=('strip')
-source=(http://hackage.haskell.org/packages/archive/csv/0.1.1/csv-0.1.1.tar.gz)
-install=haskell-csv.install
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+install=${pkgname}.install
 md5sums=('312cdb7d59528a161034b3397af10266')
 build() {
-    cd ${srcdir}/csv-0.1.1
-    runhaskell Setup configure --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
-    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/csv
-    runhaskell Setup copy --destdir=${pkgdir} || return 1
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    runhaskell Setup configure --prefix=/usr --docdir=/usr/share/doc/${pkgname} -O --enable-split-objs
+    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}/${_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/${_hkgname}
+    runhaskell Setup copy --destdir=${pkgdir}
 }

haskell-csv/haskell-csv.install

@@ -16,6 +16,3 @@ pre_remove() {
 post_remove() {
   (cd /usr/share/doc/ghc/html/libraries; ./gen_contents_index)
 }
-op=$1
-shift
-$op $*

haskell-digest/PKGBUILD

@@ -1,33 +1,34 @@
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7
-# Note: we list all package dependencies.
-# Your package tool should understand 'provides' syntax
-#
+# Maintainer: Arch Haskell Team <arch-haskell@haskell.org>
+_hkgname=digest
 pkgname=haskell-digest
-pkgrel=1
 pkgver=0.0.0.8
+pkgrel=1
 pkgdesc="Various cryptographic hashes for bytestrings; CRC32 and Adler32 for now."
-url="http://hackage.haskell.org/package/digest"
+url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
 makedepends=()
-depends=('ghc' 'haskell-cabal' 'zlib')
+depends=('ghc' 'zlib')
 options=('strip')
-source=(http://hackage.haskell.org/packages/archive/digest/0.0.0.8/digest-0.0.0.8.tar.gz)
-install=haskell-digest.install
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+install=${pkgname}.install
 md5sums=('3a730a6439b14fb7a30bcd03c9e3f4ff')
 build() {
-    cd ${srcdir}/digest-0.0.0.8
-    runhaskell Setup configure --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
-    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/digest
-    runhaskell Setup copy --destdir=${pkgdir} || return 1
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE || return 1
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    runhaskell Setup configure --prefix=/usr --docdir=/usr/share/doc/${pkgname} -O --enable-split-objs
+    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}/${_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/${_hkgname}
+    runhaskell Setup copy --destdir=${pkgdir}
+    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
     rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
 }

haskell-digest/haskell-digest.install

@@ -16,6 +16,3 @@ pre_remove() {
 post_remove() {
   (cd /usr/share/doc/ghc/html/libraries; ./gen_contents_index)
 }
-op=$1
-shift
-$op $*

haskell-funcmp/PKGBUILD

@@ -1,33 +1,32 @@
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.3
-# Note: we list all package dependencies.
-# Your package tool should understand 'provides' syntax
-#
-# Keep up to date on http://archhaskell.wordpress.com/
-#
+# Maintainer: Arch Haskell Team <arch-haskell@haskell.org>
+_hkgname=funcmp
 pkgname=haskell-funcmp
-pkgrel=1
 pkgver=1.5
+pkgrel=1
 pkgdesc="Functional MetaPost"
-url="http://hackage.haskell.org/package/funcmp"
+url="http://hackage.haskell.org/package/${_hkgname}"
 license=('GPL')
 arch=('i686' 'x86_64')
 makedepends=()
-depends=('ghc' 'haskell-cabal' 'haskell-filepath' 'haskell-process')
+depends=('ghc')
 options=('strip')
-source=(http://hackage.haskell.org/packages/archive/funcmp/1.5/funcmp-1.5.tar.gz)
-install=haskell-funcmp.install
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+install=${pkgname}.install
 md5sums=('83d82b6423508ac37092a2397d712ea6')
 build() {
-    cd ${srcdir}/funcmp-1.5
-    runhaskell Setup configure --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
-    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/funcmp
-    runhaskell Setup copy --destdir=${pkgdir} || return 1
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    runhaskell Setup configure --prefix=/usr --docdir=/usr/share/doc/${pkgname} -O --enable-split-objs
+    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}/${_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/${_hkgname}
+    runhaskell Setup copy --destdir=${pkgdir}
 }

haskell-funcmp/haskell-funcmp.install

@@ -16,6 +16,3 @@ pre_remove() {
 post_remove() {
   (cd /usr/share/doc/ghc/html/libraries; ./gen_contents_index)
 }
-op=$1
-shift
-$op $*

haskell-halipeto/PKGBUILD

@@ -1,33 +1,32 @@
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.3
-# Note: we list all package dependencies.
-# Your package tool should understand 'provides' syntax
-#
-# Keep up to date on http://archhaskell.wordpress.com/
-#
+# Maintainer: Arch Haskell Team <arch-haskell@haskell.org>
+_hkgname=halipeto
 pkgname=haskell-halipeto
-pkgrel=1
 pkgver=2.3
+pkgrel=2
 pkgdesc="Haskell Static Web Page Generator"
-url="http://hackage.haskell.org/package/halipeto"
+url="http://hackage.haskell.org/package/${_hkgname}"
 license=('GPL')
 arch=('i686' 'x86_64')
 makedepends=()
-depends=('ghc' 'haskell-cabal' 'haskell-haxml>=1.20' 'haskell-directory' 'haskell-pandoc')
+depends=('ghc' 'haskell-haxml>=1.20' 'haskell-pandoc')
 options=('strip')
-source=(http://hackage.haskell.org/packages/archive/halipeto/2.3/halipeto-2.3.tar.gz)
-install=haskell-halipeto.install
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+install=${pkgname}.install
 md5sums=('2772511bcaa91c295325856d211fa4a6')
 build() {
-    cd ${srcdir}/halipeto-2.3
-    runhaskell Setup configure --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
-    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/halipeto
-    runhaskell Setup copy --destdir=${pkgdir} || return 1
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    runhaskell Setup configure --prefix=/usr --docdir=/usr/share/doc/${pkgname} -O --enable-split-objs
+    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}/${_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/${_hkgname}
+    runhaskell Setup copy --destdir=${pkgdir}
 }

haskell-halipeto/haskell-halipeto.install

@@ -16,6 +16,3 @@ pre_remove() {
 post_remove() {
   (cd /usr/share/doc/ghc/html/libraries; ./gen_contents_index)
 }
-op=$1
-shift
-$op $*