From e0ca14e28e823db6c88eb0d2fc45e60144061eed Mon Sep 17 00:00:00 2001 From: abs Date: Wed, 19 Sep 2018 18:18:30 +0000 Subject: [PATCH] Add jhat to JAVA_WRAPPERS. Bump PKGREVISION --- lang/openjdk7/Makefile | 8 ++++---- lang/openjdk7/PLIST | 3 ++- lang/openjdk8/Makefile | 7 ++++--- lang/openjdk8/PLIST | 3 ++- lang/oracle-jdk8/Makefile | 5 +++-- lang/oracle-jdk8/PLIST.linux-i386 | 3 ++- lang/oracle-jdk8/PLIST.linux-x86_64 | 3 ++- lang/oracle-jdk8/PLIST.solaris-x86_64 | 3 ++- lang/sun-jdk7/Makefile | 6 +++--- lang/sun-jdk7/PLIST.linux-i386 | 3 ++- lang/sun-jdk7/PLIST.linux-x86_64 | 3 ++- lang/sun-jdk7/PLIST.solaris-i386 | 3 ++- lang/sun-jdk7/PLIST.solaris-x86_64 | 3 ++- 13 files changed, 32 insertions(+), 21 deletions(-) diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile index b4719e750ab7..59faa15999af 100644 --- a/lang/openjdk7/Makefile +++ b/lang/openjdk7/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.129 2018/09/14 15:53:46 tnn Exp $ +# $NetBSD: Makefile,v 1.130 2018/09/19 18:18:56 abs Exp $ JDK_MICRO= 141 DISTNAME= openjdk-1.7.${JDK_MICRO}-20170813 PKGNAME= openjdk7-1.7.${JDK_MICRO} -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/} EXTRACT_SUFX= .tar.xz @@ -20,8 +20,8 @@ DIST_SUBDIR= openjdk7 JAVA_NAME= openjdk7 JAVA_HOME= ${PREFIX}/java/${JAVA_NAME} -JAVA_WRAPPERS= jar java javac javadoc javah javap jcmd jps jstack keytool \ - orbd policytool rmid rmiregistry servertool tnameserv +JAVA_WRAPPERS= jar java javac javadoc javah javap jcmd jhat jps jstack \ + keytool orbd policytool rmid rmiregistry servertool tnameserv NOT_PAX_MPROTECT_SAFE+= java/openjdk7/bin/[a-ik-z]* NOT_PAX_MPROTECT_SAFE+= java/openjdk7/bin/j[b-z]* diff --git a/lang/openjdk7/PLIST b/lang/openjdk7/PLIST index cf7e54cb9074..b352442ae26c 100644 --- a/lang/openjdk7/PLIST +++ b/lang/openjdk7/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.26 2017/08/14 00:02:16 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.27 2018/09/19 18:18:56 abs Exp $ bin/openjdk7-jar bin/openjdk7-java bin/openjdk7-javac @@ -6,6 +6,7 @@ bin/openjdk7-javadoc bin/openjdk7-javah bin/openjdk7-javap bin/openjdk7-jcmd +bin/openjdk7-jhat bin/openjdk7-jps bin/openjdk7-jstack bin/openjdk7-keytool diff --git a/lang/openjdk8/Makefile b/lang/openjdk8/Makefile index d8c0dcac29d2..81126285efaa 100644 --- a/lang/openjdk8/Makefile +++ b/lang/openjdk8/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.70 2018/09/15 02:51:02 ryoon Exp $ +# $NetBSD: Makefile,v 1.71 2018/09/19 18:18:30 abs Exp $ DISTNAME= openjdk-1.8.181-20180914 PKGNAME= openjdk8-1.8.181 CATEGORIES= lang +PKGREVISION= 1 MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/} EXTRACT_SUFX= .tar.xz @@ -19,8 +20,8 @@ DIST_SUBDIR= openjdk7 JAVA_NAME= openjdk8 JAVA_HOME= ${PREFIX}/java/${JAVA_NAME} -JAVA_WRAPPERS= jar java javac javadoc javah javap jcmd jps jstack keytool \ - orbd policytool rmid rmiregistry servertool tnameserv +JAVA_WRAPPERS= jar java javac javadoc javah javap jcmd jhat jps jstack \ + keytool orbd policytool rmid rmiregistry servertool tnameserv BUILD_DEPENDS+= mozilla-rootcerts>=1.0.20140820nb2:../../security/mozilla-rootcerts diff --git a/lang/openjdk8/PLIST b/lang/openjdk8/PLIST index 168de675490d..140a5afd1ae9 100644 --- a/lang/openjdk8/PLIST +++ b/lang/openjdk8/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2017/11/28 05:07:25 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.9 2018/09/19 18:18:30 abs Exp $ bin/openjdk8-jar bin/openjdk8-java bin/openjdk8-javac @@ -6,6 +6,7 @@ bin/openjdk8-javadoc bin/openjdk8-javah bin/openjdk8-javap bin/openjdk8-jcmd +bin/openjdk8-jhat bin/openjdk8-jps bin/openjdk8-jstack bin/openjdk8-keytool diff --git a/lang/oracle-jdk8/Makefile b/lang/oracle-jdk8/Makefile index eeaae279dea6..38926e10328a 100644 --- a/lang/oracle-jdk8/Makefile +++ b/lang/oracle-jdk8/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2018/05/26 22:24:01 ryoon Exp $ +# $NetBSD: Makefile,v 1.7 2018/09/19 18:19:24 abs Exp $ # Note: This must be kept in sync with the oracle-jre8 package # Note: make sure you include sums for both the x86_64 and the x86_32 @@ -6,6 +6,7 @@ DISTNAME= jdk-8u${UPDATE_NUMBER}-${DIST_OS}-${DIST_ARCH} PKGNAME= oracle-jdk8-8.0.${UPDATE_NUMBER} +PKGREVISION= 1 MASTER_SITES= # empty LICENSE= oracle-binary-code-license @@ -16,7 +17,7 @@ DEPENDS+= ${PKGNAME_NOREV:S/jdk/jre/}*:../../lang/oracle-jre8 WRKSRC= ${WRKDIR}/jdk1.8.0_${UPDATE_NUMBER} JAVA_WRAPPERS= appletviewer apt extcheck idlj jar jarsigner \ - javac javadoc javah javap jcmd jdb rmic serialver jps + javac javadoc javah javap jcmd jdb jhat rmic serialver jps MAKE_JOBS_SAFE= no diff --git a/lang/oracle-jdk8/PLIST.linux-i386 b/lang/oracle-jdk8/PLIST.linux-i386 index 00d53b1b6f23..61744e2704c4 100644 --- a/lang/oracle-jdk8/PLIST.linux-i386 +++ b/lang/oracle-jdk8/PLIST.linux-i386 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.linux-i386,v 1.6 2018/05/26 22:24:01 ryoon Exp $ +@comment $NetBSD: PLIST.linux-i386,v 1.7 2018/09/19 18:19:24 abs Exp $ bin/oracle8-appletviewer bin/oracle8-apt bin/oracle8-extcheck @@ -11,6 +11,7 @@ bin/oracle8-javah bin/oracle8-javap bin/oracle8-jcmd bin/oracle8-jdb +bin/oracle8-jhat bin/oracle8-jps bin/oracle8-rmic bin/oracle8-serialver diff --git a/lang/oracle-jdk8/PLIST.linux-x86_64 b/lang/oracle-jdk8/PLIST.linux-x86_64 index d2c5b287b1a3..41abc7f9dd4d 100644 --- a/lang/oracle-jdk8/PLIST.linux-x86_64 +++ b/lang/oracle-jdk8/PLIST.linux-x86_64 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.linux-x86_64,v 1.5 2018/05/26 22:24:01 ryoon Exp $ +@comment $NetBSD: PLIST.linux-x86_64,v 1.6 2018/09/19 18:19:24 abs Exp $ bin/oracle8-appletviewer bin/oracle8-apt bin/oracle8-extcheck @@ -11,6 +11,7 @@ bin/oracle8-javah bin/oracle8-javap bin/oracle8-jcmd bin/oracle8-jdb +bin/oracle8-jhat bin/oracle8-jps bin/oracle8-rmic bin/oracle8-serialver diff --git a/lang/oracle-jdk8/PLIST.solaris-x86_64 b/lang/oracle-jdk8/PLIST.solaris-x86_64 index 3a0840935700..37743fbbfb3d 100644 --- a/lang/oracle-jdk8/PLIST.solaris-x86_64 +++ b/lang/oracle-jdk8/PLIST.solaris-x86_64 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.solaris-x86_64,v 1.2 2016/08/16 09:06:33 abs Exp $ +@comment $NetBSD: PLIST.solaris-x86_64,v 1.3 2018/09/19 18:19:24 abs Exp $ bin/oracle8-appletviewer bin/oracle8-apt bin/oracle8-extcheck @@ -11,6 +11,7 @@ bin/oracle8-javah bin/oracle8-javap bin/oracle8-jcmd bin/oracle8-jdb +bin/oracle8-jhat bin/oracle8-jps bin/oracle8-rmic bin/oracle8-serialver diff --git a/lang/sun-jdk7/Makefile b/lang/sun-jdk7/Makefile index ac2abcad53e7..9fdac917ea0d 100644 --- a/lang/sun-jdk7/Makefile +++ b/lang/sun-jdk7/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2016/08/10 22:26:46 abs Exp $ +# $NetBSD: Makefile,v 1.20 2018/09/19 18:19:09 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,7 +6,7 @@ DISTNAME= jdk-7u${UPDATE_NUMBER}-${DIST_OS}-${DIST_ARCH} PKGNAME= sun-jdk7-7.0.${UPDATE_NUMBER} -PKGREVISION= 1 +PKGREVISION= 2 MASTER_SITES= # empty LICENSE= oracle-binary-code-license @@ -17,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 jcmd jdb jps rmic serialver + javac javadoc javah javap jcmd jdb jhat jps rmic serialver MAKE_JOBS_SAFE= no diff --git a/lang/sun-jdk7/PLIST.linux-i386 b/lang/sun-jdk7/PLIST.linux-i386 index 17a8b7769f11..c6cbde437d3e 100644 --- a/lang/sun-jdk7/PLIST.linux-i386 +++ b/lang/sun-jdk7/PLIST.linux-i386 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.linux-i386,v 1.8 2016/08/10 22:26:46 abs Exp $ +@comment $NetBSD: PLIST.linux-i386,v 1.9 2018/09/19 18:19:09 abs Exp $ bin/sun7-appletviewer bin/sun7-apt bin/sun7-extcheck @@ -10,6 +10,7 @@ bin/sun7-javadoc bin/sun7-javah bin/sun7-javap bin/sun7-jcmd +bin/sun7-jhat bin/sun7-jdb bin/sun7-jps bin/sun7-rmic diff --git a/lang/sun-jdk7/PLIST.linux-x86_64 b/lang/sun-jdk7/PLIST.linux-x86_64 index 99b7433d9af1..9a77f10ab970 100644 --- a/lang/sun-jdk7/PLIST.linux-x86_64 +++ b/lang/sun-jdk7/PLIST.linux-x86_64 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.linux-x86_64,v 1.9 2016/08/10 22:26:46 abs Exp $ +@comment $NetBSD: PLIST.linux-x86_64,v 1.10 2018/09/19 18:19:09 abs Exp $ bin/sun7-appletviewer bin/sun7-apt bin/sun7-extcheck @@ -11,6 +11,7 @@ bin/sun7-javah bin/sun7-javap bin/sun7-jcmd bin/sun7-jdb +bin/sun7-jhat bin/sun7-jps bin/sun7-rmic bin/sun7-serialver diff --git a/lang/sun-jdk7/PLIST.solaris-i386 b/lang/sun-jdk7/PLIST.solaris-i386 index e7cfd7f749a1..d03d90acad3b 100644 --- a/lang/sun-jdk7/PLIST.solaris-i386 +++ b/lang/sun-jdk7/PLIST.solaris-i386 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.solaris-i386,v 1.10 2016/08/10 22:26:46 abs Exp $ +@comment $NetBSD: PLIST.solaris-i386,v 1.11 2018/09/19 18:19:09 abs Exp $ bin/sun7-appletviewer bin/sun7-apt bin/sun7-extcheck @@ -11,6 +11,7 @@ bin/sun7-javah bin/sun7-javap bin/sun7-jcmd bin/sun7-jdb +bin/sun7-jhat bin/sun7-jps bin/sun7-rmic bin/sun7-serialver diff --git a/lang/sun-jdk7/PLIST.solaris-x86_64 b/lang/sun-jdk7/PLIST.solaris-x86_64 index 633678f94a66..26816f43dd68 100644 --- a/lang/sun-jdk7/PLIST.solaris-x86_64 +++ b/lang/sun-jdk7/PLIST.solaris-x86_64 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.solaris-x86_64,v 1.9 2016/08/10 22:26:46 abs Exp $ +@comment $NetBSD: PLIST.solaris-x86_64,v 1.10 2018/09/19 18:19:09 abs Exp $ bin/sun7-appletviewer bin/sun7-apt bin/sun7-extcheck @@ -11,6 +11,7 @@ bin/sun7-javah bin/sun7-javap bin/sun7-jcmd bin/sun7-jdb +bin/sun7-jhat bin/sun7-jps bin/sun7-rmic bin/sun7-serialver