Date: Tue, 26 Aug 2003 10:34:29 -0600 From: Greg Lewis <glewis@misty.eyesbeyond.com> To: Herve Quiroz <herve.quiroz@esil.univ-mrs.fr> Cc: freebsd-java@freebsd.org Subject: Re: Binary release via ports Message-ID: <20030826163429.GA41436@misty.eyesbeyond.com> In-Reply-To: <20030826164909.K63432@puget.esil.univ-mrs.fr> References: <20030826143510.GB31392@misty.eyesbeyond.com> <20030826164909.K63432@puget.esil.univ-mrs.fr>
next in thread | previous in thread | raw e-mail | index | archive | help
--ew6BAiZeqk4r7MaW Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, Aug 26, 2003 at 05:02:12PM +0200, Herve Quiroz wrote: > First, good job to you and all the people that contributed to this event. Yes, its a relief to finally have it out :). > With these new JDK/JRE ports, we need to update the current bsd.java.mk > (1.0 flavor) so they may be used as dependencies to install java ports. Correct. See attached patch which I've been meaning to send to Ernst for review since yesterday. I think it does the right thing. > But maybe we could wait and include it directly (and probably more > easily as it is the point of the new version) in bsd.java.mk 2.0. This > requires that as many people as possible give it a try. It should definitely be included in the new one as well, but I think we should get it into the current one if possible. > BTW, have you tested it yet ? I think it handles most of what we > discussed so far. Except the JDK/JRE stuff, as there were no JRE port > available for FreeBSD at this time... which is no more the case ;) I have looked over it but not had time to try it yet :(. I agree that we need to soon and I am going to try and install it this week and rebuild some of the java ports. > I know it needs some cleaning/commenting so I will improve it tonight > (also make it a bit more verbose). Great! -- Greg Lewis Email : glewis@eyesbeyond.com Eyes Beyond Web : http://www.eyesbeyond.com Information Technology FreeBSD : glewis@FreeBSD.org --ew6BAiZeqk4r7MaW Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="bsd.java.mk.diff" Index: bsd.java.mk =================================================================== RCS file: /var/fcvs/ports/Mk/bsd.java.mk,v retrieving revision 1.33 diff -u -r1.33 bsd.java.mk --- bsd.java.mk 18 Jul 2003 14:31:45 -0000 1.33 +++ bsd.java.mk 25 Aug 2003 14:58:26 -0000 @@ -48,6 +48,7 @@ _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_DIABLO_FREEBSD_1_3= ${LOCALBASE}/diablo-jdk1.3.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 @@ -62,6 +63,7 @@ _JAVA_PORT_FREEBSD_1_2= java/jdk12 _JAVA_PORT_FREEBSD_1_3= java/jdk13 _JAVA_PORT_FREEBSD_1_4= java/jdk14 +_JAVA_PORT_DIABLO_FREEBSD_1_3= java/diablo-jdk13 _JAVA_PORT_BLACKDOWN_LINUX_1_2= java/linux-blackdown-jdk12 _JAVA_PORT_BLACKDOWN_LINUX_1_3= java/linux-blackdown-jdk13 _JAVA_PORT_BLACKDOWN_LINUX_1_4= java/linux-blackdown-jdk14 @@ -88,6 +90,7 @@ . undef HAVE_JAVA_FREEBSD_1_2 . undef HAVE_JAVA_FREEBSD_1_3 . undef HAVE_JAVA_FREEBSD_1_4 +. undef HAVE_JAVA_DIABLO_FREEBSD_1_3 . undef HAVE_JAVA_BLACKDOWN_LINUX_1_2 . undef HAVE_JAVA_BLACKDOWN_LINUX_1_3 . undef HAVE_JAVA_BLACKDOWN_LINUX_1_4 @@ -109,6 +112,9 @@ . if exists(${_JAVA_HOME_FREEBSD_1_4}/${_JDK_FILE}) HAVE_JAVA_FREEBSD_1_4= YES . endif +. if exists(${_JAVA_HOME_DIABLO_FREEBSD_1_3}/${_JDK_FILE}) +HAVE_JAVA_DIABLO_FREEBSD_1_3= YES +. endif . if exists(${_JAVA_HOME_BLACKDOWN_LINUX_1_2}/${_JDK_FILE}) HAVE_JAVA_BLACKDOWN_LINUX_1_2= YES . endif @@ -153,6 +159,8 @@ 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_DIABLO_FREEBSD_1_3} +JAVA_PORT= ${_JAVA_PORT_DIABLO_FREEBSD_1_3} . 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} @@ -204,7 +212,8 @@ . if (${USE_JAVA} == "1.1+") . if defined(HAVE_JAVA_FREEBSD_1_4) USE_JAVA= 1.4 -. elif defined(HAVE_JAVA_FREEBSD_1_3) || \ +. elif defined(HAVE_JAVA_DIABLO_FREEBSD_1_3) || \ + defined(HAVE_JAVA_FREEBSD_1_3) defined(HAVE_JAVA_SUN_LINUX_1_3) || \ defined(HAVE_JAVA_BLACKDOWN_LINUX_1_3) || \ defined(HAVE_JAVA_IBM_LINUX_1_3) @@ -224,7 +233,8 @@ . elif (${USE_JAVA} == "1.2+") . if defined(HAVE_JAVA_FREEBSD_1_4) USE_JAVA= 1.4 -. elif defined(HAVE_JAVA_FREEBSD_1_3) || \ +. elif defined(HAVE_JAVA_DIABLO_FREEBSD_1_3) || \ + defined(HAVE_JAVA_FREEBSD_1_3) || \ defined(HAVE_JAVA_SUN_LINUX_1_3) || \ defined(HAVE_JAVA_BLACKDOWN_LINUX_1_3) || \ defined(HAVE_JAVA_IBM_LINUX_1_3) @@ -240,7 +250,8 @@ . elif (${USE_JAVA} == "1.3+") . if defined(HAVE_JAVA_FREEBSD_1_4) USE_JAVA= 1.4 -. elif defined(HAVE_JAVA_FREEBSD_1_3) || \ +. elif defined(HAVE_JAVA_DIABLO_FREEBSD_1_3) || \ + defined(HAVE_JAVA_FREEBSD_1_3) || \ defined(HAVE_JAVA_SUN_LINUX_1_3) || \ defined(HAVE_JAVA_IBM_LINUX_1_3) || \ defined(HAVE_JAVA_BLACKDOWN_LINUX_1_3) || \ @@ -311,10 +322,11 @@ # If the port needs Java 1.3, then there are 4 choices. They are, in order or # preference: # -# (1) JDK 1.3.1 for FreeBSD -# (2) Sun JDK 1.3.1 for Linux -# (3) IBM JDK 1.3.1 for Linux -# (4) Blackdown JDK 1.3.1 for Linux +# (1) Diablo JDK 1.3.1 for FreeBSD +# (2) JDK 1.3.1 for FreeBSD +# (3) Sun JDK 1.3.1 for Linux +# (4) IBM JDK 1.3.1 for Linux +# (5) Blackdown JDK 1.3.1 for Linux # # If the FreeBSD JDK 1.3.1 is installed or if none of the 1.3.1 JDK's is # installed, then the FreeBSD JDK 1.3.1 is used as a dependency for the port. @@ -326,7 +338,8 @@ . if defined(HAVE_JAVA_BLACKDOWN_LINUX_1_3) \ && !defined(HAVE_JAVA_IBM_LINUX_1_3) \ && !defined(HAVE_JAVA_SUN_LINUX_1_3) \ - && !defined(HAVE_JAVA_FREEBSD_1_3) + && !defined(HAVE_JAVA_FREEBSD_1_3) \ + && !defined(HAVE_JAVA_DIABLO_FREEBSD_1_3) JAVA_VENDOR= Blackdown JAVA_VER= 1.3.1 JAVA_OS= Linux @@ -334,25 +347,34 @@ JAVA_PORT= ${_JAVA_PORT_BLACKDOWN_LINUX_1_3} . elif defined(HAVE_JAVA_IBM_LINUX_1_3) \ && !defined(HAVE_JAVA_SUN_LINUX_1_3) \ - && !defined(HAVE_JAVA_FREEBSD_1_3) + && !defined(HAVE_JAVA_FREEBSD_1_3) \ + && !defined(HAVE_JAVA_DIABLO_FREEBSD_1_3) JAVA_VENDOR= IBM JAVA_VER= 1.3.1 JAVA_OS= Linux JAVA_HOME= ${_JAVA_HOME_IBM_LINUX_1_3} JAVA_PORT= ${_JAVA_PORT_IBM_LINUX_1_3} . elif defined(HAVE_JAVA_SUN_LINUX_1_3) \ - && !defined(HAVE_JAVA_FREEBSD_1_3) + && !defined(HAVE_JAVA_FREEBSD_1_3) \ + && !defined(HAVE_JAVA_DIABLO_FREEBSD_1_3) JAVA_VENDOR= Sun JAVA_VER= 1.3.1 JAVA_OS= Linux JAVA_HOME= ${_JAVA_HOME_SUN_LINUX_1_3} JAVA_PORT= ${_JAVA_PORT_SUN_LINUX_1_3} -. else +. elif defined(HAVE_JAVA_FREEBSD_1_3) \ + && !defined(HAVE_JAVA_DIABLO_FREEBSD_1_3) JAVA_VENDOR= FreeBSD JAVA_VER= 1.3.1 JAVA_OS= FreeBSD JAVA_HOME= ${_JAVA_HOME_FREEBSD_1_3} JAVA_PORT= ${_JAVA_PORT_FREEBSD_1_3} +. else +JAVA_VENDOR= FreeBSD Foundation +JAVA_VER= 1.3.1 +JAVA_OS= FreeBSD +JAVA_HOME= ${_JAVA_HOME_DIABLO_FREEBSD_1_3} +JAVA_PORT= ${_JAVA_PORT_DIABLO_FREEBSD_1_3} . endif # If the port needs Java 1.4, then there are 4 choices. They are, in order or --ew6BAiZeqk4r7MaW--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030826163429.GA41436>