From owner-freebsd-java Fri Mar 7 7:36:12 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 8E07E37B401 for ; Fri, 7 Mar 2003 07:36:08 -0800 (PST) Received: from seed.net.tw (sn15.seed.net.tw [139.175.54.15]) by mx1.FreeBSD.org (Postfix) with ESMTP id DCAB543FE3 for ; Fri, 7 Mar 2003 07:36:04 -0800 (PST) (envelope-from leafy@leafy.idv.tw) Received: from [211.74.131.166] (port=49177 helo=leafy.idv.tw) by seed.net.tw with esmtp (Seednet 4.10:3) id 18rJtE-000Gct-00 for freebsd-java@freebsd.org; Fri, 07 Mar 2003 23:36:04 +0800 Received: from leafy.idv.tw (nobody@localhost [127.0.0.1]) by leafy.idv.tw (8.12.8/8.12.8) with ESMTP id h27Fa3Ba009929 for ; Fri, 7 Mar 2003 23:36:03 +0800 (CST) (envelope-from leafy@leafy.idv.tw) Received: (from leafy@localhost) by leafy.idv.tw (8.12.8/8.12.8/Submit) id h27Fa3Gi009928 for freebsd-java@freebsd.org; Fri, 7 Mar 2003 23:36:03 +0800 (CST) (envelope-from leafy) Date: Fri, 7 Mar 2003 23:36:03 +0800 From: leafy To: freebsd-java@freebsd.org Subject: [patch]bsd.java.mk for freebsd native jdk 1.4.1 Message-ID: <20030307153528.GA9846@leafy.idv.tw> Mail-Followup-To: freebsd-java@freebsd.org Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="WIIRZ1HQ6FgrlPgb" Content-Disposition: inline User-Agent: Mutt/1.5.3i 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 --WIIRZ1HQ6FgrlPgb Content-Type: multipart/mixed; boundary="UKNXkkdQCYZ6W5l3" Content-Disposition: inline --UKNXkkdQCYZ6W5l3 Content-Type: text/plain; charset=big5 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 mult= iple JDK installation though. JBoss3 was built successfully for JDK14. Jiawei =20 --=20 "Without the userland, the kernel is useless." --inspired by The Tao of Programming --UKNXkkdQCYZ6W5l3 Content-Type: text/plain; charset=big5 Content-Disposition: attachment; filename="bsd.java.mk.diff" Content-Transfer-Encoding: quoted-printable --- 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)=09 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 @@ =20 # If the port needs JDK 1.4, then there's currently only one choice, the S= un # 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"=20 JAVA_VENDOR=3D Sun JAVA_VER=3D 1.4.1 JAVA_OS=3D Linux --UKNXkkdQCYZ6W5l3-- --WIIRZ1HQ6FgrlPgb Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (FreeBSD) iD8DBQE+aLxjvVncUyjPAegRAvtIAKC3PYy0T5xcxJ41rPehu/nPRF1a8gCg00qT uedX5d43+bGWB1b/jFo+jYs= =7s1k -----END PGP SIGNATURE----- --WIIRZ1HQ6FgrlPgb-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-java" in the body of the message