From owner-freebsd-java@FreeBSD.ORG Thu Sep 25 06:29:16 2003 Return-Path: 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 32EA416A4B3 for ; Thu, 25 Sep 2003 06:29:16 -0700 (PDT) Received: from puget.esil.univ-mrs.fr (puget.esil.univ-mrs.fr [139.124.41.103]) by mx1.FreeBSD.org (Postfix) with ESMTP id 01C1843FEC for ; Thu, 25 Sep 2003 06:29:15 -0700 (PDT) (envelope-from rv@puget.esil.univ-mrs.fr) Received: from puget.esil.univ-mrs.fr (localhost [127.0.0.1]) h8PDJB9u057775; Thu, 25 Sep 2003 15:19:11 +0200 (CEST) (envelope-from rv@puget.esil.univ-mrs.fr) Received: (from rv@localhost) by puget.esil.univ-mrs.fr (8.12.9/8.12.9/Submit) id h8PDJA8x057774; Thu, 25 Sep 2003 15:19:10 +0200 (CEST) Date: Thu, 25 Sep 2003 15:19:09 +0200 From: Herve Quiroz To: Greg Lewis Message-ID: <20030925131909.GA56431@puget.esil.univ-mrs.fr> References: <200309240954.45634.ernst.dehaan@nl.wanadoo.com> <20030924105244.GA12146@puget.esil.univ-mrs.fr> <20030924184305.GA70288@misty.eyesbeyond.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20030924184305.GA70288@misty.eyesbeyond.com> User-Agent: Mutt/1.4.1i cc: freebsd-java@FreeBSD.ORG Subject: Re: bsd.java.mk 2.0 X-BeenThere: freebsd-java@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Porting Java to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Sep 2003 13:29:16 -0000 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. >