From owner-svn-ports-head@freebsd.org Fri Jan 26 18:13:44 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5316DEC1017; Fri, 26 Jan 2018 18:13:44 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 788937FFB2; Fri, 26 Jan 2018 18:13:42 +0000 (UTC) (envelope-from sunpoet@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 0ECD11F0EE; Fri, 26 Jan 2018 18:13:42 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0QIDfYL016580; Fri, 26 Jan 2018 18:13:41 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0QIDfP1016574; Fri, 26 Jan 2018 18:13:41 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201801261813.w0QIDfP1016574@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Fri, 26 Jan 2018 18:13:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r460044 - in head/www: . tomcat-devel tomcat9 tomcat9/files X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: in head/www: . tomcat-devel tomcat9 tomcat9/files X-SVN-Commit-Revision: 460044 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.25 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: Fri, 26 Jan 2018 18:13:44 -0000 Author: sunpoet Date: Fri Jan 26 18:13:41 2018 New Revision: 460044 URL: https://svnweb.freebsd.org/changeset/ports/460044 Log: Move www/tomcat-devel to www/tomcat9 - Update to 9.0.4 - While I'm here, update COMMENT Changes: https://tomcat.apache.org/tomcat-9.0-doc/changelog.html PR: 225459 Submitted by: (maintainer) Added: head/www/tomcat9/ - copied from r460043, head/www/tomcat-devel/ head/www/tomcat9/files/tomcat9.in - copied, changed from r459988, head/www/tomcat-devel/files/tomcat_devel.in Deleted: head/www/tomcat-devel/ head/www/tomcat9/files/tomcat_devel.in Modified: head/www/Makefile head/www/tomcat9/Makefile head/www/tomcat9/distinfo head/www/tomcat9/pkg-descr head/www/tomcat9/pkg-plist Modified: head/www/Makefile ============================================================================== --- head/www/Makefile Fri Jan 26 18:13:35 2018 (r460043) +++ head/www/Makefile Fri Jan 26 18:13:41 2018 (r460044) @@ -2295,12 +2295,12 @@ SUBDIR += tivoka SUBDIR += tntnet SUBDIR += tokyopromenade - SUBDIR += tomcat-devel SUBDIR += tomcat-native SUBDIR += tomcat6 SUBDIR += tomcat7 SUBDIR += tomcat8 SUBDIR += tomcat85 + SUBDIR += tomcat9 SUBDIR += tomee SUBDIR += trac SUBDIR += trac-OhlohWidgetsMacro Modified: head/www/tomcat9/Makefile ============================================================================== --- head/www/tomcat-devel/Makefile Fri Jan 26 18:13:35 2018 (r460043) +++ head/www/tomcat9/Makefile Fri Jan 26 18:13:41 2018 (r460044) @@ -2,15 +2,14 @@ # $FreeBSD$ PORTNAME= tomcat -PORTVERSION= 9.0.2 -PORTREVISION= 1 +PORTVERSION= 9.0.4 CATEGORIES= www java MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin -PKGNAMESUFFIX= -devel +PKGNAMESUFFIX= 9 DISTNAME= apache-${PORTNAME}-${PORTVERSION} MAINTAINER= vvd@unislabs.com -COMMENT= Open-source Java web server by Apache, development branch +COMMENT= Open-source Java web server by Apache, 9.0.x branch LICENSE= APACHE20 Modified: head/www/tomcat9/distinfo ============================================================================== --- head/www/tomcat-devel/distinfo Fri Jan 26 18:13:35 2018 (r460043) +++ head/www/tomcat9/distinfo Fri Jan 26 18:13:41 2018 (r460044) @@ -1,3 +1,3 @@ -TIMESTAMP = 1513479107 -SHA256 (apache-tomcat-9.0.2.tar.gz) = 689844c8f373bd7db6a0c5ce7414b825d500bf64300273656dba8b05e29f5e29 -SIZE (apache-tomcat-9.0.2.tar.gz) = 9431475 +TIMESTAMP = 1516917011 +SHA256 (apache-tomcat-9.0.4.tar.gz) = 791529a4289d3d5356f8f93afcfa0ee20f4b31e454be650f1dd469524ebfa1fc +SIZE (apache-tomcat-9.0.4.tar.gz) = 9471519 Copied and modified: head/www/tomcat9/files/tomcat9.in (from r459988, head/www/tomcat-devel/files/tomcat_devel.in) ============================================================================== --- head/www/tomcat-devel/files/tomcat_devel.in Fri Jan 26 11:50:33 2018 (r459988, copy source) +++ head/www/tomcat9/files/tomcat9.in Fri Jan 26 18:13:41 2018 (r460044) @@ -3,67 +3,67 @@ # $FreeBSD$ # -# PROVIDE: tomcat_devel +# PROVIDE: tomcat9 # REQUIRE: LOGIN # KEYWORD: shutdown # -# Configuration settings for tomcat_devel in /etc/rc.conf: +# Configuration settings for tomcat9 in /etc/rc.conf: # -# tomcat_devel_enable (bool): +# tomcat9_enable (bool): # Set to "NO" by default. -# Set it to "YES" to enable tomcat-devel +# Set it to "YES" to enable tomcat9 # -# tomcat_devel_catalina_base (str) +# tomcat9_catalina_base (str) # Set to "%%TOMCAT_HOME%%" by default. # Set the CATALINA_BASE variable for the Tomcat process # -# tomcat_devel_catalina_tmpdir (str) +# tomcat9_catalina_tmpdir (str) # Set to "${catalina.base}/temp" by default. # Set the CATALINA_TMPDIR variable for the Tomcat process # -# tomcat_devel_stdout (str) +# tomcat9_stdout (str) # Set to "${catalina.base}/logs/catalina.out" by default. # Set the stdout redirection. It may also be '/dev/null', '&1' or '&2' # -# tomcat_devel_stderr (str) +# tomcat9_stderr (str) # Set to "&1" by default. # Set the stderr redirection. It may also be '/dev/null', '&1' or '&2' # -# tomcat_devel_pipe_cmd (str): +# tomcat9_pipe_cmd (str): # Set to "" by default. # Set a piped command to process stdout/stderr when passthru # -# tomcat_devel_logging_manager (str): +# tomcat9_logging_manager (str): # Set to "org.apache.juli.ClassLoaderLogManager" by default. # Set the JUL log manager # -# tomcat_devel_logging_config (str): +# tomcat9_logging_config (str): # Set to "${catalina.base}/conf/logging.properties" by default. # Set the JUL config file # -# tomcat_devel_java_home (str): +# tomcat9_java_home (str): # Set to "%%JAVA_HOME%%" by default. # Specify the Java VM to use. # -# tomcat_devel_classpath (str): +# tomcat9_classpath (str): # Set to "" by default. # Addtional classes to add to the CLASSPATH. If set, must start with ':' # -# tomcat_devel_java_opts (str): +# tomcat9_java_opts (str): # Set to "" by default. # Java VM args to use. # -# tomcat_devel_wait (int): +# tomcat9_wait (int): # Set to "30" by default. # Set the wait time (in seconds) for Tomcat process startup # -# tomcat_devel_umask (str): +# tomcat9_umask (str): # Set to "0077" by default. # Sets the umask for Tomcat process. # # You may symlink this script with other names to run multiple -# instances of tomcat-devel with different configurations. +# instances of tomcat9 with different configurations. # . /etc/rc.subr Modified: head/www/tomcat9/pkg-descr ============================================================================== --- head/www/tomcat-devel/pkg-descr Fri Jan 26 18:13:35 2018 (r460043) +++ head/www/tomcat9/pkg-descr Fri Jan 26 18:13:41 2018 (r460044) @@ -5,8 +5,4 @@ Apache Tomcat 9.x is the current focus of development. specification and also the JSP 2.3, EL 3.0, WebSocket 1.1 and JASPIC 1.1 specifications (the versions required by Java EE 8 platform). -Development releases may contain large amounts of untested or missing -functionality required by the specification and/or significant -bugs and are not expected to run stably for any length of time. - WWW: http://tomcat.apache.org/ Modified: head/www/tomcat9/pkg-plist ============================================================================== --- head/www/tomcat-devel/pkg-plist Fri Jan 26 18:13:35 2018 (r460043) +++ head/www/tomcat9/pkg-plist Fri Jan 26 18:13:41 2018 (r460044) @@ -199,6 +199,7 @@ %%DOCS%%%%T%%/webapps/docs/manager-howto.html %%DOCS%%%%T%%/webapps/docs/maven-jars.html %%DOCS%%%%T%%/webapps/docs/mbeans-descriptors-howto.html +%%DOCS%%%%T%%/webapps/docs/mbeans-descriptors.dtd %%DOCS%%%%T%%/webapps/docs/monitoring.html %%DOCS%%%%T%%/webapps/docs/proxy-howto.html %%DOCS%%%%T%%/webapps/docs/realm-howto.html @@ -252,6 +253,8 @@ %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/async/Async2.java %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/async/Async3.class %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/async/Async3.java +%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/async/AsyncStockContextListener.class +%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/async/AsyncStockContextListener.java %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/async/AsyncStockServlet.class %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/async/AsyncStockServlet.java %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/async/Stockticker$Stock.class @@ -614,7 +617,9 @@ %%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/401.jsp %%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/403.jsp %%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/404.jsp +%%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/connectorCerts.jsp %%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp +%%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp %%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/sessionDetail.jsp %%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/sessionsList.jsp %%MANAGER%%%%T%%/webapps/manager/WEB-INF/web.xml