bsd.java.mk 2.0

[Herve Quiroz]

Greg,

Thanks for the job done. I posted the patched version:

http://www.esil.univ-mrs.fr/~hquiroz/bsd.java.mk-2.0-dev-20030925.tgz

I need to investigate a bit but there seems to be a problem with the
"freebsd foundation" keyword for JAVA_VENDOR. Indeed, as the native port
uses "freebsd", if you want you port to depend exclusively on Diablo,
'JAVA_VENDOR= freebsd foundation' will produce several possible ports:

I added the following line in java/j2sdkee13/Makefile:

JAVA_VENDOR= freebsd foundation

Here is the dump of 'make java-debug':

_USE_BSD_JAVA_MK_1_0= yes
_JAVA_PORTS_POSSIBLE= JAVA_PORT_DIABLO_1_3 JAVA_PORT_FREEBSD_1_3 JAVA_PORT_FREEBSD_1_4
_JAVA_PORTS_INSTALLED= JAVA_PORT_FREEBSD_1_4 JAVA_PORT_LINUX_BLACKDOWN_1_3 JAVA_PORT_LINUX_BLACKDOWN_1_4
_JAVA_PORTS_INSTALLED_POSSIBLE= JAVA_PORT_FREEBSD_1_4
_JAVA_PORT= JAVA_PORT_FREEBSD_1_4
_JAVA_PORT_META= java/jdk14 /usr/local/jdk1.4.1 1.4 native FreeBSD
JAVA_PORT= java/jdk14
JAVA_HOME= /usr/local/jdk1.4.1
JAVA_PORT_VERSION= 1.4
JAVA_PORT_OS= native
JAVA_PORT_VENDOR= FreeBSD

What about one word keywords ? Indeed, if we use for instance
"freebsd_foundation", we may grep the entire line (as spaces could be
changed to "\n" using 'tr') instead of just the keyword.

 -_JAVA_VENDOR_DIABLO!=	echo ${JAVA_VENDOR} | grep -q "freebsd foundation" && echo "yes" || echo "no"
 +_JAVA_VENDOR_DIABLO!=	echo ${JAVA_VENDOR} | tr " " "\n" | grep -q "^freebsd_foundation$$" && echo "yes" || echo "no"

...and so on for all similar tests. IMHO that would be better even for
JAVA_VERSION tests. Currently, 'JAVA_VERSION= 1.3+' sets
_JAVA_VERSION_1_3 to "yes" which is not necessary (should be exclusively
_JAVA_VERSION_1_3_UP).

I'll have a deeper look at this tonight.

Herve

On Wed, Sep 24, 2003 at 12:43:05PM -0600, Greg Lewis wrote:
> Hi Herve,
> 
> Attached is a patch which add Diablo support to bsd.java.mk 2.0.  Patch is
> against the 20030828 version, which is the latest you released I think.
>