4 files changed, 26 insertions, 19 deletions

diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile
index dde8e9406f72..b4bfc5bc1683 100644
--- a/www/cocoon/Makefile
+++ b/www/cocoon/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cocoon
-PORTVERSION=	2.1.5
+PORTVERSION=	2.1.5.1
 CATEGORIES=	textproc www java
 MASTER_SITES=	${MASTER_SITE_APACHE:S,%SUBDIR%,${PORTNAME},}
 DISTNAME=	${PDISTNAME}-src
@@ -32,7 +32,7 @@ PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 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 --git a/www/cocoon/distinfo b/www/cocoon/distinfo
index b18a30602470..172962b9fc8a 100644
--- a/www/cocoon/distinfo
+++ b/www/cocoon/distinfo
@@ -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 --git a/www/cocoon/pkg-message b/www/cocoon/pkg-message
index ee35950fd838..cf783f8360ea 100644
--- a/www/cocoon/pkg-message
+++ b/www/cocoon/pkg-message
@@ -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 --git a/www/cocoon/pkg-plist b/www/cocoon/pkg-plist
index 7116f0ff4691..e5f03d01d5a3 100644
--- a/www/cocoon/pkg-plist
+++ b/www/cocoon/pkg-plist
@@ -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-common-20030701.jar.license.txt
 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
+@dirrm cocoon/legal
 @dirrm cocoon/tools/jetty/conf
 @dirrm cocoon/tools/jetty/lib
 @dirrm cocoon/tools/jetty
 @dirrm cocoon/tools/loader
-@dirrm cocoon/legal
 @dirrm cocoon/tools
 sbin/cocoon.sh
 sbin/cocoonctl