Update to version 1.0.

PR:		15850
Submitted by:	maintainer

5 files changed, 43 insertions, 28 deletions

diff --git a/www/gnujsp/Makefile b/www/gnujsp/Makefile
index 4a9679ad2aed..e5b25bc5e1d1 100644
--- a/www/gnujsp/Makefile
+++ b/www/gnujsp/Makefile
@@ -6,34 +6,33 @@
 # $FreeBSD$
 #
 
-DISTNAME=	gnujsp-0.9.10
+DISTNAME=	gnujsp-1.0.0
 CATEGORIES=	www java
-MASTER_SITES=	http://www.klomp.org/gnujsp/09x/
+MASTER_SITES=	http://www.klomp.org/gnujsp/downloads/
 
 MAINTAINER=	girgen@partitur.se
 
-RUN_DEPENDS=	${PREFIX}/share/java/classes/jsdk.jar:${PORTSDIR}/java/jsdk
+RUN_DEPENDS=	${LOCALBASE}/libexec/apache/mod_jserv.so:${PORTSDIR}/www/apache-jserv
 
 NO_BUILD=	yes
 PKGMESSAGE=	${WRKDIR}/MESSAGE
 
+NO_BUILD=	yes  # use the prebuilt jar files
+
 do-install:
 		${MKDIR} ${PREFIX}/share/java/classes
-		${INSTALL_DATA} ${WRKSRC}/lib/gnujsp.jar ${PREFIX}/share/java/classes
+		${INSTALL_DATA} ${WRKSRC}/lib/gnujsp10.jar ${WRKSRC}/lib/servlet-2.0-plus.jar \
+			${PREFIX}/share/java/classes
 .if !defined(NOPORTDOCS)
-		${MKDIR} ${PREFIX}/share/examples/gnujsp/org/gjt/vinny/beans
-.for file in date.jsp mailform.html sendmail.jsp \
-		session.jsp snoop.jsp \
-		org/gjt/vinny/beans/MailBean.java \
-		org/gjt/vinny/beans/MailBean.class
+		${MKDIR} ${PREFIX}/share/examples/gnujsp
 		@ cd ${WRKSRC}/examples ;\
-		 ${INSTALL_DATA} ${file} \
-		 ${PREFIX}/share/examples/gnujsp/`dirname ${file}`
-.endfor
+			${INSTALL_DATA} date.jsp snoop.jsp hello.jsp ${PREFIX}/share/examples/gnujsp
 		${MKDIR} ${PREFIX}/share/doc/gnujsp
-.for file in CHANGES INSTALL README
+.for file in CHANGES FAQ INSTALL.apache INSTALL.vqserver INSTALL.jigsaw README install.html
 		${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/gnujsp
 .endfor
+		@${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${FILESDIR}/gnujsp.properties.in > \
+			${PREFIX}/share/doc/gnujsp/gnujsp.properties
 .endif
 
 post-install:
diff --git a/www/gnujsp/distinfo b/www/gnujsp/distinfo
index 29b7344bcbba..d2fbf5373b6f 100644
--- a/www/gnujsp/distinfo
+++ b/www/gnujsp/distinfo
@@ -1 +1 @@
-MD5 (gnujsp-0.9.10.tar.gz) = 2e36ac855929668d85131df1ce6cd3fc
+MD5 (gnujsp-1.0.0.tar.gz) = cb643c7acf24eeef7f9ce303e954314b
diff --git a/www/gnujsp/pkg-comment b/www/gnujsp/pkg-comment
index e1113f89b549..fe55f6960069 100644
--- a/www/gnujsp/pkg-comment
+++ b/www/gnujsp/pkg-comment
@@ -1 +1 @@
-Implementation of Sun's Java Server Pages
+GNU implementation of Sun's Java Server Pages
diff --git a/www/gnujsp/pkg-message b/www/gnujsp/pkg-message
index 6a0f26365081..e518bc15af5b 100644
--- a/www/gnujsp/pkg-message
+++ b/www/gnujsp/pkg-message
@@ -2,8 +2,26 @@
 
 GNUJSP has been installed in %%PREFIX%%/share/java/classes.
 
-Please read the INSTALL document in %%PREFIX%%/share/doc/gnujsp for
-info on how to get started.
+To get started, first set up apache with jserv to function properly,
+then add the following to your apache.conf:
+
+  ApJServAction .jsp /gnujsp/gnujsp
+  ApJServMount /gnujsp /gnujsp
+
+and add the zone gnujsp to your jserv configuration:
+  zones=gnujsp
+  gnujsp.properties=%%PREFIX%%/etc/apache/gnujsp.properties
+
+Then copy the gnujsp.properties to your apache config dir:
+cp %%PREFIX%%/share/doc/gnujsp/gnujsp.properties \
+   %%PREFIX%%/etc/apache
+
+Last, create a scratch directory for gnujsp, writable by your web
+server userid (usually 'nobody'). The default directory path is
+%%PREFIX%%/www/gnujsp
+
+If you run into problems, read the INSTALL.apache document in
+%%PREFIX%%/share/doc/gnujsp for info more info.
 
 Some examples can be found in %%PREFIX%%/share/examples/gnujsp.
 
diff --git a/www/gnujsp/pkg-plist b/www/gnujsp/pkg-plist
index 5f99385826de..30c72963b0c3 100644
--- a/www/gnujsp/pkg-plist
+++ b/www/gnujsp/pkg-plist
@@ -1,19 +1,17 @@
-share/java/classes/gnujsp.jar
+share/java/classes/gnujsp10.jar
+share/java/classes/servlet-2.0-plus.jar
 @unexec rmdir %D/share/java/classes > /dev/null 2>&1 || true
 @unexec rmdir %D/share/java > /dev/null 2>&1 || true
 share/examples/gnujsp/date.jsp
-share/examples/gnujsp/mailform.html
-share/examples/gnujsp/org/gjt/vinny/beans/MailBean.class
-share/examples/gnujsp/org/gjt/vinny/beans/MailBean.java
-share/examples/gnujsp/sendmail.jsp
-share/examples/gnujsp/session.jsp
+share/examples/gnujsp/hello.jsp
 share/examples/gnujsp/snoop.jsp
-@dirrm share/examples/gnujsp/org/gjt/vinny/beans
-@dirrm share/examples/gnujsp/org/gjt/vinny
-@dirrm share/examples/gnujsp/org/gjt
-@dirrm share/examples/gnujsp/org
 @dirrm share/examples/gnujsp
 share/doc/gnujsp/CHANGES
-share/doc/gnujsp/INSTALL
+share/doc/gnujsp/FAQ
+share/doc/gnujsp/INSTALL.apache
+share/doc/gnujsp/INSTALL.jigsaw
+share/doc/gnujsp/INSTALL.vqserver
 share/doc/gnujsp/README
+share/doc/gnujsp/install.html
+share/doc/gnujsp/gnujsp.properties
 @dirrm share/doc/gnujsp