From owner-svn-ports-head@FreeBSD.ORG  Wed Feb 13 09:23:59 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 6BB374AD;
 Wed, 13 Feb 2013 09:23:59 +0000 (UTC) (envelope-from osa@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 460A4685;
 Wed, 13 Feb 2013 09:23:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1D9NxQM007948;
 Wed, 13 Feb 2013 09:23:59 GMT (envelope-from osa@svn.freebsd.org)
Received: (from osa@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1D9NwNm007941;
 Wed, 13 Feb 2013 09:23:58 GMT (envelope-from osa@svn.freebsd.org)
Message-Id: <201302130923.r1D9NwNm007941@svn.freebsd.org>
From: "Sergey A. Osokin" <osa@FreeBSD.org>
Date: Wed, 13 Feb 2013 09:23:58 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r312147 - in head/www: nginx nginx-devel
 nginx-devel/files nginx/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Feb 2013 09:23:59 -0000

Author: osa
Date: Wed Feb 13 09:23:58 2013
New Revision: 312147
URL: http://svnweb.freebsd.org/changeset/ports/312147

Log:
  Add nginx_pid_prefix rcvar for ability to prevent collision with other PIDs names
  when using with profiles.
  
  Bump PORTREVISION.
  
  PR:	175823

Modified:
  head/www/nginx-devel/Makefile
  head/www/nginx-devel/files/nginx.in
  head/www/nginx/Makefile
  head/www/nginx/files/nginx.in

Modified: head/www/nginx-devel/Makefile
==============================================================================
--- head/www/nginx-devel/Makefile	Wed Feb 13 08:55:40 2013	(r312146)
+++ head/www/nginx-devel/Makefile	Wed Feb 13 09:23:58 2013	(r312147)
@@ -3,6 +3,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.3.12
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://nginx.org/download/
 MASTER_SITES+=	${MASTER_SITE_LOCAL}

Modified: head/www/nginx-devel/files/nginx.in
==============================================================================
--- head/www/nginx-devel/files/nginx.in	Wed Feb 13 08:55:40 2013	(r312146)
+++ head/www/nginx-devel/files/nginx.in	Wed Feb 13 09:23:58 2013	(r312147)
@@ -11,6 +11,9 @@
 #				Set it to "YES" to enable nginx
 # nginx_profiles (str):		Set to "" by default.
 #				Define your profiles here.
+# nginx_pid_prefix (str):	Set to "" by default.
+#				When using profiles manually assign value to "nginx_"
+#				for prevent collision with other PIDs names.
 # nginxlimits_enable (bool):	Set to "NO" by default.
 #				Set it to yes to run `limits $limits_args`
 #				just before nginx starts.
@@ -47,7 +50,7 @@ load_rc_config $name
 if [ -n "$2" ]; then
 	profile="$2"
 	if [ "x${nginx_profiles}" != "x" ]; then
-		pidfile="${_pidprefix}/${profile}.pid"
+		pidfile="${_pidprefix}/${nginx_pid_prefix}${profile}.pid"
 		eval nginx_configfile="\${nginx_${profile}_configfile:-}"
 		if [ "x${nginx_configfile}" = "x" ]; then
 			echo "You must define a configuration file (nginx_${profile}_configfile)"

Modified: head/www/nginx/Makefile
==============================================================================
--- head/www/nginx/Makefile	Wed Feb 13 08:55:40 2013	(r312146)
+++ head/www/nginx/Makefile	Wed Feb 13 09:23:58 2013	(r312147)
@@ -3,6 +3,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.2.7
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	http://nginx.org/download/

Modified: head/www/nginx/files/nginx.in
==============================================================================
--- head/www/nginx/files/nginx.in	Wed Feb 13 08:55:40 2013	(r312146)
+++ head/www/nginx/files/nginx.in	Wed Feb 13 09:23:58 2013	(r312147)
@@ -11,6 +11,9 @@
 #				Set it to "YES" to enable nginx
 # nginx_profiles (str):		Set to "" by default.
 #				Define your profiles here.
+# nginx_pid_prefix (str):	Set to "" by default.
+#				When using profiles manually assign value to "nginx_"
+#				for prevent collision with other PIDs names.
 # nginxlimits_enable (bool):	Set to "NO" by default.
 #				Set it to yes to run `limits $limits_args`
 #				just before nginx starts.
@@ -47,7 +50,7 @@ load_rc_config $name
 if [ -n "$2" ]; then
 	profile="$2"
 	if [ "x${nginx_profiles}" != "x" ]; then
-		pidfile="${_pidprefix}/${profile}.pid"
+		pidfile="${_pidprefix}/${nginx_pid_prefix}${profile}.pid"
 		eval nginx_configfile="\${nginx_${profile}_configfile:-}"
 		if [ "x${nginx_configfile}" = "x" ]; then
 			echo "You must define a configuration file (nginx_${profile}_configfile)"