[arch-commits] CVS update of extra/devel/jdk (PKGBUILD jdk.profile)

[Jason Chu]

    Date: Sunday, March 30, 2008 @ 05:24:58
  Author: jason
    Path: /home/cvs-extra/extra/devel/jdk

Modified: PKGBUILD (1.16 -> 1.17) jdk.profile (1.2 -> 1.3)

upgpkg: jdk 6u5-1


-------------+
 PKGBUILD    |   18 ++++++++++--------
 jdk.profile |    2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)


Index: extra/devel/jdk/PKGBUILD
diff -u extra/devel/jdk/PKGBUILD:1.16 extra/devel/jdk/PKGBUILD:1.17
--- extra/devel/jdk/PKGBUILD:1.16	Thu Oct  4 15:32:32 2007
+++ extra/devel/jdk/PKGBUILD	Sun Mar 30 05:24:58 2008
@@ -1,28 +1,26 @@
-# $Id: PKGBUILD,v 1.16 2007/10/04 19:32:32 daniel Exp $
+# $Id: PKGBUILD,v 1.17 2008/03/30 09:24:58 jason Exp $
 # Maintainer: Jason Chu <jason at archlinux.org>
 
 pkgname=jdk
-pkgver=6u3
+pkgver=6u5
 pkgrel=1
 pkgdesc="Sun's Java Development Kit"
 arch=(i686 x86_64)
   [ "${CARCH}" = "i686" ]   && ARCH=i586
   [ "${CARCH}" = "x86_64" ] && ARCH=amd64
 url="http://java.sun.com"
-depends=('gcc' 'glibc' 'jre')
+depends=('glibc' 'jre')
 install="jdk.install"
 source=(http://download.java.net/dlj/binaries/jdk-${pkgver}-dlj-linux-${ARCH}.bin
         https://jdk-distros.dev.java.net/source/browse/*checkout*/jdk-distros/trunk/utils/construct.sh
 	jdk.profile)
-md5sums=('e39a322d8e3c89d3e679047cdeab50f7'
+md5sums=('958f0b7e7465346e164770d360e60dd6'
          '94065b612df0046d9ae758943f9f6a75'
-         '4ba4fcd3825c7517179c315df5b63123')
-[ "${CARCH}" = "x86_64" ] && md5sums=('f0bf3837b2ba7965ad932e06321a172e'
-         '94065b612df0046d9ae758943f9f6a75'
-         '4ba4fcd3825c7517179c315df5b63123')
+         'cf7a5c21439ecb409811481ebb9952f8')
 replaces=('j2sdk')
 conflicts=('java-environment' 'j2sdk')
 provides=('java-environment' 'j2sdk')
+license=('custom')
 
 build() {
   cd ${startdir}/src
@@ -43,4 +41,8 @@
 
   install -D -m755 ${startdir}/src/${pkgname}.profile ${startdir}/pkg/etc/profile.d/${pkgname}.sh
 
+  mkdir -p $startdir/pkg/usr/share/licenses/jdk
+  cp $startdir/pkg/opt/java/COPYRIGHT $startdir/pkg/usr/share/licenses/jdk
+  cp $startdir/pkg/opt/java/LICENSE $startdir/pkg/usr/share/licenses/jdk
+  cp $startdir/pkg/opt/java/THIRDPARTYLICENSEREADME.txt $startdir/pkg/usr/share/licenses/jdk
 }
Index: extra/devel/jdk/jdk.profile
diff -u extra/devel/jdk/jdk.profile:1.2 extra/devel/jdk/jdk.profile:1.3
--- extra/devel/jdk/jdk.profile:1.2	Sat Feb  2 13:48:35 2008
+++ extra/devel/jdk/jdk.profile	Sun Mar 30 05:24:58 2008
@@ -1,4 +1,4 @@
 export J2SDKDIR=/opt/java
 export PATH=$PATH:$J2SDKDIR/bin
-export JAVA_HOME=/opt/java
+export JDK_HOME=/opt/java
 export CLASSPATH=$CLASSPATH:$J2SDKDIR/lib