diff options
| author | glewis <glewis@FreeBSD.org> | 2014-04-10 13:15:26 +0800 |
|---|---|---|
| committer | glewis <glewis@FreeBSD.org> | 2014-04-10 13:15:26 +0800 |
| commit | 886c4d278ca8e0f255e1b140de11ad9a94679373 (patch) | |
| tree | 072a82f4ef27207cc5f24adcc39bb726f96f2cac /java | |
| parent | 656b02fb3bb0f0ca70da454668ffa1add1a486f2 (diff) | |
| download | freebsd-ports-gnome-886c4d278ca8e0f255e1b140de11ad9a94679373.tar.gz freebsd-ports-gnome-886c4d278ca8e0f255e1b140de11ad9a94679373.tar.zst freebsd-ports-gnome-886c4d278ca8e0f255e1b140de11ad9a94679373.zip | |
. Fix a reference to JDK 7.
. Replace hardcoding of "8" with ${JDK_VERSION}.
Diffstat (limited to 'java')
| -rw-r--r-- | java/linux-oracle-jdk18/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/linux-oracle-jdk18/Makefile b/java/linux-oracle-jdk18/Makefile index 9e5d03734ffa..0532b7d9f694 100644 --- a/java/linux-oracle-jdk18/Makefile +++ b/java/linux-oracle-jdk18/Makefile @@ -5,7 +5,7 @@ PORTVERSION= ${JDK_VERSION}.${JDK_UPDATE_VERSION} CATEGORIES= java devel MASTER_SITES= # PKGNAMEPREFIX= linux-oracle- -DISTNAME= jdk-8-linux-i586 +DISTNAME= jdk-${JDK_VERSION}-linux-i586 MAINTAINER= java@FreeBSD.org COMMENT= Oracle Java ${JDK_VERSION} Development Kit for Linux @@ -17,7 +17,7 @@ DEMO_DESC= Install demos and samples NO_CDROM= License does not allow distribution with fee RESTRICTED= Redistribution of repackaged binaries not permitted -PKGNAMESUFFIX= 18 +PKGNAMESUFFIX= 1${JDK_VERSION} WRKSRC= ${WRKDIR}/jdk${DL_JDK_VERSION} PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} PORTVERSION=${PORTVERSION} @@ -29,7 +29,7 @@ USES= shebangfix ONLY_FOR_ARCHS= i386 amd64 JDK_VERSION= 8 -JDK_INTERNAL_VERSION= 1.8.0 +JDK_INTERNAL_VERSION= 1.${JDK_VERSION}.0 JDK_UPDATE_VERSION= 0 DL_JDK_VERSION= ${JDK_INTERNAL_VERSION} DOWNLOAD_URL= http://www.oracle.com/technetwork/java/javase/downloads/index.html @@ -50,7 +50,7 @@ IGNORE?=You must manually fetch the J2SE SDK download for the Linux platform (${ .if ${PORT_OPTIONS:MDEMO} DEMO_UPDATE_VERSION= ${JDK_UPDATE_VERSION} .if ${DEMO_UPDATE_VERSION} != ${JDK_UPDATE_VERSION} -DEMO_DISTNAME= jdk-7u${DEMO_UPDATE_VERSION}-linux-i586-demos +DEMO_DISTNAME= jdk-${JDK_VERSION}u${DEMO_UPDATE_VERSION}-linux-i586-demos DEMO_WRKSRC= ${WRKDIR}/jdk${JDK_INTERNAL_VERSION}_${DEMO_UPDATE_VERSION} .else DEMO_DISTNAME= ${DISTNAME}-demos |