From owner-freebsd-openoffice@FreeBSD.ORG  Mon Nov 17 14:56:35 2003
Return-Path: <owner-freebsd-openoffice@FreeBSD.ORG>
Delivered-To: freebsd-openoffice@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 99A5C16A4CE
	for <openoffice@freebsd.org>; Mon, 17 Nov 2003 14:56:35 -0800 (PST)
Received: from mobiledatanow.com (port-91-96.fastadsl.net.nz [203.96.91.96])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4B42D43FE0
	for <openoffice@freebsd.org>; Mon, 17 Nov 2003 14:56:32 -0800 (PST)
	(envelope-from jonc@mobiledatanow.com)
Received: from baldur.mobiledatanow.com (baldur.mobiledatanow.com
	[192.168.2.7])
	by mobiledatanow.com (Postfix) with ESMTP id A71C315218
	for <openoffice@freebsd.org>; Tue, 18 Nov 2003 11:56:30 +1300 (NZDT)
Received: from baldur.mobiledatanow.com (localhost [127.0.0.1])
	hAHMuU2H086583
	for <openoffice@freebsd.org>; Tue, 18 Nov 2003 11:56:30 +1300 (NZDT)
	(envelope-from jonc@baldur.mobiledatanow.com)
Received: (from jonc@localhost)
	by baldur.mobiledatanow.com (8.12.10/8.12.10/Submit) id hAHMuT9U086582
	for openoffice@freebsd.org; Tue, 18 Nov 2003 11:56:29 +1300 (NZDT)
	(envelope-from jonc)
Date: Tue, 18 Nov 2003 11:56:29 +1300
From: Jonathan Chen <jonc@mobiledatanow.com>
To: openoffice@freebsd.org
Message-ID: <20031117225629.GA86567@baldur.mobiledatanow.com>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="a8Wt8u1KmwUX3Y2C"
Content-Disposition: inline
User-Agent: Mutt/1.4.1i
Subject: Port build and Java
X-BeenThere: freebsd-openoffice@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Porting OpenOffice to FreeBSD <freebsd-openoffice.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-openoffice>,
	<mailto:freebsd-openoffice-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-openoffice>
List-Post: <mailto:freebsd-openoffice@freebsd.org>
List-Help: <mailto:freebsd-openoffice-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-openoffice>,
	<mailto:freebsd-openoffice-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Nov 2003 22:56:35 -0000


--a8Wt8u1KmwUX3Y2C
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hi,

Looking at the port's Makefile, is there any particular reason why
OpenOffice-1.1 isn't using the USE_JAVA macro? Using it would save the
maintainers the hassle of tweaking the Makefile everytime the Java VM
moves up one minor release.

Cheers.
-- 
Jonathan Chen <jonc@mobiledatanow.com>
Mobile Data Now                     Tel: +64-9-636-8014
35K Maurice Rd                      Fax: +64-9-636-8534
Penrose, Auckland
New Zealand

--a8Wt8u1KmwUX3Y2C
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=asdf

--- Makefile.orig	Tue Nov 18 11:52:25 2003
+++ Makefile	Tue Nov 18 11:52:25 2003
@@ -102,11 +102,6 @@
 COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
 .endif
 
-#
-# The JDK dependency needs to be at the first place, so all
-# following dependencies use the same JDK.
-#
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
 BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
@@ -127,15 +122,13 @@
 USE_BISON=	yes
 USE_GMAKE=	yes
 USE_GNOME=	orbit gtk12
+USE_JAVA=	1.4+
 
 EXTRACT_BEFORE_ARGS_R= -dc
 EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
 EXTRACT_REST=	gpc231.tar.Z
 
-JDKDIR?=	${LOCALBASE}/jdk1.4.2
-JAVAVM=		${JDKDIR}/bin/java
-
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
 WANT_AUTOCONF_VER= 253
@@ -160,7 +153,7 @@
 
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR}
+CONFIGURE_ARGS+=	--with-jdk-home=${JAVA_HOME}
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2

--a8Wt8u1KmwUX3Y2C--