aboutsummaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorHerve Quiroz <hq@FreeBSD.org>2006-09-07 13:04:19 +0000
committerHerve Quiroz <hq@FreeBSD.org>2006-09-07 13:04:19 +0000
commit0d53eef16baf5efb1b0a166cdb58f2f1525ae6bb (patch)
treee2d55784ccea55cf8d6b5ec63a5cc6897a2e8498 /www
parent69a0588cf370ee118d94af1e1be28d301150a257 (diff)
downloadports-0d53eef16baf5efb1b0a166cdb58f2f1525ae6bb.tar.gz
ports-0d53eef16baf5efb1b0a166cdb58f2f1525ae6bb.zip
Notes
Diffstat (limited to 'www')
-rw-r--r--www/apache-jserv/Makefile19
-rw-r--r--www/apache-jserv/pkg-plist11
2 files changed, 13 insertions, 17 deletions
diff --git a/www/apache-jserv/Makefile b/www/apache-jserv/Makefile
index bb4442fd45ce..5022cd6d7fb8 100644
--- a/www/apache-jserv/Makefile
+++ b/www/apache-jserv/Makefile
@@ -15,21 +15,19 @@ DISTNAME= ApacheJServ-${PORTVERSION}
MAINTAINER= greg@greg.rim.or.jp
COMMENT= Loadable servlet module for apache
-USE_JAVA= 1.1+
-NEED_JAVAC= yes
+USE_JAVA= yes
BUILD_DEPENDS= ${LOCALBASE}/sbin/apachectl:${PORTSDIR}/${APACHE_PORT}\
- ${LOCALBASE}/share/java/classes/jsdk.jar:${PORTSDIR}/java/jsdk
-RUN_DEPENDS= ${JAVAVM}:${PORTSDIR}/java/javavmwrapper\
+ ${JAVALIBDIR}/jsdk.jar:${PORTSDIR}/java/jsdk
+RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper\
${LOCALBASE}/sbin/apachectl:${PORTSDIR}/${APACHE_PORT}\
- ${LOCALBASE}/share/java/classes/jsdk.jar:${PORTSDIR}/java/jsdk
+ ${JAVALIBDIR}/jsdk.jar:${PORTSDIR}/java/jsdk
USE_GMAKE= yes
GMAKE= ${LOCALBASE}/bin/gmake # Must have the full path.
GNU_CONFIGURE= yes
USE_PERL5= yes
APACHE_COMPAT= yes
-JAVAVM?= ${LOCALBASE}/bin/javavm
CONFIGURE_ENV= PERL=${PERL}
CONFIGURE_ARGS= --prefix=${PREFIX}\
--libexecdir=${LOCALBASE}/libexec/apache\
@@ -38,20 +36,17 @@ CONFIGURE_ARGS= --prefix=${PREFIX}\
--sysconfdir=${PREFIX}/etc/apache\
--with-apxs=${APXS}\
--with-jdk-home=${JAVA_HOME}\
- --with-JSDK=${LOCALBASE}/share/java/classes/jsdk.jar\
+ --with-JSDK=${JAVALIBDIR}/jsdk.jar\
--with-java=${JAVA}\
--with-javac=${JAVAC}\
- --with-servlets=${PREFIX}/share/java/servlets\
+ --with-servlets=${JAVASHAREDIR}/servlets\
--with-gnu-ld\
--enable-compressed-jar\
--enable-EAPI
-.if defined (WITH_JIKES)
+.if defined (HAVE_JIKES)
CONFIGURE_ARGS+=--with-javac=${LOCALBASE}/bin/jikes
.endif
-pre-install:
- ${MKDIR} ${PREFIX}/share/java/classes
-
post-install:
@${CAT} ${PKGMESSAGE}
diff --git a/www/apache-jserv/pkg-plist b/www/apache-jserv/pkg-plist
index 57667790173b..c5eda4fa3fac 100644
--- a/www/apache-jserv/pkg-plist
+++ b/www/apache-jserv/pkg-plist
@@ -1,12 +1,13 @@
+@comment $FreeBSD$
etc/apache/jserv/jserv.conf
etc/apache/jserv/jserv.properties
etc/apache/jserv/zone.properties
-share/java/classes/ApacheJServ.jar
+%%JAVAJARDIR%%/ApacheJServ.jar
libexec/apache/mod_jserv.so
-share/java/servlets/Hello.class
-share/java/servlets/Hello.java
-share/java/servlets/IsItWorking.class
-share/java/servlets/IsItWorking.java
+%%JAVASHAREDIR%%/servlets/Hello.class
+%%JAVASHAREDIR%%/servlets/Hello.java
+%%JAVASHAREDIR%%/servlets/IsItWorking.class
+%%JAVASHAREDIR%%/servlets/IsItWorking.java
share/doc/mod_jserv/api/org/apache/java/io/SimpleFileFilter.html
share/doc/mod_jserv/api/org/apache/java/io/package-tree.html
share/doc/mod_jserv/api/org/apache/java/io/package-frame.html