[arch-commits] Commit in (6 files)

Rémy Oudompheng remy at archlinux.org
Fri Dec 31 08:02:00 UTC 2010


    Date: Friday, December 31, 2010 @ 03:02:00
  Author: remy
Revision: 104245

Move under /usr/lib/ghc-7.0.1

Modified:
  haskell-binary/trunk/PKGBUILD
  haskell-dataenc/trunk/PKGBUILD
  haskell-html/trunk/PKGBUILD
  haskell-mmap/trunk/PKGBUILD
  haskell-tar/trunk/PKGBUILD
  haskell-zlib/trunk/PKGBUILD

--------------------------------+
 haskell-binary/trunk/PKGBUILD  |   17 ++++++++++-------
 haskell-dataenc/trunk/PKGBUILD |   12 +++++++-----
 haskell-html/trunk/PKGBUILD    |   16 +++++++++-------
 haskell-mmap/trunk/PKGBUILD    |   12 +++++++-----
 haskell-tar/trunk/PKGBUILD     |   25 +++++++++++++------------
 haskell-zlib/trunk/PKGBUILD    |   10 ++++++----
 6 files changed, 52 insertions(+), 40 deletions(-)

Modified: haskell-binary/trunk/PKGBUILD
===================================================================
--- haskell-binary/trunk/PKGBUILD	2010-12-31 07:42:03 UTC (rev 104244)
+++ haskell-binary/trunk/PKGBUILD	2010-12-31 08:02:00 UTC (rev 104245)
@@ -1,22 +1,25 @@
 # Maintainer: Vesa Kaihlavirta <vesa at archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell at haskell.org>
 # Package generated by cabal2arch 0.7.5
+_hkgname=binary
 pkgname=haskell-binary
 pkgver=0.5.0.2
-pkgrel=5
+pkgrel=6
 pkgdesc="Binary serialisation for Haskell values using lazy ByteStrings"
 url="http://hackage.haskell.org/package/binary"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
 depends=(ghc=7.0.1 sh)
 options=('strip')
-source=(http://hackage.haskell.org/packages/archive/binary/$pkgver/binary-$pkgver.tar.gz)
-install=haskell-binary.install
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+install=${pkgname}.install
 md5sums=('6bf8f3d1441602c9ab09a75e3bd6e926')
 
 build() {
-    cd ${srcdir}/binary-$pkgver
-    runhaskell Setup configure --prefix=/usr --docdir=/usr/share/doc/${pkgname} -p --enable-split-objs --enable-shared
+    cd ${srcdir}/${_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
@@ -25,11 +28,11 @@
 }
 
 package() {
-    cd ${srcdir}/binary-$pkgver
+    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/binary
+    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

Modified: haskell-dataenc/trunk/PKGBUILD
===================================================================
--- haskell-dataenc/trunk/PKGBUILD	2010-12-31 07:42:03 UTC (rev 104244)
+++ haskell-dataenc/trunk/PKGBUILD	2010-12-31 08:02:00 UTC (rev 104245)
@@ -4,20 +4,22 @@
 _hkgname=dataenc
 pkgname=haskell-dataenc
 pkgver=0.13.0.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Data encoding library"
 url="http://hackage.haskell.org/package/dataenc"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
 depends=(ghc=7.0.1 sh)
 options=('strip')
-source=(http://hackage.haskell.org/packages/archive/dataenc/$pkgver/dataenc-$pkgver.tar.gz)
-install=haskell-dataenc.install
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+install=${pkgname}.install
 md5sums=('4764fa7f75ed3ee95a759d67d1347d46')
 
 build() {
-    cd ${srcdir}/${_hkgname}-$pkgver
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr --docdir=/usr/share/doc/${pkgname}
+    cd ${srcdir}/${_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

Modified: haskell-html/trunk/PKGBUILD
===================================================================
--- haskell-html/trunk/PKGBUILD	2010-12-31 07:42:03 UTC (rev 104244)
+++ haskell-html/trunk/PKGBUILD	2010-12-31 08:02:00 UTC (rev 104245)
@@ -4,20 +4,22 @@
 _hkgname=html
 pkgname=haskell-html
 pkgver=1.0.1.2
-pkgrel=7
+pkgrel=8
 pkgdesc="HTML combinator library"
 url="http://hackage.haskell.org/package/html"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
 depends=(ghc=7.0.1 sh)
 options=('strip')
-source=(http://hackage.haskell.org/packages/archive/html/$pkgver/html-$pkgver.tar.gz)
-install=haskell-html.install
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+install=${pkgname}.install
 md5sums=('2a7de5a2af9a2f80d39825d6a95ee445')
 
 build() {
-    cd ${srcdir}/html-$pkgver
-    runhaskell Setup configure -p --enable-split-objs --enable-shared --prefix=/usr --docdir=/usr/share/doc/${pkgname}
+    cd ${srcdir}/${_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
@@ -26,11 +28,11 @@
 }
 
 package() {
-    cd ${srcdir}/html-${pkgver}
+    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/html
+    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

Modified: haskell-mmap/trunk/PKGBUILD
===================================================================
--- haskell-mmap/trunk/PKGBUILD	2010-12-31 07:42:03 UTC (rev 104244)
+++ haskell-mmap/trunk/PKGBUILD	2010-12-31 08:02:00 UTC (rev 104245)
@@ -3,20 +3,22 @@
 _hkgname=mmap
 pkgname=haskell-mmap
 pkgver=0.5.7
-pkgrel=2
+pkgrel=3
 pkgdesc="Memory mapped files for POSIX and Windows"
 url="http://hackage.haskell.org/package/mmap"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
 depends=('ghc=7.0.1' sh)
 options=('strip')
-source=(http://hackage.haskell.org/packages/archive/mmap/$pkgver/mmap-$pkgver.tar.gz)
-install=haskell-mmap.install
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+install=${pkgname}.install
 md5sums=('1f74b3f59617332b06e277f5212423c1')
 
 build() {
-    cd ${srcdir}/${_hkgname}-$pkgver
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr --docdir=/usr/share/doc/${pkgname}
+    cd ${srcdir}/${_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

Modified: haskell-tar/trunk/PKGBUILD
===================================================================
--- haskell-tar/trunk/PKGBUILD	2010-12-31 07:42:03 UTC (rev 104244)
+++ haskell-tar/trunk/PKGBUILD	2010-12-31 08:02:00 UTC (rev 104245)
@@ -2,21 +2,22 @@
 _hkgname=tar
 pkgname=haskell-tar
 pkgver=0.3.1.0
-pkgrel=3
+pkgrel=4
 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=7.0.1' sh)
 options=('strip')
-source=(http://hackage.haskell.org/packages/archive/tar/${pkgver}/tar-0.3.1.0.tar.gz)
-install=haskell-tar.install
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+install=${pkgname}.install
 md5sums=('10b54856495f9ef0a42aa270085c7d5e')
 
 build() {
-    cd ${srcdir}/tar-${pkgver}
-    runhaskell Setup configure -O -p --enable-shared --enable-split-objs --prefix=/usr --docdir=/usr/share/doc/${pkgname}
+    cd ${srcdir}/${_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
@@ -25,12 +26,12 @@
 }
 
 package() {
-    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
+    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
+    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
     rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
 }

Modified: haskell-zlib/trunk/PKGBUILD
===================================================================
--- haskell-zlib/trunk/PKGBUILD	2010-12-31 07:42:03 UTC (rev 104244)
+++ haskell-zlib/trunk/PKGBUILD	2010-12-31 08:02:00 UTC (rev 104245)
@@ -4,20 +4,22 @@
 _hkgname=zlib
 pkgname=haskell-zlib
 pkgver=0.5.2.0
-pkgrel=6
+pkgrel=7
 pkgdesc="Compression and decompression in the gzip and zlib formats"
 url="http://hackage.haskell.org/package/zlib"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
 depends=(ghc=7.0.1 'zlib' sh)
 options=('strip')
-source=(http://hackage.haskell.org/packages/archive/zlib/${pkgver}/zlib-${pkgver}.tar.gz)
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
 md5sums=('19859e241dc18ef1501a5d44d8523507')
 
 build() {
-    cd ${srcdir}/${_hkgname}-$pkgver
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr --docdir=/usr/share/doc/${pkgname}
+    cd ${srcdir}/${_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




More information about the arch-commits mailing list