summaryrefslogtreecommitdiff
path: root/lang/sun-jdk7/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'lang/sun-jdk7/Makefile')
-rw-r--r--lang/sun-jdk7/Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/lang/sun-jdk7/Makefile b/lang/sun-jdk7/Makefile
index 86e524e9f99..ac4df7b674e 100644
--- a/lang/sun-jdk7/Makefile
+++ b/lang/sun-jdk7/Makefile
@@ -1,20 +1,20 @@
-# $NetBSD: Makefile,v 1.10 2013/04/20 01:10:56 ryoon Exp $
+# $NetBSD: Makefile,v 1.11 2013/07/04 12:25:31 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-7u21-${DIST_OS}-${DIST_ARCH}
-PKGNAME= sun-jdk7-7.0.21
+DISTNAME= jdk-7u25-${DIST_OS}-${DIST_ARCH}
+PKGNAME= sun-jdk7-7.0.25
MASTER_SITES= # empty
LICENSE= oracle-binary-code-license
-DOWNLOAD_NAME= Java Development Kit (JDK) 7u21
+DOWNLOAD_NAME= Java Development Kit (JDK) 7u25
DEPENDS+= ${PKGNAME_NOREV:S/jdk/jre/}*:../../lang/sun-jre7
-WRKSRC= ${WRKDIR}/jdk1.7.0_21
+WRKSRC= ${WRKDIR}/jdk1.7.0_25
JAVA_WRAPPERS= appletviewer apt extcheck idlj jar jarsigner \
javac javadoc javah javap jdb rmic serialver
@@ -28,7 +28,7 @@ CHECK_SHLIBS_SUPPORTED= no
# The 64-bit Solaris downloads for some inexplicable reason only contain
# the additional 64-bit files, and you need the main 32-bit file too.
-.if ${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "x86_64"
+.if ${EMUL_OPSYS} == "solaris" && ${EMUL_ARCH} == "x86_64"
DISTFILES= ${DEFAULT_DISTFILES} ${DEFAULT_DISTFILES:S/x64/i586/}
.endif