CVS commit: pkgsrc/lang

["David Brownlee" <abs%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   abs
Date:           Wed Aug 10 22:26:46 UTC 2016

Modified Files:
        pkgsrc/lang/sun-jdk7: Makefile PLIST.linux-i386 PLIST.linux-x86_64
            PLIST.solaris-i386 PLIST.solaris-x86_64 distinfo
        pkgsrc/lang/sun-jre7: Makefile.common distinfo

Log Message:
Add jcmd to JAVA_WRAPPERS
Add back missed UnlimitedJCEPolicyJDK7.zip from distinfo
Add a comment on why we are u80 while Oracle download page suggests 79
http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/lang/sun-jdk7/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/sun-jdk7/PLIST.linux-i386
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/sun-jdk7/PLIST.linux-x86_64 \
    pkgsrc/lang/sun-jdk7/PLIST.solaris-x86_64
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/sun-jdk7/PLIST.solaris-i386
cvs rdiff -u -r1.20 -r1.21 pkgsrc/lang/sun-jdk7/distinfo
cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/sun-jre7/Makefile.common
cvs rdiff -u -r1.25 -r1.26 pkgsrc/lang/sun-jre7/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/sun-jdk7/Makefile
diff -u pkgsrc/lang/sun-jdk7/Makefile:1.18 pkgsrc/lang/sun-jdk7/Makefile:1.19
--- pkgsrc/lang/sun-jdk7/Makefile:1.18  Sun May  8 17:23:28 2016
+++ pkgsrc/lang/sun-jdk7/Makefile       Wed Aug 10 22:26:46 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2016/05/08 17:23:28 christos Exp $
+# $NetBSD: Makefile,v 1.19 2016/08/10 22:26:46 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=   1
 MASTER_SITES=  # empty
 
 LICENSE=       oracle-binary-code-license
@@ -17,7 +17,7 @@ DEPENDS+=     ${PKGNAME_NOREV:S/jdk/jre/}*:.
 
 WRKSRC=                ${WRKDIR}/jdk1.7.0_${UPDATE_NUMBER}
 JAVA_WRAPPERS= appletviewer apt extcheck idlj jar jarsigner \
-               javac javadoc javah javap jdb jps rmic serialver
+               javac javadoc javah javap jcmd jdb jps rmic serialver
 
 MAKE_JOBS_SAFE=        no
 

Index: pkgsrc/lang/sun-jdk7/PLIST.linux-i386
diff -u pkgsrc/lang/sun-jdk7/PLIST.linux-i386:1.7 pkgsrc/lang/sun-jdk7/PLIST.linux-i386:1.8
--- pkgsrc/lang/sun-jdk7/PLIST.linux-i386:1.7   Sun May  8 17:23:28 2016
+++ pkgsrc/lang/sun-jdk7/PLIST.linux-i386       Wed Aug 10 22:26:46 2016
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.linux-i386,v 1.7 2016/05/08 17:23:28 christos Exp $
+@comment $NetBSD: PLIST.linux-i386,v 1.8 2016/08/10 22:26:46 abs Exp $
 bin/sun7-appletviewer
 bin/sun7-apt
 bin/sun7-extcheck
@@ -9,6 +9,7 @@ bin/sun7-javac
 bin/sun7-javadoc
 bin/sun7-javah
 bin/sun7-javap
+bin/sun7-jcmd
 bin/sun7-jdb
 bin/sun7-jps
 bin/sun7-rmic

Index: pkgsrc/lang/sun-jdk7/PLIST.linux-x86_64
diff -u pkgsrc/lang/sun-jdk7/PLIST.linux-x86_64:1.8 pkgsrc/lang/sun-jdk7/PLIST.linux-x86_64:1.9
--- pkgsrc/lang/sun-jdk7/PLIST.linux-x86_64:1.8 Sun May  8 17:23:28 2016
+++ pkgsrc/lang/sun-jdk7/PLIST.linux-x86_64     Wed Aug 10 22:26:46 2016
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.linux-x86_64,v 1.8 2016/05/08 17:23:28 christos Exp $
+@comment $NetBSD: PLIST.linux-x86_64,v 1.9 2016/08/10 22:26:46 abs Exp $
 bin/sun7-appletviewer
 bin/sun7-apt
 bin/sun7-extcheck
@@ -9,6 +9,7 @@ bin/sun7-javac
 bin/sun7-javadoc
 bin/sun7-javah
 bin/sun7-javap
+bin/sun7-jcmd
 bin/sun7-jdb
 bin/sun7-jps
 bin/sun7-rmic
Index: pkgsrc/lang/sun-jdk7/PLIST.solaris-x86_64
diff -u pkgsrc/lang/sun-jdk7/PLIST.solaris-x86_64:1.8 pkgsrc/lang/sun-jdk7/PLIST.solaris-x86_64:1.9
--- pkgsrc/lang/sun-jdk7/PLIST.solaris-x86_64:1.8       Tue May 17 12:42:19 2016
+++ pkgsrc/lang/sun-jdk7/PLIST.solaris-x86_64   Wed Aug 10 22:26:46 2016
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.solaris-x86_64,v 1.8 2016/05/17 12:42:19 jperkin Exp $
+@comment $NetBSD: PLIST.solaris-x86_64,v 1.9 2016/08/10 22:26:46 abs Exp $
 bin/sun7-appletviewer
 bin/sun7-apt
 bin/sun7-extcheck
@@ -9,6 +9,7 @@ bin/sun7-javac
 bin/sun7-javadoc
 bin/sun7-javah
 bin/sun7-javap
+bin/sun7-jcmd
 bin/sun7-jdb
 bin/sun7-jps
 bin/sun7-rmic

Index: pkgsrc/lang/sun-jdk7/PLIST.solaris-i386
diff -u pkgsrc/lang/sun-jdk7/PLIST.solaris-i386:1.9 pkgsrc/lang/sun-jdk7/PLIST.solaris-i386:1.10
--- pkgsrc/lang/sun-jdk7/PLIST.solaris-i386:1.9 Tue May 17 12:42:19 2016
+++ pkgsrc/lang/sun-jdk7/PLIST.solaris-i386     Wed Aug 10 22:26:46 2016
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.solaris-i386,v 1.9 2016/05/17 12:42:19 jperkin Exp $
+@comment $NetBSD: PLIST.solaris-i386,v 1.10 2016/08/10 22:26:46 abs Exp $
 bin/sun7-appletviewer
 bin/sun7-apt
 bin/sun7-extcheck
@@ -9,6 +9,7 @@ bin/sun7-javac
 bin/sun7-javadoc
 bin/sun7-javah
 bin/sun7-javap
+bin/sun7-jcmd
 bin/sun7-jdb
 bin/sun7-jps
 bin/sun7-rmic

Index: pkgsrc/lang/sun-jdk7/distinfo
diff -u pkgsrc/lang/sun-jdk7/distinfo:1.20 pkgsrc/lang/sun-jdk7/distinfo:1.21
--- pkgsrc/lang/sun-jdk7/distinfo:1.20  Tue May 17 12:42:19 2016
+++ pkgsrc/lang/sun-jdk7/distinfo       Wed Aug 10 22:26:46 2016
@@ -1,14 +1,6 @@
-$NetBSD: distinfo,v 1.20 2016/05/17 12:42:19 jperkin Exp $
+$NetBSD: distinfo,v 1.21 2016/08/10 22:26:46 abs Exp $
 
 SHA1 (jdk-7u80-linux-x64.tar.gz) = 21e5e18c3511def01590994e926a4350c0509f01
 RMD160 (jdk-7u80-linux-x64.tar.gz) = c519e687374915166441995d4e3951b52bb2f82b
 SHA512 (jdk-7u80-linux-x64.tar.gz) = a772878f740e87835bafc82841e8f4c1dfbe8bc79e072d3f6c5c74d3a206eb9001a53b474d91a22819c7c0d6407ed88993635c39738779c2b08c22c7a1c2e9e9
 Size (jdk-7u80-linux-x64.tar.gz) = 153530841 bytes
-SHA1 (jdk-7u80-solaris-i586.tar.gz) = ff6939c7623cebd277b0ec7041225fd36cc396cf
-RMD160 (jdk-7u80-solaris-i586.tar.gz) = 7723b082c30ffdfba8a66d0632632732e104342a
-SHA512 (jdk-7u80-solaris-i586.tar.gz) = 16219609a356339a8575880f44b9eefe4459681202ff0925740f921a7239ebf5fe718c2607cbbebe790d8afc0ace25583c9b3ad67257d0a48cb32032072b2b3f
-Size (jdk-7u80-solaris-i586.tar.gz) = 101088226 bytes
-SHA1 (jdk-7u80-solaris-x64.tar.gz) = 46fa2e8303f952e7af03186de9a1e954252dc3e0
-RMD160 (jdk-7u80-solaris-x64.tar.gz) = a04a41465ef612d9f1b35b09b344716223e6865e
-SHA512 (jdk-7u80-solaris-x64.tar.gz) = 83ce229c3a38e454d9acafa189b3b6f247a4723ddb3c3fa08993323590949295b0f3740ab235c7c539f90a684b8cefad7839f82f566b7a141019b94af6cbad89
-Size (jdk-7u80-solaris-x64.tar.gz) = 17176587 bytes

Index: pkgsrc/lang/sun-jre7/Makefile.common
diff -u pkgsrc/lang/sun-jre7/Makefile.common:1.11 pkgsrc/lang/sun-jre7/Makefile.common:1.12
--- pkgsrc/lang/sun-jre7/Makefile.common:1.11   Sun May  8 17:23:29 2016
+++ pkgsrc/lang/sun-jre7/Makefile.common        Wed Aug 10 22:26:46 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2016/05/08 17:23:29 christos Exp $
+# $NetBSD: Makefile.common,v 1.12 2016/08/10 22:26:46 abs Exp $
 # used by lang/sun-jre7/Makefile
 # used by lang/sun-jdk7/Makefile
 
@@ -22,6 +22,8 @@ USE_TOOLS+=   pax
 
 # JDK7 Update number
 UPDATE_NUMBER= 80
+# See following URL for why this is 80 while Oracle download page suggests 79
+# http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html
 
 .include "../../mk/bsd.prefs.mk"
 

Index: pkgsrc/lang/sun-jre7/distinfo
diff -u pkgsrc/lang/sun-jre7/distinfo:1.25 pkgsrc/lang/sun-jre7/distinfo:1.26
--- pkgsrc/lang/sun-jre7/distinfo:1.25  Tue May 17 11:57:19 2016
+++ pkgsrc/lang/sun-jre7/distinfo       Wed Aug 10 22:26:46 2016
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.25 2016/05/17 11:57:19 jperkin Exp $
+$NetBSD: distinfo,v 1.26 2016/08/10 22:26:46 abs Exp $
 
+SHA1 (UnlimitedJCEPolicyJDK7.zip) = 7d3c9ee89536b82cd21c680088b1bced16017253
+RMD160 (UnlimitedJCEPolicyJDK7.zip) = a4a6a284579f43d2df3532d279e143d2f03c2c3f
+SHA512 (UnlimitedJCEPolicyJDK7.zip) = 02eca7da8f3fffea388431d5352290535a63d53a1f5c795d6511ccba62445787a0ee6ad4bc1852e5262860b6d607ba2a8c6a3dbb0c3e1d7c3a67ac7bbc783204
+Size (UnlimitedJCEPolicyJDK7.zip) = 7426 bytes
 SHA1 (jre-7u80-linux-x64.tar.gz) = 5f5eb4a4e76cfe1d9eb02ed71ae01a809bde8440
 RMD160 (jre-7u80-linux-x64.tar.gz) = 942f0da61dde6b760c24fd144fee2555d05497a3
 SHA512 (jre-7u80-linux-x64.tar.gz) = e61e78ab1be0313690e8ab8d6cbae7366dd78aa4716f47c8908178196b658b94ee318dd04043965a72c34d8ef5c1cb4902afaa2188e76eb944256f090339107d