Attachment #206768 for bug #239892

Lines 2-8 Link Here

(-)www/tomcat9/Makefile (-1 / +2 lines)
2	# $FreeBSD: head/www/tomcat9/Makefile 506770 2019-07-16 17:29:46Z swills $	2	# $FreeBSD: head/www/tomcat9/Makefile 506770 2019-07-16 17:29:46Z swills $
3		3
4	PORTNAME= tomcat	4	PORTNAME= tomcat
5	PORTVERSION= 9.0.22	5	PORTVERSION= 9.0.24
		6	PORTREVISION= 0
6	CATEGORIES= www java	7	CATEGORIES= www java
7	MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin	8	MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin
8	PKGNAMESUFFIX= 9	9	PKGNAMESUFFIX= 9

Lines 1-3 Link Here

(-)www/tomcat9/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1563135834	1	TIMESTAMP = 1566425345
2	SHA256 (apache-tomcat-9.0.22.tar.gz) = 86b30768f7674409dfe1091e0917637bfa3b1b699851112bef99b65673039168	2	SHA256 (apache-tomcat-9.0.24.tar.gz) = 22064138e25f7ab899802804775259a156c06770535b8ce93856beba13dfcf6d
3	SIZE (apache-tomcat-9.0.22.tar.gz) = 10929702	3	SIZE (apache-tomcat-9.0.24.tar.gz) = 10914435

Lines 44-50 Link Here

(-)www/tomcat9/files/tomcat9.in (-2 / +13 lines)
44	#	44	#
45	# tomcat9_logging_config (str):	45	# tomcat9_logging_config (str):
46	# Set to "${catalina.base}/conf/logging.properties" by default.	46	# Set to "${catalina.base}/conf/logging.properties" by default.
47	# Set the JUL config file	47	# Set the JUL config file
48	#	48	#
49	# tomcat9_java_home (str):	49	# tomcat9_java_home (str):
50	# Set to "%%JAVA_HOME%%" by default.	50	# Set to "%%JAVA_HOME%%" by default.
Lines 111-116 Link Here
111		111
112	extra_commands="reload"	112	extra_commands="reload"
113		113
		114	_tomcat_java_version=`${_tomcat_java_home}/bin/java -version 2>&1 \| /usr/bin/awk -F '"' '/version/ {print $2}'`
		115
		116	case "${_tomcat_java_version}" in
		117	9* \| 1[0-9]* )
		118	_tomcat_endorsed_dirs_option=
		119	;;
		120	*)
		121	_tomcat_endorsed_dirs_option="-Djava.endorsed.dirs='${_tomcat_catalina_home}/endorsed'"
		122	;;
		123	esac
		124
114	command="%%LOCALBASE%%/bin/jsvc"	125	command="%%LOCALBASE%%/bin/jsvc"
115	command_args="-java-home '${_tomcat_java_home}' \	126	command_args="-java-home '${_tomcat_java_home}' \
116	-server \	127	-server \
Lines 124-130 Link Here
124	-Djava.util.logging.manager=${_tomcat_logging_manager} \	135	-Djava.util.logging.manager=${_tomcat_logging_manager} \
125	-Djava.util.logging.config.file='${_tomcat_logging_config}' \	136	-Djava.util.logging.config.file='${_tomcat_logging_config}' \
126	${_tomcat_java_opts} \	137	${_tomcat_java_opts} \
127	-Djava.endorsed.dirs='${_tomcat_catalina_home}/endorsed' \	138	${_tomcat_endorsed_dirs_option} \
128	-Dcatalina.home='${_tomcat_catalina_home}' \	139	-Dcatalina.home='${_tomcat_catalina_home}' \
129	-Dcatalina.base='${_tomcat_catalina_base}' \	140	-Dcatalina.base='${_tomcat_catalina_base}' \
130	-Djava.io.tmpdir='${_tomcat_catalina_tmpdir}' \	141	-Djava.io.tmpdir='${_tomcat_catalina_tmpdir}' \

Return to bug 239892