From owner-svn-ports-all@FreeBSD.ORG Fri Oct 19 20:21:55 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F3920DED; Fri, 19 Oct 2012 20:21:54 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DA7748FC08; Fri, 19 Oct 2012 20:21:54 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9JKLsUA070836; Fri, 19 Oct 2012 20:21:54 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9JKLsrh070832; Fri, 19 Oct 2012 20:21:54 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201210192021.q9JKLsrh070832@svn.freebsd.org> From: Jung-uk Kim Date: Fri, 19 Oct 2012 20:21:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r306136 - head/java/linux-sun-jdk17 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Oct 2012 20:21:55 -0000 Author: jkim Date: Fri Oct 19 20:21:54 2012 New Revision: 306136 URL: http://svn.freebsd.org/changeset/ports/306136 Log: - Update to 7u9. - Trim makefile header and convert to optionsNG. Feature safe: yes Modified: head/java/linux-sun-jdk17/Makefile head/java/linux-sun-jdk17/distinfo head/java/linux-sun-jdk17/pkg-plist Modified: head/java/linux-sun-jdk17/Makefile ============================================================================== --- head/java/linux-sun-jdk17/Makefile Fri Oct 19 20:15:14 2012 (r306135) +++ head/java/linux-sun-jdk17/Makefile Fri Oct 19 20:21:54 2012 (r306136) @@ -1,13 +1,8 @@ -# New ports collection makefile for: Sun Linux JDK 1.7.x -# Date created: 30 January 2012 -# Whom: Greg Lewis -# +# Created by: Greg Lewis # $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 f 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 + +.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}/ Modified: head/java/linux-sun-jdk17/distinfo ============================================================================== --- head/java/linux-sun-jdk17/distinfo Fri Oct 19 20:15:14 2012 (r306135) +++ head/java/linux-sun-jdk17/distinfo Fri Oct 19 20:21:54 2012 (r306136) @@ -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 Modified: head/java/linux-sun-jdk17/pkg-plist ============================================================================== --- head/java/linux-sun-jdk17/pkg-plist Fri Oct 19 20:15:14 2012 (r306135) +++ head/java/linux-sun-jdk17/pkg-plist Fri Oct 19 20:21:54 2012 (r306136) @@ -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