[pkgsrc/trunk]: pkgsrc/lang define JDK7 Update number in Makefile.common and ...

[obache <obache%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/559cf53c9366
branches:  trunk
changeset: 631342:559cf53c9366
user:      obache <obache%pkgsrc.org@localhost>
date:      Sun Mar 02 09:53:41 2014 +0000

description:
define JDK7 Update number in Makefile.common and use it.

diffstat:

 lang/sun-jdk7/Makefile        |  10 +++++-----
 lang/sun-jre7/Makefile        |  10 +++++-----
 lang/sun-jre7/Makefile.common |   5 ++++-
 3 files changed, 14 insertions(+), 11 deletions(-)

diffs (78 lines):

diff -r 2c25dd3b8247 -r 559cf53c9366 lang/sun-jdk7/Makefile
--- a/lang/sun-jdk7/Makefile    Sun Mar 02 09:47:20 2014 +0000
+++ b/lang/sun-jdk7/Makefile    Sun Mar 02 09:53:41 2014 +0000
@@ -1,20 +1,20 @@
-# $NetBSD: Makefile,v 1.14 2014/02/11 09:12:12 obache Exp $
+# $NetBSD: Makefile,v 1.15 2014/03/02 09:53:41 obache 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
 # in distinfo (make makesum will eat one of them)
 
-DISTNAME=      jdk-7u51-${DIST_OS}-${DIST_ARCH}
-PKGNAME=       sun-jdk7-7.0.51
+DISTNAME=      jdk-7u${UPDATE_NUMBER}-${DIST_OS}-${DIST_ARCH}
+PKGNAME=       sun-jdk7-7.0.${UPDATE_NUMBER}
 MASTER_SITES=  # empty
 
 LICENSE=       oracle-binary-code-license
 
-DOWNLOAD_NAME= Java Development Kit (JDK) 7u51
+DOWNLOAD_NAME= Java Development Kit (JDK) 7u${UPDATE_NUMBER}
 
 DEPENDS+=      ${PKGNAME_NOREV:S/jdk/jre/}*:../../lang/sun-jre7
 
-WRKSRC=                ${WRKDIR}/jdk1.7.0_51
+WRKSRC=                ${WRKDIR}/jdk1.7.0_${UPDATE_NUMBER}
 JAVA_WRAPPERS= appletviewer apt extcheck idlj jar jarsigner \
                javac javadoc javah javap jdb rmic serialver
 
diff -r 2c25dd3b8247 -r 559cf53c9366 lang/sun-jre7/Makefile
--- a/lang/sun-jre7/Makefile    Sun Mar 02 09:47:20 2014 +0000
+++ b/lang/sun-jre7/Makefile    Sun Mar 02 09:53:41 2014 +0000
@@ -1,21 +1,21 @@
-# $NetBSD: Makefile,v 1.20 2014/02/11 09:12:12 obache Exp $
+# $NetBSD: Makefile,v 1.21 2014/03/02 09:53:41 obache Exp $
 
 # Note: Regen distinfo with PKG_OPTIONS.sun-jre7+=sun-jre-jce
 # Note: Update DOWNLOAD_NAME when you update the JRE version
 # Note: This needs to be kept in sync with the sun-jdk7 package
 # Note: If you make makesum, make sure that you include both archs in distinfo
 
-DISTNAME=      jre-7u51-${DIST_OS}-${DIST_ARCH}
-PKGNAME=       sun-jre7-7.0.51
+DISTNAME=      jre-7u${UPDATE_NUMBER}-${DIST_OS}-${DIST_ARCH}
+PKGNAME=       sun-jre7-7.0.${UPDATE_NUMBER}
 MASTER_SITES=  # empty
 
 LICENSE=       oracle-binary-code-license
 
-DOWNLOAD_NAME= Java Runtime Environment (JRE) 7u51
+DOWNLOAD_NAME= Java Runtime Environment (JRE) 7u${UPDATE_NUMBER}
 
 USE_TOOLS+=    pax
 
-WRKSRC=                ${WRKDIR}/jre1.7.0_51
+WRKSRC=                ${WRKDIR}/jre1.7.0_${UPDATE_NUMBER}
 JAVA_WRAPPERS= java javaws keytool orbd policytool rmid rmiregistry \
                servertool tnameserv
 REQD_DIRS=     ${JAVA_HOME}
diff -r 2c25dd3b8247 -r 559cf53c9366 lang/sun-jre7/Makefile.common
--- a/lang/sun-jre7/Makefile.common     Sun Mar 02 09:47:20 2014 +0000
+++ b/lang/sun-jre7/Makefile.common     Sun Mar 02 09:53:41 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2013/07/04 12:25:31 obache Exp $
+# $NetBSD: Makefile.common,v 1.4 2014/03/02 09:53:41 obache Exp $
 # used by lang/sun-jre7/Makefile
 # used by lang/sun-jdk7/Makefile
 
@@ -20,6 +20,9 @@
 
 USE_TOOLS+=    pax
 
+# JDK7 Update number 
+UPDATE_NUMBER= 51
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${EMUL_OPSYS} == "solaris"