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

[Ronald van Haren]

    Date: Thursday, October 30, 2008 @ 18:52:15
  Author: ronald
Revision: 17546

fix svn merge error

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

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


Property changes on: emboss/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /emboss/trunk:1
   + /emboss/trunk:1-17545

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-10-30 22:50:42 UTC (rev 17545)
+++ extra-x86_64/PKGBUILD	2008-10-30 22:52:15 UTC (rev 17546)
@@ -2,24 +2,24 @@
 # Maintainer: damir <damir at archlinux.org>
 pkgname=emboss
 orgname=EMBOSS
-pkgver=5.0.0
+pkgver=6.0.1
 pkgrel=1
 pkgdesc="A collection of molecular biology applications"
 arch=(i686 x86_64)
 url="http://emboss.sourceforge.net/"
-depends=('gd' 'libx11' 'pcre' 'perl' 'jre')
-makedepends=('jdk')
+depends=('gd' 'libx11' 'pcre' 'perl' 'openjdk6')
 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
+#  source /etc/profile.d/jdk.sh
+  CFLAGS="${CFLAGS} -I/usr/lib/jvm/java-1.6.0-openjdk/include/"
   ./configure --prefix=/usr --enable-large --with-x \
-	--with-javaos=/opt/java/include/linux/ --with-java=/opt/java/
+	--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
 }
-md5sums=('be4c895220ad34afd65d450ba7d8e34b')