Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 7 Apr 2017 22:32:02 +0000 (UTC)
From:      Matthew Rezny <rezny@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r437962 - in head/www: . tomcat-devel tomcat-devel/files
Message-ID:  <201704072232.v37MW2vB095453@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rezny
Date: Fri Apr  7 22:32:01 2017
New Revision: 437962
URL: https://svnweb.freebsd.org/changeset/ports/437962

Log:
  Add Apache Tomcat development port starting on 9.0 alpha
  
  This is the version of Tomcat currently under active development.
  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.
  
  PR:		215290
  Submitted by:	vvd@unislabs.com
  Approved by:	swills (mentor)
  Differential Revision:	https://reviews.freebsd.org/D10226

Added:
  head/www/tomcat-devel/
     - copied from r437245, head/www/tomcat85/
  head/www/tomcat-devel/files/tomcat-devel.in
     - copied, changed from r437245, head/www/tomcat85/files/tomcat85.in
Deleted:
  head/www/tomcat-devel/files/tomcat85.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  7 22:06:07 2017	(r437961)
+++ head/www/Makefile	Fri Apr  7 22:32:01 2017	(r437962)
@@ -2206,6 +2206,7 @@
     SUBDIR += tivoka
     SUBDIR += tntnet
     SUBDIR += tokyopromenade
+    SUBDIR += tomcat-devel
     SUBDIR += tomcat-native
     SUBDIR += tomcat6
     SUBDIR += tomcat7

Modified: head/www/tomcat-devel/Makefile
==============================================================================
--- head/www/tomcat85/Makefile	Wed Mar 29 22:07:39 2017	(r437245)
+++ head/www/tomcat-devel/Makefile	Fri Apr  7 22:32:01 2017	(r437962)
@@ -2,14 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	tomcat
-PORTVERSION=	8.5.12
+PORTVERSION=	9.0.0.M18
 CATEGORIES=	www java
-MASTER_SITES=	APACHE/tomcat/tomcat-8/v${PORTVERSION}/bin
-PKGNAMESUFFIX=	85
+MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin
+PKGNAMESUFFIX=	-devel
 DISTNAME=	apache-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	vvd@unislabs.com
-COMMENT=	Open-source Java web server by Apache, 8.5.x branch
+COMMENT=	Open-source Java web server by Apache, development branch
 
 LICENSE=	APACHE20
 
@@ -19,13 +19,13 @@ USES=		cpe
 CPE_VENDOR=	apache
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
+JAVA_VERSION=	1.8+
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 USE_RC_SUBR=	${PKGBASE}
 
-TOMCAT_SUBDIR?=	${DISTNAME:R}
+TOMCAT_SUBDIR?=	${PORTVERSION:C/([0-9])\.([0-9])(.*)/\1.\2/}
 TOMCAT_HOME=	${PREFIX}/${TOMCAT_SUBDIR}
 TOMCAT_CONF_FILES=	\
 		catalina.policy catalina.properties context.xml logging.properties \

Modified: head/www/tomcat-devel/distinfo
==============================================================================
--- head/www/tomcat85/distinfo	Wed Mar 29 22:07:39 2017	(r437245)
+++ head/www/tomcat-devel/distinfo	Fri Apr  7 22:32:01 2017	(r437962)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1490321344
-SHA256 (apache-tomcat-8.5.12.tar.gz) = 6d2cad1b595d0cc8083f9bbbb73c359d611249c7eaf283c40cb4ae4ca9c4644a
-SIZE (apache-tomcat-8.5.12.tar.gz) = 9353658
+TIMESTAMP = 1490321753
+SHA256 (apache-tomcat-9.0.0.M18.tar.gz) = 75a0b023fcd9fcc31acc203940de840a2b31468b3eba55766c5fcd58402c722c
+SIZE (apache-tomcat-9.0.0.M18.tar.gz) = 9287772

Copied and modified: head/www/tomcat-devel/files/tomcat-devel.in (from r437245, head/www/tomcat85/files/tomcat85.in)
==============================================================================
--- head/www/tomcat85/files/tomcat85.in	Wed Mar 29 22:07:39 2017	(r437245, copy source)
+++ head/www/tomcat-devel/files/tomcat-devel.in	Fri Apr  7 22:32:01 2017	(r437962)
@@ -3,63 +3,63 @@
 # $FreeBSD$
 #
 
-# PROVIDE: tomcat85
+# PROVIDE: tomcat-devel
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 
 #
-# Configuration settings for tomcat85 in /etc/rc.conf:
+# Configuration settings for tomcat-devel in /etc/rc.conf:
 #
-# tomcat85_enable (bool):
+# tomcat-devel_enable (bool):
 #   Set to "NO" by default.
-#   Set it to "YES" to enable tomcat85
+#   Set it to "YES" to enable tomcat-devel
 #
-# tomcat85_catalina_base (str)
+# tomcat-devel_catalina_base (str)
 #   Set to "%%TOMCAT_HOME%%" by default.
 #   Set the CATALINA_BASE variable for the Tomcat process
 #
-# tomcat85_catalina_tmpdir (str)
+# tomcat-devel_catalina_tmpdir (str)
 #   Set to "${catalina.base}/temp" by default.
 #   Set the CATALINA_TMPDIR variable for the Tomcat process
 #
-# tomcat85_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'
 #
-# tomcat85_stderr (str)
+# tomcat-devel_stderr (str)
 #   Set to "&1" by default.
 #   Set the stderr redirection. It may also be '/dev/null', '&1' or '&2'
 #
-# tomcat85_pipe_cmd (str):
+# tomcat-devel_pipe_cmd (str):
 #   Set to "" by default.
 #   Set a piped command to process stdout/stderr when passthru
 #
-# tomcat85_logging_manager (str):
+# tomcat-devel_logging_manager (str):
 #   Set to "org.apache.juli.ClassLoaderLogManager" by default.
 #   Set the JUL log manager
 #
-# tomcat85_logging_config (str):
+# tomcat-devel_logging_config (str):
 #   Set to "${catalina.base}/conf/logging.properties" by default.
 #   Set the JUL config file 
 #
-# tomcat85_java_home (str):
+# tomcat-devel_java_home (str):
 #   Set to "%%JAVA_HOME%%" by default.
 #   Specify the Java VM to use.
 #
-# tomcat85_classpath (str):
+# tomcat-devel_classpath (str):
 #   Set to "" by default.
 #   Addtional classes to add to the CLASSPATH. If set, must start with ':'
 #
-# tomcat85_java_opts (str):
+# tomcat-devel_java_opts (str):
 #   Set to "" by default.
 #   Java VM args to use.
 #
-# tomcat85_wait (int):
+# tomcat-devel_wait (int):
 #   Set to "30" by default.
 #   Set the wait time (in seconds) for Tomcat process startup
 #
 # You may symlink this script with other names to run multiple
-# instances of tomcat85 with different configurations.
+# instances of tomcat-devel with different configurations.
 #
 
 . /etc/rc.subr

Modified: head/www/tomcat-devel/pkg-descr
==============================================================================
--- head/www/tomcat85/pkg-descr	Wed Mar 29 22:07:39 2017	(r437245)
+++ head/www/tomcat-devel/pkg-descr	Fri Apr  7 22:32:01 2017	(r437962)
@@ -1,9 +1,8 @@
 Apache Tomcat is a web server written in 100% Pure Java.
 
-Apache Tomcat version 8.5 implements the Servlet 3.1, JavaServer Pages 2.3,
-Java Unified Expression Language 3.0 and Java WebSocket 1.1 specifications
-from the Java Community Process, and includes many additional features that
-make it a useful platform for developing and deploying web applications and
-web services. Tomcat 8.5 is aligned with Java EE 7.
+This is the version of Tomcat currently under active development.
+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/tomcat-devel/pkg-plist
==============================================================================
--- head/www/tomcat85/pkg-plist	Wed Mar 29 22:07:39 2017	(r437245)
+++ head/www/tomcat-devel/pkg-plist	Fri Apr  7 22:32:01 2017	(r437962)
@@ -68,7 +68,6 @@
 %%T%%/webapps/ROOT/asf-logo-wide.svg
 %%T%%/webapps/ROOT/bg-button.png
 %%T%%/webapps/ROOT/bg-middle.png
-%%T%%/webapps/ROOT/bg-nav-item.png
 %%T%%/webapps/ROOT/bg-nav.png
 %%T%%/webapps/ROOT/bg-upper.png
 %%T%%/webapps/ROOT/favicon.ico
@@ -184,10 +183,8 @@
 %%T%%/webapps/docs/images/fonts/OpenSans700.woff
 %%T%%/webapps/docs/images/fonts/OpenSans700italic.woff
 %%T%%/webapps/docs/images/fonts/fonts.css
-%%T%%/webapps/docs/images/printer.gif
 %%T%%/webapps/docs/images/tomcat.gif
 %%T%%/webapps/docs/images/tomcat.png
-%%T%%/webapps/docs/images/tomcat.svg
 %%T%%/webapps/docs/images/update.gif
 %%T%%/webapps/docs/images/void.gif
 %%T%%/webapps/docs/index.html
@@ -455,7 +452,6 @@
 %%T%%/webapps/examples/jsp/forward/two.html
 %%T%%/webapps/examples/jsp/images/code.gif
 %%T%%/webapps/examples/jsp/images/execute.gif
-%%T%%/webapps/examples/jsp/images/read.gif
 %%T%%/webapps/examples/jsp/images/return.gif
 %%T%%/webapps/examples/jsp/include/foo.html
 %%T%%/webapps/examples/jsp/include/foo.jsp
@@ -605,15 +601,8 @@
 %%T%%/webapps/host-manager/WEB-INF/jsp/403.jsp
 %%T%%/webapps/host-manager/WEB-INF/jsp/404.jsp
 %%T%%/webapps/host-manager/WEB-INF/web.xml
-%%T%%/webapps/host-manager/images/add.gif
 %%T%%/webapps/host-manager/images/asf-logo.svg
-%%T%%/webapps/host-manager/images/code.gif
-%%T%%/webapps/host-manager/images/design.gif
-%%T%%/webapps/host-manager/images/docs.gif
-%%T%%/webapps/host-manager/images/fix.gif
 %%T%%/webapps/host-manager/images/tomcat.gif
-%%T%%/webapps/host-manager/images/update.gif
-%%T%%/webapps/host-manager/images/void.gif
 %%T%%/webapps/host-manager/index.jsp
 %%T%%/webapps/host-manager/manager.xml
 %%T%%/webapps/manager/META-INF/context.xml
@@ -624,15 +613,8 @@
 %%T%%/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
 %%T%%/webapps/manager/WEB-INF/jsp/sessionsList.jsp
 %%T%%/webapps/manager/WEB-INF/web.xml
-%%T%%/webapps/manager/images/add.gif
 %%T%%/webapps/manager/images/asf-logo.svg
-%%T%%/webapps/manager/images/code.gif
-%%T%%/webapps/manager/images/design.gif
-%%T%%/webapps/manager/images/docs.gif
-%%T%%/webapps/manager/images/fix.gif
 %%T%%/webapps/manager/images/tomcat.gif
-%%T%%/webapps/manager/images/update.gif
-%%T%%/webapps/manager/images/void.gif
 %%T%%/webapps/manager/index.jsp
 %%T%%/webapps/manager/status.xsd
 %%T%%/webapps/manager/xform.xsl



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704072232.v37MW2vB095453>