Index: head/www/apache-jserv/Makefile =================================================================== --- head/www/apache-jserv/Makefile (revision 172493) +++ head/www/apache-jserv/Makefile (revision 172494) @@ -1,58 +1,53 @@ # New ports collection makefile for: apache mod_jserv # Date created: 1999/05/29 # Whom: Kensaku Masuda # # $FreeBSD$ # PORTNAME= apache-jserv PORTVERSION= 1.1.2 PORTREVISION= 2 CATEGORIES= www java MASTER_SITES= http://archive.apache.org/dist/java/jserv/ 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\ --libdir=${LOCALBASE}/libexec/apache\ --with-logdir=/var/log\ --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} .include Property changes on: head/www/apache-jserv/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.22 \ No newline at end of property +1.23 \ No newline at end of property Index: head/www/apache-jserv/pkg-plist =================================================================== --- head/www/apache-jserv/pkg-plist (revision 172493) +++ head/www/apache-jserv/pkg-plist (revision 172494) @@ -1,158 +1,159 @@ +@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 share/doc/mod_jserv/api/org/apache/java/io/Logger.html share/doc/mod_jserv/api/org/apache/java/io/LogRecord.html share/doc/mod_jserv/api/org/apache/java/io/LogWriter.html share/doc/mod_jserv/api/org/apache/java/io/LogWriter.Agent.html share/doc/mod_jserv/api/org/apache/java/io/ReadFullyInputStream.html share/doc/mod_jserv/api/org/apache/java/io/package-summary.html share/doc/mod_jserv/api/org/apache/java/lang/TimeoutException.html share/doc/mod_jserv/api/org/apache/java/lang/package-tree.html share/doc/mod_jserv/api/org/apache/java/lang/package-frame.html share/doc/mod_jserv/api/org/apache/java/lang/Stoppable.html share/doc/mod_jserv/api/org/apache/java/lang/AdaptiveClassLoader.html share/doc/mod_jserv/api/org/apache/java/lang/AdaptiveClassLoader.ClassCacheEntry.html share/doc/mod_jserv/api/org/apache/java/lang/Bytes.html share/doc/mod_jserv/api/org/apache/java/lang/Lock.html share/doc/mod_jserv/api/org/apache/java/lang/Semaphore.html share/doc/mod_jserv/api/org/apache/java/lang/package-summary.html share/doc/mod_jserv/api/org/apache/java/net/package-summary.html share/doc/mod_jserv/api/org/apache/java/net/package-tree.html share/doc/mod_jserv/api/org/apache/java/net/package-frame.html share/doc/mod_jserv/api/org/apache/java/net/AuthenticatedServerSocket.html share/doc/mod_jserv/api/org/apache/java/net/AuthenticatedSocket.html share/doc/mod_jserv/api/org/apache/java/net/AuthenticationException.html share/doc/mod_jserv/api/org/apache/java/recycle/pool/package-summary.html share/doc/mod_jserv/api/org/apache/java/recycle/pool/package-tree.html share/doc/mod_jserv/api/org/apache/java/recycle/pool/package-frame.html share/doc/mod_jserv/api/org/apache/java/recycle/pool/Worker.html share/doc/mod_jserv/api/org/apache/java/recycle/pool/WorkerContainer.html share/doc/mod_jserv/api/org/apache/java/recycle/pool/WorkerPool.html share/doc/mod_jserv/api/org/apache/java/recycle/package-tree.html share/doc/mod_jserv/api/org/apache/java/recycle/package-frame.html share/doc/mod_jserv/api/org/apache/java/recycle/Controller.html share/doc/mod_jserv/api/org/apache/java/recycle/Recyclable.html share/doc/mod_jserv/api/org/apache/java/recycle/RecycleBin.html share/doc/mod_jserv/api/org/apache/java/recycle/AdaptiveController.html share/doc/mod_jserv/api/org/apache/java/recycle/Container.html share/doc/mod_jserv/api/org/apache/java/recycle/ControlledContainer.html share/doc/mod_jserv/api/org/apache/java/recycle/ControllerFactory.html share/doc/mod_jserv/api/org/apache/java/recycle/DefaultController.html share/doc/mod_jserv/api/org/apache/java/recycle/GaussianController.html share/doc/mod_jserv/api/org/apache/java/recycle/LimitedContainer.html share/doc/mod_jserv/api/org/apache/java/recycle/MinMaxController.html share/doc/mod_jserv/api/org/apache/java/recycle/RecycleBinIsEmpty.html share/doc/mod_jserv/api/org/apache/java/recycle/package-summary.html share/doc/mod_jserv/api/org/apache/java/recycle/RecycleBinIsFull.html share/doc/mod_jserv/api/org/apache/java/security/package-summary.html share/doc/mod_jserv/api/org/apache/java/security/package-tree.html share/doc/mod_jserv/api/org/apache/java/security/package-frame.html share/doc/mod_jserv/api/org/apache/java/security/MD5.html share/doc/mod_jserv/api/org/apache/java/security/MessageDigest.html share/doc/mod_jserv/api/org/apache/java/util/SimpleQueue.html share/doc/mod_jserv/api/org/apache/java/util/package-tree.html share/doc/mod_jserv/api/org/apache/java/util/package-frame.html share/doc/mod_jserv/api/org/apache/java/util/Configurations.html share/doc/mod_jserv/api/org/apache/java/util/ConfigurationsRepository.html share/doc/mod_jserv/api/org/apache/java/util/ExtendedProperties.html share/doc/mod_jserv/api/org/apache/java/util/ExtendedProperties.PropertiesReader.html share/doc/mod_jserv/api/org/apache/java/util/ExtendedProperties.PropertiesTokenizer.html share/doc/mod_jserv/api/org/apache/java/util/package-summary.html share/doc/mod_jserv/api/org/apache/jserv/JServUtils.html share/doc/mod_jserv/api/org/apache/jserv/package-tree.html share/doc/mod_jserv/api/org/apache/jserv/package-frame.html share/doc/mod_jserv/api/org/apache/jserv/JServDefs.html share/doc/mod_jserv/api/org/apache/jserv/JServLogChannels.html share/doc/mod_jserv/api/org/apache/jserv/JServSendError.html share/doc/mod_jserv/api/org/apache/jserv/Ajpv12InputStream.html share/doc/mod_jserv/api/org/apache/jserv/JServ.html share/doc/mod_jserv/api/org/apache/jserv/JServConnection.html share/doc/mod_jserv/api/org/apache/jserv/JServConnection.JServInputStream.html share/doc/mod_jserv/api/org/apache/jserv/JServConnection.JServOutputStream.html share/doc/mod_jserv/api/org/apache/jserv/JServContext.html share/doc/mod_jserv/api/org/apache/jserv/JServLog.html share/doc/mod_jserv/api/org/apache/jserv/JServServletManager.html share/doc/mod_jserv/api/org/apache/jserv/JServSession.html share/doc/mod_jserv/api/org/apache/jserv/JServSTMStore.html share/doc/mod_jserv/api/org/apache/jserv/JServServletManager.ACLObjectInputStream.html share/doc/mod_jserv/api/org/apache/jserv/package-summary.html share/doc/mod_jserv/api/stylesheet.css share/doc/mod_jserv/api/serialized-form.html share/doc/mod_jserv/api/packages.html share/doc/mod_jserv/api/overview-tree.html share/doc/mod_jserv/api/overview-summary.html share/doc/mod_jserv/api/package-list share/doc/mod_jserv/api/index.html share/doc/mod_jserv/api/index-all.html share/doc/mod_jserv/api/help-doc.html share/doc/mod_jserv/api/deprecated-list.html share/doc/mod_jserv/api/allclasses-frame.html share/doc/mod_jserv/api/overview-frame.html share/doc/mod_jserv/FAQ.html share/doc/mod_jserv/STATUS.txt share/doc/mod_jserv/bugs.html share/doc/mod_jserv/changes.html share/doc/mod_jserv/contributing.html share/doc/mod_jserv/contributors.html share/doc/mod_jserv/features.html share/doc/mod_jserv/future/index.html share/doc/mod_jserv/future/sandboxing.html share/doc/mod_jserv/glossary.html share/doc/mod_jserv/howto.load-balancing.html share/doc/mod_jserv/images/apache_pb.gif share/doc/mod_jserv/images/java-apache-project.gif share/doc/mod_jserv/images/lbfail001.gif share/doc/mod_jserv/images/lbfail002.gif share/doc/mod_jserv/images/lbfail003.gif share/doc/mod_jserv/images/lbprod001.gif share/doc/mod_jserv/images/lbprod002.gif share/doc/mod_jserv/images/lbshm001.gif share/doc/mod_jserv/index.html share/doc/mod_jserv/install/howto.security.html share/doc/mod_jserv/install/howto.servlets.html share/doc/mod_jserv/install/howto.status.html share/doc/mod_jserv/install/howto.unix_install.html share/doc/mod_jserv/install/howto.win32_install.html share/doc/mod_jserv/install/index.html share/doc/mod_jserv/license.html share/doc/mod_jserv/modules.html share/doc/mod_jserv/operation.html share/doc/mod_jserv/protocol/AJPv1.html share/doc/mod_jserv/protocol/AJPv11.html share/doc/mod_jserv/protocol/AJPv2.html share/doc/mod_jserv/protocol/AJPv21.html share/doc/mod_jserv/security.html share/doc/mod_jserv/sendbug.html share/doc/mod_jserv/support.html share/doc/mod_jserv/upgrade.html share/doc/mod_jserv/y2k.html share/doc/mod_jserv/zones.html @dirrm etc/apache/jserv @dirrm share/java/servlets @dirrm share/doc/mod_jserv/api/org/apache/java/io @dirrm share/doc/mod_jserv/api/org/apache/java/lang @dirrm share/doc/mod_jserv/api/org/apache/java/net @dirrm share/doc/mod_jserv/api/org/apache/java/recycle/pool @dirrm share/doc/mod_jserv/api/org/apache/java/recycle @dirrm share/doc/mod_jserv/api/org/apache/java/security @dirrm share/doc/mod_jserv/api/org/apache/java/util @dirrm share/doc/mod_jserv/api/org/apache/java @dirrm share/doc/mod_jserv/api/org/apache/jserv @dirrm share/doc/mod_jserv/api/org/apache @dirrm share/doc/mod_jserv/api/org @dirrm share/doc/mod_jserv/api @dirrm share/doc/mod_jserv/future @dirrm share/doc/mod_jserv/images @dirrm share/doc/mod_jserv/install @dirrm share/doc/mod_jserv/protocol @dirrm share/doc/mod_jserv Property changes on: head/www/apache-jserv/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property