Bring into line with the new java world order.

3 files changed, 53 insertions, 57 deletions

diff --git a/www/jssi/Makefile b/www/jssi/Makefile
index 49366a5c085..7fb5411f07c 100644
--- a/www/jssi/Makefile
+++ b/www/jssi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/01/20 05:03:34 jwise Exp $
+# $NetBSD: Makefile,v 1.3 2000/05/09 20:53:18 jwise Exp $
 
 DISTNAME=	ApacheJSSI-1.1.2
 PKGNAME=	jssi-1.1.2
@@ -16,25 +16,21 @@ DEPENDS+=	jsdk-2.0:../../www/jsdk20
 USE_JAVA=
 USE_GMAKE=
 NO_CONFIGURE=
-NO_MTREE=
-MAKE_ENV+=	CLASSPATH=${CLASSPATH}:${JSDK_HOME}/lib/jsdk.jar
 WRKSRC=		${WRKDIR}/ApacheJSSI-1.1.2/src/java
+MAKE_ENV+=	CLASSPATH=${CLASSPATH}
 MESSAGE_FILE=	${WRKDIR}/MESSAGE
 
 post-build:
-	(cd ${WRKSRC}/../../docs && \
-		CLASSPATH=${CLASSPATH}:${JSDK_HOME}/lib/jsdk.jar \
-		${SH} generate_javadoc)
-	${SED} -e 's,@JSDK_HOME@,${JSDK_HOME},g' \
-		< ${PKGDIR}/MESSAGE > ${WRKDIR}/MESSAGE
+	(cd ${WRKSRC}/../../docs && CLASSPATH=${CLASSPATH} ${SH} generate_javadoc)
+	${SED} -e 's,@PREFIX@,${PREFIX},g' < ${PKGDIR}/MESSAGE > ${WRKDIR}/MESSAGE
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/ApacheJSSI.jar ${JSDK_HOME}/lib
-	${MKDIR} ${JSDK_HOME}/doc/jssi
+	${INSTALL_DATA} ${WRKSRC}/ApacheJSSI.jar ${PREFIX}/lib/java/ApacheJSSI.jar
+	${MKDIR} ${PREFIX}/share/doc/java/jssi
 	(cd ${WRKSRC}/../../docs ; ${GTAR} pcf - .) | \
-		(cd ${JSDK_HOME}/doc/jssi ; ${GTAR} pxvf -)
+		(cd ${PREFIX}/share/doc/java/jssi ; ${GTAR} pxvf -)
 
 .include "../../mk/bsd.pkg.mk"
-JSDK_HOME=	${JAVA_HOME}/jsdk
-BUILD_DEFS+=	JSDK_HOME
-PREFIX:=	${JSDK_HOME}
+
+# This must be after bsd.pkg.mk is brought in
+CLASSPATH:=${CLASSPATH}:${PREFIX}/lib/java/jsdk.jar:.
diff --git a/www/jssi/pkg/MESSAGE b/www/jssi/pkg/MESSAGE
index b225321f512..7e3e9955763 100644
--- a/www/jssi/pkg/MESSAGE
+++ b/www/jssi/pkg/MESSAGE
@@ -1,5 +1,5 @@
 =============================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2000/01/18 01:51:44 jwise Exp $
+$NetBSD: MESSAGE,v 1.2 2000/05/09 20:53:19 jwise Exp $
 
 To install Apache-JSSI for use with Apache Server's mod_jserv (from the
 ap-jserv package), add the following line to your httpd.conf:
@@ -8,7 +8,7 @@ ap-jserv package), add the following line to your httpd.conf:
 
 and the following line to your zone.properties:
 
-	repositories=@JSDK_HOME@/lib/ApacheJSSI.jar
+	repositories=@PREFIX@/lib/java/ApacheJSSI.jar
 
 To use Apache-JSSI with others servlet engines, see the appropriate
 documentation.
diff --git a/www/jssi/pkg/PLIST b/www/jssi/pkg/PLIST
index ff6cd1caa61..8a1a5790904 100644
--- a/www/jssi/pkg/PLIST
+++ b/www/jssi/pkg/PLIST
@@ -1,41 +1,41 @@
-@comment $NetBSD: PLIST,v 1.2 2000/01/20 05:03:35 jwise Exp $
-lib/ApacheJSSI.jar
-doc/jssi/generate_javadoc
-doc/jssi/images/java-apache-project.gif
-doc/jssi/index.html
-doc/jssi/install.html
-doc/jssi/parameterprop.html
-doc/jssi/traditionalssi.html
-doc/jssi/javadoc/packages.html
-doc/jssi/javadoc/Package-org.apache.java.io.html
-doc/jssi/javadoc/org.apache.java.io.PositionReader.html
-doc/jssi/javadoc/Package-org.apache.java.util.html
-doc/jssi/javadoc/org.apache.java.util.SGMLTag.html
-doc/jssi/javadoc/Package-org.apache.servlet.ssi.html
-doc/jssi/javadoc/org.apache.servlet.ssi.ParseContext.html
-doc/jssi/javadoc/org.apache.servlet.ssi.SpecialTagHandler.html
-doc/jssi/javadoc/org.apache.servlet.ssi.AbstractParseContext.html
-doc/jssi/javadoc/org.apache.servlet.ssi.ConfigTagHandler.html
-doc/jssi/javadoc/tree.html
-doc/jssi/javadoc/org.apache.servlet.ssi.DelegateHttpServletRequest.html
-doc/jssi/javadoc/org.apache.servlet.ssi.EchoTagHandler.html
-doc/jssi/javadoc/org.apache.servlet.ssi.ExampleTagHandler.html
-doc/jssi/javadoc/org.apache.servlet.ssi.FLastModTagHandler.html
-doc/jssi/javadoc/org.apache.servlet.ssi.FSizeTagHandler.html
-doc/jssi/javadoc/org.apache.servlet.ssi.HREFParameterPropagator.html
-doc/jssi/javadoc/org.apache.servlet.ssi.IncludeTagHandler.html
-doc/jssi/javadoc/org.apache.servlet.ssi.OSServletOutputStream.html
-doc/jssi/javadoc/org.apache.servlet.ssi.PageParser.html
-doc/jssi/javadoc/org.apache.servlet.ssi.PageParserServlet.html
-doc/jssi/javadoc/org.apache.servlet.ssi.ParamPropContext.html
-doc/jssi/javadoc/org.apache.servlet.ssi.ParameterPropagatingSSI.html
-doc/jssi/javadoc/org.apache.servlet.ssi.SSI.html
-doc/jssi/javadoc/org.apache.servlet.ssi.SSIContext.html
-doc/jssi/javadoc/org.apache.servlet.ssi.SSIHttpServletResponse.html
-doc/jssi/javadoc/org.apache.servlet.ssi.SSIOutputStream.html
-doc/jssi/javadoc/org.apache.servlet.ssi.SSITagHandler.html
-doc/jssi/javadoc/org.apache.servlet.ssi.ServletTagHandler.html
-doc/jssi/javadoc/AllNames.html
-@dirrm doc/jssi/javadoc/
-@dirrm doc/jssi/images
-@dirrm doc/jssi
+@comment $NetBSD: PLIST,v 1.3 2000/05/09 20:53:19 jwise Exp $
+lib/java/ApacheJSSI.jar
+share/doc/java/jssi/generate_javadoc
+share/doc/java/jssi/images/java-apache-project.gif
+share/doc/java/jssi/index.html
+share/doc/java/jssi/install.html
+share/doc/java/jssi/parameterprop.html
+share/doc/java/jssi/traditionalssi.html
+share/doc/java/jssi/javadoc/packages.html
+share/doc/java/jssi/javadoc/Package-org.apache.java.io.html
+share/doc/java/jssi/javadoc/org.apache.java.io.PositionReader.html
+share/doc/java/jssi/javadoc/Package-org.apache.java.util.html
+share/doc/java/jssi/javadoc/org.apache.java.util.SGMLTag.html
+share/doc/java/jssi/javadoc/Package-org.apache.servlet.ssi.html
+share/doc/java/jssi/javadoc/org.apache.servlet.ssi.ParseContext.html
+share/doc/java/jssi/javadoc/org.apache.servlet.ssi.SpecialTagHandler.html
+share/doc/java/jssi/javadoc/org.apache.servlet.ssi.AbstractParseContext.html
+share/doc/java/jssi/javadoc/org.apache.servlet.ssi.ConfigTagHandler.html
+share/doc/java/jssi/javadoc/tree.html
+share/doc/java/jssi/javadoc/org.apache.servlet.ssi.DelegateHttpServletRequest.html
+share/doc/java/jssi/javadoc/org.apache.servlet.ssi.EchoTagHandler.html
+share/doc/java/jssi/javadoc/org.apache.servlet.ssi.ExampleTagHandler.html
+share/doc/java/jssi/javadoc/org.apache.servlet.ssi.FLastModTagHandler.html
+share/doc/java/jssi/javadoc/org.apache.servlet.ssi.FSizeTagHandler.html
+share/doc/java/jssi/javadoc/org.apache.servlet.ssi.HREFParameterPropagator.html
+share/doc/java/jssi/javadoc/org.apache.servlet.ssi.IncludeTagHandler.html
+share/doc/java/jssi/javadoc/org.apache.servlet.ssi.OSServletOutputStream.html
+share/doc/java/jssi/javadoc/org.apache.servlet.ssi.PageParser.html
+share/doc/java/jssi/javadoc/org.apache.servlet.ssi.PageParserServlet.html
+share/doc/java/jssi/javadoc/org.apache.servlet.ssi.ParamPropContext.html
+share/doc/java/jssi/javadoc/org.apache.servlet.ssi.ParameterPropagatingSSI.html
+share/doc/java/jssi/javadoc/org.apache.servlet.ssi.SSI.html
+share/doc/java/jssi/javadoc/org.apache.servlet.ssi.SSIContext.html
+share/doc/java/jssi/javadoc/org.apache.servlet.ssi.SSIHttpServletResponse.html
+share/doc/java/jssi/javadoc/org.apache.servlet.ssi.SSIOutputStream.html
+share/doc/java/jssi/javadoc/org.apache.servlet.ssi.SSITagHandler.html
+share/doc/java/jssi/javadoc/org.apache.servlet.ssi.ServletTagHandler.html
+share/doc/java/jssi/javadoc/AllNames.html
+@dirrm share/doc/java/jssi/javadoc/
+@dirrm share/doc/java/jssi/images
+@dirrm share/doc/java/jssi