Update to official 1.5.0beta1.

Bumped PORTEPOCH, because this second beta is called 'beta1'.

See:
http://java.sun.com/j2se/1.5.0/

6 files changed, 38 insertions, 12 deletions

diff --git a/java/linux-sun-jdk15/Makefile b/java/linux-sun-jdk15/Makefile
index b9730de4f6b2..c43eb29f170f 100644
--- a/java/linux-sun-jdk15/Makefile
+++ b/java/linux-sun-jdk15/Makefile
@@ -7,10 +7,11 @@
 
 PORTNAME=	jdk
 PORTVERSION=	1.5.0.b1
+PORTEPOCH=	1
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMEPREFIX=	linux-sun-
-DISTNAME=	j2sdk-1_5_0-beta-bin-b31-linux-i586-11_dec_2003
+DISTNAME=	j2sdk-1_5_0-beta-linux-i586
 EXTRACT_SUFX=	.bin
 
 MAINTAINER=	znerd@FreeBSD.org
@@ -33,7 +34,7 @@ JDK_VERSION=	1.5.0
 JDK_BETA_LEVEL=	1
 DL_JDK_VERSION=	"${JDK_VERSION} beta ${JDK_BETA_LEVEL}"
 ONLY_FOR_ARCHS=	i386
-DOWNLOAD_URL?=	http://jsecom16.sun.com/ECom/EComActionServlet?StoreId=22&PartDetailId=j2sdk-1.5.0-beta-b31-oth-JPR
+DOWNLOAD_URL?=	http://jsecom16.sun.com/ECom/EComActionServlet?StoreId=22&PartDetailId=j2sdk-1.5.0-beta-oth-JPR&TransactionId=noreg
 PORTTITLE=	Java 2 Development Kit ${DL_JDK_VERSION} for Linux
 APP_HOME=	${PREFIX}/${PKGNAMEPREFIX}${PORTNAME}${JDK_VERSION}
 PACKED_JARS=	lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/javaws/javaws.jar
@@ -51,7 +52,7 @@ pre-everything::
 do-extract:
 	@${MKDIR} ${WRKDIR}
 	@cd ${WRKDIR} \
-	&& ${TAIL} -n 144439 ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} > ${WRKDIR}/install.sfx \
+	&& ${TAIL} -n +579 ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} > ${WRKDIR}/install.sfx \
 	&& ${CHMOD} +x ${WRKDIR}/install.sfx \
 	&& ${WRKDIR}/install.sfx > /dev/null
 
diff --git a/java/linux-sun-jdk15/distinfo b/java/linux-sun-jdk15/distinfo
index f2c67accf0a6..cc1f36a39b87 100644
--- a/java/linux-sun-jdk15/distinfo
+++ b/java/linux-sun-jdk15/distinfo
@@ -1 +1,2 @@
-MD5 (j2sdk-1_5_0-beta-bin-b31-linux-i586-11_dec_2003.bin) = ee03c299e1d6a402908a23f7897abc47
+MD5 (j2sdk-1_5_0-beta-linux-i586.bin) = 1e6af0d64563b085ffadec97db365b19
+SIZE (j2sdk-1_5_0-beta-linux-i586.bin) = 44654223
diff --git a/java/linux-sun-jdk15/pkg-plist b/java/linux-sun-jdk15/pkg-plist
index e1d986636b7a..8c00a9db8649 100644
--- a/java/linux-sun-jdk15/pkg-plist
+++ b/java/linux-sun-jdk15/pkg-plist
@@ -11,7 +11,6 @@
 %%T%%/jre/bin/tnameserv
 %%T%%/jre/bin/ControlPanel
 %%T%%/jre/bin/java_vm
-%%T%%/jre/bin/javawsbin
 %%T%%/jre/bin/javaws
 %%T%%/jre/lib/i386/native_threads/libhpi.so
 %%T%%/jre/lib/i386/server/libjvm.so
@@ -20,6 +19,8 @@
 %%T%%/jre/lib/i386/client/libjvm.so
 %%T%%/jre/lib/i386/client/Xusage.txt
 %%T%%/jre/lib/i386/client/libjsig.so
+%%T%%/jre/lib/i386/liboldhprof.so
+%%T%%/jre/lib/i386/libsaproc.so
 %%T%%/jre/lib/i386/libnative_chmod.so
 %%T%%/jre/lib/i386/libjsig.so
 %%T%%/jre/lib/i386/libj2pkcs11.so
@@ -505,6 +506,7 @@
 %%T%%/jre/lib/fontconfig.properties
 %%T%%/jre/lib/fontconfig.RedHat.properties
 %%T%%/jre/lib/fontconfig.RedHat.8.0.properties
+%%T%%/jre/lib/fontconfig.RedHat.3.properties
 %%T%%/jre/lib/fontconfig.RedHat.2.1.properties
 %%T%%/jre/lib/fontconfig.Sun.properties
 %%T%%/jre/lib/fontconfig.Turbo.properties
@@ -534,6 +536,10 @@
 %%T%%/jre/lib/locale/zh_TW.BIG5/LC_MESSAGES/sunw_java_plugin.mo
 %%T%%/jre/lib/locale/zh_HK.BIG5HK/LC_MESSAGES/sunw_java_plugin.mo
 %%T%%/jre/lib/javaws.pack
+%%T%%/jre/lib/javaws/sun-java.png
+%%T%%/jre/lib/javaws/sun-java_HighContrast.png
+%%T%%/jre/lib/javaws/sun-java_HighContrastInverse.png
+%%T%%/jre/lib/javaws/sun-java_LowContrast.png
 %%T%%/jre/lib/javaws/miniSplash.jpg
 %%T%%/jre/lib/javaws/messages.properties
 %%T%%/jre/lib/javaws/messages_zh_TW.properties
@@ -547,11 +553,11 @@
 %%T%%/jre/lib/javaws/messages_zh_CN.properties
 %%T%%/jre/lib/javaws/messages_zh_HK.properties
 %%T%%/jre/lib/javaws/Java1.5.ico
-%%T%%/jre/lib/deploy.jar
 %%T%%/jre/lib/plugin.jar
 %%T%%/jre/lib/rt.jar
 %%T%%/jre/lib/jsse.jar
 %%T%%/jre/lib/charsets.jar
+%%T%%/jre/lib/deploy.pack
 %%T%%/jre/CHANGES
 %%T%%/jre/COPYRIGHT
 %%T%%/jre/Welcome.html
@@ -562,6 +568,7 @@
 %%T%%/jre/plugin/i386/ns7-gcc29/libjavaplugin_oji.so
 %%T%%/jre/plugin/desktop/sun_java.png
 %%T%%/jre/plugin/desktop/sun_java.desktop
+%%T%%/jre/javaws/javaws
 %%T%%/jre/.systemPrefs/.system.lock
 %%T%%/jre/.systemPrefs/.systemRootModFile
 %%T%%/lib/orb.idl
@@ -570,6 +577,7 @@
 %%T%%/lib/htmlconverter.jar
 %%T%%/lib/unpack
 %%T%%/lib/tools.jar
+%%T%%/lib/sa-jdi.jar
 %%T%%/bin/java
 %%T%%/bin/javac
 %%T%%/bin/javadoc
@@ -596,6 +604,8 @@
 %%T%%/bin/extcheck
 %%T%%/bin/jdb
 %%T%%/bin/HtmlConverter
+%%T%%/bin/ControlPanel
+%%T%%/bin/javaws
 %%T%%/demo/applets/Animator/audio/0.au
 %%T%%/demo/applets/Animator/audio/1.au
 %%T%%/demo/applets/Animator/audio/2.au
@@ -1690,6 +1700,7 @@
 @dirrm %%T%%/jre/plugin/i386
 @dirrm %%T%%/jre/plugin/desktop
 @dirrm %%T%%/jre/plugin
+@dirrm %%T%%/jre/javaws
 @dirrm %%T%%/jre/.systemPrefs
 @dirrm %%T%%/jre
 @dirrm %%T%%/lib
diff --git a/java/linux-sun-jdk16/Makefile b/java/linux-sun-jdk16/Makefile
index b9730de4f6b2..c43eb29f170f 100644
--- a/java/linux-sun-jdk16/Makefile
+++ b/java/linux-sun-jdk16/Makefile
@@ -7,10 +7,11 @@
 
 PORTNAME=	jdk
 PORTVERSION=	1.5.0.b1
+PORTEPOCH=	1
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMEPREFIX=	linux-sun-
-DISTNAME=	j2sdk-1_5_0-beta-bin-b31-linux-i586-11_dec_2003
+DISTNAME=	j2sdk-1_5_0-beta-linux-i586
 EXTRACT_SUFX=	.bin
 
 MAINTAINER=	znerd@FreeBSD.org
@@ -33,7 +34,7 @@ JDK_VERSION=	1.5.0
 JDK_BETA_LEVEL=	1
 DL_JDK_VERSION=	"${JDK_VERSION} beta ${JDK_BETA_LEVEL}"
 ONLY_FOR_ARCHS=	i386
-DOWNLOAD_URL?=	http://jsecom16.sun.com/ECom/EComActionServlet?StoreId=22&PartDetailId=j2sdk-1.5.0-beta-b31-oth-JPR
+DOWNLOAD_URL?=	http://jsecom16.sun.com/ECom/EComActionServlet?StoreId=22&PartDetailId=j2sdk-1.5.0-beta-oth-JPR&TransactionId=noreg
 PORTTITLE=	Java 2 Development Kit ${DL_JDK_VERSION} for Linux
 APP_HOME=	${PREFIX}/${PKGNAMEPREFIX}${PORTNAME}${JDK_VERSION}
 PACKED_JARS=	lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/javaws/javaws.jar
@@ -51,7 +52,7 @@ pre-everything::
 do-extract:
 	@${MKDIR} ${WRKDIR}
 	@cd ${WRKDIR} \
-	&& ${TAIL} -n 144439 ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} > ${WRKDIR}/install.sfx \
+	&& ${TAIL} -n +579 ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} > ${WRKDIR}/install.sfx \
 	&& ${CHMOD} +x ${WRKDIR}/install.sfx \
 	&& ${WRKDIR}/install.sfx > /dev/null
 
diff --git a/java/linux-sun-jdk16/distinfo b/java/linux-sun-jdk16/distinfo
index f2c67accf0a6..cc1f36a39b87 100644
--- a/java/linux-sun-jdk16/distinfo
+++ b/java/linux-sun-jdk16/distinfo
@@ -1 +1,2 @@
-MD5 (j2sdk-1_5_0-beta-bin-b31-linux-i586-11_dec_2003.bin) = ee03c299e1d6a402908a23f7897abc47
+MD5 (j2sdk-1_5_0-beta-linux-i586.bin) = 1e6af0d64563b085ffadec97db365b19
+SIZE (j2sdk-1_5_0-beta-linux-i586.bin) = 44654223
diff --git a/java/linux-sun-jdk16/pkg-plist b/java/linux-sun-jdk16/pkg-plist
index e1d986636b7a..8c00a9db8649 100644
--- a/java/linux-sun-jdk16/pkg-plist
+++ b/java/linux-sun-jdk16/pkg-plist
@@ -11,7 +11,6 @@
 %%T%%/jre/bin/tnameserv
 %%T%%/jre/bin/ControlPanel
 %%T%%/jre/bin/java_vm
-%%T%%/jre/bin/javawsbin
 %%T%%/jre/bin/javaws
 %%T%%/jre/lib/i386/native_threads/libhpi.so
 %%T%%/jre/lib/i386/server/libjvm.so
@@ -20,6 +19,8 @@
 %%T%%/jre/lib/i386/client/libjvm.so
 %%T%%/jre/lib/i386/client/Xusage.txt
 %%T%%/jre/lib/i386/client/libjsig.so
+%%T%%/jre/lib/i386/liboldhprof.so
+%%T%%/jre/lib/i386/libsaproc.so
 %%T%%/jre/lib/i386/libnative_chmod.so
 %%T%%/jre/lib/i386/libjsig.so
 %%T%%/jre/lib/i386/libj2pkcs11.so
@@ -505,6 +506,7 @@
 %%T%%/jre/lib/fontconfig.properties
 %%T%%/jre/lib/fontconfig.RedHat.properties
 %%T%%/jre/lib/fontconfig.RedHat.8.0.properties
+%%T%%/jre/lib/fontconfig.RedHat.3.properties
 %%T%%/jre/lib/fontconfig.RedHat.2.1.properties
 %%T%%/jre/lib/fontconfig.Sun.properties
 %%T%%/jre/lib/fontconfig.Turbo.properties
@@ -534,6 +536,10 @@
 %%T%%/jre/lib/locale/zh_TW.BIG5/LC_MESSAGES/sunw_java_plugin.mo
 %%T%%/jre/lib/locale/zh_HK.BIG5HK/LC_MESSAGES/sunw_java_plugin.mo
 %%T%%/jre/lib/javaws.pack
+%%T%%/jre/lib/javaws/sun-java.png
+%%T%%/jre/lib/javaws/sun-java_HighContrast.png
+%%T%%/jre/lib/javaws/sun-java_HighContrastInverse.png
+%%T%%/jre/lib/javaws/sun-java_LowContrast.png
 %%T%%/jre/lib/javaws/miniSplash.jpg
 %%T%%/jre/lib/javaws/messages.properties
 %%T%%/jre/lib/javaws/messages_zh_TW.properties
@@ -547,11 +553,11 @@
 %%T%%/jre/lib/javaws/messages_zh_CN.properties
 %%T%%/jre/lib/javaws/messages_zh_HK.properties
 %%T%%/jre/lib/javaws/Java1.5.ico
-%%T%%/jre/lib/deploy.jar
 %%T%%/jre/lib/plugin.jar
 %%T%%/jre/lib/rt.jar
 %%T%%/jre/lib/jsse.jar
 %%T%%/jre/lib/charsets.jar
+%%T%%/jre/lib/deploy.pack
 %%T%%/jre/CHANGES
 %%T%%/jre/COPYRIGHT
 %%T%%/jre/Welcome.html
@@ -562,6 +568,7 @@
 %%T%%/jre/plugin/i386/ns7-gcc29/libjavaplugin_oji.so
 %%T%%/jre/plugin/desktop/sun_java.png
 %%T%%/jre/plugin/desktop/sun_java.desktop
+%%T%%/jre/javaws/javaws
 %%T%%/jre/.systemPrefs/.system.lock
 %%T%%/jre/.systemPrefs/.systemRootModFile
 %%T%%/lib/orb.idl
@@ -570,6 +577,7 @@
 %%T%%/lib/htmlconverter.jar
 %%T%%/lib/unpack
 %%T%%/lib/tools.jar
+%%T%%/lib/sa-jdi.jar
 %%T%%/bin/java
 %%T%%/bin/javac
 %%T%%/bin/javadoc
@@ -596,6 +604,8 @@
 %%T%%/bin/extcheck
 %%T%%/bin/jdb
 %%T%%/bin/HtmlConverter
+%%T%%/bin/ControlPanel
+%%T%%/bin/javaws
 %%T%%/demo/applets/Animator/audio/0.au
 %%T%%/demo/applets/Animator/audio/1.au
 %%T%%/demo/applets/Animator/audio/2.au
@@ -1690,6 +1700,7 @@
 @dirrm %%T%%/jre/plugin/i386
 @dirrm %%T%%/jre/plugin/desktop
 @dirrm %%T%%/jre/plugin
+@dirrm %%T%%/jre/javaws
 @dirrm %%T%%/jre/.systemPrefs
 @dirrm %%T%%/jre
 @dirrm %%T%%/lib