3 files changed, 63 insertions, 25 deletions

diff --git a/sysutils/javaservicewrapper/Makefile b/sysutils/javaservicewrapper/Makefile
index 8bb2b9bf7bbf..45f25164483b 100644
--- a/sysutils/javaservicewrapper/Makefile
+++ b/sysutils/javaservicewrapper/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	javaservicewrapper
-PORTVERSION=	3.5.21
+PORTVERSION=	3.5.29
 CATEGORIES=	sysutils java
 MASTER_SITES=	http://wrapper.tanukisoftware.com/download/${PORTVERSION}/
 DISTNAME=	wrapper_${PORTVERSION}_src
diff --git a/sysutils/javaservicewrapper/distinfo b/sysutils/javaservicewrapper/distinfo
index e069b94460a2..f2da45122ef2 100644
--- a/sysutils/javaservicewrapper/distinfo
+++ b/sysutils/javaservicewrapper/distinfo
@@ -1,2 +1,2 @@
-SHA256 (wrapper_3.5.21_src.tar.gz) = 4b7cf9b280cba7c8161d03af3e8fdf003ce6622092e7d50eaf32ffce13c5b43a
-SIZE (wrapper_3.5.21_src.tar.gz) = 538978
+SHA256 (wrapper_3.5.29_src.tar.gz) = 828875f246df05c4328bc13087f82c388a61d1f2ebad707951bdca5165c81b28
+SIZE (wrapper_3.5.29_src.tar.gz) = 611760
diff --git a/sysutils/javaservicewrapper/pkg-plist b/sysutils/javaservicewrapper/pkg-plist
index d7eea1ae706c..dd153ba0860f 100644
--- a/sysutils/javaservicewrapper/pkg-plist
+++ b/sysutils/javaservicewrapper/pkg-plist
@@ -1,34 +1,39 @@
 bin/javaservicewrapper
+%%DATADIR%%/bin/demoapp
 %%DATADIR%%/bin/testwrapper
 %%DATADIR%%/bin/wrapper
-%%DATADIR%%/bin/demoapp
-%%DATADIR%%/conf/wrapper.conf
 %%DATADIR%%/conf/demoapp.conf
+%%DATADIR%%/conf/wrapper.conf
 %%DATADIR%%/lib/libwrapper.so
 %%DATADIR%%/lib/wrapper.jar
+%%DATADIR%%/lib/wrapperdemo.jar
 %%DATADIR%%/lib/wrappertest.jar
 %%DATADIR%%/lib/wrappertest2.jar
-%%DATADIR%%/lib/wrapperdemo.jar
-%%DATADIR%%/test/additionalparameterfile-01-empty
-%%DATADIR%%/test/additionalparameterfile-01-empty.conf
-%%DATADIR%%/test/additionalparameterfile-01-empty.param
-%%DATADIR%%/test/additionalparameterfile-02-1line
-%%DATADIR%%/test/additionalparameterfile-02-1line.conf
-%%DATADIR%%/test/additionalparameterfile-02-1line.param
-%%DATADIR%%/test/additionalparameterfile-03-stripq-false
-%%DATADIR%%/test/additionalparameterfile-03-stripq-false.conf
-%%DATADIR%%/test/additionalparameterfile-03-stripq-false.param
-%%DATADIR%%/test/additionalparameterfile-04-stripq-true
-%%DATADIR%%/test/additionalparameterfile-04-stripq-true.conf
-%%DATADIR%%/test/additionalparameterfile-04-stripq-true.param
-%%DATADIR%%/test/additionalparameterfile-05-encoding
-%%DATADIR%%/test/additionalparameterfile-05-encoding.conf
-%%DATADIR%%/test/additionalparameterfile-05-encoding.param
-%%DATADIR%%/test/additionalparameterfile-06-multilines
-%%DATADIR%%/test/additionalparameterfile-06-multilines.conf
-%%DATADIR%%/test/additionalparameterfile-06-multilines.param
+%%DATADIR%%/test/appparameterfile-01-empty
+%%DATADIR%%/test/appparameterfile-01-empty.conf
+%%DATADIR%%/test/appparameterfile-01-empty.param
+%%DATADIR%%/test/appparameterfile-02-1line
+%%DATADIR%%/test/appparameterfile-02-1line.conf
+%%DATADIR%%/test/appparameterfile-02-1line.param
+%%DATADIR%%/test/appparameterfile-03-stripq-false
+%%DATADIR%%/test/appparameterfile-03-stripq-false.conf
+%%DATADIR%%/test/appparameterfile-03-stripq-false.param
+%%DATADIR%%/test/appparameterfile-04-stripq-true
+%%DATADIR%%/test/appparameterfile-04-stripq-true.conf
+%%DATADIR%%/test/appparameterfile-04-stripq-true.param
+%%DATADIR%%/test/appparameterfile-05-encoding
+%%DATADIR%%/test/appparameterfile-05-encoding.conf
+%%DATADIR%%/test/appparameterfile-05-encoding.param
+%%DATADIR%%/test/appparameterfile-06-multilines
+%%DATADIR%%/test/appparameterfile-06-multilines.conf
+%%DATADIR%%/test/appparameterfile-06-multilines.param
+%%DATADIR%%/test/appparameterfile-07-envvars
+%%DATADIR%%/test/appparameterfile-07-envvars.conf
+%%DATADIR%%/test/appparameterfile-07-envvars.param
 %%DATADIR%%/test/backgroundthreads
 %%DATADIR%%/test/backgroundthreads.conf
+%%DATADIR%%/test/childwrapper
+%%DATADIR%%/test/childwrapper.conf
 %%DATADIR%%/test/daemonthreads
 %%DATADIR%%/test/daemonthreads.conf
 %%DATADIR%%/test/defaultstripquotes-01-none
@@ -51,8 +56,39 @@ bin/javaservicewrapper
 %%DATADIR%%/test/filter.conf
 %%DATADIR%%/test/growinglogoutput
 %%DATADIR%%/test/growinglogoutput.conf
+%%DATADIR%%/test/hugeclasspathenvmaxsize
+%%DATADIR%%/test/hugeclasspathenvmaxsize-path.conf
+%%DATADIR%%/test/hugeclasspathenvmaxsize.conf
+%%DATADIR%%/test/hugeclasspathenvoversize
+%%DATADIR%%/test/hugeclasspathenvoversize-path.conf
+%%DATADIR%%/test/hugeclasspathenvoversize.conf
+%%DATADIR%%/test/hugeclasspathmaxsize
+%%DATADIR%%/test/hugeclasspathmaxsize.conf
+%%DATADIR%%/test/hugeclasspathoversize
+%%DATADIR%%/test/hugeclasspathoversize.conf
 %%DATADIR%%/test/hugelogoutput
 %%DATADIR%%/test/hugelogoutput.conf
+%%DATADIR%%/test/javaadditionalfile-01-empty
+%%DATADIR%%/test/javaadditionalfile-01-empty.conf
+%%DATADIR%%/test/javaadditionalfile-01-empty.param
+%%DATADIR%%/test/javaadditionalfile-02-1line
+%%DATADIR%%/test/javaadditionalfile-02-1line.conf
+%%DATADIR%%/test/javaadditionalfile-02-1line.param
+%%DATADIR%%/test/javaadditionalfile-03-stripq-false
+%%DATADIR%%/test/javaadditionalfile-03-stripq-false.conf
+%%DATADIR%%/test/javaadditionalfile-03-stripq-false.param
+%%DATADIR%%/test/javaadditionalfile-04-stripq-true
+%%DATADIR%%/test/javaadditionalfile-04-stripq-true.conf
+%%DATADIR%%/test/javaadditionalfile-04-stripq-true.param
+%%DATADIR%%/test/javaadditionalfile-05-encoding
+%%DATADIR%%/test/javaadditionalfile-05-encoding.conf
+%%DATADIR%%/test/javaadditionalfile-05-encoding.param
+%%DATADIR%%/test/javaadditionalfile-06-multilines
+%%DATADIR%%/test/javaadditionalfile-06-multilines.conf
+%%DATADIR%%/test/javaadditionalfile-06-multilines.param
+%%DATADIR%%/test/javaadditionalfile-07-envvars
+%%DATADIR%%/test/javaadditionalfile-07-envvars.conf
+%%DATADIR%%/test/javaadditionalfile-07-envvars.param
 %%DATADIR%%/test/loadedgcoutput
 %%DATADIR%%/test/loadedgcoutput.conf
 %%DATADIR%%/test/loadedlogoutput
@@ -79,6 +115,8 @@ bin/javaservicewrapper
 %%DATADIR%%/test/onexit.conf
 %%DATADIR%%/test/outputloader
 %%DATADIR%%/test/outputloader.conf
+%%DATADIR%%/test/passthrough
+%%DATADIR%%/test/passthrough.conf
 %%DATADIR%%/test/percentoutput
 %%DATADIR%%/test/percentoutput.conf
 %%DATADIR%%/test/performance
@@ -110,4 +148,4 @@ bin/javaservicewrapper
 %%DATADIR%%/test/timedlogoutput.conf
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/revisions.txt
-%%PORTDOCS%%%%DOCSDIR%%/wrapper-community-license-1.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/wrapper-community-license-1.3.txt