From owner-freebsd-java Sat Mar 15 1:47:59 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 81BAE37B401; Sat, 15 Mar 2003 01:47:55 -0800 (PST) Received: from gate.volant.org (gate.volant.org [207.111.218.246]) by mx1.FreeBSD.org (Postfix) with ESMTP id DA83143F85; Sat, 15 Mar 2003 01:47:54 -0800 (PST) (envelope-from patl+freebsd@volant.org) Received: from 64-144-229-193.client.dsl.net ([64.144.229.193] helo=[192.168.0.13]) by gate.volant.org with asmtp (TLSv1:DES-CBC3-SHA:168) (Exim 3.33 #1) id 18u8GZ-0000Lt-00; Sat, 15 Mar 2003 01:47:48 -0800 Date: Sat, 15 Mar 2003 01:47:39 -0800 From: Pat Lashley To: Ernst de Haan , Greg Lewis , leafy Cc: freebsd-java@FreeBSD.ORG Subject: Re: [patch]bsd.java.mk for freebsd native jdk 1.4.1 Message-ID: <540872704.1047721659@mccaffrey.phoenix.volant.org> In-Reply-To: <200303101006.01312.znerd@FreeBSD.org> References: <20030307153528.GA9846@leafy.idv.tw> <20030308050430.C60098@misty.eyesbeyond.com> <200303101006.01312.znerd@FreeBSD.org> X-Mailer: Mulberry/2.2.1 (Linux/x86 Demo) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="==========1642826634==========" 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 --==========1642826634========== Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: quoted-printable Content-Disposition: inline With these patches, if 1.3 and 1.4 are both installed, a port requesting 1.1+ or 1.2+ will get 1.3, not 1.4; but ports requesting 1.3+ will get 1.4. Was that intentional? (And if so, why?) -Pat > 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=3D ${LOCALBASE}/jdk1.1.8 >> > _JAVA_HOME_FREEBSD_1_2=3D ${LOCALBASE}/jdk1.2.2 >> > _JAVA_HOME_FREEBSD_1_3=3D ${LOCALBASE}/jdk1.3.1 >> > +_JAVA_HOME_FREEBSD_1_4=3D ${LOCALBASE}/jdk1.4.1 >> > = _JAVA_HOME_BLACKDOWN_LINUX_1_2=3D ${LOCALBASE}/linux-blackdown-jdk1.2.2 >> > = _JAVA_HOME_BLACKDOWN_LINUX_1_3=3D ${LOCALBASE}/linux-blackdown-jdk1.3.1 >> > = _JAVA_HOME_BLACKDOWN_LINUX_1_4=3D ${LOCALBASE}/linux-blackdown-jdk1.4.1 >> > @@ -59,6 +60,7 @@ >> > _JAVA_PORT_FREEBSD_1_1=3D java/jdk11 >> > _JAVA_PORT_FREEBSD_1_2=3D java/jdk12 >> > _JAVA_PORT_FREEBSD_1_3=3D java/jdk13 >> > +_JAVA_PORT_FREEBSD_1_4=3D java/jdk14 >> > _JAVA_PORT_BLACKDOWN_LINUX_1_2=3D java/linux-blackdown-jdk12 >> > _JAVA_PORT_BLACKDOWN_LINUX_1_3=3D java/linux-blackdown-jdk13 >> > _JAVA_PORT_IBM_LINUX_1_3=3D 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=3D YES >> > . endif >> > +. if exists(${_JAVA_HOME_FREEBSD_1_4}/${_JDK_FILE}) >> > +HAVE_JAVA_FREEBSD_1_4=3D YES >> > +. endif >> > . if exists(${_JAVA_HOME_BLACKDOWN_LINUX_1_2}/${_JDK_FILE}) >> > HAVE_JAVA_BLACKDOWN_LINUX_1_2=3D YES >> > . endif >> > @@ -134,6 +140,8 @@ >> > JAVA_PORT=3D ${_JAVA_PORT_FREEBSD_1_2} >> > . elif ${_JAVA_HOME} =3D=3D ${_JAVA_HOME_FREEBSD_1_3} >> > JAVA_PORT=3D ${_JAVA_PORT_FREEBSD_1_3} >> > +. elif ${_JAVA_HOME} =3D=3D ${_JAVA_HOME_FREEBSD_1_4} >> > +JAVA_PORT=3D ${_JAVA_PORT_FREEBSD_1_4} >> > . elif ${_JAVA_HOME} =3D=3D ${_JAVA_HOME_BLACKDOWN_LINUX_1_2} >> > JAVA_PORT=3D ${_JAVA_PORT_BLACKDOWN_LINUX_1_2} >> > . elif ${_JAVA_HOME} =3D=3D ${_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=3D 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=3D 1.1 >> > . else >> > USE_JAVA=3D 1.4 >> > @@ -203,7 +212,8 @@ >> > defined(HAVE_JAVA_BLACKDOWN_LINUX_1_3) || \ >> > defined(HAVE_JAVA_IBM_LINUX_1_3) >> > USE_JAVA=3D 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=3D 1.2 >> > . else >> > USE_JAVA=3D 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=3D 1.3 >> > . else >> > USE_JAVA=3D 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} =3D=3D "1.4" >> > +. elif ${USE_JAVA} =3D=3D "1.4" && defined(HAVE_JAVA_FREEBSD_1_4) >> > +JAVA_VENDOR=3D FreeBSD >> > +JAVA_VER=3D 1.4.1 >> > +JAVA_OS=3D FreeBSD >> > +JAVA_HOME=3D ${_JAVA_HOME_FREEBSD_1_4} >> > +JAVA_PORT=3D ${_JAVA_PORT_FREEBSD_1_4} >> > +. elif ${USE_JAVA} =3D=3D "1.4" >> > JAVA_VENDOR=3D Sun >> > JAVA_VER=3D 1.4.1 >> > JAVA_OS=3D Linux > > To Unsubscribe: send mail to majordomo@FreeBSD.org > with "unsubscribe freebsd-java" in the body of the message --==========1642826634========== Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (FreeBSD) iD8DBQE+cva8ncYNbLD8wuMRAk0OAJ4hJYrVcK0vEGcNG2kZZ849iUAbXgCguLDn FUYm57cNuzIGn57xYS8gu6g= =O2B+ -----END PGP SIGNATURE----- --==========1642826634==========-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-java" in the body of the message