From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Aug 22 21:00:35 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8674416A4DA for ; Tue, 22 Aug 2006 21:00:35 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4C45543D55 for ; Tue, 22 Aug 2006 21:00:34 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k7ML0XdO014042 for ; Tue, 22 Aug 2006 21:00:33 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k7ML0XFm014041; Tue, 22 Aug 2006 21:00:33 GMT (envelope-from gnats) Resent-Date: Tue, 22 Aug 2006 21:00:33 GMT Resent-Message-Id: <200608222100.k7ML0XFm014041@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Herve Quiroz Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7859816A4DD for ; Tue, 22 Aug 2006 20:54:32 +0000 (UTC) (envelope-from rv@arabica.esil.univ-mrs.fr) Received: from arabica.esil.univ-mrs.fr (arabica.esil.univ-mrs.fr [139.124.41.108]) by mx1.FreeBSD.org (Postfix) with ESMTP id E77C243D5D for ; Tue, 22 Aug 2006 20:54:31 +0000 (GMT) (envelope-from rv@arabica.esil.univ-mrs.fr) Received: from arabica.esil.univ-mrs.fr (localhost [127.0.0.1]) by arabica.esil.univ-mrs.fr (8.13.6/8.13.6) with ESMTP id k7MKsUoT077291; Tue, 22 Aug 2006 22:54:30 +0200 (CEST) (envelope-from rv@arabica.esil.univ-mrs.fr) Received: (from rv@localhost) by arabica.esil.univ-mrs.fr (8.13.6/8.13.6/Submit) id k7MKsTWg076658; Tue, 22 Aug 2006 22:54:29 +0200 (CEST) (envelope-from rv) Message-Id: <200608222054.k7MKsTWg076658@arabica.esil.univ-mrs.fr> Date: Tue, 22 Aug 2006 22:54:29 +0200 (CEST) From: Herve Quiroz To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: greg@greg.rim.or.jp Subject: ports/102404: [PATCH] www/apache-jserv: Update to bsd.java.mk 2.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Aug 2006 21:00:35 -0000 >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: