From d1dfae0c3c9b28d27ee79ebad84b4f46ab130ede Mon Sep 17 00:00:00 2001
From: osa <osa@FreeBSD.org>
Date: Thu, 2 Jul 2009 10:31:13 +0000
Subject: Default stop signal is SIGTERM, the quick shutdown.  Also nginx
 understands QUIT signal for graceful (gradual) stop.

Add gracefulstop extra command accordingly for stable and devel
versions.
Bump PORTREVISIONs.

PR:	ports/136232 (partialy)
---
 www/nginx-devel/Makefile          |  1 +
 www/nginx-devel/files/nginx.sh.in | 10 +++++++++-
 www/nginx/Makefile                |  1 +
 www/nginx/files/nginx.sh.in       | 10 +++++++++-
 4 files changed, 20 insertions(+), 2 deletions(-)

(limited to 'www')

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index e1ef63359e7c..834b85ab5a42 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	0.8.4
+PORTREIVION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://sysoev.ru/nginx/
 MASTER_SITES+=	${MASTER_SITE_LOCAL}
diff --git a/www/nginx-devel/files/nginx.sh.in b/www/nginx-devel/files/nginx.sh.in
index b87ef0a8b295..b8e8e79c82f4 100644
--- a/www/nginx-devel/files/nginx.sh.in
+++ b/www/nginx-devel/files/nginx.sh.in
@@ -28,6 +28,7 @@ start_precmd="nginx_precmd"
 restart_precmd="nginx_checkconfig"
 reload_precmd="nginx_checkconfig"
 configtest_cmd="nginx_checkconfig"
+gracefulstop_cmd="nginx_gracefulstop"
 upgrade_precmd="nginx_checkconfig"
 upgrade_cmd="nginx_upgrade"
 command="%%PREFIX%%/sbin/nginx"
@@ -83,6 +84,13 @@ nginx_checkconfig()
 	eval ${command} ${nginx_flags} -t
 }
 
+nginx_gracefulstop()
+{
+	echo "Performing a graceful stop:"
+	sig_stop="QUIT"
+	run_rc_command ${rc_prefix}stop $rc_extra_args || return 1
+}
+
 nginx_upgrade()
 {
 	echo "Upgrading nginx binary:"
@@ -112,5 +120,5 @@ nginx_precmd()
 	fi
 }
 
-extra_commands="reload configtest upgrade"
+extra_commands="reload configtest upgrade gracefulstop"
 run_rc_command "$1"
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 840038738294..58ae03457316 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	0.7.61
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://sysoev.ru/nginx/
 MASTER_SITES+=	${MASTER_SITE_LOCAL}
diff --git a/www/nginx/files/nginx.sh.in b/www/nginx/files/nginx.sh.in
index b87ef0a8b295..b8e8e79c82f4 100644
--- a/www/nginx/files/nginx.sh.in
+++ b/www/nginx/files/nginx.sh.in
@@ -28,6 +28,7 @@ start_precmd="nginx_precmd"
 restart_precmd="nginx_checkconfig"
 reload_precmd="nginx_checkconfig"
 configtest_cmd="nginx_checkconfig"
+gracefulstop_cmd="nginx_gracefulstop"
 upgrade_precmd="nginx_checkconfig"
 upgrade_cmd="nginx_upgrade"
 command="%%PREFIX%%/sbin/nginx"
@@ -83,6 +84,13 @@ nginx_checkconfig()
 	eval ${command} ${nginx_flags} -t
 }
 
+nginx_gracefulstop()
+{
+	echo "Performing a graceful stop:"
+	sig_stop="QUIT"
+	run_rc_command ${rc_prefix}stop $rc_extra_args || return 1
+}
+
 nginx_upgrade()
 {
 	echo "Upgrading nginx binary:"
@@ -112,5 +120,5 @@ nginx_precmd()
 	fi
 }
 
-extra_commands="reload configtest upgrade"
+extra_commands="reload configtest upgrade gracefulstop"
 run_rc_command "$1"
-- 
cgit