[arch-commits] Commit in emboss/repos (extra-i686 extra-i686/PKGBUILD)

[Ronald van Haren]

    Date: Sunday, December 7, 2008 @ 06:17:30
  Author: ronald
Revision: 20922

Merged revisions 20920 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/emboss/trunk

........
  r20920 | ronald | 2008-12-07 12:06:48 +0100 (Sun, 07 Dec 2008) | 1 line
  
  upgpkg: emboss 6.0.1-2
........

Modified:
  emboss/repos/extra-i686/	(properties)
  emboss/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)


Property changes on: emboss/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /emboss/trunk:1-17546
   + /emboss/trunk:1-20921

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-12-07 11:07:23 UTC (rev 20921)
+++ extra-i686/PKGBUILD	2008-12-07 11:17:30 UTC (rev 20922)
@@ -3,23 +3,22 @@
 pkgname=emboss
 orgname=EMBOSS
 pkgver=6.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A collection of molecular biology applications"
 arch=(i686 x86_64)
 url="http://emboss.sourceforge.net/"
-depends=('gd' 'libx11' 'pcre' 'perl' 'openjdk6')
-options=("!libtool")
+depends=('gd' 'libx11' 'pcre' 'perl' 'java-runtime')
+options=('!libtool')
 license=('GPL2')
 source=(ftp://emboss.open-bio.org/pub/EMBOSS/$orgname-$pkgver.tar.gz)
 md5sums=('2182b148dace6bea403deed8facae40d')
 
 build() {
-  cd $startdir/src/$orgname-$pkgver
-#  source /etc/profile.d/jdk.sh
+  cd ${srcdir}/$orgname-$pkgver
   CFLAGS="${CFLAGS} -I/usr/lib/jvm/java-1.6.0-openjdk/include/"
   ./configure --prefix=/usr --enable-large --with-x \
 	--with-javaos=/usr/lib/jvm/java-1.6.0-openjdk/include//linux/
   make || return 1
-  make prefix=$startdir/pkg/usr install 
-  rm -f $startdir/pkg/usr/include/{pcre,pcreposix}.h
+  make prefix=${pkgdir}/usr install || return 1
+  rm -f ${pkgdir}/usr/include/{pcre,pcreposix}.h
 }