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

2 files changed, 10 insertions, 53 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