From owner-svn-ports-all@FreeBSD.ORG Sat Feb 2 18:13:15 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 83E38969; Sat, 2 Feb 2013 18:13:15 +0000 (UTC) (envelope-from glewis@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 702A0ED9; Sat, 2 Feb 2013 18:13:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r12IDFrw045845; Sat, 2 Feb 2013 18:13:15 GMT (envelope-from glewis@svn.freebsd.org) Received: (from glewis@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r12IDFJA045843; Sat, 2 Feb 2013 18:13:15 GMT (envelope-from glewis@svn.freebsd.org) Message-Id: <201302021813.r12IDFJA045843@svn.freebsd.org> From: Greg Lewis Date: Sat, 2 Feb 2013 18:13:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r311439 - head/java/linux-sun-jdk16 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: Sat, 02 Feb 2013 18:13:15 -0000 Author: glewis Date: Sat Feb 2 18:13:14 2013 New Revision: 311439 URL: http://svnweb.freebsd.org/changeset/ports/311439 Log: . Update to 6u39. . Cope with the version of the demos distfile not being the same as the version of the main JDK distfile. . Update to OptionsNG. Modified: head/java/linux-sun-jdk16/Makefile head/java/linux-sun-jdk16/distinfo Modified: head/java/linux-sun-jdk16/Makefile ============================================================================== --- head/java/linux-sun-jdk16/Makefile Sat Feb 2 18:12:15 2013 (r311438) +++ head/java/linux-sun-jdk16/Makefile Sat Feb 2 18:13:14 2013 (r311439) @@ -14,7 +14,9 @@ COMMENT= Sun Java Development Kit 1.6 fo EXTRACT_DEPENDS=${LINUX_BASE_PORT} RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper -OPTIONS= DEMO "Install demos and samples" on +OPTIONS_DEFINE= DEMO +DEMO_DESC= Install demos and samples +OPTIONS_DEFAULT=DEMO NO_CDROM= License does not allow distribution with fee RESTRICTED= Redistribution of repackaged binaries not permitted @@ -28,7 +30,7 @@ NO_BUILD= yes USE_LINUX= yes USE_LINUX_APPS= xorglibs JDK_VERSION= 1.6.0 -JDK_REVISION= 38 +JDK_REVISION= 39 DL_JDK_VERSION= ${JDK_VERSION}_${JDK_REVISION} ONLY_FOR_ARCHS= i386 amd64 DOWNLOAD_URL?= http://www.oracle.com/technetwork/java/javase/downloads/index.html @@ -42,11 +44,19 @@ UNPACK_CMD= ${WRKSRC}/bin/unpack200 IGNORE?=You must manually fetch the J2SE SDK self-extracting file for the Linux platform (${DISTNAME}${EXTRACT_SUFX}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again .endif -.if defined(WITH_DEMO) -.if !exists(${DISTDIR}/${DISTNAME}-demos.tar.gz) && !defined(PACKAGE_BUILDING) -IGNORE?=You must manually fetch the J2SE demos and samples for the Linux platform (${DISTNAME}-demos.tar.gz) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again +.include + +.if ${PORT_OPTIONS:MDEMO} +#DEMO_UPDATE_VERSION= ${JDK_UPDATE_VERSION} +DEMO_UPDATE_VERSION= 38 +#DEMO_DISTNAME= ${DISTNAME}-demos +DEMO_DISTNAME= jdk-6u${DEMO_UPDATE_VERSION}-linux-i586-demos +#DEMO_WRKSRC= ${WRKSRC} +DEMO_WRKSRC= ${WRKDIR}/jdk${JDK_VERSION}_${DEMO_UPDATE_VERSION} +.if !exists(${DISTDIR}/${DEMO_DISTNAME}.tar.gz) && !defined(PACKAGE_BUILDING) +IGNORE?=You must manually fetch the J2SE demos and samples for the Linux platform (${DEMO_DISTNAME}.tar.gz) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again .endif -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-demos.tar.gz +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DEMO_DISTNAME}.tar.gz PLIST_SUB+= DEMO="" .else PLIST_SUB+= DEMO="@comment " @@ -64,8 +74,14 @@ do-extract: .for i in ${PACKED_JARS} @${UNPACK_CMD} -r ${WRKSRC}/${i}.pack ${WRKSRC}/${i}.jar .endfor -.if defined(WITH_DEMO) - @${TAR} -x -f ${DISTDIR}/${DISTNAME}-demos.tar.gz -C ${WRKDIR} +.if ${PORT_OPTIONS:MDEMO} + @${TAR} -x -f ${DISTDIR}/${DEMO_DISTNAME}.tar.gz -C ${WRKDIR} +.endif + +.if ${PORT_OPTIONS:MDEMO} && ${DEMO_WRKSRC} != ${WRKSRC} +post-extract: + @${MV} ${DEMO_WRKSRC}/demo ${WRKSRC}/ + @${MV} ${DEMO_WRKSRC}/sample ${WRKSRC}/ .endif post-patch: Modified: head/java/linux-sun-jdk16/distinfo ============================================================================== --- head/java/linux-sun-jdk16/distinfo Sat Feb 2 18:12:15 2013 (r311438) +++ head/java/linux-sun-jdk16/distinfo Sat Feb 2 18:13:14 2013 (r311439) @@ -1,4 +1,4 @@ -SHA256 (jdk-6u38-linux-i586.bin) = 34b698c3f27f961c092cd982843a890fccf1ce1f9928c7e53333527dd60a63b0 -SIZE (jdk-6u38-linux-i586.bin) = 71771782 +SHA256 (jdk-6u39-linux-i586.bin) = 98211a71eef47f9e73a57b32995ca4b698d12b4282c90ffff8c533fa8b96d103 +SIZE (jdk-6u39-linux-i586.bin) = 71756435 SHA256 (jdk-6u38-linux-i586-demos.tar.gz) = cb69d792495c554db2de171893cf5eac936a4ffb11491d30e4a282ba4c64e08a SIZE (jdk-6u38-linux-i586-demos.tar.gz) = 12073550