Date: Thu, 10 Apr 2014 05:15:26 +0000 (UTC) From: Greg Lewis <glewis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r350767 - head/java/linux-oracle-jdk18 Message-ID: <201404100515.s3A5FQM4043080@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glewis Date: Thu Apr 10 05:15:26 2014 New Revision: 350767 URL: http://svnweb.freebsd.org/changeset/ports/350767 QAT: https://qat.redports.org/buildarchive/r350767/ Log: . Fix a reference to JDK 7. . Replace hardcoding of "8" with ${JDK_VERSION}. Modified: head/java/linux-oracle-jdk18/Makefile Modified: head/java/linux-oracle-jdk18/Makefile ============================================================================== --- head/java/linux-oracle-jdk18/Makefile Thu Apr 10 05:07:53 2014 (r350766) +++ head/java/linux-oracle-jdk18/Makefile Thu Apr 10 05:15:26 2014 (r350767) @@ -5,7 +5,7 @@ PORTVERSION= ${JDK_VERSION}.${JDK_UPDATE 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 .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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404100515.s3A5FQM4043080>