Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 21 Jun 2017 01:44:06 +0000 (UTC)
From:      Larry Rosenman <ler@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r444005 - in head/www/tomcat-devel: . files
Message-ID:  <201706210144.v5L1i6p4056090@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ler
Date: Wed Jun 21 01:44:06 2017
New Revision: 444005
URL: https://svnweb.freebsd.org/changeset/ports/444005

Log:
  www/tomcat-devel: fixed rc.d script and update to version 9.0.0.M21
  Note: startup script has been renamed from tomcat-devel to tomcat_devel.
  
  PR:		219426
  Submitted by:	vvd@unislabs.com

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

Modified: head/www/tomcat-devel/Makefile
==============================================================================
--- head/www/tomcat-devel/Makefile	Tue Jun 20 21:50:30 2017	(r444004)
+++ head/www/tomcat-devel/Makefile	Wed Jun 21 01:44:06 2017	(r444005)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tomcat
-PORTVERSION=	9.0.0.M20
+PORTVERSION=	9.0.0.M21
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin
 PKGNAMESUFFIX=	-devel
@@ -23,7 +23,7 @@ JAVA_VERSION=	1.8+
 NO_BUILD=	yes
 NO_ARCH=	yes
 
-USE_RC_SUBR=	${PKGBASE}
+USE_RC_SUBR=	${PKGBASE:C/-/_/}
 
 TOMCAT_SUBDIR?=	${DISTNAME:C/([0-9])\.([0-9])(.*)/\1.\2/}
 TOMCAT_HOME=	${PREFIX}/${TOMCAT_SUBDIR}

Modified: head/www/tomcat-devel/distinfo
==============================================================================
--- head/www/tomcat-devel/distinfo	Tue Jun 20 21:50:30 2017	(r444004)
+++ head/www/tomcat-devel/distinfo	Wed Jun 21 01:44:06 2017	(r444005)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494081797
-SHA256 (apache-tomcat-9.0.0.M20.tar.gz) = cfcc184901d368a3581b20cc08490f39994896806b6008c8376d49be201bdfeb
-SIZE (apache-tomcat-9.0.0.M20.tar.gz) = 9314793
+TIMESTAMP = 1495305437
+SHA256 (apache-tomcat-9.0.0.M21.tar.gz) = c959c5a8ef09af269ddb0681d428f82ff5b3ba10ffbff177f671938f27ca7cee
+SIZE (apache-tomcat-9.0.0.M21.tar.gz) = 9335939

Copied and modified: head/www/tomcat-devel/files/tomcat_devel.in (from r444004, head/www/tomcat-devel/files/tomcat-devel.in)
==============================================================================
--- head/www/tomcat-devel/files/tomcat-devel.in	Tue Jun 20 21:50:30 2017	(r444004, copy source)
+++ head/www/tomcat-devel/files/tomcat_devel.in	Wed Jun 21 01:44:06 2017	(r444005)
@@ -3,58 +3,58 @@
 # $FreeBSD$
 #
 
-# PROVIDE: tomcat-devel
+# PROVIDE: tomcat_devel
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 
 #
-# Configuration settings for tomcat-devel in /etc/rc.conf:
+# Configuration settings for tomcat_devel in /etc/rc.conf:
 #
-# tomcat-devel_enable (bool):
+# tomcat_devel_enable (bool):
 #   Set to "NO" by default.
 #   Set it to "YES" to enable tomcat-devel
 #
-# tomcat-devel_catalina_base (str)
+# tomcat_devel_catalina_base (str)
 #   Set to "%%TOMCAT_HOME%%" by default.
 #   Set the CATALINA_BASE variable for the Tomcat process
 #
-# tomcat-devel_catalina_tmpdir (str)
+# tomcat_devel_catalina_tmpdir (str)
 #   Set to "${catalina.base}/temp" by default.
 #   Set the CATALINA_TMPDIR variable for the Tomcat process
 #
-# tomcat-devel_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'
 #
-# tomcat-devel_stderr (str)
+# tomcat_devel_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):
+# tomcat_devel_pipe_cmd (str):
 #   Set to "" by default.
 #   Set a piped command to process stdout/stderr when passthru
 #
-# tomcat-devel_logging_manager (str):
+# tomcat_devel_logging_manager (str):
 #   Set to "org.apache.juli.ClassLoaderLogManager" by default.
 #   Set the JUL log manager
 #
-# tomcat-devel_logging_config (str):
+# tomcat_devel_logging_config (str):
 #   Set to "${catalina.base}/conf/logging.properties" by default.
 #   Set the JUL config file 
 #
-# tomcat-devel_java_home (str):
+# tomcat_devel_java_home (str):
 #   Set to "%%JAVA_HOME%%" by default.
 #   Specify the Java VM to use.
 #
-# tomcat-devel_classpath (str):
+# tomcat_devel_classpath (str):
 #   Set to "" by default.
 #   Addtional classes to add to the CLASSPATH. If set, must start with ':'
 #
-# tomcat-devel_java_opts (str):
+# tomcat_devel_java_opts (str):
 #   Set to "" by default.
 #   Java VM args to use.
 #
-# tomcat-devel_wait (int):
+# tomcat_devel_wait (int):
 #   Set to "30" by default.
 #   Set the wait time (in seconds) for Tomcat process startup
 #

Modified: head/www/tomcat-devel/pkg-plist
==============================================================================
--- head/www/tomcat-devel/pkg-plist	Tue Jun 20 21:50:30 2017	(r444004)
+++ head/www/tomcat-devel/pkg-plist	Wed Jun 21 01:44:06 2017	(r444005)
@@ -39,7 +39,7 @@
 %%T%%/lib/catalina-storeconfig.jar
 %%T%%/lib/catalina-tribes.jar
 %%T%%/lib/catalina.jar
-%%T%%/lib/ecj-4.6.1.jar
+%%T%%/lib/ecj-4.6.3.jar
 %%T%%/lib/el-api.jar
 %%T%%/lib/jasper-el.jar
 %%T%%/lib/jasper.jar



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