From owner-svn-ports-all@FreeBSD.ORG Thu Apr 10 05:15:27 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 01F73CEE; Thu, 10 Apr 2014 05:15:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E32B211F7; Thu, 10 Apr 2014 05:15:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3A5FQer043081; Thu, 10 Apr 2014 05:15:26 GMT (envelope-from glewis@svn.freebsd.org) Received: (from glewis@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3A5FQM4043080; Thu, 10 Apr 2014 05:15:26 GMT (envelope-from glewis@svn.freebsd.org) Message-Id: <201404100515.s3A5FQM4043080@svn.freebsd.org> From: Greg Lewis Date: Thu, 10 Apr 2014 05:15:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r350767 - head/java/linux-oracle-jdk18 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.17 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: Thu, 10 Apr 2014 05:15:27 -0000 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