From owner-svn-ports-head@freebsd.org Sun Jan 17 18:43:13 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E7BE84D3BFF; Sun, 17 Jan 2021 18:43:13 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DJkM56Cxdz3rvX; Sun, 17 Jan 2021 18:43:13 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BDDF3261D0; Sun, 17 Jan 2021 18:43:13 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 10HIhDPr035167; Sun, 17 Jan 2021 18:43:13 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 10HIhDrx035164; Sun, 17 Jan 2021 18:43:13 GMT (envelope-from swills@FreeBSD.org) Message-Id: <202101171843.10HIhDrx035164@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Sun, 17 Jan 2021 18:43:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r561859 - in head/sysutils/javaservicewrapper: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/sysutils/javaservicewrapper: . files X-SVN-Commit-Revision: 561859 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Jan 2021 18:43:14 -0000 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 (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 + +.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 +.include 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