sysutils/javaservicewrapper: update to 3.5.45

While here, add support for building with Java 15+ (removal of Nashorn
JS engine)

PR:		252561
Submitted by:	Michael Osipov <michael.osipov@siemens.com> (maintainer)

5 files changed, 23 insertions, 84 deletions

diff --git a/sysutils/javaservicewrapper/Makefile b/sysutils/javaservicewrapper/Makefile
index 269017b0e231..ff4385de1c9c 100644
--- a/sysutils/javaservicewrapper/Makefile
+++ b/sysutils/javaservicewrapper/Makefile
@@ -2,7 +2,7 @@
 # $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
@@ -35,6 +35,14 @@ 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 ; \
@@ -58,4 +66,4 @@ do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/sysutils/javaservicewrapper/distinfo b/sysutils/javaservicewrapper/distinfo
index 76e01a04fe6e..6b60ea5579a9 100644
--- a/sysutils/javaservicewrapper/distinfo
+++ b/sysutils/javaservicewrapper/distinfo
@@ -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
diff --git a/sysutils/javaservicewrapper/files/patch-build-tests.xml b/sysutils/javaservicewrapper/files/patch-build-tests.xml
deleted file mode 100644
index e505e424c6c7..000000000000
--- a/sysutils/javaservicewrapper/files/patch-build-tests.xml
+++ /dev/null
@@ -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 -->
diff --git a/sysutils/javaservicewrapper/files/patch-build.xml b/sysutils/javaservicewrapper/files/patch-build.xml
deleted file mode 100644
index 42ddd07aadae..000000000000
--- a/sysutils/javaservicewrapper/files/patch-build.xml
+++ /dev/null
@@ -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"/>
diff --git a/sysutils/javaservicewrapper/pkg-plist b/sysutils/javaservicewrapper/pkg-plist
index 6a0369053a3d..4b6f0e4080f6 100644
--- a/sysutils/javaservicewrapper/pkg-plist
+++ b/sysutils/javaservicewrapper/pkg-plist
@@ -59,12 +59,12 @@ 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
+%%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
@@ -149,6 +149,10 @@ bin/javaservicewrapper
 %%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