Date: Fri, 7 Apr 2000 03:01:42 +0200 (CEST) From: Palle Girgensohn <girgen@partitur.se> To: FreeBSD-gnats-submit@freebsd.org Cc: greg@greg.rim.or.jp Subject: ports/17835: www/apache-jserv: put jar-files in share/java/classes Message-ID: <200004070101.DAA68761@stordatan.telia.com>
next in thread | raw e-mail | index | archive | help
>Number: 17835 >Category: ports >Synopsis: www/apache-jserv: put jar-files in share/java/classes >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Apr 6 18:10:00 PDT 2000 >Closed-Date: >Last-Modified: >Originator: Palle Girgensohn >Release: FreeBSD 4.0-STABLE i386 >Organization: Partitur >Environment: 3.4, 4.0 jdk-1.1.8 tested with jikes >Description: This is a set of cleanups for the apache-jserv port. It puts ApacheJServ.jar where it really belongs, namely in ${PREFIX}/share/java/classes. Also makes portlint happy and properly deinstalls. >How-To-Repeat: >Fix: Here's a patch. Please note the addition of patches/patch-ah, a new file. Index: Makefile =================================================================== RCS file: /home/ncvs/ports/www/apache-jserv/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- Makefile 2000/02/10 14:19:14 1.4 +++ Makefile 2000/04/07 00:39:52 @@ -27,6 +27,7 @@ --libdir=${LOCALBASE}/libexec/apache\ --with-logdir=/var/log\ --sysconfdir=${PREFIX}/etc/apache\ + --with-apxs=${LOCALBASE}/sbin/apxs\ --with-jdk-home=${LOCALBASE}/jdk1.1.8\ --with-JSDK=${LOCALBASE}/share/java/classes/jsdk.jar\ --with-java=${LOCALBASE}/jdk1.1.8/bin/java\ @@ -35,6 +36,12 @@ --with-gnu-ld\ --enable-compressed-jar\ --enable-EAPI +.if defined (USE_JIKES) +CONFIGURE_ARGS+=--with-javac=${LOCALBASE}/bin/jikes +.endif + +pre-install: + ${MKDIR} ${PREFIX}/share/java/classes post-install: @${CAT} ${PKGDIR}/MESSAGE Index: patches/patch-ad =================================================================== RCS file: /home/ncvs/ports/www/apache-jserv/patches/patch-ad,v retrieving revision 1.2 diff -u -r1.2 patch-ad --- patches/patch-ad 2000/02/10 14:19:18 1.2 +++ patches/patch-ad 2000/04/07 00:01:23 @@ -1,11 +1,11 @@ ---- conf/jserv.properties.in.orig Wed Jan 26 18:26:31 2000 -+++ conf/jserv.properties.in Wed Jan 26 18:28:44 2000 +--- conf/jserv.properties.in.orig Sat Jan 15 01:58:57 2000 ++++ conf/jserv.properties.in Fri Apr 7 01:57:42 2000 @@ -53,8 +53,15 @@ # MUST NOT be in this classpath or the classpath of the shell # you start the Apache from. # -wrapper.classpath=@JSERV_CLASSES@ -+wrapper.classpath=@libexecdir@/ApacheJServ.jar ++wrapper.classpath=@prefix@/share/java/classes/ApacheJServ.jar wrapper.classpath=@JSDK_CLASSES@ +# Uncomment if you use Cocoon. +#wrapper.classpath=@prefix@/share/java/classes/Cocoon.jar Index: patches/patch-af =================================================================== RCS file: /home/ncvs/ports/www/apache-jserv/patches/patch-af,v retrieving revision 1.1 diff -u -r1.1 patch-af --- patches/patch-af 2000/02/10 14:19:20 1.1 +++ patches/patch-af 2000/04/07 00:20:09 @@ -16,7 +16,7 @@ + i += size; + } + stream.close(); -+ return new ByteArrayInputStream(data);; ++ return new ByteArrayInputStream(data); } else { return null; } Index: pkg/PLIST =================================================================== RCS file: /home/ncvs/ports/www/apache-jserv/pkg/PLIST,v retrieving revision 1.2 diff -u -r1.2 PLIST --- pkg/PLIST 2000/02/10 14:19:22 1.2 +++ pkg/PLIST 2000/04/07 00:57:27 @@ -1,12 +1,13 @@ etc/apache/jserv/jserv.conf etc/apache/jserv/jserv.properties etc/apache/jserv/zone.properties -libexec/apache/ApacheJServ.jar +share/java/classes/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 +share/doc/mod_jserv/api/index.html share/doc/mod_jserv/FAQ.html share/doc/mod_jserv/STATUS.txt share/doc/mod_jserv/bugs.html @@ -158,3 +159,5 @@ @dirrm share/doc/mod_jserv/install @dirrm share/doc/mod_jserv/protocol @dirrm share/doc/mod_jserv +@unexec rmdir %D/share/java/classes > /dev/null 2>&1 || true +@unexec rmdir %D/share/java > /dev/null 2>&1 || true --- /dev/null Fri Apr 7 02:58:59 2000 +++ patches/patch-ah Fri Apr 7 01:42:53 2000 @@ -0,0 +1,11 @@ +--- src/java/Makefile.in.orig Fri Apr 7 01:36:25 2000 ++++ src/java/Makefile.in Fri Apr 7 01:37:51 2000 +@@ -109,7 +109,7 @@ + SUBDIRS = org + + ARCHIVE = $(PACKAGE).jar +-jardir = ${libexecdir} ++jardir = $(prefix)/share/java/classes + jar_DATA = ${ARCHIVE} + + # VT: NOTE: This is not going to be as bad as in ECS because the findstring >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200004070101.DAA68761>