aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorznerd <znerd@FreeBSD.org>2002-08-30 02:50:11 +0800
committerznerd <znerd@FreeBSD.org>2002-08-30 02:50:11 +0800
commit34007273db24343419cb5df6494d52e0d1b1335d (patch)
tree593cdb9d8bd59a0be293d15197ced1df7dae0693
parentb8a4428b25367718219d467d050b7e557764f974 (diff)
downloadfreebsd-ports-graphics-34007273db24343419cb5df6494d52e0d1b1335d.tar.gz
freebsd-ports-graphics-34007273db24343419cb5df6494d52e0d1b1335d.tar.zst
freebsd-ports-graphics-34007273db24343419cb5df6494d52e0d1b1335d.zip
Convert this port to use the new bsd.java.mk structure, so it
doesn't try to install jdk-1.1.8 when the user has a newer version of java installed. Submitted by: Dave Glowacki <dglo@hyde.ssec.wisc.edu> PR: 39902
-rw-r--r--www/apache-jserv/Makefile12
1 files changed, 7 insertions, 5 deletions
diff --git a/www/apache-jserv/Makefile b/www/apache-jserv/Makefile
index d2b233c077d..a4eead0e32c 100644
--- a/www/apache-jserv/Makefile
+++ b/www/apache-jserv/Makefile
@@ -14,8 +14,10 @@ DISTNAME= ApacheJServ-${PORTVERSION}
MAINTAINER= greg@greg.rim.or.jp
-BUILD_DEPENDS= ${LOCALBASE}/jdk1.1.8/bin/javac:${PORTSDIR}/java/jdk11\
- ${LOCALBASE}/sbin/apachectl:${PORTSDIR}/www/apache13\
+USE_JAVA= 1.1+
+NEED_JAVAC= yes
+
+BUILD_DEPENDS= ${LOCALBASE}/sbin/apachectl:${PORTSDIR}/www/apache13\
${LOCALBASE}/share/java/classes/jsdk.jar:${PORTSDIR}/java/jsdk
RUN_DEPENDS= ${JAVAVM}:${PORTSDIR}/java/javavmwrapper\
${LOCALBASE}/sbin/apachectl:${PORTSDIR}/www/apache13\
@@ -33,10 +35,10 @@ CONFIGURE_ARGS= --prefix=${PREFIX}\
--with-logdir=/var/log\
--sysconfdir=${PREFIX}/etc/apache\
--with-apxs=${LOCALBASE}/sbin/apxs\
- --with-jdk-home=${LOCALBASE}/jdk1.1.8\
+ --with-jdk-home=${JAVA_HOME}\
--with-JSDK=${LOCALBASE}/share/java/classes/jsdk.jar\
- --with-java=${LOCALBASE}/jdk1.1.8/bin/java\
- --with-javac=${LOCALBASE}/jdk1.1.8/bin/javac\
+ --with-java=${JAVA}\
+ --with-javac=${JAVAC}\
--with-servlets=${PREFIX}/share/java/servlets\
--with-gnu-ld\
--enable-compressed-jar\