summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2006-04-22 11:29:07 +0000
committerrillig <rillig@pkgsrc.org>2006-04-22 11:29:07 +0000
commit87a51efd6d58f85f4d7abb373886f7963b039bbd (patch)
tree5992b6dca865eabf2e6c0ba6a7cb9a247d021e8b /www
parent6ad02eac06dab0b8393485f8e1eca737def9a90c (diff)
downloadpkgsrc-87a51efd6d58f85f4d7abb373886f7963b039bbd.tar.gz
Fixed pkglint warnings. Removed the BROKEN_IN line, since the package
works for me.
Diffstat (limited to 'www')
-rw-r--r--www/jssi/Makefile14
-rw-r--r--www/jssi/PLIST99
-rw-r--r--www/jssi/distinfo4
-rw-r--r--www/jssi/patches/patch-aa9
4 files changed, 75 insertions, 51 deletions
diff --git a/www/jssi/Makefile b/www/jssi/Makefile
index 9620c9b7608..d9257968b53 100644
--- a/www/jssi/Makefile
+++ b/www/jssi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/02/05 23:11:25 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2006/04/22 11:29:07 rillig Exp $
DISTNAME= ApacheJSSI-1.1.2
PKGNAME= jssi-1.1.2
@@ -10,12 +10,10 @@ MAINTAINER= jwise@NetBSD.org
HOMEPAGE= http://java.apache.org/
COMMENT= Java Server-Side Include engine as a JSDK-2.0 servlet
-BROKEN_IN= pkgsrc-2005Q4
-
# yes, this needs _exactly_ version 2.0
DEPENDS+= jsdk-2.0nb1:../../www/jsdk20
-WRKSRC= ${WRKDIR}/ApacheJSSI-1.1.2/src/java
+BUILD_DIRS= src/java
.include "../../mk/bsd.prefs.mk"
@@ -24,14 +22,14 @@ NO_CONFIGURE= yes
MAKE_ENV+= CLASSPATH=${CLASSPATH:Q}
post-build:
- (cd ${WRKSRC}/../../docs && ${SETENV} ${SCRIPTS_ENV} ${SH} generate_javadoc)
+ cd ${WRKSRC}/docs && ${SETENV} ${SCRIPTS_ENV} ${SH} ./generate_javadoc
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/lib/java
- ${INSTALL_DATA} ${WRKSRC}/ApacheJSSI.jar ${PREFIX}/lib/java/ApacheJSSI.jar
+ ${INSTALL_DATA} ${WRKSRC}/src/java/ApacheJSSI.jar ${PREFIX}/lib/java/ApacheJSSI.jar
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/jssi
- ${RM} -f ${WRKSRC}/../../docs/*.orig
- cd ${WRKSRC}/../../docs && ${PAX} -rw -pp . ${PREFIX}/share/doc/java/jssi
+ ${RM} -f ${WRKSRC}/docs/*.orig
+ cd ${WRKSRC}/docs && ${PAX} -rw -pp . ${PREFIX}/share/doc/java/jssi
.include "../../mk/java-vm.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/jssi/PLIST b/www/jssi/PLIST
index 6dd3ef6e4be..7e077c76171 100644
--- a/www/jssi/PLIST
+++ b/www/jssi/PLIST
@@ -1,41 +1,64 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:17:12 zuntum 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
+@comment $NetBSD: PLIST,v 1.2 2006/04/22 11:29:07 rillig Exp $
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/
+share/doc/java/jssi/parameterprop.html
+share/doc/java/jssi/javadoc/stylesheet.css
+share/doc/java/jssi/javadoc/serialized-form.html
+share/doc/java/jssi/javadoc/resources/inherit.gif
+share/doc/java/jssi/javadoc/package-list
+share/doc/java/jssi/javadoc/overview-tree.html
+share/doc/java/jssi/javadoc/overview-summary.html
+share/doc/java/jssi/javadoc/overview-frame.html
+share/doc/java/jssi/javadoc/org/apache/servlet/ssi/package-tree.html
+share/doc/java/jssi/javadoc/org/apache/servlet/ssi/package-summary.html
+share/doc/java/jssi/javadoc/org/apache/servlet/ssi/package-frame.html
+share/doc/java/jssi/javadoc/org/apache/servlet/ssi/SpecialTagHandler.html
+share/doc/java/jssi/javadoc/org/apache/servlet/ssi/ServletTagHandler.html
+share/doc/java/jssi/javadoc/org/apache/servlet/ssi/SSITagHandler.html
+share/doc/java/jssi/javadoc/org/apache/servlet/ssi/SSIOutputStream.html
+share/doc/java/jssi/javadoc/org/apache/servlet/ssi/SSIHttpServletResponse.html
+share/doc/java/jssi/javadoc/org/apache/servlet/ssi/SSIContext.html
+share/doc/java/jssi/javadoc/org/apache/servlet/ssi/SSI.html
+share/doc/java/jssi/javadoc/org/apache/servlet/ssi/ParseContext.html
+share/doc/java/jssi/javadoc/org/apache/servlet/ssi/ParameterPropagatingSSI.html
+share/doc/java/jssi/javadoc/org/apache/servlet/ssi/ParamPropContext.html
+share/doc/java/jssi/javadoc/org/apache/servlet/ssi/PageParserServlet.html
+share/doc/java/jssi/javadoc/org/apache/servlet/ssi/PageParser.html
+share/doc/java/jssi/javadoc/org/apache/servlet/ssi/OSServletOutputStream.html
+share/doc/java/jssi/javadoc/org/apache/servlet/ssi/IncludeTagHandler.html
+share/doc/java/jssi/javadoc/org/apache/servlet/ssi/HREFParameterPropagator.html
+share/doc/java/jssi/javadoc/org/apache/servlet/ssi/FSizeTagHandler.html
+share/doc/java/jssi/javadoc/org/apache/servlet/ssi/FLastModTagHandler.html
+share/doc/java/jssi/javadoc/org/apache/servlet/ssi/ExampleTagHandler.html
+share/doc/java/jssi/javadoc/org/apache/servlet/ssi/EchoTagHandler.html
+share/doc/java/jssi/javadoc/org/apache/servlet/ssi/DelegateHttpServletRequest.html
+share/doc/java/jssi/javadoc/org/apache/servlet/ssi/ConfigTagHandler.html
+share/doc/java/jssi/javadoc/org/apache/servlet/ssi/AbstractParseContext.html
+share/doc/java/jssi/javadoc/org/apache/java/util/package-tree.html
+share/doc/java/jssi/javadoc/org/apache/java/util/package-summary.html
+share/doc/java/jssi/javadoc/org/apache/java/util/package-frame.html
+share/doc/java/jssi/javadoc/org/apache/java/util/SGMLTag.html
+share/doc/java/jssi/javadoc/org/apache/java/io/package-tree.html
+share/doc/java/jssi/javadoc/org/apache/java/io/package-summary.html
+share/doc/java/jssi/javadoc/org/apache/java/io/package-frame.html
+share/doc/java/jssi/javadoc/org/apache/java/io/PositionReader.html
+share/doc/java/jssi/javadoc/index.html
+share/doc/java/jssi/javadoc/index-all.html
+share/doc/java/jssi/javadoc/help-doc.html
+share/doc/java/jssi/javadoc/deprecated-list.html
+share/doc/java/jssi/javadoc/constant-values.html
+share/doc/java/jssi/javadoc/allclasses-noframe.html
+share/doc/java/jssi/javadoc/allclasses-frame.html
+share/doc/java/jssi/install.html
+share/doc/java/jssi/index.html
+share/doc/java/jssi/images/java-apache-project.gif
+share/doc/java/jssi/generate_javadoc
+lib/java/ApacheJSSI.jar
+@dirrm share/doc/java/jssi/javadoc/org/apache/servlet/ssi
+@dirrm share/doc/java/jssi/javadoc/org/apache/servlet
+@dirrm share/doc/java/jssi/javadoc/org/apache/java/util
+@dirrm share/doc/java/jssi/javadoc/org/apache/java/io
+@dirrm share/doc/java/jssi/javadoc/org/apache/java
+@dirrm share/doc/java/jssi/javadoc/org
+@dirrm share/doc/java/jssi/javadoc
@dirrm share/doc/java/jssi/images
@dirrm share/doc/java/jssi
diff --git a/www/jssi/distinfo b/www/jssi/distinfo
index 88c700eb1ec..ed1cfffd330 100644
--- a/www/jssi/distinfo
+++ b/www/jssi/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 14:08:32 wiz Exp $
+$NetBSD: distinfo,v 1.5 2006/04/22 11:29:07 rillig Exp $
SHA1 (ApacheJSSI-1.1.2.tar.gz) = 8f57d1a663ae0fd0767921ec9915ecd9e776a584
RMD160 (ApacheJSSI-1.1.2.tar.gz) = 8297f1df1e75333c837f9b8ad845525978adacf6
Size (ApacheJSSI-1.1.2.tar.gz) = 76962 bytes
-SHA1 (patch-aa) = 587205565ed349ab64607b08c73f0d9ecaa5ba3e
+SHA1 (patch-aa) = 259550b86d63ae4dfc4f6604df2e105de64078ee
diff --git a/www/jssi/patches/patch-aa b/www/jssi/patches/patch-aa
index 55e63e93755..b6b9ee0d4d2 100644
--- a/www/jssi/patches/patch-aa
+++ b/www/jssi/patches/patch-aa
@@ -1,6 +1,9 @@
-$NetBSD: patch-aa,v 1.2 2002/05/20 19:06:41 cjep Exp $
---- ../../docs/generate_javadoc.orig Mon Jan 14 10:23:29 2002
-+++ ../../docs/generate_javadoc Mon Jan 14 10:23:47 2002
+$NetBSD: patch-aa,v 1.3 2006/04/22 11:29:07 rillig Exp $
+
+Don't expect javadoc in the PATH.
+
+--- docs/generate_javadoc.orig Mon Jan 14 10:23:29 2002
++++ docs/generate_javadoc Mon Jan 14 10:23:47 2002
@@ -73,6 +73,6 @@
sed 's!/[^/]*$!!'|\
sed 's!/!.!g'|\