diff options
| author | glewis <glewis@FreeBSD.org> | 2012-09-01 13:39:07 +0800 |
|---|---|---|
| committer | glewis <glewis@FreeBSD.org> | 2012-09-01 13:39:07 +0800 |
| commit | e8689fcda8d62e98639233fe1cee995db1f58969 (patch) | |
| tree | 51f38ec2217856db7acff4d1b94c63b90329496a | |
| parent | b88657f3e4f66ddd69c87e6f6a5b8fcc596cbbfe (diff) | |
| download | freebsd-ports-gnome-e8689fcda8d62e98639233fe1cee995db1f58969.tar.gz freebsd-ports-gnome-e8689fcda8d62e98639233fe1cee995db1f58969.tar.zst freebsd-ports-gnome-e8689fcda8d62e98639233fe1cee995db1f58969.zip | |
. Update to 7u7. This update is complicated by the demo package not having
a u7 version released.
| -rw-r--r-- | java/linux-sun-jdk17/Makefile | 20 | ||||
| -rw-r--r-- | java/linux-sun-jdk17/distinfo | 4 |
2 files changed, 18 insertions, 6 deletions
diff --git a/java/linux-sun-jdk17/Makefile b/java/linux-sun-jdk17/Makefile index 544c6d7d70d7..8c22e171f6e4 100644 --- a/java/linux-sun-jdk17/Makefile +++ b/java/linux-sun-jdk17/Makefile @@ -34,7 +34,7 @@ ONLY_FOR_ARCHS= i386 amd64 JDK_VERSION= 7 JDK_INTERNAL_VERSION= 1.7.0 -JDK_UPDATE_VERSION= 6 +JDK_UPDATE_VERSION= 7 DL_JDK_VERSION= ${JDK_INTERNAL_VERSION}_0${JDK_UPDATE_VERSION} DOWNLOAD_URL= http://www.oracle.com/technetwork/java/javase/downloads/index.html @@ -49,10 +49,16 @@ IGNORE?=You must manually fetch the J2SE SDK download for the Linux platform (${ .endif .if defined(WITH_DEMO) -.if !exists(${DISTDIR}/${DISTNAME}-demos${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING) -IGNORE?=You must manually fetch the J2SE demos and samples for the Linux platform (${DISTNAME}-demos${EXTRACT_SUFX}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again +#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 -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-demos${EXTRACT_SUFX} +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DEMO_DISTNAME}${EXTRACT_SUFX} PLIST_SUB+= DEMO="" .else PLIST_SUB+= DEMO="@comment " @@ -61,6 +67,12 @@ PLIST_SUB+= DEMO="@comment " pre-everything:: @${CAT} ${PKGMESSAGE} +.if defined(WITH_DEMO) && ${DEMO_WRKSRC} != ${WRKSRC} +post-extract: + @${MV} ${DEMO_WRKSRC}/demo ${WRKSRC}/ + @${MV} ${DEMO_WRKSRC}/sample ${WRKSRC}/ +.endif + post-patch: .for script in ${SCRIPT_FILES} @${REINPLACE_CMD} -i.orig -e 's:^#!/bin/bash:#!/bin/sh:' ${WRKSRC}/${script} diff --git a/java/linux-sun-jdk17/distinfo b/java/linux-sun-jdk17/distinfo index e1794d255d1e..1218a2084f05 100644 --- a/java/linux-sun-jdk17/distinfo +++ b/java/linux-sun-jdk17/distinfo @@ -1,4 +1,4 @@ -SHA256 (jdk-7u6-linux-i586.tar.gz) = 852cf2db507d1ff831dec01e757912023bb6219f32de83912ba52f04af6a8275 -SIZE (jdk-7u6-linux-i586.tar.gz) = 97360299 +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 |