Index: head/sysutils/javaservicewrapper/files/patch-build-tests.xml
===================================================================
--- head/sysutils/javaservicewrapper/files/patch-build-tests.xml	(revision 561858)
+++ head/sysutils/javaservicewrapper/files/patch-build-tests.xml	(nonexistent)
@@ -1,14 +0,0 @@
---- build-tests.xml.orig	2019-10-30 07:02:29 UTC
-+++ build-tests.xml
-@@ -31,10 +31,7 @@
-  
-     <!-- Does Java include the JavaScript Engine ? -->
-     <condition property="java-includes-jsEngine">
--        <and>
--            <isfalse value="${is.java 1.5 or lower}"/>
--            <istrue  value="${is.JavaSunOracleApple}"/>
--        </and>
-+        <javaversion atleast="1.8"/>
-     </condition>
-  
-     <!-- platform -->

Property changes on: head/sysutils/javaservicewrapper/files/patch-build-tests.xml
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/sysutils/javaservicewrapper/files/patch-build.xml
===================================================================
--- head/sysutils/javaservicewrapper/files/patch-build.xml	(revision 561858)
+++ head/sysutils/javaservicewrapper/files/patch-build.xml	(nonexistent)
@@ -1,59 +0,0 @@
---- build.xml.orig	2020-03-13 16:37:05 UTC
-+++ build.xml
-@@ -515,7 +515,7 @@
-         <mkdir dir="${lib.dir}"/>
-         
-         <!-- compile everything under src/java -->
--        <javac srcdir="${src.dir}/java" destdir="${build.classes}"
-+        <javac srcdir="${src.dir}/java" destdir="${build.classes}" nativeheaderdir="${src.dir}/c"
-                deprecation="on"
-                debug="on"
-                optimize="on"
-@@ -524,6 +524,7 @@
-                target="${javac.target.version}">
-             <classpath refid="project.class.path"/>
-         </javac>
-+        <fixcrlf srcdir="${src.dir}/c" includes="org_tanukisoftware_wrapper_*.h" eol="lf" />
- 
-         <!-- copy resource files to build directory -->
-         <copy todir="${build.classes}" > 
-@@ -545,39 +546,6 @@
-             </fileset> 
-         </copy>
-         
--        <!-- Generate the jni header files.  This is done here rather than with the
--             c code to make intermediate pre-release distributions possible. -->
--        <javah
--            destdir="${src.dir}/c"
--            classpath="${build.classes}">
--            <class name="org.tanukisoftware.wrapper.WrapperManager"/>
--        </javah>
--        <fixcrlf srcdir="${src.dir}/c" includes="org_tanukisoftware_wrapper_WrapperManager.h" eol="lf" />
--        <javah
--            destdir="${src.dir}/c"
--            classpath="${build.classes}">
--            <class name="org.tanukisoftware.wrapper.WrapperProcessInputStream"/>
--        </javah>
--        <fixcrlf srcdir="${src.dir}/c" includes="org_tanukisoftware_wrapper_WrapperProcessInputStream.h" eol="lf" />
--        <javah
--            destdir="${src.dir}/c"
--            classpath="${build.classes}">
--            <class name="org.tanukisoftware.wrapper.WrapperProcessOutputStream"/>
--        </javah>
--        <fixcrlf srcdir="${src.dir}/c" includes="org_tanukisoftware_wrapper_WrapperProcessOutputStream.h" eol="lf" />
--        <javah
--            destdir="${src.dir}/c"
--            classpath="${build.classes}">
--            <class name="org.tanukisoftware.wrapper.WrapperProcessConfig"/>
--        </javah>
--        <fixcrlf srcdir="${src.dir}/c" includes="org_tanukisoftware_wrapper_WrapperProcessConfig.h" eol="lf" />
--        <javah
--            destdir="${src.dir}/c"
--            classpath="${build.classes}">
--            <class name="org.tanukisoftware.wrapper.WrapperResources"/>
--        </javah>
--        <fixcrlf srcdir="${src.dir}/c" includes="org_tanukisoftware_wrapper_WrapperResources.h" eol="lf" />
--
-         <available property="junit.present"
-             classname="junit.framework.TestCase">
-             <classpath refid="project.class.path"/>

Property changes on: head/sysutils/javaservicewrapper/files/patch-build.xml
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/sysutils/javaservicewrapper/Makefile
===================================================================
--- head/sysutils/javaservicewrapper/Makefile	(revision 561858)
+++ head/sysutils/javaservicewrapper/Makefile	(revision 561859)
@@ -1,61 +1,69 @@
 # Created by: alepulver
 # $FreeBSD$
 
 PORTNAME=	javaservicewrapper
-PORTVERSION=	3.5.43
+PORTVERSION=	3.5.45
 CATEGORIES=	sysutils java
 MASTER_SITES=	https://wrapper.tanukisoftware.com/download/${PORTVERSION}/
 DISTNAME=	wrapper_${PORTVERSION}_src
 
 MAINTAINER=	michael.osipov@siemens.com
 COMMENT=	JSW enables a Java application to be run as a Unix daemon
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
 ONLY_FOR_ARCHS=	amd64 i386 powerpc64 powerpc64le
 
 USES=		gmake iconv
 USE_JAVA=	yes
 JAVA_VERSION=	8+
 
 USE_ANT=	yes
 USE_LDCONFIG=	${PREFIX}/lib/javaservicewrapper/lib
 
 DATADIR=	${PREFIX}/lib/${PORTNAME}
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == amd64 || ${ARCH:Mpowerpc64*}
 MAKE_ARGS+=	-Dbits=64
 .else
 MAKE_ARGS+=	-Dbits=32
 CFLAGS+=	-fPIC
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if ${JAVA_PORT_VERSION} >= 15
+PLIST_SUB+=	JS_ENGINE="@comment "
+.else
+PLIST_SUB+=	JS_ENGINE=""
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|gcc|${CC} ${CFLAGS}| ; \
 			s|/usr/local|${ICONV_PREFIX}|g ; \
 			s|-liconv|${ICONV_LIB}|' \
 		${WRKSRC}/src/c/Makefile-freebsd-x86-32.gmake \
 		${WRKSRC}/src/c/Makefile-freebsd-x86-64.gmake
 	@${REINPLACE_CMD} -e 's|\(javac\.target\.version\)=.*|\1=1.8|' \
 		${WRKSRC}/default.properties
 	@${CP} ${WRKSRC}/src/c/Makefile-freebsd-x86-64.gmake \
 		${WRKSRC}/src/c/Makefile-freebsd-ppcbe-64.gmake
 	@${CP} ${WRKSRC}/src/c/Makefile-freebsd-x86-64.gmake \
 		${WRKSRC}/src/c/Makefile-freebsd-ppcle-64.gmake
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC} && ${CP} -rp bin conf lib test ${STAGEDIR}${DATADIR}
 	${STRIP_CMD} ${STAGEDIR}${DATADIR}/bin/wrapper
 	${LN} -sf ${DATADIR}/bin/wrapper ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: head/sysutils/javaservicewrapper/distinfo
===================================================================
--- head/sysutils/javaservicewrapper/distinfo	(revision 561858)
+++ head/sysutils/javaservicewrapper/distinfo	(revision 561859)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1592680865
-SHA256 (wrapper_3.5.43_src.tar.gz) = 4b802ee036541eed97f0fab3a36579ba464d9cedfba26f0a10ebcc4c0a1a9da5
-SIZE (wrapper_3.5.43_src.tar.gz) = 736950
+TIMESTAMP = 1610005557
+SHA256 (wrapper_3.5.45_src.tar.gz) = ae7965a1ad0389c593d5194fdaccc3bc120dbd3e7f459d7b18e6ab533bd7d402
+SIZE (wrapper_3.5.45_src.tar.gz) = 748917
Index: head/sysutils/javaservicewrapper/pkg-plist
===================================================================
--- head/sysutils/javaservicewrapper/pkg-plist	(revision 561858)
+++ head/sysutils/javaservicewrapper/pkg-plist	(revision 561859)
@@ -1,163 +1,167 @@
 bin/javaservicewrapper
 %%DATADIR%%/bin/demoapp
 %%DATADIR%%/bin/testwrapper
 %%DATADIR%%/bin/wrapper
 %%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%%/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/common/matchOutput
 %%DATADIR%%/test/common/report
 %%DATADIR%%/test/common/resourcelimit
 %%DATADIR%%/test/daemonthreads
 %%DATADIR%%/test/daemonthreads.conf
 %%DATADIR%%/test/defaultstripquotes-01-none
 %%DATADIR%%/test/defaultstripquotes-01-none.conf
 %%DATADIR%%/test/defaultstripquotes-02-true
 %%DATADIR%%/test/defaultstripquotes-02-true.conf
 %%DATADIR%%/test/defaultstripquotes-03-false
 %%DATADIR%%/test/defaultstripquotes-03-false.conf
 %%DATADIR%%/test/delayediorestarter
 %%DATADIR%%/test/delayediorestarter.conf
 %%DATADIR%%/test/envvars
 %%DATADIR%%/test/envvars.conf
 %%DATADIR%%/test/executablejar
 %%DATADIR%%/test/executablejar.conf
 %%DATADIR%%/test/executablejarcp
 %%DATADIR%%/test/executablejarcp.conf
 %%DATADIR%%/test/executablejarinitfail
 %%DATADIR%%/test/executablejarinitfail.conf
 %%DATADIR%%/test/filter
 %%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
+%%JS_ENGINE%% %%DATADIR%%/test/hugeclasspathenvmaxsize
+%%JS_ENGINE%% %%DATADIR%%/test/hugeclasspathenvmaxsize-path.conf
+%%JS_ENGINE%% %%DATADIR%%/test/hugeclasspathenvmaxsize.conf
+%%JS_ENGINE%% %%DATADIR%%/test/hugeclasspathenvoversize
+%%JS_ENGINE%% %%DATADIR%%/test/hugeclasspathenvoversize-path.conf
+%%JS_ENGINE%% %%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/jvmencoding
 %%DATADIR%%/test/jvmencoding.conf
 %%DATADIR%%/test/jvmencoding2
 %%DATADIR%%/test/jvmencoding2.conf
 %%DATADIR%%/test/loadedgcoutput
 %%DATADIR%%/test/loadedgcoutput.conf
 %%DATADIR%%/test/loadedlogoutput
 %%DATADIR%%/test/loadedlogoutput.conf
 %%DATADIR%%/test/loadedsplitoutput
 %%DATADIR%%/test/loadedsplitoutput.conf
 %%DATADIR%%/test/loadedwrapperlistener
 %%DATADIR%%/test/loadedwrapperlistener.conf
 %%DATADIR%%/test/logoutput
 %%DATADIR%%/test/logoutput.conf
 %%DATADIR%%/test/logstdoutstderr
 %%DATADIR%%/test/logstdoutstderr.conf
 %%DATADIR%%/test/logstdoutstderrdetached
 %%DATADIR%%/test/logstdoutstderrdetached.conf
 %%DATADIR%%/test/longrunningbackgroundthreads
 %%DATADIR%%/test/longrunningbackgroundthreads.conf
 %%DATADIR%%/test/memory
 %%DATADIR%%/test/memory.conf
 %%DATADIR%%/test/nestedwrapperlistener
 %%DATADIR%%/test/nestedwrapperlistener.conf
 %%DATADIR%%/test/noreturn
 %%DATADIR%%/test/noreturn.conf
 %%DATADIR%%/test/onexit
 %%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
 %%DATADIR%%/test/performance.conf
 %%DATADIR%%/test/performancestartstop
 %%DATADIR%%/test/performancestartstop.conf
 %%DATADIR%%/test/postshutdowngc
 %%DATADIR%%/test/postshutdowngc.conf
 %%DATADIR%%/test/quickcomplete
 %%DATADIR%%/test/quickcomplete.conf
 %%DATADIR%%/test/resourcelimit_data
 %%DATADIR%%/test/resourcelimit_data.conf
 %%DATADIR%%/test/resourcelimit_nofile
 %%DATADIR%%/test/resourcelimit_nofile.conf
 %%DATADIR%%/test/resourcelimit.conf
 %%DATADIR%%/test/restarter
 %%DATADIR%%/test/restarter.conf
 %%DATADIR%%/test/shutdownhook
 %%DATADIR%%/test/shutdownhook.conf
 %%DATADIR%%/test/shutdownlock
 %%DATADIR%%/test/shutdownlock.conf
 %%DATADIR%%/test/simplewrapperlistener
 %%DATADIR%%/test/simplewrapperlistener.conf
 %%DATADIR%%/test/slowstop
 %%DATADIR%%/test/slowstop.conf
+%%DATADIR%%/test/startstopstopandreturnwhilestarting
+%%DATADIR%%/test/startstopstopandreturnwhilestarting.conf
+%%DATADIR%%/test/startstopstopwhilestarting
+%%DATADIR%%/test/startstopstopwhilestarting.conf
 %%DATADIR%%/test/stopwhilestarting
 %%DATADIR%%/test/stopwhilestarting.conf
 %%DATADIR%%/test/stopwhilestartingforcestop
 %%DATADIR%%/test/stopwhilestartingforcestop.conf
 %%DATADIR%%/test/systemproperty
 %%DATADIR%%/test/systemproperty.conf
 %%DATADIR%%/test/template.conf
 %%DATADIR%%/test/timedlogoutput
 %%DATADIR%%/test/timedlogoutput.conf
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/revisions.txt
 %%PORTDOCS%%%%DOCSDIR%%/wrapper-community-license-1.3.txt