[arch-commits] Commit in openjdk6/trunk (PKGBUILD)

[andyrtr at archlinux.org]

    Date: Saturday, August 8, 2009 @ 13:04:51
  Author: andyrtr
Revision: 49472

fix svn conflict

Modified:
  openjdk6/trunk/PKGBUILD

----------+
 PKGBUILD |   75 +++++++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 53 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-08-08 15:18:36 UTC (rev 49471)
+++ PKGBUILD	2009-08-08 17:04:51 UTC (rev 49472)
@@ -2,30 +2,24 @@
 # Maintainer: Andreas Radke <andyrtr at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 
-pkgname=openjdk6
+pkgname=('openjdk6' 'openjdk6-src')
+pkgbase="opejdk6"
 _date=20090524
 #pkgver=1.5_hg${_date}
-pkgver=1.5
+pkgver=1.5.1
 _hgver=926c38e2b283 # =hg rc3 tagged, see http://icedtea.classpath.org/hg/icedtea6/summary
-_icedteaver=1.5
-pkgrel=5
-pkgdesc='Free Java environment based on OpenJDK 6.0 with IcedTea6 replacing binary plugs.'
+_icedteaver=1.5.1
+pkgrel=1
 url='http://icedtea.classpath.org'
 arch=('i686' 'x86_64')
 license=('GPL')
 _openjdk_version=b16
 _openjdk_date=24_apr_2009
 _hotspotver=25a020f13592 # what it downlopads itself / remove from configure to get it
-depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst')
-makedepends=('alsa-lib' 'giflib' 'libxp' 'gtk2' 'nspr' 'zlib' 'freetype2' 'libjpeg>=7' 'libx11'
-	     'libcups' 'patch' 'xalan-java' 'xulrunner>=1.9.1-2' 'apache-ant>=1.7.0-2' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip')
-optdepends=('xulrunner: for the browser plugin'
-            'alsa-lib: for sound'
-            'giflib: for gif format support')
-conflicts=('java-environment' 'java-runtime')
-provides=('java-environment=6' 'java-runtime=6')
+makedepends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'alsa-lib' 'giflib' 'libxp' 'gtk2'
+	     'nspr' 'zlib' 'freetype2' 'libjpeg>=7' 'libx11' 'libcups' 'patch' 'xalan-java' 'xulrunner>=1.9.1-2' 
+	     'apache-ant>=1.7.0-2' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip')
 options=('!emptydirs' 'force')
-install=openjdk6.install
 source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz
 	#ftp://ftp.archlinux.org/other/openjdk6/icedtea6-${_date}.tar.bz2
 	#http://icedtea.classpath.org/hg/icedtea6/archive/${_hgver}.tar.gz
@@ -39,7 +33,7 @@
 	libjpeg7.patch
 	openjdk6.profile)
 noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz ${_hotspotver}.tar.gz)
-md5sums=('a67303675a53781c4e42bdb02ec78e40'
+md5sums=('fe365fbb57ba04af099a822486ee9108'
          '850a29b70206bc7fa083cd26acc781f3'
          'dbd7aca5544d1aeebf0eadd45d29d08e'
          '5da3e39fa60985576c4f37d1491efbe2'
@@ -65,11 +59,6 @@
   
     [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
   
-  if [ "${CARCH}" = "x86_64" ]; then
-    _arch=amd64
-  else
-    _arch=i586
-  fi
   _javaver=1.6.0
   _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
 
@@ -115,14 +104,34 @@
 # 	--enable-visualvm \ --with-additional-vms=cacao,zero,shark \
 
   LD_PRELOAD="" make || return 1
- 
+}
+
+package_openjdk6() {
+ pkgdesc='Free Java environment based on OpenJDK 6.0 with IcedTea6 replacing binary plugs.'
+ depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst')
+ optdepends=('xulrunner: for the browser plugin'
+            'alsa-lib: for sound'
+            'giflib: for gif format support')
+ conflicts=('java-environment' 'java-runtime')
+ provides=('java-environment=6' 'java-runtime=6')
+ install=openjdk6.install
+
+  if [ "${CARCH}" = "x86_64" ]; then
+    _arch=amd64
+  else
+    _arch=i586
+  fi
+  _javaver=1.6.0
+  _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
+
+  cd ${srcdir}/icedtea6-${_icedteaver}
   install -m755 -d ${pkgdir}/${_jvmdir}/jre
 
 #  pushd ${srcdir}/icedtea6/openjdk/build/linux-${_arch}/j2sdk-image
   pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk/build/linux-${_arch}/j2sdk-image
 #  pushd ${srcdir}/icedtea6-${_hgver}/openjdk/build/linux-${_arch}/j2sdk-image
    # Install main files.
-  cp -a bin include lib src.zip ${pkgdir}/${_jvmdir}/ || return 1
+  cp -a bin include lib ${pkgdir}/${_jvmdir}/ || return 1
   cp -a jre/bin jre/lib ${pkgdir}/${_jvmdir}/jre/ || return 1
 
   mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.properties.src \
@@ -177,3 +186,25 @@
   install -m755 -d ${pkgdir}/etc/profile.d
   install -m755 ${srcdir}/openjdk6.profile ${pkgdir}/etc/profile.d/openjdk6.sh || return 1
 }
+
+package_openjdk6-src() {
+ pkgdesc='Free Java environment based on OpenJDK 6.0 Source Bundle'
+ depends=('openjdk6')
+ 
+  if [ "${CARCH}" = "x86_64" ]; then
+    _arch=amd64
+  else
+    _arch=i586
+  fi
+  _javaver=1.6.0
+  _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
+
+  cd ${srcdir}/icedtea6-${_icedteaver}
+  install -m755 -d ${pkgdir}/${_jvmdir}/jre
+  
+#  pushd ${srcdir}/icedtea6/openjdk/build/linux-${_arch}/j2sdk-image
+  pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk/build/linux-${_arch}/j2sdk-image
+#  pushd ${srcdir}/icedtea6-${_hgver}/openjdk/build/linux-${_arch}/j2sdk-image
+   # Install src.zip file
+  cp -a src.zip ${pkgdir}/${_jvmdir}/ || return 1
+}