Add jps to the list of wrapped java binaries. Bump PKGREVISION

4 files changed, 12 insertions, 11 deletions

diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile
index 2aac8a15b89..50798a5d941 100644
--- a/lang/openjdk7/Makefile
+++ b/lang/openjdk7/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.98 2015/04/27 19:24:17 jperkin Exp $
+# $NetBSD: Makefile,v 1.99 2015/05/05 16:20:08 abs Exp $
 
 DISTNAME=	openjdk-1.7.76-20150127
 PKGNAME=	openjdk7-1.7.76
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_LOCAL:=openjdk7/}
 EXTRACT_SUFX=	.tar.bz2
@@ -19,7 +19,7 @@ DIST_SUBDIR=	openjdk7
 
 JAVA_NAME=	openjdk7
 JAVA_HOME=	${PREFIX}/java/${JAVA_NAME}
-JAVA_WRAPPERS=	jar java javac javadoc javah javap keytool orbd \
+JAVA_WRAPPERS=	jar java javac javadoc javah javap jps keytool orbd \
 		policytool rmid rmiregistry servertool tnameserv
 
 MAKE_ENV+=		PKGSRC_ZIPEXE=${TOOLS_PATH.zip}
diff --git a/lang/openjdk8/Makefile b/lang/openjdk8/Makefile
index 84a36e8b7a7..711c9dc0277 100644
--- a/lang/openjdk8/Makefile
+++ b/lang/openjdk8/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2015/03/05 16:35:49 tnn Exp $
+# $NetBSD: Makefile,v 1.13 2015/05/05 16:20:08 abs Exp $
 
 DISTNAME=	openjdk-1.8.31-20150207
 PKGNAME=	openjdk8-1.8.31
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_LOCAL:=openjdk7/}
 EXTRACT_SUFX=	.tar.xz
@@ -20,7 +20,7 @@ DIST_SUBDIR=	openjdk7
 
 JAVA_NAME=	openjdk8
 JAVA_HOME=	${PREFIX}/java/${JAVA_NAME}
-JAVA_WRAPPERS=	jar java javac javadoc javah javap keytool orbd \
+JAVA_WRAPPERS=	jar java javac javadoc javah javap jps keytool orbd \
 		policytool rmid rmiregistry servertool tnameserv
 
 BUILD_DEPENDS+=		mozilla-rootcerts>=1.0.20140820nb2:../../security/mozilla-rootcerts
diff --git a/lang/sun-jdk6/Makefile b/lang/sun-jdk6/Makefile
index 5e3a3b9aa69..05a444a1d24 100644
--- a/lang/sun-jdk6/Makefile
+++ b/lang/sun-jdk6/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2013/09/07 09:11:52 ryoon Exp $
+# $NetBSD: Makefile,v 1.36 2015/05/05 16:20:08 abs Exp $
 
 DISTNAME=	jdk-6u45-${DIST_OS}-${DIST_ARCH}
 PKGNAME=	sun-jdk6-6.0.45
-PKGREVISION=	1
+PKGREVISION=	2
 MASTER_SITES=	# empty
 
 LICENSE=	sun-jdk6-license
@@ -11,7 +11,7 @@ DEPENDS+=	${PKGNAME_NOREV:S/jdk/jre/}*:../../lang/sun-jre6
 
 WRKSRC=		${WRKDIR}/jdk1.6.0_45
 JAVA_WRAPPERS=	appletviewer apt extcheck idlj jar jarsigner \
-		javac javadoc javah javap jdb rmic serialver
+		javac javadoc javah javap jdb jps rmic serialver
 
 MAKE_JOBS_SAFE=	no
 
diff --git a/lang/sun-jdk7/Makefile b/lang/sun-jdk7/Makefile
index 091294ab2c3..33cb34532b4 100644
--- a/lang/sun-jdk7/Makefile
+++ b/lang/sun-jdk7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2014/03/02 09:53:41 obache Exp $
+# $NetBSD: Makefile,v 1.16 2015/05/05 16:20:08 abs Exp $
 
 # Note: This must be kept in sync with the sun-jre7 package
 # Note: make sure you include sums for both the x86_64 and the x86_32
@@ -6,6 +6,7 @@
 
 DISTNAME=	jdk-7u${UPDATE_NUMBER}-${DIST_OS}-${DIST_ARCH}
 PKGNAME=	sun-jdk7-7.0.${UPDATE_NUMBER}
+PKGREVISION=	1
 MASTER_SITES=	# empty
 
 LICENSE=	oracle-binary-code-license
@@ -16,7 +17,7 @@ DEPENDS+=	${PKGNAME_NOREV:S/jdk/jre/}*:../../lang/sun-jre7
 
 WRKSRC=		${WRKDIR}/jdk1.7.0_${UPDATE_NUMBER}
 JAVA_WRAPPERS=	appletviewer apt extcheck idlj jar jarsigner \
-		javac javadoc javah javap jdb rmic serialver
+		javac javadoc javah javap jdb jps rmic serialver
 
 MAKE_JOBS_SAFE=	no