ports/69358: Maintainer update: Cocoon 2.1.5.1

[Jean-Baptiste Quenot]

>Number:         69358
>Category:       ports
>Synopsis:       Maintainer update: Cocoon 2.1.5.1
>Confidential:   no
>Severity:       critical
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 20 21:30:11 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Jean-Baptiste Quenot
>Release:        FreeBSD 5.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD oxyd.caraldi.com 5.1-RELEASE FreeBSD 5.1-RELEASE #0: Thu Jun 5 02:55:42 GMT 2003 root at wv1u.btc.adaptec.com:/usr/obj/usr/src/sys/GENERIC i386
>Description:
1) Updates cocoon to 2.1.5.1, as 2.1.5 is no more available on mirrors.
2) Cocoon does not belong to textproc anymore, it should be moved to www
>How-To-Repeat:
>Fix:
1) Apply the following patch
2) Request a repocopy to move cocoon from textproc to www

diff -ru /usr/ports/textproc/cocoon/Makefile cocoon/Makefile
--- /usr/ports/textproc/cocoon/Makefile	Fri Jul  2 11:29:38 2004
+++ cocoon/Makefile	Tue Jul 20 23:12:05 2004
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	cocoon
-PORTVERSION=	2.1.5
-CATEGORIES=	textproc www java
+PORTVERSION=	2.1.5.1
+CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE:S,%SUBDIR%,${PORTNAME},}
 DISTNAME=	${PDISTNAME}-src
 
@@ -32,7 +32,7 @@
 COCOON_LIB=	${JAVASHAREDIR}/${APP_NAME}
 PLIST_SUB+=	"COCOON_LIB=${COCOON_LIB}"
 
-COPYDIRS=	tools/jetty tools/loader legal
+COPYDIRS=	*.txt tools/jetty tools/loader legal
 
 PORT?=		8888
 PID_FILE?=	/var/run/${APP_NAME}.pid
diff -ru /usr/ports/textproc/cocoon/distinfo cocoon/distinfo
--- /usr/ports/textproc/cocoon/distinfo	Fri Jul  2 11:29:38 2004
+++ cocoon/distinfo	Tue Jul 20 23:12:05 2004
@@ -1,2 +1,2 @@
-MD5 (cocoon-2.1.5-src.tar.gz) = 74fc8b179d6f08330cbb1f96254f5b21
-SIZE (cocoon-2.1.5-src.tar.gz) = 42029472
+MD5 (cocoon-2.1.5.1-src.tar.gz) = 0f6e58bd430db7cf6d98b1ccac2dcc99
+SIZE (cocoon-2.1.5.1-src.tar.gz) = 42035921
diff -ru /usr/ports/textproc/cocoon/pkg-message cocoon/pkg-message
--- /usr/ports/textproc/cocoon/pkg-message	Fri Jul  2 11:29:38 2004
+++ cocoon/pkg-message	Tue Jul 20 23:12:05 2004
@@ -1,10 +1,12 @@
-Cocoon is now installed in %%APP_HOME%%
+Cocoon is now installed in %%APP_HOME%%.
 
-You may want to start it by issuing `%%PREFIX%%/etc/rc.d/%%APP_NAME%%.sh start'
-and then point your web browser to the default home page at http://localhost:%%PORT%%/ to read
-the documentation and test the samples.
-
-If you wish to start Cocoon automatically at boot time, add the following line
-to /etc/rc.conf:
+In order to be able to run Cocoon, please add the following line to
+/etc/rc.conf:
 
 %%APP_NAME%%_enable="YES"
+
+If you wish to start cocoon right now, invoke the startup script with
+`%%PREFIX%%/etc/rc.d/%%APP_NAME%%.sh start'
+and point your web browser to the default home page at
+http://localhost:%%PORT%%/ where you may read the documentation and test the
+samples.
diff -ru /usr/ports/textproc/cocoon/pkg-plist cocoon/pkg-plist
--- /usr/ports/textproc/cocoon/pkg-plist	Fri Jul  2 11:29:38 2004
+++ cocoon/pkg-plist	Tue Jul 20 23:12:05 2004
@@ -1,10 +1,8 @@
-cocoon/tools/jetty/conf/admin.xml
-cocoon/tools/jetty/conf/main.xml
-cocoon/tools/jetty/conf/webdefaults.xml
-cocoon/tools/jetty/lib/jetty-4.2.19.jar
-cocoon/tools/jetty/lib/servlet-2.3.jar
-cocoon/tools/loader/Loader$RepositoryClassLoader.class
-cocoon/tools/loader/Loader.class
+cocoon/CREDITS.txt
+cocoon/INSTALL.txt
+cocoon/LICENSE.txt
+cocoon/NOTICE.txt
+cocoon/README.txt
 cocoon/legal/altrmi-client-impl-0.9.2.jar.license.txt
 cocoon/legal/altrmi-client-interfaces-0.9.2.jar.license.txt
 cocoon/legal/altrmi-common-0.9.2.jar.license.txt
@@ -118,11 +116,18 @@
 cocoon/legal/xmldb-xupdate-20040205.jar.license.txt
 cocoon/legal/xmlunit0.8.jar.license.txt
 cocoon/legal/xreporter-expression-20030725.jar.license.txt
+cocoon/tools/jetty/conf/admin.xml
+cocoon/tools/jetty/conf/main.xml
+cocoon/tools/jetty/conf/webdefaults.xml
+cocoon/tools/jetty/lib/jetty-4.2.19.jar
+cocoon/tools/jetty/lib/servlet-2.3.jar
+cocoon/tools/loader/Loader$RepositoryClassLoader.class
+cocoon/tools/loader/Loader.class
+ at dirrm cocoon/legal
 @dirrm cocoon/tools/jetty/conf
 @dirrm cocoon/tools/jetty/lib
 @dirrm cocoon/tools/jetty
 @dirrm cocoon/tools/loader
- at dirrm cocoon/legal
 @dirrm cocoon/tools
 sbin/cocoon.sh
 sbin/cocoonctl
>Release-Note:
>Audit-Trail:
>Unformatted: