From owner-freebsd-java Mon Mar 10 2:16:25 2003 Delivered-To: freebsd-java@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1204837B404 for ; Mon, 10 Mar 2003 02:16:21 -0800 (PST) Received: from zaphod.euronet.nl (zaphod.euronet.nl [194.134.168.213]) by mx1.FreeBSD.org (Postfix) with ESMTP id BEBC343F93 for ; Mon, 10 Mar 2003 02:16:16 -0800 (PST) (envelope-from ernst@zaphod.euronet.nl) Received: from zaphod.euronet.nl (localhost [127.0.0.1]) by zaphod.euronet.nl (8.12.6/8.12.6) with ESMTP id h2A9669c000786; Mon, 10 Mar 2003 10:06:06 +0100 (CET) (envelope-from ernst@zaphod.euronet.nl) Received: (from ernst@localhost) by zaphod.euronet.nl (8.12.6/8.12.6/Submit) id h2A961g3000785; Mon, 10 Mar 2003 10:06:01 +0100 (CET) From: Ernst de Haan To: Greg Lewis , leafy Subject: Re: [patch]bsd.java.mk for freebsd native jdk 1.4.1 Date: Mon, 10 Mar 2003 10:06:01 +0100 User-Agent: KMail/1.5 Cc: freebsd-java@FreeBSD.ORG References: <20030307153528.GA9846@leafy.idv.tw> <20030308050430.C60098@misty.eyesbeyond.com> In-Reply-To: <20030308050430.C60098@misty.eyesbeyond.com> X-Address: Muiderstraat 1, Amsterdam, Netherlands MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200303101006.01312.znerd@FreeBSD.org> Sender: owner-freebsd-java@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org Approved! Let's hope portmgr will approve too. Ernst On Friday 07 March 2003 19:34, Greg Lewis wrote: > On Fri, Mar 07, 2003 at 11:36:03PM +0800, leafy wrote: > > Since jdk14 is now in our ports, the following patch is needed > > if you want the ports to use the native JDK installed as dependancy. > > I didin't try multiple JDK installation though. JBoss3 was built > > successfully for JDK14. > > Great! Ernst, as bsd.java.mk maintainer have you time to review this? > We should try and get this in during the freeze if portmgr will approve. > > > --- bsd.java.mk.old Fri Mar 7 23:10:39 2003 > > +++ bsd.java.mk Fri Mar 7 23:28:46 2003 > > @@ -47,6 +47,7 @@ > > _JAVA_HOME_FREEBSD_1_1= ${LOCALBASE}/jdk1.1.8 > > _JAVA_HOME_FREEBSD_1_2= ${LOCALBASE}/jdk1.2.2 > > _JAVA_HOME_FREEBSD_1_3= ${LOCALBASE}/jdk1.3.1 > > +_JAVA_HOME_FREEBSD_1_4= ${LOCALBASE}/jdk1.4.1 > > _JAVA_HOME_BLACKDOWN_LINUX_1_2= ${LOCALBASE}/linux-blackdown-jdk1.2.2 > > _JAVA_HOME_BLACKDOWN_LINUX_1_3= ${LOCALBASE}/linux-blackdown-jdk1.3.1 > > _JAVA_HOME_BLACKDOWN_LINUX_1_4= ${LOCALBASE}/linux-blackdown-jdk1.4.1 > > @@ -59,6 +60,7 @@ > > _JAVA_PORT_FREEBSD_1_1= java/jdk11 > > _JAVA_PORT_FREEBSD_1_2= java/jdk12 > > _JAVA_PORT_FREEBSD_1_3= java/jdk13 > > +_JAVA_PORT_FREEBSD_1_4= java/jdk14 > > _JAVA_PORT_BLACKDOWN_LINUX_1_2= java/linux-blackdown-jdk12 > > _JAVA_PORT_BLACKDOWN_LINUX_1_3= java/linux-blackdown-jdk13 > > _JAVA_PORT_IBM_LINUX_1_3= java/linux-ibm-jdk13 > > @@ -82,6 +84,7 @@ > > . undef HAVE_JAVA_FREEBSD_1_1 > > . undef HAVE_JAVA_FREEBSD_1_2 > > . undef HAVE_JAVA_FREEBSD_1_3 > > +. undef HAVE_JAVA_FREEBSD_1_4 > > . undef HAVE_JAVA_BLACKDOWN_LINUX_1_2 > > . undef HAVE_JAVA_BLACKDOWN_LINUX_1_3 > > . undef HAVE_JAVA_IBM_LINUX_1_3 > > @@ -98,6 +101,9 @@ > > . if exists(${_JAVA_HOME_FREEBSD_1_3}/${_JDK_FILE}) > > HAVE_JAVA_FREEBSD_1_3= YES > > . endif > > +. if exists(${_JAVA_HOME_FREEBSD_1_4}/${_JDK_FILE}) > > +HAVE_JAVA_FREEBSD_1_4= YES > > +. endif > > . if exists(${_JAVA_HOME_BLACKDOWN_LINUX_1_2}/${_JDK_FILE}) > > HAVE_JAVA_BLACKDOWN_LINUX_1_2= YES > > . endif > > @@ -134,6 +140,8 @@ > > JAVA_PORT= ${_JAVA_PORT_FREEBSD_1_2} > > . elif ${_JAVA_HOME} == ${_JAVA_HOME_FREEBSD_1_3} > > JAVA_PORT= ${_JAVA_PORT_FREEBSD_1_3} > > +. elif ${_JAVA_HOME} == ${_JAVA_HOME_FREEBSD_1_4} > > +JAVA_PORT= ${_JAVA_PORT_FREEBSD_1_4} > > . elif ${_JAVA_HOME} == ${_JAVA_HOME_BLACKDOWN_LINUX_1_2} > > JAVA_PORT= ${_JAVA_PORT_BLACKDOWN_LINUX_1_2} > > . elif ${_JAVA_HOME} == ${_JAVA_HOME_BLACKDOWN_LINUX_1_3} > > @@ -191,7 +199,8 @@ > > defined(HAVE_JAVA_BLACKDOWN_LINUX_1_2) || \ > > defined(HAVE_JAVA_SUN_LINUX_1_2) > > USE_JAVA= 1.2 > > -. elif !defined(HAVE_JAVA_SUN_LINUX_1_4) > > +. elif !defined(HAVE_JAVA_SUN_LINUX_1_4) || \ > > + !defined(HAVE_JAVA_FREEBSD_1_4) > > USE_JAVA= 1.1 > > . else > > USE_JAVA= 1.4 > > @@ -203,7 +212,8 @@ > > defined(HAVE_JAVA_BLACKDOWN_LINUX_1_3) || \ > > defined(HAVE_JAVA_IBM_LINUX_1_3) > > USE_JAVA= 1.3 > > -. elif !defined(HAVE_JAVA_SUN_LINUX_1_4) > > +. elif !defined(HAVE_JAVA_SUN_LINUX_1_4) && \ > > + !defined(HAVE_JAVA_FREEBSD_1_4) > > USE_JAVA= 1.2 > > . else > > USE_JAVA= 1.4 > > @@ -213,7 +223,8 @@ > > defined(HAVE_JAVA_SUN_LINUX_1_3) || \ > > defined(HAVE_JAVA_IBM_LINUX_1_3) || \ > > defined(HAVE_JAVA_BLACKDOWN_LINUX_1_3) || \ > > - !defined(HAVE_JAVA_SUN_LINUX_1_4) > > + !defined(HAVE_JAVA_SUN_LINUX_1_4) || \ > > + !defined(HAVE_JAVA_FREEBSD_1_4) > > USE_JAVA= 1.3 > > . else > > USE_JAVA= 1.4 > > @@ -326,7 +337,13 @@ > > > > # If the port needs JDK 1.4, then there's currently only one choice, > > the Sun # JDK 1.4.x for Linux. > > -. elif ${USE_JAVA} == "1.4" > > +. elif ${USE_JAVA} == "1.4" && defined(HAVE_JAVA_FREEBSD_1_4) > > +JAVA_VENDOR= FreeBSD > > +JAVA_VER= 1.4.1 > > +JAVA_OS= FreeBSD > > +JAVA_HOME= ${_JAVA_HOME_FREEBSD_1_4} > > +JAVA_PORT= ${_JAVA_PORT_FREEBSD_1_4} > > +. elif ${USE_JAVA} == "1.4" > > JAVA_VENDOR= Sun > > JAVA_VER= 1.4.1 > > JAVA_OS= Linux To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-java" in the body of the message