Switch to a dynamic PLIST so we can install against jdk or sun-jdk

7 files changed, 87 insertions, 106 deletions

diff --git a/www/jakarta-servletapi/Makefile b/www/jakarta-servletapi/Makefile
index 4a1b2e8d9ad..9220fccad96 100644
--- a/www/jakarta-servletapi/Makefile
+++ b/www/jakarta-servletapi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/03/29 00:19:34 jwise Exp $
+# $NetBSD: Makefile,v 1.3 2001/06/21 13:12:25 abs Exp $
 
 DISTNAME=	jakarta-servletapi-3.2-src
 PKGNAME=	jakarta-servletapi-3.2.1
@@ -15,16 +15,22 @@ USE_JAVA=	yes
 
 MAKE_ENV+=	JAVA_HOME=${JAVA_HOME}
 MAKEFILE=	build.xml
+PLIST_SRC=	${PKGDIR}/PLIST ${WRKDIR}/PLIST.javadoc
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
+post-build:
+	rm -f ${WRKDIR}/PLIST.javadoc
+	cd ${WRKDIR}/dist/servletapi/docs ; ${FIND} * -type f -print | sort | ${SED} 's:^:share/doc/java/jakarta-servletapi/:' > ${WRKDIR}/PLIST.javadoc
+	cd ${WRKDIR}/dist/servletapi/docs ; ${FIND} * -type d -print | sort -r | ${SED} 's:^:@dirrm share/doc/java/jakarta-servletapi/:' >> ${WRKDIR}/PLIST.javadoc
+	echo '@dirrm share/doc/java/jakarta-servletapi' >> ${WRKDIR}/PLIST.javadoc
+
 do-install:
 	${INSTALL_DATA} ${WRKDIR}/dist/servletapi/lib/servlet.jar ${PREFIX}/lib/java
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/jakarta-servletapi
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/jakarta-servletapi/api
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/java/jakarta-servletapi
 	${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/java/jakarta-servletapi
-	${INSTALL_DATA} ${WRKDIR}/dist/servletapi/docs/api/* ${PREFIX}/share/doc/java/jakarta-servletapi/api
+	cd ${WRKDIR}/dist/servletapi/docs ; ${GTAR} pcf - . | ( cd ${PREFIX}/share/doc/java/jakarta-servletapi ; ${GTAR} pvxf - )
 
 .include "../../mk/bsd.pkg.mk"
 MAKE_PROGRAM=	${LOCALBASE}/bin/ant
diff --git a/www/jakarta-servletapi/pkg/PLIST b/www/jakarta-servletapi/pkg/PLIST
index 67a8aad7991..e891deded6c 100644
--- a/www/jakarta-servletapi/pkg/PLIST
+++ b/www/jakarta-servletapi/pkg/PLIST
@@ -1,53 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/03/20 19:43:29 jwise Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/06/21 13:12:26 abs Exp $
 lib/java/servlet.jar
 share/doc/java/jakarta-servletapi/README
 share/doc/java/jakarta-servletapi/LICENSE
-share/doc/java/jakarta-servletapi/api/AllNames.html
-share/doc/java/jakarta-servletapi/api/Package-javax.servlet.html
-share/doc/java/jakarta-servletapi/api/Package-javax.servlet.http.html
-share/doc/java/jakarta-servletapi/api/Package-javax.servlet.jsp.html
-share/doc/java/jakarta-servletapi/api/Package-javax.servlet.jsp.tagext.html
-share/doc/java/jakarta-servletapi/api/javax.servlet.GenericServlet.html
-share/doc/java/jakarta-servletapi/api/javax.servlet.RequestDispatcher.html
-share/doc/java/jakarta-servletapi/api/javax.servlet.Servlet.html
-share/doc/java/jakarta-servletapi/api/javax.servlet.ServletConfig.html
-share/doc/java/jakarta-servletapi/api/javax.servlet.ServletContext.html
-share/doc/java/jakarta-servletapi/api/javax.servlet.ServletException.html
-share/doc/java/jakarta-servletapi/api/javax.servlet.ServletInputStream.html
-share/doc/java/jakarta-servletapi/api/javax.servlet.ServletOutputStream.html
-share/doc/java/jakarta-servletapi/api/javax.servlet.ServletRequest.html
-share/doc/java/jakarta-servletapi/api/javax.servlet.ServletResponse.html
-share/doc/java/jakarta-servletapi/api/javax.servlet.SingleThreadModel.html
-share/doc/java/jakarta-servletapi/api/javax.servlet.UnavailableException.html
-share/doc/java/jakarta-servletapi/api/javax.servlet.http.Cookie.html
-share/doc/java/jakarta-servletapi/api/javax.servlet.http.HttpServlet.html
-share/doc/java/jakarta-servletapi/api/javax.servlet.http.HttpServletRequest.html
-share/doc/java/jakarta-servletapi/api/javax.servlet.http.HttpServletResponse.html
-share/doc/java/jakarta-servletapi/api/javax.servlet.http.HttpSession.html
-share/doc/java/jakarta-servletapi/api/javax.servlet.http.HttpSessionBindingEvent.html
-share/doc/java/jakarta-servletapi/api/javax.servlet.http.HttpSessionBindingListener.html
-share/doc/java/jakarta-servletapi/api/javax.servlet.http.HttpSessionContext.html
-share/doc/java/jakarta-servletapi/api/javax.servlet.http.HttpUtils.html
-share/doc/java/jakarta-servletapi/api/javax.servlet.jsp.HttpJspPage.html
-share/doc/java/jakarta-servletapi/api/javax.servlet.jsp.JspEngineInfo.html
-share/doc/java/jakarta-servletapi/api/javax.servlet.jsp.JspException.html
-share/doc/java/jakarta-servletapi/api/javax.servlet.jsp.JspFactory.html
-share/doc/java/jakarta-servletapi/api/javax.servlet.jsp.JspPage.html
-share/doc/java/jakarta-servletapi/api/javax.servlet.jsp.JspTagException.html
-share/doc/java/jakarta-servletapi/api/javax.servlet.jsp.JspWriter.html
-share/doc/java/jakarta-servletapi/api/javax.servlet.jsp.PageContext.html
-share/doc/java/jakarta-servletapi/api/javax.servlet.jsp.tagext.BodyContent.html
-share/doc/java/jakarta-servletapi/api/javax.servlet.jsp.tagext.BodyTag.html
-share/doc/java/jakarta-servletapi/api/javax.servlet.jsp.tagext.BodyTagSupport.html
-share/doc/java/jakarta-servletapi/api/javax.servlet.jsp.tagext.Tag.html
-share/doc/java/jakarta-servletapi/api/javax.servlet.jsp.tagext.TagAttributeInfo.html
-share/doc/java/jakarta-servletapi/api/javax.servlet.jsp.tagext.TagData.html
-share/doc/java/jakarta-servletapi/api/javax.servlet.jsp.tagext.TagExtraInfo.html
-share/doc/java/jakarta-servletapi/api/javax.servlet.jsp.tagext.TagInfo.html
-share/doc/java/jakarta-servletapi/api/javax.servlet.jsp.tagext.TagLibraryInfo.html
-share/doc/java/jakarta-servletapi/api/javax.servlet.jsp.tagext.TagSupport.html
-share/doc/java/jakarta-servletapi/api/javax.servlet.jsp.tagext.VariableInfo.html
-share/doc/java/jakarta-servletapi/api/packages.html
-share/doc/java/jakarta-servletapi/api/tree.html
-@dirrm share/doc/java/jakarta-servletapi/api
-@dirrm share/doc/java/jakarta-servletapi
diff --git a/www/jakarta-tomcat/Makefile b/www/jakarta-tomcat/Makefile
index 254895c3f6a..7ba3cfe57e9 100644
--- a/www/jakarta-tomcat/Makefile
+++ b/www/jakarta-tomcat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2001/04/05 19:12:21 jwise Exp $
+# $NetBSD: Makefile,v 1.20 2001/06/21 13:12:27 abs Exp $
 
 DISTNAME=	${PKGNAME}-src
 PKGNAME=	jakarta-tomcat-3.2.1
@@ -29,8 +29,8 @@ post-patch:
 		-e "s|@JAVA_HOME@|${JAVA_HOME}|g"			\
 		${WRKSRC}/src/etc/workers.properties > ${WRKSRC}/src/etc/workers.properties.tmp
 		${MV} ${WRKSRC}/src/etc/workers.properties.tmp ${WRKSRC}/src/etc/workers.properties
-	${RM} ${WRKSRC}/src/share/org/apache/tomcat/task/ApacheConfig.java.orig
-	${RM} ${WRKSRC}/src/etc/workers.properties.orig
+	${RM} -f ${WRKSRC}/src/share/org/apache/tomcat/task/ApacheConfig.java.orig
+	${RM} -f ${WRKSRC}/src/etc/workers.properties.orig
 
 post-build:
 	${SED}	-e "s|@PREFIX@|${PREFIX}|g"				\
diff --git a/www/jakarta-tomcat/distinfo b/www/jakarta-tomcat/distinfo
index e6ddae105d8..a2837d733e3 100644
--- a/www/jakarta-tomcat/distinfo
+++ b/www/jakarta-tomcat/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/05/21 21:54:11 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/06/21 13:12:27 abs Exp $
 
 SHA1 (jakarta-tomcat-3.2.1-src.tar.gz) = c28d97378dcc1c9a15d15cae404733674ae91c9c
 Size (jakarta-tomcat-3.2.1-src.tar.gz) = 920745 bytes
-SHA1 (patch-aa) = 7d2810e5306c68e416f04b26e505504924488f98
-SHA1 (patch-ab) = 6bbd0e0655dbac92dfaff25274d6c68b2deadf0d
-SHA1 (patch-ac) = 9d5927d7cf660cc0e8d9b8aa27543436dd503aec
+SHA1 (patch-aa) = 9bb02eba6a7444a353046461411d31a77a9dca56
+SHA1 (patch-ab) = 759c6373af773d45931bba58e512e4be50dfdc9e
+SHA1 (patch-ac) = 3bdcc53f7f8649131d2d9f37c82f2d833f497281
diff --git a/www/jakarta-tomcat/patches/patch-aa b/www/jakarta-tomcat/patches/patch-aa
index de952eefbeb..68fc9488cdd 100644
--- a/www/jakarta-tomcat/patches/patch-aa
+++ b/www/jakarta-tomcat/patches/patch-aa
@@ -1,6 +1,7 @@
-$NetBSD: patch-aa,v 1.6 2001/03/29 22:22:13 jwise Exp $
---- build.xml.orig	Tue Dec 12 14:51:36 2000
-+++ build.xml	Tue Mar 27 17:17:22 2001
+$NetBSD: patch-aa,v 1.7 2001/06/21 13:12:27 abs Exp $
+
+--- build.xml.orig	Tue Dec 12 22:51:36 2000
++++ build.xml
 @@ -6,11 +6,11 @@
    <property name="build.compiler" value="classic"/>
    <property name="debug" value="on"/>
@@ -74,7 +75,30 @@ $NetBSD: patch-aa,v 1.6 2001/03/29 22:22:13 jwise Exp $
      <chmod perm="+x" file="${tomcat.build}/bin/jspc.sh"/>
      <chmod perm="+x" file="${tomcat.build}/bin/startup.sh"/>
      <chmod perm="+x" file="${tomcat.build}/bin/shutdown.sh"/>
-@@ -202,8 +207,8 @@
+@@ -81,8 +86,10 @@
+   <target name="tomcat" depends="prepare">
+ 
+     <!-- Determine availability of optional components -->
++    <!-- No JSSE yet
+     <available property="jsse.present" 
+                classname="com.sun.net.ssl.internal.ssl.Provider" />
++    -->
+     <available property="jdk12.present"
+                classname="java.security.PrivilegedAction" />
+ 
+@@ -104,8 +111,10 @@
+                     unless="jdk12.present"/>
+            <exclude name="**/AdaptiveClassLoader12.java" 
+                     unless="jdk12.present"/>
++           <exclude name="**/EmbededTomcat.java" 
++                    unless="jsse.present"/>
+            <exclude name="**/SSLSocketFactory.java"
+-                    unless="jsse.present" />
++                    unless="jsse.present"/>
+     </javac>
+ 
+     <!-- Copy the corresponding resource files -->
+@@ -202,8 +211,8 @@
      </copy>
  
      <!-- Fixups for executable permissions -->
diff --git a/www/jakarta-tomcat/patches/patch-ab b/www/jakarta-tomcat/patches/patch-ab
index 22da6250a6f..02d6bbb0b7b 100644
--- a/www/jakarta-tomcat/patches/patch-ab
+++ b/www/jakarta-tomcat/patches/patch-ab
@@ -1,15 +1,29 @@
-$NetBSD: patch-ab,v 1.8 2001/04/03 11:05:25 wennmach Exp $
+$NetBSD: patch-ab,v 1.9 2001/06/21 13:12:27 abs Exp $
 
---- src/share/org/apache/tomcat/task/ApacheConfig.java.orig	Thu Mar 29 13:52:28 2001
-+++ src/share/org/apache/tomcat/task/ApacheConfig.java	Thu Mar 29 13:52:53 2001
-@@ -115,8 +115,8 @@
- 	    } else {
- 		// XXX XXX change it to mod_jserv_${os.name}.so, put all so in tomcat
- 		// home
--		pw.println("LoadModule jserv_module libexec/mod_jserv.so");
--                mod_jk.println("LoadModule jk_module libexec/mod_jk.so");
-+		pw.println("LoadModule jserv_module lib/httpd/mod_jserv.so");
-+                mod_jk.println("LoadModule jk_module lib/httpd/mod_jk.so");
-                 mod_jk.println();                                
-                 mod_jk.println("JkWorkersFile " + new File(tomcatHome, WORKERS_CONFIG));
-                 mod_jk.println("JkLogFile " + new File(tomcatHome, JK_LOG_LOCATION));
+--- src/etc/workers.properties.orig	Tue Dec 12 22:51:46 2000
++++ src/etc/workers.properties
+@@ -40,20 +40,20 @@
+ # installed tomcat. This is where you have your conf, webapps and lib
+ # directories.
+ #
+-workers.tomcat_home=c:\jakarta-tomcat
++workers.tomcat_home=@PREFIX@/tomcat
+ 
+ #
+ # workers.java_home should point to your Java installation. Normally
+ # you should have a bin and lib directories beneath it.
+ #
+-workers.java_home=c:\jdk1.2.2
++workers.java_home=@JAVA_HOME@
+ 
+ #
+ # You should configure your environment slash... ps=\ on NT and / on UNIX
+ # and maybe something different elsewhere.
+ #
+-ps=\
+-# ps=/
++# ps=\
++ps=/
+ 
+ #
+ #------ ADVANCED MODE ------------------------------------------------
diff --git a/www/jakarta-tomcat/patches/patch-ac b/www/jakarta-tomcat/patches/patch-ac
index 3369b9385cc..0be7a9ce424 100644
--- a/www/jakarta-tomcat/patches/patch-ac
+++ b/www/jakarta-tomcat/patches/patch-ac
@@ -1,29 +1,15 @@
-$NetBSD: patch-ac,v 1.5 2001/04/03 11:05:25 wennmach Exp $
+$NetBSD: patch-ac,v 1.6 2001/06/21 13:12:27 abs Exp $
 
---- src/etc/workers.properties.orig	Thu Mar 29 14:16:09 2001
-+++ src/etc/workers.properties	Thu Mar 29 14:16:41 2001
-@@ -40,20 +40,20 @@
- # installed tomcat. This is where you have your conf, webapps and lib
- # directories.
- #
--workers.tomcat_home=c:\jakarta-tomcat
-+workers.tomcat_home=@PREFIX@/tomcat
- 
- #
- # workers.java_home should point to your Java installation. Normally
- # you should have a bin and lib directories beneath it.
- #
--workers.java_home=c:\jdk1.2.2
-+workers.java_home=@JAVA_HOME@
- 
- #
- # You should configure your environment slash... ps=\ on NT and / on UNIX
- # and maybe something different elsewhere.
- #
--ps=\
--# ps=/
-+# ps=\
-+ps=/
- 
- #
- #------ ADVANCED MODE ------------------------------------------------
+--- src/share/org/apache/tomcat/task/ApacheConfig.java.orig	Tue Dec 12 22:52:08 2000
++++ src/share/org/apache/tomcat/task/ApacheConfig.java
+@@ -115,8 +115,8 @@
+ 	    } else {
+ 		// XXX XXX change it to mod_jserv_${os.name}.so, put all so in tomcat
+ 		// home
+-		pw.println("LoadModule jserv_module libexec/mod_jserv.so");
+-                mod_jk.println("LoadModule jk_module libexec/mod_jk.so");
++		pw.println("LoadModule jserv_module lib/httpd/mod_jserv.so");
++                mod_jk.println("LoadModule jk_module lib/httpd/mod_jk.so");
+                 mod_jk.println();                                
+                 mod_jk.println("JkWorkersFile " + new File(tomcatHome, WORKERS_CONFIG));
+                 mod_jk.println("JkLogFile " + new File(tomcatHome, JK_LOG_LOCATION));