svn commit: r561859 - in head/sysutils/javaservicewrapper: . files

[Steve Wills]

Author: swills
Date: Sun Jan 17 18:43:12 2021
New Revision: 561859
URL: https://svnweb.freebsd.org/changeset/ports/561859

Log:
  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 at siemens.com> (maintainer)

Deleted:
  head/sysutils/javaservicewrapper/files/
Modified:
  head/sysutils/javaservicewrapper/Makefile   (contents, props changed)
  head/sysutils/javaservicewrapper/distinfo   (contents, props changed)
  head/sysutils/javaservicewrapper/pkg-plist   (contents, props changed)

Modified: head/sysutils/javaservicewrapper/Makefile
==============================================================================
--- head/sysutils/javaservicewrapper/Makefile	Sun Jan 17 18:40:39 2021	(r561858)
+++ head/sysutils/javaservicewrapper/Makefile	Sun Jan 17 18:43:12 2021	(r561859)
@@ -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>

Modified: head/sysutils/javaservicewrapper/distinfo
==============================================================================
--- head/sysutils/javaservicewrapper/distinfo	Sun Jan 17 18:40:39 2021	(r561858)
+++ head/sysutils/javaservicewrapper/distinfo	Sun Jan 17 18:43:12 2021	(r561859)
@@ -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

Modified: head/sysutils/javaservicewrapper/pkg-plist
==============================================================================
--- head/sysutils/javaservicewrapper/pkg-plist	Sun Jan 17 18:40:39 2021	(r561858)
+++ head/sysutils/javaservicewrapper/pkg-plist	Sun Jan 17 18:43:12 2021	(r561859)
@@ -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