CVS commit: pkgsrc/www

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/www
From: "Jean-Yves Migeon" <jym%netbsd.org@localhost>
Date: Sat, 25 Apr 2020 22:23:06 +0000

Module Name:    pkgsrc
Committed By:   jym
Date:           Sat Apr 25 22:23:06 UTC 2020

Modified Files:
        pkgsrc/www/apache-tomcat6: Makefile
        pkgsrc/www/apache-tomcat6/files: tomcat.sh
        pkgsrc/www/apache-tomcat7: Makefile
        pkgsrc/www/apache-tomcat7/files: tomcat.sh
        pkgsrc/www/apache-tomcat8: Makefile
        pkgsrc/www/apache-tomcat8/files: tomcat.sh
        pkgsrc/www/apache-tomcat85: Makefile
        pkgsrc/www/apache-tomcat85/files: tomcat.sh
        pkgsrc/www/apache-tomcat9: Makefile
        pkgsrc/www/apache-tomcat9/files: tomcat.sh

Log Message:
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@.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/www/apache-tomcat6/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/apache-tomcat6/files/tomcat.sh
cvs rdiff -u -r1.41 -r1.42 pkgsrc/www/apache-tomcat7/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/apache-tomcat7/files/tomcat.sh
cvs rdiff -u -r1.19 -r1.20 pkgsrc/www/apache-tomcat8/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/apache-tomcat8/files/tomcat.sh
cvs rdiff -u -r1.14 -r1.15 pkgsrc/www/apache-tomcat85/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/apache-tomcat85/files/tomcat.sh
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/apache-tomcat9/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/apache-tomcat9/files/tomcat.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/apache-tomcat6/Makefile
diff -u pkgsrc/www/apache-tomcat6/Makefile:1.20 pkgsrc/www/apache-tomcat6/Makefile:1.21
--- pkgsrc/www/apache-tomcat6/Makefile:1.20     Sat Jan 18 23:35:42 2020
+++ pkgsrc/www/apache-tomcat6/Makefile  Sat Apr 25 22:23:05 2020
@@ -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

Index: pkgsrc/www/apache-tomcat6/files/tomcat.sh
diff -u pkgsrc/www/apache-tomcat6/files/tomcat.sh:1.4 pkgsrc/www/apache-tomcat6/files/tomcat.sh:1.5
--- pkgsrc/www/apache-tomcat6/files/tomcat.sh:1.4       Thu Aug 13 21:21:30 2009
+++ pkgsrc/www/apache-tomcat6/files/tomcat.sh   Sat Apr 25 22:23:05 2020
@@ -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 @@ command="@TOMCAT_HOME@/bin/catalina.sh"
 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"

Index: pkgsrc/www/apache-tomcat7/Makefile
diff -u pkgsrc/www/apache-tomcat7/Makefile:1.41 pkgsrc/www/apache-tomcat7/Makefile:1.42
--- pkgsrc/www/apache-tomcat7/Makefile:1.41     Sat Jan 18 23:35:42 2020
+++ pkgsrc/www/apache-tomcat7/Makefile  Sat Apr 25 22:23:05 2020
@@ -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/
 

Index: pkgsrc/www/apache-tomcat7/files/tomcat.sh
diff -u pkgsrc/www/apache-tomcat7/files/tomcat.sh:1.2 pkgsrc/www/apache-tomcat7/files/tomcat.sh:1.3
--- pkgsrc/www/apache-tomcat7/files/tomcat.sh:1.2       Sun May  6 08:08:16 2012
+++ pkgsrc/www/apache-tomcat7/files/tomcat.sh   Sat Apr 25 22:23:05 2020
@@ -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 @@ command="@TOMCAT_HOME@/bin/catalina.sh"
 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"

Index: pkgsrc/www/apache-tomcat8/Makefile
diff -u pkgsrc/www/apache-tomcat8/Makefile:1.19 pkgsrc/www/apache-tomcat8/Makefile:1.20
--- pkgsrc/www/apache-tomcat8/Makefile:1.19     Sat Jan 18 23:35:42 2020
+++ pkgsrc/www/apache-tomcat8/Makefile  Sat Apr 25 22:23:05 2020
@@ -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

Index: pkgsrc/www/apache-tomcat8/files/tomcat.sh
diff -u pkgsrc/www/apache-tomcat8/files/tomcat.sh:1.1 pkgsrc/www/apache-tomcat8/files/tomcat.sh:1.2
--- pkgsrc/www/apache-tomcat8/files/tomcat.sh:1.1       Tue May  5 13:29:24 2015
+++ pkgsrc/www/apache-tomcat8/files/tomcat.sh   Sat Apr 25 22:23:05 2020
@@ -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 @@ command="@TOMCAT_HOME@/bin/catalina.sh"
 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"

Index: pkgsrc/www/apache-tomcat85/Makefile
diff -u pkgsrc/www/apache-tomcat85/Makefile:1.14 pkgsrc/www/apache-tomcat85/Makefile:1.15
--- pkgsrc/www/apache-tomcat85/Makefile:1.14    Thu Apr 16 23:00:01 2020
+++ pkgsrc/www/apache-tomcat85/Makefile Sat Apr 25 22:23:05 2020
@@ -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

Index: pkgsrc/www/apache-tomcat85/files/tomcat.sh
diff -u pkgsrc/www/apache-tomcat85/files/tomcat.sh:1.1 pkgsrc/www/apache-tomcat85/files/tomcat.sh:1.2
--- pkgsrc/www/apache-tomcat85/files/tomcat.sh:1.1      Mon Apr 10 10:43:22 2017
+++ pkgsrc/www/apache-tomcat85/files/tomcat.sh  Sat Apr 25 22:23:06 2020
@@ -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 @@ command="@TOMCAT_HOME@/bin/catalina.sh"
 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"

Index: pkgsrc/www/apache-tomcat9/Makefile
diff -u pkgsrc/www/apache-tomcat9/Makefile:1.7 pkgsrc/www/apache-tomcat9/Makefile:1.8
--- pkgsrc/www/apache-tomcat9/Makefile:1.7      Thu Apr 16 15:08:08 2020
+++ pkgsrc/www/apache-tomcat9/Makefile  Sat Apr 25 22:23:06 2020
@@ -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

Index: pkgsrc/www/apache-tomcat9/files/tomcat.sh
diff -u pkgsrc/www/apache-tomcat9/files/tomcat.sh:1.1 pkgsrc/www/apache-tomcat9/files/tomcat.sh:1.2
--- pkgsrc/www/apache-tomcat9/files/tomcat.sh:1.1       Tue Jan 22 14:54:41 2019
+++ pkgsrc/www/apache-tomcat9/files/tomcat.sh   Sat Apr 25 22:23:06 2020
@@ -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 @@ command="@TOMCAT_HOME@/bin/catalina.sh"
 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"

Prev by Date: Re: CVS commit: pkgsrc/mk/build
Next by Date: CVS commit: pkgsrc/textproc
Previous by Thread: CVS commit: pkgsrc/games/velena
Next by Thread: CVS commit: pkgsrc/textproc
Indexes:

Home | Main Index | Thread Index | Old Index