Attachment 182762 Details for Bug 219426 – Fixed rc.d script and update tomcat-devel version from 9.0.0.M20 to 9.0.0.M21

[patch] Fixed rc.d script and update tomcat-devel version from 9.0.0.M20 to 9.0.0.M21

tomcat-devel.diff (text/plain), 3.85 KB, created by Vladimir Druzenko on 2017-05-20 19:34:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Druzenko

Created: 2017-05-20 19:34:58 UTC

Size: 3.85 KB

patch

obsolete

>diff -abBur tomcat-devel.orig/Makefile tomcat-devel/Makefile
>--- tomcat-devel.orig/Makefile
>+++ tomcat-devel/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/www/tomcat-devel/Makefile 440277 2017-05-06 15:28:11Z ler $
> 
> 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 @@
> 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}
>diff -abBur tomcat-devel.orig/distinfo tomcat-devel/distinfo
>--- tomcat-devel.orig/distinfo
>+++ tomcat-devel/distinfo
>@@ -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
>diff -abBur tomcat-devel.orig/pkg-plist tomcat-devel/pkg-plist
>--- tomcat-devel.orig/pkg-plist
>+++ tomcat-devel/pkg-plist
>@@ -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
>diff -abBur tomcat-devel.orig/files/tomcat-devel.in tomcat-devel/files/tomcat_devel.in
>--- tomcat-devel.orig/files/tomcat-devel.in
>+++ tomcat-devel/files/tomcat_devel.in
>@@ -3,58 +3,58 @@
> # $FreeBSD: head/www/tomcat-devel/files/tomcat-devel.in 437962 2017-04-07 22:32:01Z rezny $
> #
> 
>-# 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
> #

Flags:

vvd: maintainer-approval+

Actions: View | Diff

Attachments on bug 219426: 182762