[arch-commits] Commit in darcs/repos (3 files)

[Vesa Kaihlavirta]

    Date: Monday, August 3, 2009 @ 03:19:14
  Author: vesa
Revision: 48731

Merged revisions 47831,47833 via svnmerge from 
svn+ssh://vesa@archlinux.org/srv/svn-packages/darcs/trunk

........
  r47831 | vesa | 2009-07-28 09:33:37 +0300 (Tue, 28 Jul 2009) | 1 line
  
  => 2.3.0
........
  r47833 | vesa | 2009-07-28 09:52:58 +0300 (Tue, 28 Jul 2009) | 1 line
  
  fix: do not include the libs now
........

Modified:
  darcs/repos/extra-x86_64/	(properties)
  darcs/repos/extra-x86_64/PKGBUILD
  darcs/repos/extra-x86_64/darcs.install

---------------+
 PKGBUILD      |   28 ++++++++++++++++++----------
 darcs.install |   35 ++++++-----------------------------
 2 files changed, 24 insertions(+), 39 deletions(-)


Property changes on: darcs/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /darcs/trunk:1-36747
   + /darcs/trunk:1-48729

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-08-03 07:19:03 UTC (rev 48730)
+++ extra-x86_64/PKGBUILD	2009-08-03 07:19:14 UTC (rev 48731)
@@ -3,22 +3,30 @@
 # Contributor: Simo Leone <neotuli at gmail.com>
 
 pkgname=darcs
-pkgver=2.2.0
-pkgrel=1.1
+pkgver=2.3.0
+pkgrel=2
 pkgdesc="Decentralized replacement for CVS with roots in quantum mechanics"
 arch=(i686 x86_64)
 url="http://darcs.net/"
 license=('GPL')
 depends=('curl' 'gmp' 'ncurses>=5.6-7')
-makedepends=('ghc')
-install=darcs.install
-source=("http://darcs.net/$pkgname-$pkgver.tar.gz")
-md5sums=('8f0a5eba5971e7cf324c63664cde59e2')
+makedepends=('ghc' 'haskell-hashed-storage' 'haskell-haskeline')
+#install=darcs.install
+source=("http://darcs.net/releases/$pkgname-$pkgver.tar.gz")
 
 build() {
     cd $startdir/src/$pkgname-$pkgver
-    ./configure --prefix=/usr --sysconfdir=/etc --with-sendmail=sendmail
-    make || return 1
-    make DESTDIR=$startdir/pkg install
+    runhaskell Setup.lhs configure --ghc --prefix=/usr \
+         --disable-library-for-ghci --libsubdir=\$compiler/site-local/\$pkgid || return 1
+
+    runhaskell Setup.lhs build || return 1
+
+    #runhaskell Setup.lhs register --gen-script
+    #runhaskell Setup.lhs unregister --gen-script
+  
+    #install -D -m744 register.sh $startdir/pkg/usr/share/haskell/$pkgname/register.sh
+    #install -m744 unregister.sh $startdir/pkg/usr/share/haskell/$pkgname/unregister.sh
+    runhaskell Setup.lhs copy --destdir=$startdir/pkg
+    rm -r $startdir/pkg/usr/lib/ 
 }
-
+md5sums=('aa970a6eca29c407a22b366c8ca392ab')

Modified: extra-x86_64/darcs.install
===================================================================
--- extra-x86_64/darcs.install	2009-08-03 07:19:03 UTC (rev 48730)
+++ extra-x86_64/darcs.install	2009-08-03 07:19:14 UTC (rev 48731)
@@ -1,44 +1,21 @@
-# This is a default template for a post-install scriptlet.  You can
-# remove any functions you don't need (and this header).
+HS_DIR=/usr/share/haskell/darcs
 
-# arg 1:  the new package version
-pre_install() {
-  /bin/true
-}
-
-# arg 1:  the new package version
 post_install() {
-  echo "Optional dependencies:"
-  echo "gnupg - for patch signing"
-  echo "postfix - for patch sending via email"
-  /bin/true
+    ${HS_DIR}/register.sh
 }
 
-# arg 1:  the new package version
-# arg 2:  the old package version
 pre_upgrade() {
-  /bin/true
+  ${HS_DIR}/unregister.sh
 }
 
-# arg 1:  the new package version
-# arg 2:  the old package version
 post_upgrade() {
-  echo "Optional dependencies:"
-  echo "gnupg - for patch signing"
-  echo "postfix - for patch sending via email"
-  /bin/true
+  ${HS_DIR}/register.sh
 }
 
-# arg 1:  the old package version
 pre_remove() {
-  /bin/true
+  ${HS_DIR}/unregister.sh
 }
-
-# arg 1:  the old package version
-post_remove() {
-  /bin/true
-}
-
 op=$1
 shift
+
 $op $*