From owner-svn-ports-all@freebsd.org Thu Aug 22 02:46:32 2019 Return-Path: Delivered-To: svn-ports-all@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 CAEFCDB8ED; Thu, 22 Aug 2019 02:46:32 +0000 (UTC) (envelope-from glewis@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46DTSS4zjvz3QXt; Thu, 22 Aug 2019 02:46:32 +0000 (UTC) (envelope-from glewis@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 8866E255E3; Thu, 22 Aug 2019 02:46:32 +0000 (UTC) (envelope-from glewis@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7M2kWKc064688; Thu, 22 Aug 2019 02:46:32 GMT (envelope-from glewis@FreeBSD.org) Received: (from glewis@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7M2kWtk064686; Thu, 22 Aug 2019 02:46:32 GMT (envelope-from glewis@FreeBSD.org) Message-Id: <201908220246.x7M2kWtk064686@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glewis set sender to glewis@FreeBSD.org using -f From: Greg Lewis Date: Thu, 22 Aug 2019 02:46:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r509575 - in head/www/tomcat85: . files X-SVN-Group: ports-head X-SVN-Commit-Author: glewis X-SVN-Commit-Paths: in head/www/tomcat85: . files X-SVN-Commit-Revision: 509575 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Aug 2019 02:46:32 -0000 Author: glewis Date: Thu Aug 22 02:46:31 2019 New Revision: 509575 URL: https://svnweb.freebsd.org/changeset/ports/509575 Log: * Support Java 9+ by not setting java.endorsed.dirs for those versions PR: 239892 Submitted by: vvd@unislabs.com (maintainer) Modified: head/www/tomcat85/Makefile head/www/tomcat85/files/tomcat85.in Modified: head/www/tomcat85/Makefile ============================================================================== --- head/www/tomcat85/Makefile Thu Aug 22 02:40:39 2019 (r509574) +++ head/www/tomcat85/Makefile Thu Aug 22 02:46:31 2019 (r509575) @@ -3,6 +3,7 @@ PORTNAME= tomcat PORTVERSION= 8.5.43 +PORTREVISION= 1 CATEGORIES= www java MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin PKGNAMESUFFIX= 85 Modified: head/www/tomcat85/files/tomcat85.in ============================================================================== --- head/www/tomcat85/files/tomcat85.in Thu Aug 22 02:40:39 2019 (r509574) +++ head/www/tomcat85/files/tomcat85.in Thu Aug 22 02:46:31 2019 (r509575) @@ -44,7 +44,7 @@ # # tomcat85_logging_config (str): # Set to "${catalina.base}/conf/logging.properties" by default. -# Set the JUL config file +# Set the JUL config file # # tomcat85_java_home (str): # Set to "%%JAVA_HOME%%" by default. @@ -111,6 +111,17 @@ required_dirs="${_tomcat_catalina_tmpdir}" extra_commands="reload" +_tomcat_java_version=`${_tomcat_java_home}/bin/java -version 2>&1 | /usr/bin/awk -F '"' '/version/ {print $2}'` + +case "${_tomcat_java_version}" in + 9* | 1[0-9]* ) + _tomcat_endorsed_dirs_option= + ;; + *) + _tomcat_endorsed_dirs_option="-Djava.endorsed.dirs='${_tomcat_catalina_home}/endorsed'" + ;; +esac + command="%%LOCALBASE%%/bin/jsvc" command_args="-java-home '${_tomcat_java_home}' \ -server \ @@ -124,7 +135,7 @@ command_args="-java-home '${_tomcat_java_home}' \ -Djava.util.logging.manager=${_tomcat_logging_manager} \ -Djava.util.logging.config.file='${_tomcat_logging_config}' \ ${_tomcat_java_opts} \ - -Djava.endorsed.dirs='${_tomcat_catalina_home}/endorsed' \ + ${_tomcat_endorsed_dirs_option} \ -Dcatalina.home='${_tomcat_catalina_home}' \ -Dcatalina.base='${_tomcat_catalina_base}' \ -Djava.io.tmpdir='${_tomcat_catalina_tmpdir}' \