diff options
| author | hq <hq@FreeBSD.org> | 2006-09-07 21:04:19 +0800 |
|---|---|---|
| committer | hq <hq@FreeBSD.org> | 2006-09-07 21:04:19 +0800 |
| commit | 972f76f2fae5182a6e594b7b887e671faa84631c (patch) | |
| tree | 2175b60315792526c3ef229ab39c4c907d83d738 /www/apache-jserv | |
| parent | 065250c30b804f6b8c90fdf978cdfb4796c73bbc (diff) | |
| download | freebsd-ports-gnome-972f76f2fae5182a6e594b7b887e671faa84631c.tar.gz freebsd-ports-gnome-972f76f2fae5182a6e594b7b887e671faa84631c.tar.zst freebsd-ports-gnome-972f76f2fae5182a6e594b7b887e671faa84631c.zip | |
- Update to bsd.java.mk 2.0
- Use bsd.java.mk macros: ${JAVAJARDIR}, ${JAVALIBDIR} and ${JAVASHAREDIR}
PR: 102404
Submitted by: hq
Approved by: maintainer timeout
Diffstat (limited to 'www/apache-jserv')
| -rw-r--r-- | www/apache-jserv/Makefile | 19 | ||||
| -rw-r--r-- | www/apache-jserv/pkg-plist | 11 |
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 |