svn commit: r531294 - in head/www: . tomcat-devel tomcat-devel/files

Dima Panov fluffy at FreeBSD.org
Fri Apr 10 07:03:17 UTC 2020 

Author: fluffy
Date: Fri Apr 10 07:03:16 2020
New Revision: 531294
URL: https://svnweb.freebsd.org/changeset/ports/531294

Log:
  www/tomcat-devel: repocopy from tomcat9 and update to 10.0.0.m4
  
  PR:		245471
  Submitted by:	VVD <vvd at unislabs.com> (maintainer)
  Relnotes:	https://tomcat.apache.org/tomcat-10.0-doc/changelog.html#Tomcat_10.0.0-M4_(markt)

Added:
  head/www/tomcat-devel/
     - copied from r531218, head/www/tomcat9/
  head/www/tomcat-devel/files/tomcat_devel.in
     - copied, changed from r531218, head/www/tomcat9/files/tomcat9.in
Deleted:
  head/www/tomcat-devel/files/tomcat9.in
Modified:
  head/www/Makefile
  head/www/tomcat-devel/Makefile
  head/www/tomcat-devel/distinfo
  head/www/tomcat-devel/pkg-descr
  head/www/tomcat-devel/pkg-plist

Modified: head/www/Makefile
==============================================================================
--- head/www/Makefile	Fri Apr 10 07:01:41 2020	(r531293)
+++ head/www/Makefile	Fri Apr 10 07:03:16 2020	(r531294)
@@ -2227,6 +2227,7 @@
     SUBDIR += tivoka
     SUBDIR += tntnet
     SUBDIR += tokyopromenade
+    SUBDIR += tomcat-devel
     SUBDIR += tomcat-native
     SUBDIR += tomcat7
     SUBDIR += tomcat85

Modified: head/www/tomcat-devel/Makefile
==============================================================================
--- head/www/tomcat9/Makefile	Thu Apr  9 16:48:49 2020	(r531218)
+++ head/www/tomcat-devel/Makefile	Fri Apr 10 07:03:16 2020	(r531294)
@@ -2,15 +2,15 @@
 # $FreeBSD$
 
 PORTNAME=	tomcat
-PORTVERSION=	9.0.34
+PORTVERSION=	10.0.0.M4
 PORTREVISION=	0
 CATEGORIES=	www java
-MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin
-PKGNAMESUFFIX=	9
-DISTNAME=	apache-${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9]+)(.*)/\1/}/v${PORTVERSION:C/.M/-M/}/bin
+PKGNAMESUFFIX=	-devel
+DISTNAME=	apache-${PORTNAME}-${PORTVERSION:C/.M/-M/}
 
 MAINTAINER=	vvd at unislabs.com
-COMMENT=	Open-source Java web server by Apache, 9.0.x branch
+COMMENT=	Open-source Java web server by Apache, 10.0.x branch
 
 LICENSE=	APACHE20
 

Modified: head/www/tomcat-devel/distinfo
==============================================================================
--- head/www/tomcat9/distinfo	Thu Apr  9 16:48:49 2020	(r531218)
+++ head/www/tomcat-devel/distinfo	Fri Apr 10 07:03:16 2020	(r531294)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1586444063
-SHA256 (apache-tomcat-9.0.34.tar.gz) = 321de5b18a48ec09d2963d9faba4bfeafc7dd2203d80a2ef7e7a20b159e2120a
-SIZE (apache-tomcat-9.0.34.tar.gz) = 11136813
+TIMESTAMP = 1586442904
+SHA256 (apache-tomcat-10.0.0-M4.tar.gz) = e65e2f820d948c7fddca3aa1b79db790b12d4ed3e098c68461f5d71e66fae6d0
+SIZE (apache-tomcat-10.0.0-M4.tar.gz) = 11003293

Copied and modified: head/www/tomcat-devel/files/tomcat_devel.in (from r531218, head/www/tomcat9/files/tomcat9.in)
==============================================================================
--- head/www/tomcat9/files/tomcat9.in	Thu Apr  9 16:48:49 2020	(r531218, copy source)
+++ head/www/tomcat-devel/files/tomcat_devel.in	Fri Apr 10 07:03:16 2020	(r531294)
@@ -3,71 +3,71 @@
 # $FreeBSD$
 #
 
-# PROVIDE: tomcat9
+# PROVIDE: tomcat_devel
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 
 #
-# Configuration settings for tomcat9 in /etc/rc.conf:
+# Configuration settings for tomcat_devel in /etc/rc.conf:
 #
-# tomcat9_enable (bool):
+# tomcat_devel_enable (bool):
 #   Set to "NO" by default.
-#   Set it to "YES" to enable tomcat9
+#   Set it to "YES" to enable tomcat_devel
 #
-# tomcat9_catalina_home (str)
+# tomcat_devel_catalina_home (str)
 #   Set to "%%TOMCAT_HOME%%" by default.
 #   Set the CATALINA_HOME variable for the Tomcat process
 #
-# tomcat9_catalina_base (str)
+# tomcat_devel_catalina_base (str)
 #   Set to "${catalina.home}" by default.
 #   Set the CATALINA_BASE variable for the Tomcat process
 #
-# tomcat9_catalina_tmpdir (str)
+# tomcat_devel_catalina_tmpdir (str)
 #   Set to "${catalina.base}/temp" by default.
 #   Set the CATALINA_TMPDIR variable for the Tomcat process
 #
-# tomcat9_stdout (str)
+# tomcat_devel_stdout (str)
 #   Set to "${catalina.base}/logs/catalina.out" by default.
 #   Set the stdout redirection. It may also be '/dev/null', '&1' or '&2'
 #
-# tomcat9_stderr (str)
+# tomcat_devel_stderr (str)
 #   Set to "&1" by default.
 #   Set the stderr redirection. It may also be '/dev/null', '&1' or '&2'
 #
-# tomcat9_pipe_cmd (str):
+# tomcat_devel_pipe_cmd (str):
 #   Set to "" by default.
 #   Set a piped command to process stdout/stderr when passthru
 #
-# tomcat9_logging_manager (str):
+# tomcat_devel_logging_manager (str):
 #   Set to "org.apache.juli.ClassLoaderLogManager" by default.
 #   Set the JUL log manager
 #
-# tomcat9_logging_config (str):
+# tomcat_devel_logging_config (str):
 #   Set to "${catalina.base}/conf/logging.properties" by default.
 #   Set the JUL config file
 #
-# tomcat9_java_home (str):
+# tomcat_devel_java_home (str):
 #   Set to "%%JAVA_HOME%%" by default.
 #   Specify the Java VM to use.
 #
-# tomcat9_classpath (str):
+# tomcat_devel_classpath (str):
 #   Set to "" by default.
 #   Addtional classes to add to the CLASSPATH. If set, must start with ':'
 #
-# tomcat9_java_opts (str):
+# tomcat_devel_java_opts (str):
 #   Set to "" by default.
 #   Java VM args to use.
 #
-# tomcat9_wait (int):
+# tomcat_devel_wait (int):
 #   Set to "30" by default.
 #   Set the wait time (in seconds) for Tomcat process startup
 #
-# tomcat9_umask (str):
+# tomcat_devel_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 tomcat9 with different configurations.
+# instances of tomcat_devel with different configurations.
 #
 
 . /etc/rc.subr

Modified: head/www/tomcat-devel/pkg-descr
==============================================================================
--- head/www/tomcat9/pkg-descr	Thu Apr  9 16:48:49 2020	(r531218)
+++ head/www/tomcat-devel/pkg-descr	Fri Apr 10 07:03:16 2020	(r531294)
@@ -1,8 +1,8 @@
 Apache Tomcat is a web server written in 100% Pure Java.
 
-Apache Tomcat 9.x is the current focus of development. It builds on Tomcat
-8.0.x and 8.5.x and implements the current draft of the Servlet 4.0
-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).
+Apache Tomcat 10.x is the current focus of development. It builds on
+Tomcat 9.0.x and implements the Servlet 5.0, JSP 3.0, EL 4.0, WebSocket 2.0
+and Authentication 2.0 specifications (the versions required by Jakarta EE 9
+platform).
 
 WWW: http://tomcat.apache.org/

Modified: head/www/tomcat-devel/pkg-plist
==============================================================================
--- head/www/tomcat9/pkg-plist	Thu Apr  9 16:48:49 2020	(r531218)
+++ head/www/tomcat-devel/pkg-plist	Fri Apr 10 07:03:16 2020	(r531294)
@@ -412,8 +412,8 @@
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/jsp/debug-taglib.tld
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/jsp/example-taglib.tld
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/jsp2/jsp2-example-taglib.tld
-%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.5.jar
-%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.5.jar
+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.5-migrated-0.0.1.jar
+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.5-migrated-0.0.1.jar
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/tags/displayProducts.tag
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/tags/helloWorld.tag
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/tags/panel.tag

More information about the svn-ports-all mailing list