From owner-svn-ports-head@FreeBSD.ORG Tue Dec 11 05:11:46 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 31274BFD;
Tue, 11 Dec 2012 05:11:46 +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 F02068FC08;
Tue, 11 Dec 2012 05:11:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBB5Bjd4004016;
Tue, 11 Dec 2012 05:11:45 GMT (envelope-from glewis@svn.freebsd.org)
Received: (from glewis@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBB5BjI8004015;
Tue, 11 Dec 2012 05:11:45 GMT (envelope-from glewis@svn.freebsd.org)
Message-Id: <201212110511.qBB5BjI8004015@svn.freebsd.org>
From: Greg Lewis <glewis@FreeBSD.org>
Date: Tue, 11 Dec 2012 05:11:45 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-head@freebsd.org
Subject: svn commit: r308661 - head/Mk
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
<svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Dec 2012 05:11:46 -0000
Author: glewis
Date: Tue Dec 11 05:11:45 2012
New Revision: 308661
URL: http://svnweb.freebsd.org/changeset/ports/308661
Log:
. Fix all of the ports which still have as a version requirement
JAVA_VERSION=1.5
or
JAVA_VERSION=1.5+
The previous revision took this out as a valid version number meaning
that we end up with the non-existent "/bin/java" as the desired JDK.
Expand 1.5 to 1.6 and 1.5+ to 1.6 1.7 for now. This can be reverted
once all the ports are updated.
Modified:
head/Mk/bsd.java.mk (contents, props changed)
Modified: head/Mk/bsd.java.mk
==============================================================================
--- head/Mk/bsd.java.mk Tue Dec 11 04:59:56 2012 (r308660)
+++ head/Mk/bsd.java.mk Tue Dec 11 05:11:45 2012 (r308661)
@@ -25,7 +25,7 @@ Java_Include_MAINTAINER= glewis@FreeBSD.
#
# JAVA_VERSION List of space-separated suitable java versions for the
# port. An optional "+" allows you to specify a range of
-# versions. (allowed values: 1.6[+] 1.7[+])
+# versions. (allowed values: 1.5[+] 1.6[+] 1.7[+])
#
# JAVA_OS List of space-separated suitable JDK port operating systems
# for the port. (allowed values: native linux)
@@ -156,7 +156,7 @@ SUB_LIST+= JAVA_OS="${JAVA_OS}"
. endif
# The complete list of Java versions, os and vendors supported.
-__JAVA_VERSION_LIST= 1.6 1.7
+__JAVA_VERSION_LIST= 1.5 1.6 1.7
_JAVA_VERSION_LIST= ${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/}
_JAVA_OS_LIST= native linux
_JAVA_VENDOR_LIST= sun openjdk
@@ -252,7 +252,7 @@ JAVA_RUN= jre
. undef _JAVA_PORTS_INSTALLED
. undef _JAVA_PORTS_POSSIBLE
. if defined(JAVA_VERSION)
-_JAVA_VERSION= ${JAVA_VERSION:S/1.6+/1.6 1.7+/:S/1.7+/1.7/}
+_JAVA_VERSION= ${JAVA_VERSION:S/1.5/1.6/:S/1.5+/1.6+/:S/1.6+/1.6 1.7+/:S/1.7+/1.7/}
. else
_JAVA_VERSION= ${__JAVA_VERSION_LIST}
. endif