Date: Tue, 22 Aug 2006 22:54:29 +0200 (CEST) From: Herve Quiroz <hq@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: greg@greg.rim.or.jp Subject: ports/102404: [PATCH] www/apache-jserv: Update to bsd.java.mk 2.0 Message-ID: <200608222054.k7MKsTWg076658@arabica.esil.univ-mrs.fr> Resent-Message-ID: <200608222100.k7ML0XFm014041@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 102404
>Category: ports
>Synopsis: [PATCH] www/apache-jserv: Update to bsd.java.mk 2.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Aug 22 21:00:33 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Herve Quiroz
>Release: FreeBSD 6.1-RELEASE-p3 i386
>Organization:
>Environment:
System: FreeBSD arabica.esil.univ-mrs.fr 6.1-RELEASE-p3 FreeBSD 6.1-RELEASE-p3 #0: Mon Jul 24 17:23:17 CEST 2006
>Description:
- Update to bsd.java.mk 2.0
- Use bsd.java.mk macros: ${JAVAJARDIR}, ${JAVALIBDIR} and ${JAVASHAREDIR}
Port maintainer (greg@greg.rim.or.jp) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- apache-jserv-1.1.2_2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/apache-jserv/Makefile,v
retrieving revision 1.22
diff -u -u -r1.22 Makefile
--- Makefile 23 Feb 2006 10:39:34 -0000 1.22
+++ Makefile 22 Aug 2006 20:53:20 -0000
@@ -15,21 +15,19 @@
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,19 +36,16 @@
--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}
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/apache-jserv/pkg-plist,v
retrieving revision 1.5
diff -u -u -r1.5 pkg-plist
--- pkg-plist 10 Nov 2002 22:44:02 -0000 1.5
+++ pkg-plist 22 Aug 2006 20:53:20 -0000
@@ -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
--- apache-jserv-1.1.2_2.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200608222054.k7MKsTWg076658>