Date: Mon, 10 Dec 2012 21:13:37 -0800 From: Greg Lewis <glewis@eyesbeyond.com> To: Baptiste Daroussin <bapt@freebsd.org> Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r308619 - in head: . Mk java java/diablo-jdk15 java/diablo-jdk16 java/diablo-jre15 java/diablo-jre16 java/jdk15 java/jdk15-doc java/jdk16 java/linux-sun-jdk15 java/linux-sun-jre15 Message-ID: <20121211051337.GA81071@misty.eyesbeyond.com> In-Reply-To: <201212101718.qBAHIWwk066120@svn.freebsd.org> References: <201212101718.qBAHIWwk066120@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
G'day Bapt, On Mon, Dec 10, 2012 at 05:18:32PM +0000, Baptiste Daroussin wrote: > Author: bapt > Date: Mon Dec 10 17:18:32 2012 > New Revision: 308619 > URL: http://svnweb.freebsd.org/changeset/ports/308619 > > Log: > Decommissioning java 1.5 (EOLed since October 2009): > removal of the different 1.5 jre and jdk vendors > > Removing outdated jdk16 vendors: > removing all the bsdjava and freebsd vendors, consider using openjdk6 or > openjsk7 instead. > > Discussed with: java (glarkin) Thanks for doing this, but the part of the change to bsd.java.mk below broke a lot of Java ports which had requirements of "1.5" or "1.5+" for the Java version. I've committed a fix which grandfathers them in. > @@ -156,10 +156,10 @@ SUB_LIST+= JAVA_OS="${JAVA_OS}" > . endif > > # The complete list of Java versions, os and vendors supported. > -__JAVA_VERSION_LIST= 1.5 1.6 1.7 > +__JAVA_VERSION_LIST= 1.6 1.7 > _JAVA_VERSION_LIST= ${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/} > _JAVA_OS_LIST= native linux > -_JAVA_VENDOR_LIST= freebsd bsdjava sun openjdk > +_JAVA_VENDOR_LIST= sun openjdk > > # Set all meta-information about JDK ports: > # port location, corresponding JAVA_HOME, JDK version, OS, vendor > @@ -269,7 +252,7 @@ JAVA_RUN= jre > . undef _JAVA_PORTS_INSTALLED > . undef _JAVA_PORTS_POSSIBLE > . if defined(JAVA_VERSION) > -_JAVA_VERSION= ${JAVA_VERSION:S/1.5+/1.5 1.6+/:S/1.6+/1.6 1.7+/:S/1.7+/1.7/} > +_JAVA_VERSION= ${JAVA_VERSION:S/1.6+/1.6 1.7+/:S/1.7+/1.7/} > . else > _JAVA_VERSION= ${__JAVA_VERSION_LIST} > . endif -- Greg Lewis Email : glewis@eyesbeyond.com Eyes Beyond Web : http://www.eyesbeyond.com Information Technology FreeBSD : glewis@FreeBSD.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121211051337.GA81071>