summaryrefslogtreecommitdiff
path: root/lang/openjdk7
diff options
context:
space:
mode:
authorjperkin <jperkin>2015-11-03 16:41:55 +0000
committerjperkin <jperkin>2015-11-03 16:41:55 +0000
commite4919c85c3890420b483c7a2e57fde4f7c344174 (patch)
tree1d3f9a571839d488c3fcd6f4c6a535ef85ef2560 /lang/openjdk7
parentb0ceffb847023b97e6dfb07ccefcc005fd14f507 (diff)
downloadpkgsrc-e4919c85c3890420b483c7a2e57fde4f7c344174.tar.gz
Set JDK_MICRO_VERSION so that the update number is reflected in version
output, going from this: openjdk version "1.7.0-internal" to this: openjdk version "1.7.0_80-internal" This matches the behaviour of sun-jre, and fixes software such as Logstash and Jira which expect it to be included. Bump PKGREVISION.
Diffstat (limited to 'lang/openjdk7')
-rw-r--r--lang/openjdk7/Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile
index 66b282a7cdc..0d9501f288b 100644
--- a/lang/openjdk7/Makefile
+++ b/lang/openjdk7/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.102 2015/06/17 20:54:42 rodent Exp $
+# $NetBSD: Makefile,v 1.103 2015/11/03 16:41:55 jperkin Exp $
-DISTNAME= openjdk-1.7.80-20150609
-PKGNAME= openjdk7-1.7.80
+JDK_MICRO= 80
+DISTNAME= openjdk-1.7.${JDK_MICRO}-20150609
+PKGNAME= openjdk7-1.7.${JDK_MICRO}
+PKGREVISION= 1
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/}
EXTRACT_SUFX= .tar.xz
@@ -54,6 +56,7 @@ MAKE_ENV+= HOTSPOT_BUILD_JOBS=${MAKE_JOBS}
MAKE_ENV+= USE_PRECOMPILED_HEADER=0
MAKE_ENV+= HOTSPOT_BUILD_USER=pkgsrc
+MAKE_ENV+= JDK_MICRO_VERSION="0_${JDK_MICRO}"
MAKE_ENV+= NO_DOCS=true
MAKE_ENV+= SKIP_COMPARE_IMAGES=true