Mon May 5 03:56:02 UTC 2014

23 files changed, 112 insertions, 761 deletions

diff --git a/extra/cabal-install/PKGBUILD b/extra/cabal-install/PKGBUILD
index ae8403ea8..4683605f8 100644
--- a/extra/cabal-install/PKGBUILD
+++ b/extra/cabal-install/PKGBUILD
@@ -3,29 +3,34 @@
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 
 pkgname=cabal-install
-pkgver=1.18.0.2
-pkgrel=1
+pkgver=1.18.0.3
+pkgrel=3
 pkgdesc="The command-line interface for Cabal and Hackage."
 url="http://hackage.haskell.org/package/cabal-install"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-#depends=('ghc' 'gmp' 'zlib')
 makedepends=('ghc')
 depends=('gmp' 'zlib')
 source=("http://hackage.haskell.org/packages/archive/cabal-install/${pkgver}/cabal-install-${pkgver}.tar.gz")
-md5sums=('e7e46406d43539616388aeafa01c689d')
+md5sums=('f7823387c21b4969e64238f63bb25740')
 
 build() {
+  mkdir ${srcdir}/build
+  export PREFIX="${srcdir}/build"
+
   cd cabal-install-${pkgver}
 
   sh bootstrap.sh --user
 }
 
 package() {
+  install -D -m755 ${srcdir}/build/bin/cabal ${pkgdir}/usr/bin/cabal
+
   cd cabal-install-${pkgver}
 
-  install -D -m755 /build/.cabal/bin/cabal $pkgdir/usr/bin/cabal
-  install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+  install -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 LICENSE \
+    ${pkgdir}/usr/share/licenses/${pkgname}
     
   # add bash completion
   install -d ${pkgdir}/usr/share/bash-completion/completions
diff --git a/extra/ghc/PKGBUILD b/extra/ghc/PKGBUILD
index b36efb967..5d7e91ce0 100644
--- a/extra/ghc/PKGBUILD
+++ b/extra/ghc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196900 2013-10-21 03:40:08Z td123 $
+# $Id: PKGBUILD 212004 2014-05-04 13:54:04Z td123 $
 # Maintainer: Thomas Dziedzic <gostrc@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Special note for devs looking to upgrade this package:
@@ -10,75 +10,75 @@
 # grep -r ghc /var/abs/ | awk -F '/' '{ print $5; }' | sort -u
 
 pkgname=ghc
-pkgver=7.6.3
-pkgrel=1
+pkgver=7.8.2
+pkgrel=3
 pkgdesc='The Glasgow Haskell Compiler'
 arch=('i686' 'x86_64')
 url='http://www.haskell.org/ghc/'
 license=('custom')
-# libffi might be needed in the future: http://hackage.haskell.org/trac/ghc/ticket/4496
-depends=('perl' 'gmp>=5.0' 'gcc') # 'libffi')
+depends=('perl' 'gmp' 'gcc' 'libffi')
 makedepends=('ghc' 'perl' 'libxslt' 'docbook-xsl')
 checkdepends=('python2')
 install='ghc.install'
-# keep this otherwise a lot of tests will show as unexpected failures... need to investigate why using -jn for n > 1 does this...
-#options=('!makeflags')
-# missing rtl?
 options=('staticlibs')
-provides=('haskell-array=0.4.0.1'
-          'haskell-base=4.6.0.1'
-          'haskell-binary=0.5.1.1'
+provides=('haskell-array=0.5.0.0'
+          'haskell-base=4.7.0.0'
+          'haskell-binary=0.7.1.0'
           'haskell-bin-package-db=0.0.0.0'
-          'haskell-bytestring=0.10.0.2'
-          'haskell-containers=0.5.0.0'
-          'haskell-deepseq=1.3.0.1'
-          'haskell-directory=1.2.0.1'
-          'haskell-filepath=1.3.0.1'
-          'haskell-ghc-prim=0.3.0.0'
-          'haskell-haskell2010=1.1.1.0'
-          'haskell-haskell98=2.0.0.2'
-          'haskell-hoopl=3.9.0.0'
-          'haskell-hpc=0.6.0.0'
-          'haskell-integer-gmp=0.5.0.0'
-          'haskell-old-locale=1.0.0.5'
-          'haskell-old-time=1.1.0.1'
-          'haskell-pretty=1.1.1.0'
-          'haskell-process=1.1.0.2'
-          'haskell-template-haskell=2.8.0.0'
-          'haskell-time=1.4.0.1'
-          'haskell-unix=2.6.0.1'
-          'haskell-cabal=1.16.0'
+          'haskell-bytestring=0.10.4.0'
+          'haskell-containers=0.5.5.1'
+          'haskell-deepseq=1.3.0.2'
+          'haskell-directory=1.2.1.0'
+          'haskell-filepath=1.3.0.2'
+          'haskell-ghc-prim=0.3.1.0'
+          'haskell-haskell2010=1.1.2.0'
+          'haskell-haskell98=2.0.0.3'
+          'haskell-hoopl=3.10.0.1'
+          'haskell-hpc=0.6.0.1'
+          'haskell-integer-gmp=0.5.1.0'
+          'haskell-old-locale=1.0.0.6'
+          'haskell-old-time=1.1.0.2'
+          'haskell-pretty=1.1.1.1'
+          'haskell-process=1.2.0.0'
+          'haskell-template-haskell=2.9.0.0'
+          'haskell-time=1.4.2'
+          'haskell-transformers=0.3.0.0'
+          'haskell-unix=2.7.0.1'
+          'haskell-cabal=1.18.1.3'
          )
-replaces=('haskell-array<0.4.0.1'
-          'haskell-base<4.6.0.1'
-          'haskell-binary<0.5.1.1'
+replaces=('haskell-array<0.5.0.0'
+          'haskell-base<4.7.0.0'
+          'haskell-binary<0.7.1.0'
           'haskell-bin-package-db<0.0.0.0'
-          'haskell-bytestring<0.10.0.2'
-          'haskell-containers<0.5.0.0'
-          'haskell-deepseq<1.3.0.1'
-          'haskell-directory<1.2.0.1'
-          'haskell-filepath<1.3.0.1'
-          'haskell-ghc-prim<0.3.0.0'
-          'haskell-haskell2010<1.1.1.0'
-          'haskell-haskell98<2.0.0.2'
-          'haskell-hoopl<3.9.0.0'
-          'haskell-hpc<0.6.0.0'
-          'haskell-integer-gmp<0.5.0.0'
-          'haskell-old-locale<1.0.0.5'
-          'haskell-old-time<1.1.0.1'
-          'haskell-pretty<1.1.1.0'
-          'haskell-process<1.1.0.2'
-          'haskell-template-haskell<2.8.0.0'
-          'haskell-time<1.4.0.1'
-          'haskell-unix<2.6.0.1'
-          'haskell-cabal<1.16.0'
+          'haskell-bytestring<0.10.4.0'
+          'haskell-containers<0.5.5.1'
+          'haskell-deepseq<1.3.0.2'
+          'haskell-directory<1.2.1.0'
+          'haskell-filepath<1.3.0.2'
+          'haskell-ghc-prim<0.3.1.0'
+          'haskell-haskell2010<1.1.2.0'
+          'haskell-haskell98<2.0.0.3'
+          'haskell-hoopl<3.10.0.1'
+          'haskell-hpc<0.6.0.1'
+          'haskell-integer-gmp<0.5.1.0'
+          'haskell-old-locale<1.0.0.6'
+          'haskell-old-time<1.1.0.2'
+          'haskell-pretty<1.1.1.1'
+          'haskell-process<1.2.0.0'
+          'haskell-template-haskell<2.9.0.0'
+          'haskell-time<1.4.2'
+          'haskell-transformers'
+          'haskell-unix<2.7.0.1'
+          'haskell-cabal<1.18.1.3'
          )
-source=("http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-src.tar.bz2"
-        "http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-testsuite.tar.bz2"
-        'build.mk')
-md5sums=('986d1f90ca30d60f7b2820d75c6b8ea7'
-         '66aa6177a31cc4b9d7eeb55cb1514918'
-         'c367ef26300648ee9b8aca3dee5c9669')
+source=("http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-src.tar.xz"
+        "http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-testsuite.tar.xz"
+        'build.mk'
+        'ghc')
+md5sums=('97578e0c27574a99e0d5071a7f35d136'
+         'ac54f7fa453010149a573740705ecbfb'
+         'c367ef26300648ee9b8aca3dee5c9669'
+         'c1d46d86752c50dd85e7143b029fa07f')
 
 build() {
   cd ghc-${pkgver}
@@ -86,7 +86,9 @@ build() {
   cp ${srcdir}/build.mk mk/build.mk
 
   ./configure \
-    --prefix=/usr
+    --prefix=/usr \
+    --with-system-libffi \
+    --with-ffi-includes=/usr/lib/libffi-3.0.13/include
 
   make
 }
@@ -98,7 +100,6 @@ check() {
   cd ghc-${pkgver}
 
   # python2 rename
-  sed -e 's/PYTHON = python/&2/' -i testsuite/mk/boilerplate.mk
   sed -e 's_#!/usr/bin/env python_&2_' -i testsuite/timeout/calibrate testsuite/timeout/timeout.py
 
   # upstream known failures on both i686 and x86_64:
@@ -132,4 +133,10 @@ package() {
   install -d ${pkgdir}/usr/share/licenses/ghc
   install -m644 LICENSE \
     ${pkgdir}/usr/share/licenses/ghc
+
+  # provide non vanilla bash completion since ghc currently doesn't ship with any:
+  # https://ghc.haskell.org/trac/ghc/ticket/9006
+  install -d ${pkgdir}/usr/share/bash-completion/completions
+  install -m644 ${srcdir}/ghc \
+    ${pkgdir}/usr/share/bash-completion/completions
 }
diff --git a/extra/ghc/ghc b/extra/ghc/ghc
new file mode 100644
index 000000000..5e1e189c5
--- /dev/null
+++ b/extra/ghc/ghc
@@ -0,0 +1,10 @@
+_ghc()
+{
+    local envs=`ghc --show-options`
+    # get the word currently being completed
+   local cur=${COMP_WORDS[$COMP_CWORD]}
+
+    # the resulting completions should be put into this array
+    COMPREPLY=( $( compgen -W "$envs" -- $cur ) )
+}
+complete -F _ghc -o default ghc
diff --git a/extra/ghc/print-provides-replaces.sh b/extra/ghc/print-provides-replaces.sh
index 33d1da051..a81a439e7 100755
--- a/extra/ghc/print-provides-replaces.sh
+++ b/extra/ghc/print-provides-replaces.sh
@@ -12,6 +12,11 @@ declare -A exclude
 exclude['Win32']=1
 # no integer-simple because we use integer-gmp
 exclude['integer-simple']=1
+# the rest are installed as dependencies of ghc and some shouldn't even be installed!
+# https://ghc.haskell.org/trac/ghc/ticket/8919
+exclude['haskeline']=1
+exclude['terminfo']=1
+exclude['xhtml']=1
 # extract excluded libraries from ghc.mk
 for exclude_pkg in $(sed 's/PKGS_THAT_ARE_INTREE_ONLY := //p' -n src/ghc-${pkgver}/ghc.mk); do
   exclude[${exclude_pkg}]=1
@@ -26,13 +31,17 @@ print_var() {
   for pkg in $(ls ./*/*.cabal | awk -F '/' '{ print $2 }'); do
     [[ ${exclude[${pkg}]} ]] && continue
     version=$(awk 'tolower($0) ~ /^version:/ {print $2 }' $pkg/$pkg.cabal)
-    printf "'haskell-$pkg$2$version'\n          "
+    printf "'haskell-$pkg"
+    [[ -n "$2" ]] && printf "$2$version"
+    printf "'\n          "
   done
   # also add cabal
   version=$(awk 'tolower($0) ~ /^version:/ { print $2 }' Cabal/Cabal/Cabal.cabal)
-  printf "'haskell-cabal$2$version'\n          "
+  printf "'haskell-cabal"
+  [[ -n "$2" ]] && printf "$2$version"
+  printf "'\n          "
   echo -e '\b)'
 }
 
 print_var 'provides' '='
-print_var 'replaces' '<'
+print_var 'replaces'
diff --git a/extra/haskell-http/PKGBUILD b/extra/haskell-http/PKGBUILD
deleted file mode 100644
index 6e3fa134e..000000000
--- a/extra/haskell-http/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-
-_hkgname=HTTP
-pkgname=haskell-http
-pkgver=4000.2.11
-pkgrel=1
-pkgdesc="A library for client-side HTTP"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.3-1' 'sh' 'haskell-network=2.4.1.2-1' 'haskell-parsec=3.1.3-3' 'haskell-mtl=2.1.2-3')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install=${pkgname}.install
-options=('staticlibs')
-md5sums=('a293c8a1b6caebda06cf655f42d473d0')
-
-build() {
-  cd ${_hkgname}-${pkgver}
-
-  runhaskell Setup configure -O -p \
-    --enable-split-objs \
-    --enable-shared \
-    --prefix=/usr \
-    --docdir=/usr/share/doc/${pkgname} \
-    --libsubdir=\$compiler/site-local/\$pkgid
-
-  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 ${_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
-}
-
diff --git a/extra/haskell-http/haskell-http.install b/extra/haskell-http/haskell-http.install
deleted file mode 100644
index 0593ec4e2..000000000
--- a/extra/haskell-http/haskell-http.install
+++ /dev/null
@@ -1,35 +0,0 @@
-pkgname=haskell-http
-
-_register() {
-  usr/share/haskell/${pkgname}/register.sh
-}
-
-_unregister() {
-  usr/share/haskell/${pkgname}/unregister.sh
-}
-
-_gen_contents() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-post_install() {
-  _register
-  _gen_contents
-}
-
-pre_upgrade() {
-  _unregister
-}
-
-post_upgrade() {
-  _register
-  _gen_contents
-}
-
-pre_remove() {
-  _unregister
-}
-
-post_remove() {
-  _gen_contents
-}
diff --git a/extra/haskell-mtl/PKGBUILD b/extra/haskell-mtl/PKGBUILD
deleted file mode 100644
index 9ff28ad5e..000000000
--- a/extra/haskell-mtl/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-
-_hkgname=mtl
-pkgname=haskell-mtl
-pkgver=2.1.2
-pkgrel=3
-pkgdesc="Monad classes, using functional dependencies"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.3-1' 'sh' 'haskell-transformers=0.3.0.0-4')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install=${pkgname}.install
-options=('staticlibs')
-md5sums=('943c110524d96126bfa0e61f7df1ebcd')
-
-build() {
-  cd ${_hkgname}-${pkgver}
-
-  runhaskell Setup configure -O -p \
-    --enable-split-objs \
-    --enable-shared \
-    --prefix=/usr \
-    --docdir=/usr/share/doc/${pkgname} \
-    --libsubdir=\$compiler/site-local/\$pkgid
-
-  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 ${_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
-}
-
diff --git a/extra/haskell-mtl/haskell-mtl.install b/extra/haskell-mtl/haskell-mtl.install
deleted file mode 100644
index 17c40da11..000000000
--- a/extra/haskell-mtl/haskell-mtl.install
+++ /dev/null
@@ -1,35 +0,0 @@
-pkgname=haskell-mtl
-
-_register() {
-  usr/share/haskell/${pkgname}/register.sh
-}
-
-_unregister() {
-  usr/share/haskell/${pkgname}/unregister.sh
-}
-
-_gen_contents() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-post_install() {
-  _register
-  _gen_contents
-}
-
-pre_upgrade() {
-  _unregister
-}
-
-post_upgrade() {
-  _register
-  _gen_contents
-}
-
-pre_remove() {
-  _unregister
-}
-
-post_remove() {
-  _gen_contents
-}
diff --git a/extra/haskell-network/PKGBUILD b/extra/haskell-network/PKGBUILD
deleted file mode 100644
index 0ef09b9b5..000000000
--- a/extra/haskell-network/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-
-_hkgname=network
-pkgname=haskell-network
-pkgver=2.4.1.2
-pkgrel=1
-pkgdesc="Low-level networking interface"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.3-1' 'sh' 'haskell-parsec=3.1.3-3')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install=${pkgname}.install
-options=('staticlibs')
-md5sums=('032075c35dea5d23923af3928f9a5511')
-
-build() {
-  cd ${_hkgname}-${pkgver}
-
-  runhaskell Setup configure -O -p \
-    --enable-split-objs \
-    --enable-shared \
-    --prefix=/usr \
-    --docdir=/usr/share/doc/${pkgname} \
-    --libsubdir=\$compiler/site-local/\$pkgid
-
-  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 ${_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
-}
-
diff --git a/extra/haskell-network/haskell-network.install b/extra/haskell-network/haskell-network.install
deleted file mode 100644
index e6177f643..000000000
--- a/extra/haskell-network/haskell-network.install
+++ /dev/null
@@ -1,35 +0,0 @@
-pkgname=haskell-network
-
-_register() {
-  usr/share/haskell/${pkgname}/register.sh
-}
-
-_unregister() {
-  usr/share/haskell/${pkgname}/unregister.sh
-}
-
-_gen_contents() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-post_install() {
-  _register
-  _gen_contents
-}
-
-pre_upgrade() {
-  _unregister
-}
-
-post_upgrade() {
-  _register
-  _gen_contents
-}
-
-pre_remove() {
-  _unregister
-}
-
-post_remove() {
-  _gen_contents
-}
diff --git a/extra/haskell-parsec/PKGBUILD b/extra/haskell-parsec/PKGBUILD
deleted file mode 100644
index 613897c4d..000000000
--- a/extra/haskell-parsec/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 199158 2013-11-08 18:16:08Z eric $
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-
-_hkgname=parsec
-pkgname=haskell-parsec
-pkgver=3.1.3
-pkgrel=3
-pkgdesc="Monadic parser combinators"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.3-1' 'sh' 'haskell-mtl=2.1.2-3' 'haskell-text=0.11.2.3-3')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install=${pkgname}.install
-options=('staticlibs')
-md5sums=('d72fc94b81153132c61125a1ec52a4a5')
-
-build() {
-  cd ${_hkgname}-${pkgver}
-
-  runhaskell Setup configure -O -p \
-    --enable-split-objs \
-    --enable-shared \
-    --prefix=/usr \
-    --docdir=/usr/share/doc/${pkgname} \
-    --libsubdir=\$compiler/site-local/\$pkgid
-
-  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 ${_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
-}
-
diff --git a/extra/haskell-parsec/haskell-parsec.install b/extra/haskell-parsec/haskell-parsec.install
deleted file mode 100644
index 25f4e6e9b..000000000
--- a/extra/haskell-parsec/haskell-parsec.install
+++ /dev/null
@@ -1,35 +0,0 @@
-pkgname=haskell-parsec
-
-_register() {
-  usr/share/haskell/${pkgname}/register.sh
-}
-
-_unregister() {
-  usr/share/haskell/${pkgname}/unregister.sh
-}
-
-_gen_contents() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-post_install() {
-  _register
-  _gen_contents
-}
-
-pre_upgrade() {
-  _unregister
-}
-
-post_upgrade() {
-  _register
-  _gen_contents
-}
-
-pre_remove() {
-  _unregister
-}
-
-post_remove() {
-  _gen_contents
-}
diff --git a/extra/haskell-random/PKGBUILD b/extra/haskell-random/PKGBUILD
deleted file mode 100644
index ba0c472c3..000000000
--- a/extra/haskell-random/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-
-_hkgname=random
-pkgname=haskell-random
-pkgver=1.0.1.1
-pkgrel=5
-pkgdesc="random number library"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.3-1' 'sh')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install=${pkgname}.install
-options=('staticlibs')
-md5sums=('9a249cfa7ff6793cbf2be06e9fcd7538')
-
-build() {
-  cd ${_hkgname}-${pkgver}
-
-  runhaskell Setup configure -O -p \
-    --enable-split-objs \
-    --enable-shared \
-    --prefix=/usr \
-    --docdir=/usr/share/doc/${pkgname} \
-    --libsubdir=\$compiler/site-local/\$pkgid
-
-  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 ${_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
-}
-
diff --git a/extra/haskell-random/haskell-random.install b/extra/haskell-random/haskell-random.install
deleted file mode 100644
index 0dc80227b..000000000
--- a/extra/haskell-random/haskell-random.install
+++ /dev/null
@@ -1,35 +0,0 @@
-pkgname=haskell-random
-
-_register() {
-  usr/share/haskell/${pkgname}/register.sh
-}
-
-_unregister() {
-  usr/share/haskell/${pkgname}/unregister.sh
-}
-
-_gen_contents() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-post_install() {
-  _register
-  _gen_contents
-}
-
-pre_upgrade() {
-  _unregister
-}
-
-post_upgrade() {
-  _register
-  _gen_contents
-}
-
-pre_remove() {
-  _unregister
-}
-
-post_remove() {
-  _gen_contents
-}
diff --git a/extra/haskell-text/PKGBUILD b/extra/haskell-text/PKGBUILD
deleted file mode 100644
index da4b5abf7..000000000
--- a/extra/haskell-text/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-
-_hkgname=text
-pkgname=haskell-text
-pkgver=0.11.2.3
-pkgrel=3
-pkgdesc="An efficient packed Unicode text type."
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.3-1' 'sh')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install=${pkgname}.install
-options=('staticlibs')
-md5sums=('7a469d49a7576fb3a18785cb64d4ee6c')
-
-build() {
-  cd ${_hkgname}-${pkgver}
-
-  runhaskell Setup configure -O -p \
-    --enable-split-objs \
-    --enable-shared \
-    --prefix=/usr \
-    --docdir=/usr/share/doc/${pkgname} \
-    --libsubdir=\$compiler/site-local/\$pkgid
-
-  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 ${_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
-}
-
diff --git a/extra/haskell-text/haskell-text.install b/extra/haskell-text/haskell-text.install
deleted file mode 100644
index 44ef4244a..000000000
--- a/extra/haskell-text/haskell-text.install
+++ /dev/null
@@ -1,35 +0,0 @@
-pkgname=haskell-text
-
-_register() {
-  usr/share/haskell/${pkgname}/register.sh
-}
-
-_unregister() {
-  usr/share/haskell/${pkgname}/unregister.sh
-}
-
-_gen_contents() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-post_install() {
-  _register
-  _gen_contents
-}
-
-pre_upgrade() {
-  _unregister
-}
-
-post_upgrade() {
-  _register
-  _gen_contents
-}
-
-pre_remove() {
-  _unregister
-}
-
-post_remove() {
-  _gen_contents
-}
diff --git a/extra/haskell-transformers/PKGBUILD b/extra/haskell-transformers/PKGBUILD
deleted file mode 100644
index 144848401..000000000
--- a/extra/haskell-transformers/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-
-_hkgname=transformers
-pkgname=haskell-transformers
-pkgver=0.3.0.0
-pkgrel=4
-pkgdesc="Concrete functor and monad transformers"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.3-1' 'sh')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install=${pkgname}.install
-options=('staticlibs')
-md5sums=('852dc0b79cc2bcb39136287d3dd385e5')
-
-build() {
-  cd ${_hkgname}-${pkgver}
-
-  runhaskell Setup configure -O -p \
-    --enable-split-objs \
-    --enable-shared \
-    --prefix=/usr \
-    --docdir=/usr/share/doc/${pkgname} \
-    --libsubdir=\$compiler/site-local/\$pkgid
-
-  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 ${_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
-}
-
diff --git a/extra/haskell-transformers/haskell-transformers.install b/extra/haskell-transformers/haskell-transformers.install
deleted file mode 100644
index a59cd9850..000000000
--- a/extra/haskell-transformers/haskell-transformers.install
+++ /dev/null
@@ -1,35 +0,0 @@
-pkgname=haskell-transformers
-
-_register() {
-  usr/share/haskell/${pkgname}/register.sh
-}
-
-_unregister() {
-  usr/share/haskell/${pkgname}/unregister.sh
-}
-
-_gen_contents() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-post_install() {
-  _register
-  _gen_contents
-}
-
-pre_upgrade() {
-  _unregister
-}
-
-post_upgrade() {
-  _register
-  _gen_contents
-}
-
-pre_remove() {
-  _unregister
-}
-
-post_remove() {
-  _gen_contents
-}
diff --git a/extra/haskell-zlib/PKGBUILD b/extra/haskell-zlib/PKGBUILD
deleted file mode 100644
index 5175a544f..000000000
--- a/extra/haskell-zlib/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-
-_hkgname=zlib
-pkgname=haskell-zlib
-pkgver=0.5.4.1
-pkgrel=1
-pkgdesc="Compression and decompression in the gzip and zlib formats"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.3-1' 'sh' 'zlib')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install=${pkgname}.install
-options=('staticlibs')
-md5sums=('d0d10786d2bbd1d401a8b28a83e88475')
-
-build() {
-  cd ${_hkgname}-${pkgver}
-
-  runhaskell Setup configure -O -p \
-    --enable-split-objs \
-    --enable-shared \
-    --prefix=/usr \
-    --docdir=/usr/share/doc/${pkgname} \
-    --libsubdir=\$compiler/site-local/\$pkgid
-
-  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 ${_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
-}
-
diff --git a/extra/haskell-zlib/haskell-zlib.install b/extra/haskell-zlib/haskell-zlib.install
deleted file mode 100644
index a2bb66224..000000000
--- a/extra/haskell-zlib/haskell-zlib.install
+++ /dev/null
@@ -1,35 +0,0 @@
-pkgname=haskell-zlib
-
-_register() {
-  usr/share/haskell/${pkgname}/register.sh
-}
-
-_unregister() {
-  usr/share/haskell/${pkgname}/unregister.sh
-}
-
-_gen_contents() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-post_install() {
-  _register
-  _gen_contents
-}
-
-pre_upgrade() {
-  _unregister
-}
-
-post_upgrade() {
-  _register
-  _gen_contents
-}
-
-pre_remove() {
-  _unregister
-}
-
-post_remove() {
-  _gen_contents
-}
diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD
index dc40217c5..bb137ddf7 100644
--- a/extra/mercurial/PKGBUILD
+++ b/extra/mercurial/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 209809 2014-04-04 16:27:12Z giovanni $
+# $Id: PKGBUILD 212041 2014-05-04 16:12:39Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=mercurial
-pkgver=2.9.2
+pkgver=3.0
 pkgrel=1
 pkgdesc="A scalable distributed SCM tool"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI')
 backup=('etc/mercurial/hgrc')
 source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz"
         'mercurial.profile')
-md5sums=('1caeed1bea1232598fc5ce5d6d109f56'
+md5sums=('133ff0a31047d2c0b4640943a58535a7'
          '43e1d36564d4c7fbe9a091d3ea370a44')
 
 package() {
diff --git a/extra/xorg-xbacklight/PKGBUILD b/extra/xorg-xbacklight/PKGBUILD
index 412b91056..e34883770 100644
--- a/extra/xorg-xbacklight/PKGBUILD
+++ b/extra/xorg-xbacklight/PKGBUILD
@@ -1,8 +1,9 @@
-# $Id: PKGBUILD 166654 2012-09-14 14:36:40Z andyrtr $
+# $Id: PKGBUILD 211998 2014-05-04 08:34:39Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-xbacklight
-pkgver=1.2.0
+pkgver=1.2.1
 pkgrel=1
 pkgdesc="RandR-based backlight control application"
 arch=('i686' 'x86_64')
@@ -12,16 +13,16 @@ depends=('xcb-util')
 makedepends=('xorg-util-macros')
 groups=('xorg-apps' 'xorg')
 source=(http://xorg.freedesktop.org/archive/individual/app/xbacklight-${pkgver}.tar.bz2)
-sha256sums=('5152d6134fa592c9c14060d7324a7db104da0184cc9b2f9715e847f9354e36a5')
+sha256sums=('17f6cf51a35eaa918abec36b7871d28b712c169312e22a0eaf1ffe8d6468362b')
 
 build() {
-  cd "${srcdir}/xbacklight-${pkgver}"
+  cd xbacklight-${pkgver}
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/xbacklight-${pkgver}"
+  cd xbacklight-${pkgver}
   make DESTDIR="${pkgdir}" install
   install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD
index 9323bcac6..bcb4cdbe4 100644
--- a/extra/xterm/PKGBUILD
+++ b/extra/xterm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 207149 2014-03-07 19:55:00Z andyrtr $
+# $Id: PKGBUILD 212000 2014-05-04 08:39:18Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xterm
-pkgver=303
+pkgver=304
 pkgrel=1
 pkgdesc="X Terminal Emulator"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('custom')
 depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps' 'libutempter')
 source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz{,.asc}
         LICENSE)
-md5sums=('48f6d49b2b6b6933d501d767cbed9254'
+md5sums=('8a9460d848cf4ed244fcfc9b07d1c3d0'
          'SKIP'
          '10ecc3f8ee91e3189863a172f68282d2')