Expand the JAVA_WRAPPERS definitions for the sun-j{re,dk}* packages.

This adds many commonly used tools to $PREFIX/bin, such as keytool,
rmiregistry, rmic, idlj, etc.

12 files changed, 69 insertions, 18 deletions

diff --git a/lang/sun-jdk13/Makefile b/lang/sun-jdk13/Makefile
index d260d0d4330..81c6e4e850d 100644
--- a/lang/sun-jdk13/Makefile
+++ b/lang/sun-jdk13/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2004/06/08 14:52:38 jschauma Exp $
+# $NetBSD: Makefile,v 1.30 2004/10/05 22:09:23 tv Exp $
 
 DISTNAME=	j2sdk-1_3_1_12-linux-i586
 PKGNAME=	sun-jdk13-1.0.12
+PKGREVISION=	1
 MASTER_SITES=	# empty
 
 COMMENT=	Sun's Java(tm) Development Kit 1.3.1
@@ -11,7 +12,8 @@ SHORT=		JDK
 DEPENDS=	sun-jre13>=1.0.12:../../lang/sun-jre13
 
 JAVA_CLASSPATH=	${JAVA_HOME}/src.jar
-JAVA_WRAPPERS=	appletviewer jar javac javadoc javah javap
+JAVA_WRAPPERS=	appletviewer extcheck idlj jar jarsigner \
+		javac javadoc javah javap jdb rmic serialver
 WRKSRC=		${WRKDIR}/jdk1.3.1_12
 
 # Remove parts that are in common with the JRE.
diff --git a/lang/sun-jdk13/PLIST b/lang/sun-jdk13/PLIST
index dd3f90a44e1..1a1627934ae 100644
--- a/lang/sun-jdk13/PLIST
+++ b/lang/sun-jdk13/PLIST
@@ -1,10 +1,16 @@
-@comment $NetBSD: PLIST,v 1.5 2004/05/22 21:22:59 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/10/05 22:09:23 tv Exp $
 bin/sun13-appletviewer
+bin/sun13-extcheck
+bin/sun13-idlj
 bin/sun13-jar
+bin/sun13-jarsigner
 bin/sun13-javac
 bin/sun13-javadoc
 bin/sun13-javah
 bin/sun13-javap
+bin/sun13-jdb
+bin/sun13-rmic
+bin/sun13-serialver
 java/sun-1.3.1/README.html
 java/sun-1.3.1/bin/HtmlConverter
 java/sun-1.3.1/bin/appletviewer
diff --git a/lang/sun-jdk14/Makefile b/lang/sun-jdk14/Makefile
index 75b57dacf1c..eb35b8718ff 100644
--- a/lang/sun-jdk14/Makefile
+++ b/lang/sun-jdk14/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2004/07/02 14:40:21 jschauma Exp $
+# $NetBSD: Makefile,v 1.20 2004/10/05 22:09:23 tv Exp $
 
 DISTNAME=	j2sdk-1_4_2_05-linux-i586
 PKGNAME=	sun-jdk14-2.5
+PKGREVISION=	1
 MASTER_SITES=	# empty
 
 COMMENT=	Sun's Java(tm) 2 SDK, Standard Edition 1.4.2
@@ -11,7 +12,8 @@ SHORT=		SDK
 DEPENDS=	sun-jre14>=2.5:../../lang/sun-jre14
 
 WRKSRC=		${WRKDIR}/j2sdk1.4.2_05
-JAVA_WRAPPERS=	appletviewer jar javac javadoc javah javap
+JAVA_WRAPPERS=	appletviewer extcheck idlj jar jarsigner \
+		javac javadoc javah javap jdb rmic serialver
 
 # Remove parts that are in common with the JRE
 #
diff --git a/lang/sun-jdk14/PLIST b/lang/sun-jdk14/PLIST
index a3289eb9649..adda84cdf27 100644
--- a/lang/sun-jdk14/PLIST
+++ b/lang/sun-jdk14/PLIST
@@ -1,10 +1,16 @@
-@comment $NetBSD: PLIST,v 1.6 2004/05/22 21:32:34 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/10/05 22:09:23 tv Exp $
 bin/sun14-appletviewer
+bin/sun14-extcheck
+bin/sun14-idlj
 bin/sun14-jar
+bin/sun14-jarsigner
 bin/sun14-javac
 bin/sun14-javadoc
 bin/sun14-javah
 bin/sun14-javap
+bin/sun14-jdb
+bin/sun14-rmic
+bin/sun14-serialver
 java/sun-1.4/README.html
 java/sun-1.4/bin/HtmlConverter
 java/sun-1.4/bin/appletviewer
diff --git a/lang/sun-jdk15/Makefile b/lang/sun-jdk15/Makefile
index e96a1311907..7137018990b 100644
--- a/lang/sun-jdk15/Makefile
+++ b/lang/sun-jdk15/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/09/30 23:47:19 rh Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/05 22:09:23 tv Exp $
 
 DISTNAME=	jdk-1_5_0-linux-i586
 PKGNAME=	sun-jdk15-5.0
+PKGREVISION=	1
 MASTER_SITES=	# empty
 
 COMMENT=	Sun's Java(tm) 2 SDK, Standard Edition 1.5.0
@@ -11,7 +12,8 @@ SHORT=		SDK
 DEPENDS=	sun-jre15>=5.0:../../lang/sun-jre15
 
 WRKSRC=		${WRKDIR}/jdk1.5.0
-JAVA_WRAPPERS=	appletviewer jar javac javadoc javah javap
+JAVA_WRAPPERS=	appletviewer apt extcheck idlj jar jarsigner \
+		javac javadoc javah javap jdb rmic serialver
 
 # Remove parts that are in common with the JRE
 #
diff --git a/lang/sun-jdk15/PLIST b/lang/sun-jdk15/PLIST
index 49b6579b356..60353b6792c 100644
--- a/lang/sun-jdk15/PLIST
+++ b/lang/sun-jdk15/PLIST
@@ -1,10 +1,17 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/09/30 23:47:20 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/10/05 22:09:23 tv Exp $
 bin/sun15-appletviewer
+bin/sun15-apt
+bin/sun15-extcheck
+bin/sun15-idlj
 bin/sun15-jar
+bin/sun15-jarsigner
 bin/sun15-javac
 bin/sun15-javadoc
 bin/sun15-javah
 bin/sun15-javap
+bin/sun15-jdb
+bin/sun15-rmic
+bin/sun15-serialver
 java/sun-1.5/README.html
 java/sun-1.5/bin/HtmlConverter
 java/sun-1.5/bin/appletviewer
diff --git a/lang/sun-jre13/Makefile b/lang/sun-jre13/Makefile
index f1d471d102e..e1e5ec316cf 100644
--- a/lang/sun-jre13/Makefile
+++ b/lang/sun-jre13/Makefile
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.35 2004/06/08 14:52:38 jschauma Exp $
+# $NetBSD: Makefile,v 1.36 2004/10/05 22:09:23 tv Exp $
 
 DISTNAME=	j2re-1_3_1_12-linux-i586
 PKGNAME=	sun-jre13-1.0.12
+PKGREVISION=	1
 MASTER_SITES=	# empty
 
 COMMENT=	Sun's Java(tm) Runtime Environment 1.3.1
 
 SHORT=		JRE
 
-JAVA_WRAPPERS=	java
+JAVA_WRAPPERS=	java keytool policytool rmid rmiregistry tnameserv
 WRKSRC=		${WRKDIR}/jre1.3.1_12
 USE_PKGINSTALL=	yes
 OWN_DIRS=	${JAVA_HOME}
diff --git a/lang/sun-jre13/PLIST b/lang/sun-jre13/PLIST
index c7a90e7ca87..0591a4e1042 100644
--- a/lang/sun-jre13/PLIST
+++ b/lang/sun-jre13/PLIST
@@ -1,4 +1,10 @@
-@comment $NetBSD: PLIST,v 1.7 2004/05/22 21:22:59 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/10/05 22:09:23 tv Exp $
+bin/sun13-java
+bin/sun13-keytool
+bin/sun13-policytool
+bin/sun13-rmid
+bin/sun13-rmiregistry
+bin/sun13-tnameserv
 java/sun-1.3.1/CHANGES
 java/sun-1.3.1/COPYRIGHT
 java/sun-1.3.1/ControlPanel.html
diff --git a/lang/sun-jre14/Makefile b/lang/sun-jre14/Makefile
index 0bfed793a7f..dd82d2dc1d4 100644
--- a/lang/sun-jre14/Makefile
+++ b/lang/sun-jre14/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2004/07/06 11:32:49 abs Exp $
+# $NetBSD: Makefile,v 1.20 2004/10/05 22:09:23 tv Exp $
 
 # Note: Regen distinfo with SUN_JRE14_USE_JCE=YES
 
 DISTNAME=	j2re-1_4_2_05-linux-i586
 PKGNAME=	sun-jre14-2.5
+PKGREVISION=	1
 MASTER_SITES=	# empty
 
 COMMENT=	Sun's Java(tm) 2 Runtime Environment 1.4.2
@@ -12,7 +13,8 @@ SHORT=		JRE
 
 WRKSRC=		${WRKDIR}/j2re1.4.2_05
 USE_PKGINSTALL=	yes
-JAVA_WRAPPERS=	java
+JAVA_WRAPPERS=	java keytool orbd policytool rmid rmiregistry \
+		servertool tnameserv
 OWN_DIRS=	${JAVA_HOME}
 OWN_DIRS+=	${JAVA_HOME}/lib
 OWN_DIRS+=	${JAVA_HOME}/lib/applet
diff --git a/lang/sun-jre14/PLIST b/lang/sun-jre14/PLIST
index 59fa0cffa35..a65e50e2e63 100644
--- a/lang/sun-jre14/PLIST
+++ b/lang/sun-jre14/PLIST
@@ -1,5 +1,12 @@
-@comment $NetBSD: PLIST,v 1.14 2004/07/06 11:32:49 abs Exp $
+@comment $NetBSD: PLIST,v 1.15 2004/10/05 22:09:23 tv Exp $
 bin/sun14-java
+bin/sun14-keytool
+bin/sun14-orbd
+bin/sun14-policytool
+bin/sun14-rmid
+bin/sun14-rmiregistry
+bin/sun14-servertool
+bin/sun14-tnameserv
 java/sun-1.4/.systemPrefs/.system.lock
 java/sun-1.4/.systemPrefs/.systemRootModFile
 java/sun-1.4/CHANGES
diff --git a/lang/sun-jre15/Makefile b/lang/sun-jre15/Makefile
index 770e096a711..4cd9de6915b 100644
--- a/lang/sun-jre15/Makefile
+++ b/lang/sun-jre15/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2004/10/05 21:36:15 tv Exp $
+# $NetBSD: Makefile,v 1.3 2004/10/05 22:09:23 tv Exp $
 
 DISTNAME=	jre-1_5_0-linux-i586
 PKGNAME=	sun-jre15-5.0
+PKGREVISION=	1
 MASTER_SITES=	# empty
 
 COMMENT=	Sun's Java(tm) 2 Runtime Environment 1.5.0
@@ -10,7 +11,8 @@ SHORT=		JRE
 
 WRKSRC=		${WRKDIR}/jre1.5.0
 USE_PKGINSTALL=	yes
-JAVA_WRAPPERS=	java
+JAVA_WRAPPERS=	java javaws keytool orbd policytool rmid rmiregistry \
+		servertool tnameserv
 OWN_DIRS=	${JAVA_HOME}
 OWN_DIRS+=	${JAVA_HOME}/lib
 OWN_DIRS+=	${JAVA_HOME}/lib/applet
diff --git a/lang/sun-jre15/PLIST b/lang/sun-jre15/PLIST
index 65fbb34d015..d6dfddff694 100644
--- a/lang/sun-jre15/PLIST
+++ b/lang/sun-jre15/PLIST
@@ -1,5 +1,13 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/09/30 22:11:52 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/10/05 22:09:23 tv Exp $
 bin/sun15-java
+bin/sun15-javaws
+bin/sun15-keytool
+bin/sun15-orbd
+bin/sun15-policytool
+bin/sun15-rmid
+bin/sun15-rmiregistry
+bin/sun15-servertool
+bin/sun15-tnameserv
 java/sun-1.5/.pkgsrc
 java/sun-1.5/.systemPrefs/.system.lock
 java/sun-1.5/.systemPrefs/.systemRootModFile