. Update to 1.5.0_01.

. Since the Makefile does a registervm, do the correct
  registervm/unregistervm dance in the packing list or we get stuck
  with a registered non-existent VM when the package is deinstalled.

6 files changed, 28 insertions, 14 deletions

diff --git a/java/linux-sun-jdk15/Makefile b/java/linux-sun-jdk15/Makefile
index 59d4b0931cf9..3092131847ab 100644
--- a/java/linux-sun-jdk15/Makefile
+++ b/java/linux-sun-jdk15/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	jdk
-PORTVERSION=	1.5.0
-PORTREVISION=	1
+PORTVERSION=	${DL_JDK_VERSION:S/_/./g}
 PORTEPOCH=	2
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMEPREFIX=	linux-sun-
-DISTNAME=	jdk-1_5_0-linux-i586
+DISTNAME=	jdk-${DL_JDK_VERSION:S/./_/g}-linux-i586
 EXTRACT_SUFX=	.bin
 
 MAINTAINER=	java@FreeBSD.org
@@ -26,14 +25,15 @@ NO_CDROM=	"License does not allow distribution with fee"
 RESTRICTED=	"Redistribution of repackaged binaries not permitted"
 LATEST_LINK=	linux-sun-jdk15
 
-WRKSRC=		${WRKDIR}/jdk${JDK_VERSION}
+WRKSRC=		${WRKDIR}/jdk${DL_JDK_VERSION}
 PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///} PORTVERSION=${PORTVERSION}
 PKGINSTALL=	${WRKDIR}/pkg-install
 
 NO_BUILD=	yes
 USE_LINUX=	yes
 JDK_VERSION=	1.5.0
-DL_JDK_VERSION=	"${JDK_VERSION}"
+JDK_REVISION=	01
+DL_JDK_VERSION=	${JDK_VERSION}_${JDK_REVISION}
 ONLY_FOR_ARCHS=	i386 amd64
 DOWNLOAD_URL?=	http://java.sun.com/j2se/1.5.0/download.jsp
 PORTTITLE=	Java 2 Development Kit ${DL_JDK_VERSION} for Linux
diff --git a/java/linux-sun-jdk15/distinfo b/java/linux-sun-jdk15/distinfo
index b16b0e3e8dc2..f4703ac13610 100644
--- a/java/linux-sun-jdk15/distinfo
+++ b/java/linux-sun-jdk15/distinfo
@@ -1,2 +1,2 @@
-MD5 (jdk-1_5_0-linux-i586.bin) = 81d0511feb32e7b7d61f7c07ee0b15e9
-SIZE (jdk-1_5_0-linux-i586.bin) = 46087154
+MD5 (jdk-1_5_0_01-linux-i586.bin) = 3e3aa7f89685a30c5c343f8f70966800
+SIZE (jdk-1_5_0_01-linux-i586.bin) = 46120566
diff --git a/java/linux-sun-jdk15/pkg-plist b/java/linux-sun-jdk15/pkg-plist
index b44e5246a2a1..282167ab37a1 100644
--- a/java/linux-sun-jdk15/pkg-plist
+++ b/java/linux-sun-jdk15/pkg-plist
@@ -1,3 +1,4 @@
+@unexec	%%LOCALBASE%%/bin/unregistervm "%D/%%T%%/bin/java"
 %%T%%/COPYRIGHT
 %%T%%/LICENSE
 %%T%%/README.html
@@ -553,10 +554,13 @@
 %%T%%/demo/jvmti/hprof/src/jvm.hprof.txt
 %%T%%/demo/jvmti/hprof/src/linux/hprof_md.c
 %%T%%/demo/jvmti/hprof/src/manual.html
+%%T%%/demo/jvmti/hprof/src/sample.makefile.txt
 %%T%%/demo/jvmti/index.html
 %%T%%/demo/jvmti/java_crw_demo/README.txt
+%%T%%/demo/jvmti/java_crw_demo/src/classfile_constants.h
 %%T%%/demo/jvmti/java_crw_demo/src/java_crw_demo.c
 %%T%%/demo/jvmti/java_crw_demo/src/java_crw_demo.h
+%%T%%/demo/jvmti/java_crw_demo/src/sample.makefile.txt
 %%T%%/demo/jvmti/java_crw_demo/src/test_crw.c
 %%T%%/demo/jvmti/mtrace/README.txt
 %%T%%/demo/jvmti/mtrace/lib/libmtrace.so
@@ -1844,6 +1848,9 @@
 %%T%%/sample/nio/server/StringContent.java
 %%T%%/sample/nio/server/URLDumper.java
 %%T%%/src.zip
+@exec	mkdir -p %D/share/doc/java
+@unexec	rmdir %D/share/doc/java 2>/dev/null || true
+@exec	%%LOCALBASE%%/bin/registervm "%D/%%T%%/bin/java # Linux-Sun-JDK%%PORTVERSION%%"
 @dirrm %%T%%/sample/nio/server
 @dirrm %%T%%/sample/nio
 @dirrm %%T%%/sample/jnlp/webpad/war/app
diff --git a/java/linux-sun-jdk16/Makefile b/java/linux-sun-jdk16/Makefile
index 59d4b0931cf9..3092131847ab 100644
--- a/java/linux-sun-jdk16/Makefile
+++ b/java/linux-sun-jdk16/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	jdk
-PORTVERSION=	1.5.0
-PORTREVISION=	1
+PORTVERSION=	${DL_JDK_VERSION:S/_/./g}
 PORTEPOCH=	2
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMEPREFIX=	linux-sun-
-DISTNAME=	jdk-1_5_0-linux-i586
+DISTNAME=	jdk-${DL_JDK_VERSION:S/./_/g}-linux-i586
 EXTRACT_SUFX=	.bin
 
 MAINTAINER=	java@FreeBSD.org
@@ -26,14 +25,15 @@ NO_CDROM=	"License does not allow distribution with fee"
 RESTRICTED=	"Redistribution of repackaged binaries not permitted"
 LATEST_LINK=	linux-sun-jdk15
 
-WRKSRC=		${WRKDIR}/jdk${JDK_VERSION}
+WRKSRC=		${WRKDIR}/jdk${DL_JDK_VERSION}
 PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///} PORTVERSION=${PORTVERSION}
 PKGINSTALL=	${WRKDIR}/pkg-install
 
 NO_BUILD=	yes
 USE_LINUX=	yes
 JDK_VERSION=	1.5.0
-DL_JDK_VERSION=	"${JDK_VERSION}"
+JDK_REVISION=	01
+DL_JDK_VERSION=	${JDK_VERSION}_${JDK_REVISION}
 ONLY_FOR_ARCHS=	i386 amd64
 DOWNLOAD_URL?=	http://java.sun.com/j2se/1.5.0/download.jsp
 PORTTITLE=	Java 2 Development Kit ${DL_JDK_VERSION} for Linux
diff --git a/java/linux-sun-jdk16/distinfo b/java/linux-sun-jdk16/distinfo
index b16b0e3e8dc2..f4703ac13610 100644
--- a/java/linux-sun-jdk16/distinfo
+++ b/java/linux-sun-jdk16/distinfo
@@ -1,2 +1,2 @@
-MD5 (jdk-1_5_0-linux-i586.bin) = 81d0511feb32e7b7d61f7c07ee0b15e9
-SIZE (jdk-1_5_0-linux-i586.bin) = 46087154
+MD5 (jdk-1_5_0_01-linux-i586.bin) = 3e3aa7f89685a30c5c343f8f70966800
+SIZE (jdk-1_5_0_01-linux-i586.bin) = 46120566
diff --git a/java/linux-sun-jdk16/pkg-plist b/java/linux-sun-jdk16/pkg-plist
index b44e5246a2a1..282167ab37a1 100644
--- a/java/linux-sun-jdk16/pkg-plist
+++ b/java/linux-sun-jdk16/pkg-plist
@@ -1,3 +1,4 @@
+@unexec	%%LOCALBASE%%/bin/unregistervm "%D/%%T%%/bin/java"
 %%T%%/COPYRIGHT
 %%T%%/LICENSE
 %%T%%/README.html
@@ -553,10 +554,13 @@
 %%T%%/demo/jvmti/hprof/src/jvm.hprof.txt
 %%T%%/demo/jvmti/hprof/src/linux/hprof_md.c
 %%T%%/demo/jvmti/hprof/src/manual.html
+%%T%%/demo/jvmti/hprof/src/sample.makefile.txt
 %%T%%/demo/jvmti/index.html
 %%T%%/demo/jvmti/java_crw_demo/README.txt
+%%T%%/demo/jvmti/java_crw_demo/src/classfile_constants.h
 %%T%%/demo/jvmti/java_crw_demo/src/java_crw_demo.c
 %%T%%/demo/jvmti/java_crw_demo/src/java_crw_demo.h
+%%T%%/demo/jvmti/java_crw_demo/src/sample.makefile.txt
 %%T%%/demo/jvmti/java_crw_demo/src/test_crw.c
 %%T%%/demo/jvmti/mtrace/README.txt
 %%T%%/demo/jvmti/mtrace/lib/libmtrace.so
@@ -1844,6 +1848,9 @@
 %%T%%/sample/nio/server/StringContent.java
 %%T%%/sample/nio/server/URLDumper.java
 %%T%%/src.zip
+@exec	mkdir -p %D/share/doc/java
+@unexec	rmdir %D/share/doc/java 2>/dev/null || true
+@exec	%%LOCALBASE%%/bin/registervm "%D/%%T%%/bin/java # Linux-Sun-JDK%%PORTVERSION%%"
 @dirrm %%T%%/sample/nio/server
 @dirrm %%T%%/sample/nio
 @dirrm %%T%%/sample/jnlp/webpad/war/app