[pkgsrc/trunk]: pkgsrc/www For clarity, use tomcat_start (resp. tomcat_stop) ...

[jym <jym%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/207c3b42db11
branches:  trunk
changeset: 429890:207c3b42db11
user:      jym <jym%pkgsrc.org@localhost>
date:      Sat Apr 25 22:23:05 2020 +0000

description:
For clarity, use tomcat_start (resp. tomcat_stop) function instead of
calling ${command} directly for start (resp. stop) within rc.d.

Tested on tomcat9; but applicable down to tomcat6.

Bump PKGREVISION.

ok ryo@.

diffstat:

 www/apache-tomcat6/Makefile         |  3 ++-
 www/apache-tomcat6/files/tomcat.sh  |  6 +++---
 www/apache-tomcat7/Makefile         |  3 ++-
 www/apache-tomcat7/files/tomcat.sh  |  6 +++---
 www/apache-tomcat8/Makefile         |  3 ++-
 www/apache-tomcat8/files/tomcat.sh  |  6 +++---
 www/apache-tomcat85/Makefile        |  3 ++-
 www/apache-tomcat85/files/tomcat.sh |  6 +++---
 www/apache-tomcat9/Makefile         |  3 ++-
 www/apache-tomcat9/files/tomcat.sh  |  6 +++---
 10 files changed, 25 insertions(+), 20 deletions(-)

diffs (179 lines):

diff -r 4ca997f62a2d -r 207c3b42db11 www/apache-tomcat6/Makefile
--- a/www/apache-tomcat6/Makefile       Sat Apr 25 21:49:38 2020 +0000
+++ b/www/apache-tomcat6/Makefile       Sat Apr 25 22:23:05 2020 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2020/01/18 23:35:42 rillig Exp $
+# $NetBSD: Makefile,v 1.21 2020/04/25 22:23:05 jym Exp $
 #
 
 DISTNAME=      apache-tomcat-${TOMCAT_VER}
 CATEGORIES=    www
+PKGREVISION=   1
 MASTER_SITES=  ${MASTER_SITE_APACHE:=tomcat/tomcat-6/v${TOMCAT_VER}/bin/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
diff -r 4ca997f62a2d -r 207c3b42db11 www/apache-tomcat6/files/tomcat.sh
--- a/www/apache-tomcat6/files/tomcat.sh        Sat Apr 25 21:49:38 2020 +0000
+++ b/www/apache-tomcat6/files/tomcat.sh        Sat Apr 25 22:23:05 2020 +0000
@@ -1,6 +1,6 @@
 #! @RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: tomcat.sh,v 1.4 2009/08/13 21:21:30 adrianp Exp $
+# $NetBSD: tomcat.sh,v 1.5 2020/04/25 22:23:05 jym Exp $
 #
 # PROVIDE: tomcat
 # REQUIRE: DAEMON
@@ -17,8 +17,8 @@
 pidfile="@VARBASE@/run/tomcat/catalina.pid"
 tomcat_user="@TOMCAT_USER@"
 tomcat_group="@TOMCAT_GROUP@"
-start_cmd="$command start"
-stop_cmd="$command stop"
+start_cmd="tomcat_start"
+stop_cmd="tomcat_stop"
 restart_cmd="$stop_cmd && $start_cmd"
 run_cmd="tomcat_run"
 version_cmd="tomcat_version"
diff -r 4ca997f62a2d -r 207c3b42db11 www/apache-tomcat7/Makefile
--- a/www/apache-tomcat7/Makefile       Sat Apr 25 21:49:38 2020 +0000
+++ b/www/apache-tomcat7/Makefile       Sat Apr 25 22:23:05 2020 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2020/01/18 23:35:42 rillig Exp $
+# $NetBSD: Makefile,v 1.42 2020/04/25 22:23:05 jym Exp $
 
 DISTNAME=      apache-tomcat-${TOMCAT_VER}
 CATEGORIES=    www
+PKGREVISION=   1
 MASTER_SITES=  ${MASTER_SITE_APACHE:=tomcat/tomcat-7/v${TOMCAT_VER}/bin/}
 MASTER_SITES+= https://archive.apache.org/dist/tomcat/tomcat-7/v${TOMCAT_VER}/bin/
 
diff -r 4ca997f62a2d -r 207c3b42db11 www/apache-tomcat7/files/tomcat.sh
--- a/www/apache-tomcat7/files/tomcat.sh        Sat Apr 25 21:49:38 2020 +0000
+++ b/www/apache-tomcat7/files/tomcat.sh        Sat Apr 25 22:23:05 2020 +0000
@@ -1,6 +1,6 @@
 #! @RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: tomcat.sh,v 1.2 2012/05/06 08:08:16 ryoon Exp $
+# $NetBSD: tomcat.sh,v 1.3 2020/04/25 22:23:05 jym Exp $
 #
 # PROVIDE: tomcat
 # REQUIRE: DAEMON
@@ -17,8 +17,8 @@
 pidfile="@VARBASE@/run/tomcat/catalina.pid"
 tomcat_user="@TOMCAT_USER@"
 tomcat_group="@TOMCAT_GROUP@"
-start_cmd="$command start"
-stop_cmd="$command stop"
+start_cmd="tomcat_start"
+stop_cmd="tomcat_stop"
 restart_cmd="$stop_cmd && $start_cmd"
 run_cmd="tomcat_run"
 version_cmd="tomcat_version"
diff -r 4ca997f62a2d -r 207c3b42db11 www/apache-tomcat8/Makefile
--- a/www/apache-tomcat8/Makefile       Sat Apr 25 21:49:38 2020 +0000
+++ b/www/apache-tomcat8/Makefile       Sat Apr 25 22:23:05 2020 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2020/01/18 23:35:42 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2020/04/25 22:23:05 jym Exp $
 #
 
 DISTNAME=      apache-tomcat-${TOMCAT_VER}
 CATEGORIES=    www
+PKGREVISION=   1
 MASTER_SITES=  ${MASTER_SITE_APACHE:=tomcat/tomcat-8/v${TOMCAT_VER}/bin/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
diff -r 4ca997f62a2d -r 207c3b42db11 www/apache-tomcat8/files/tomcat.sh
--- a/www/apache-tomcat8/files/tomcat.sh        Sat Apr 25 21:49:38 2020 +0000
+++ b/www/apache-tomcat8/files/tomcat.sh        Sat Apr 25 22:23:05 2020 +0000
@@ -1,6 +1,6 @@
 #! @RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: tomcat.sh,v 1.1 2015/05/05 13:29:24 ryoon Exp $
+# $NetBSD: tomcat.sh,v 1.2 2020/04/25 22:23:05 jym Exp $
 #
 # PROVIDE: tomcat
 # REQUIRE: DAEMON
@@ -17,8 +17,8 @@
 pidfile="@VARBASE@/run/tomcat/catalina.pid"
 tomcat_user="@TOMCAT_USER@"
 tomcat_group="@TOMCAT_GROUP@"
-start_cmd="$command start"
-stop_cmd="$command stop"
+start_cmd="tomcat_start"
+stop_cmd="tomcat_stop"
 restart_cmd="$stop_cmd && $start_cmd"
 run_cmd="tomcat_run"
 version_cmd="tomcat_version"
diff -r 4ca997f62a2d -r 207c3b42db11 www/apache-tomcat85/Makefile
--- a/www/apache-tomcat85/Makefile      Sat Apr 25 21:49:38 2020 +0000
+++ b/www/apache-tomcat85/Makefile      Sat Apr 25 22:23:05 2020 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2020/04/16 23:00:01 ryoon Exp $
+# $NetBSD: Makefile,v 1.15 2020/04/25 22:23:05 jym Exp $
 #
 
 DISTNAME=      apache-tomcat-${TOMCAT_VER}
 CATEGORIES=    www
+PKGREVISION=   1
 MASTER_SITES=  ${MASTER_SITE_APACHE:=tomcat/tomcat-8/v${TOMCAT_VER}/bin/}
 
 MAINTAINER=    ryoon%NetBSD.org@localhost
diff -r 4ca997f62a2d -r 207c3b42db11 www/apache-tomcat85/files/tomcat.sh
--- a/www/apache-tomcat85/files/tomcat.sh       Sat Apr 25 21:49:38 2020 +0000
+++ b/www/apache-tomcat85/files/tomcat.sh       Sat Apr 25 22:23:05 2020 +0000
@@ -1,6 +1,6 @@
 #! @RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: tomcat.sh,v 1.1 2017/04/10 10:43:22 ryoon Exp $
+# $NetBSD: tomcat.sh,v 1.2 2020/04/25 22:23:06 jym Exp $
 #
 # PROVIDE: tomcat
 # REQUIRE: DAEMON
@@ -17,8 +17,8 @@
 pidfile="@VARBASE@/run/tomcat/catalina.pid"
 tomcat_user="@TOMCAT_USER@"
 tomcat_group="@TOMCAT_GROUP@"
-start_cmd="$command start"
-stop_cmd="$command stop"
+start_cmd="tomcat_start"
+stop_cmd="tomcat_stop"
 restart_cmd="$stop_cmd && $start_cmd"
 run_cmd="tomcat_run"
 version_cmd="tomcat_version"
diff -r 4ca997f62a2d -r 207c3b42db11 www/apache-tomcat9/Makefile
--- a/www/apache-tomcat9/Makefile       Sat Apr 25 21:49:38 2020 +0000
+++ b/www/apache-tomcat9/Makefile       Sat Apr 25 22:23:05 2020 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2020/04/16 15:08:08 ryoon Exp $
+# $NetBSD: Makefile,v 1.8 2020/04/25 22:23:06 jym Exp $
 #
 
 DISTNAME=      apache-tomcat-${TOMCAT_VER}
 CATEGORIES=    www
+PKGREVISION=   1
 MASTER_SITES=  ${MASTER_SITE_APACHE:=tomcat/tomcat-9/v${TOMCAT_VER}/bin/}
 
 MAINTAINER=    ryoon%NetBSD.org@localhost
diff -r 4ca997f62a2d -r 207c3b42db11 www/apache-tomcat9/files/tomcat.sh
--- a/www/apache-tomcat9/files/tomcat.sh        Sat Apr 25 21:49:38 2020 +0000
+++ b/www/apache-tomcat9/files/tomcat.sh        Sat Apr 25 22:23:05 2020 +0000
@@ -1,6 +1,6 @@
 #! @RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: tomcat.sh,v 1.1 2019/01/22 14:54:41 ryoon Exp $
+# $NetBSD: tomcat.sh,v 1.2 2020/04/25 22:23:06 jym Exp $
 #
 # PROVIDE: tomcat
 # REQUIRE: DAEMON
@@ -17,8 +17,8 @@
 pidfile="@VARBASE@/run/tomcat/catalina.pid"
 tomcat_user="@TOMCAT_USER@"
 tomcat_group="@TOMCAT_GROUP@"
-start_cmd="$command start"
-stop_cmd="$command stop"
+start_cmd="tomcat_start"
+stop_cmd="tomcat_stop"
 restart_cmd="$stop_cmd && $start_cmd"
 run_cmd="tomcat_run"
 version_cmd="tomcat_version"