Port build and Java

[Jonathan Chen]

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 at mobiledatanow.com>
Mobile Data Now                     Tel: +64-9-636-8014
35K Maurice Rd                      Fax: +64-9-636-8534
Penrose, Auckland
New Zealand
-------------- next part --------------
--- 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