- Update to 7u9.

- Trim makefile header and convert to optionsNG.

Feature safe:	yes

3 files changed, 19 insertions, 20 deletions

diff --git a/java/linux-sun-jdk17/Makefile b/java/linux-sun-jdk17/Makefile
index 3d02426f0463..703426f1f7e3 100644
--- a/java/linux-sun-jdk17/Makefile
+++ b/java/linux-sun-jdk17/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for:	Sun Linux JDK 1.7.x
-# Date created:				30 January 2012
-# Whom:					Greg Lewis <glewis@FreeBSD.org>
-#
+# Created by:	Greg Lewis <glewis@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}.${JDK_UPDATE_VERSION}
-PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMEPREFIX=	linux-sun-
@@ -18,7 +13,8 @@ COMMENT=	Oracle Java 7 Development Kit for Linux
 
 RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
 
-OPTIONS=	DEMO "Install demos and samples" off
+OPTIONS_DEFINE=	DEMO
+DEMO_DESC=	Install demos and samples
 
 NO_CDROM=	License does not allow distribution with fee
 RESTRICTED=	Redistribution of repackaged binaries not permitted
@@ -35,7 +31,7 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 JDK_VERSION=		7
 JDK_INTERNAL_VERSION=	1.7.0
-JDK_UPDATE_VERSION=	7
+JDK_UPDATE_VERSION=	9
 DL_JDK_VERSION=		${JDK_INTERNAL_VERSION}_0${JDK_UPDATE_VERSION}
 DOWNLOAD_URL=		http://www.oracle.com/technetwork/java/javase/downloads/index.html
 
@@ -49,13 +45,15 @@ BIN_DIRS=	bin jre/bin
 IGNORE?=You must manually fetch the J2SE SDK download for the Linux platform (${DISTNAME}${EXTRACT_SUFX}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again
 .endif
 
-.if defined(WITH_DEMO)
-#DEMO_UPDATE_VERSION=	${JDK_UPDATE_VERSION}
-DEMO_UPDATE_VERSION=	6
-#DEMO_DISTNAME=	${DISTNAME}-demos
-DEMO_DISTNAME=	jdk-7u${DEMO_UPDATE_VERSION}-linux-i586-demos
-#DEMO_WRKSRC=	${WRKSRC}
-DEMO_WRKSRC=	${WRKDIR}/jdk${JDK_INTERNAL_VERSION}_0${DEMO_UPDATE_VERSION}
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDEMO}
+DEMO_UPDATE_VERSION=	${JDK_UPDATE_VERSION}
+#DEMO_UPDATE_VERSION=	6
+DEMO_DISTNAME=	${DISTNAME}-demos
+#DEMO_DISTNAME=	jdk-7u${DEMO_UPDATE_VERSION}-linux-i586-demos
+DEMO_WRKSRC=	${WRKSRC}
+#DEMO_WRKSRC=	${WRKDIR}/jdk${JDK_INTERNAL_VERSION}_0${DEMO_UPDATE_VERSION}
 .if !exists(${DISTDIR}/${DEMO_DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
 IGNORE?=You must manually fetch the J2SE demos and samples for the Linux platform (${DEMO_DISTNAME}${EXTRACT_SUFX}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again
 .endif
@@ -68,7 +66,7 @@ PLIST_SUB+=	DEMO="@comment "
 pre-everything::
 	@${CAT} ${PKGMESSAGE}
 
-.if defined(WITH_DEMO) && ${DEMO_WRKSRC} != ${WRKSRC}
+.if ${PORT_OPTIONS:MDEMO} && ${DEMO_WRKSRC} != ${WRKSRC}
 post-extract:
 	@${MV} ${DEMO_WRKSRC}/demo ${WRKSRC}/
 	@${MV} ${DEMO_WRKSRC}/sample ${WRKSRC}/
diff --git a/java/linux-sun-jdk17/distinfo b/java/linux-sun-jdk17/distinfo
index 1218a2084f05..b53ccd11d57d 100644
--- a/java/linux-sun-jdk17/distinfo
+++ b/java/linux-sun-jdk17/distinfo
@@ -1,4 +1,4 @@
-SHA256 (jdk-7u7-linux-i586.tar.gz) = d54497580794091831cac86f93b066e0a4105b08acaf2c5d430dea87d2bf7ffe
-SIZE (jdk-7u7-linux-i586.tar.gz) = 97373835
-SHA256 (jdk-7u6-linux-i586-demos.tar.gz) = 15001be7615e92ffb21e805fdd17b56e2ac7cfa29eb7e429c8d2a81e9cff3dfc
-SIZE (jdk-7u6-linux-i586-demos.tar.gz) = 14741227
+SHA256 (jdk-7u9-linux-i586.tar.gz) = 47e86ceb7f59c821a8d0c54f34530bca84e10c1849ed46da7f4fdb5f621bc8d6
+SIZE (jdk-7u9-linux-i586.tar.gz) = 97361259
+SHA256 (jdk-7u9-linux-i586-demos.tar.gz) = 5aa1098fde7b22d0b8b5c8e436c39a11fa52eb37cc52a63ead3732040f3ae2c6
+SIZE (jdk-7u9-linux-i586-demos.tar.gz) = 14751397
diff --git a/java/linux-sun-jdk17/pkg-plist b/java/linux-sun-jdk17/pkg-plist
index 5ff3cf7e0c60..910c417ef8b3 100644
--- a/java/linux-sun-jdk17/pkg-plist
+++ b/java/linux-sun-jdk17/pkg-plist
@@ -1168,6 +1168,7 @@
 %%T%%/jre/lib/security/cacerts
 %%T%%/jre/lib/security/java.policy
 %%T%%/jre/lib/security/java.security
+%%T%%/jre/lib/security/javafx.policy
 %%T%%/jre/lib/security/javaws.policy
 %%T%%/jre/lib/security/local_policy.jar
 %%T%%/jre/lib/security/trusted.libraries