From owner-svn-ports-head@FreeBSD.ORG  Mon Nov 26 20:23:50 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 630618EA;
 Mon, 26 Nov 2012 20:23:50 +0000 (UTC)
 (envelope-from demon@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 2C3578FC14;
 Mon, 26 Nov 2012 20:23:50 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAQKNoXr067396;
 Mon, 26 Nov 2012 20:23:50 GMT (envelope-from demon@svn.freebsd.org)
Received: (from demon@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAQKNn8f067394;
 Mon, 26 Nov 2012 20:23:49 GMT (envelope-from demon@svn.freebsd.org)
Message-Id: <201211262023.qAQKNn8f067394@svn.freebsd.org>
From: Dmitry Sivachenko <demon@FreeBSD.org>
Date: Mon, 26 Nov 2012 20:23:49 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r307795 - head/www/uwsgi/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: Mon, 26 Nov 2012 20:23:50 -0000

Author: demon
Date: Mon Nov 26 20:23:49 2012
New Revision: 307795
URL: http://svnweb.freebsd.org/changeset/ports/307795

Log:
  Allow to redefine uwsgi_procname to fix 'status' command when
  uwsgi was started with --auto-procname option.
  
  Patch from Gennady Karpov <gekar@yandex-team.ru>.
  
  Approved by:	maintainer
  Feature safe:	yes

Modified:
  head/www/uwsgi/files/uwsgi.in

Modified: head/www/uwsgi/files/uwsgi.in
==============================================================================
--- head/www/uwsgi/files/uwsgi.in	Mon Nov 26 19:49:22 2012	(r307794)
+++ head/www/uwsgi/files/uwsgi.in	Mon Nov 26 20:23:49 2012	(r307795)
@@ -22,6 +22,8 @@
 #				Default is 80.
 # uwsgi_flags (str):		Set the uwsgi command line arguments
 #				Default is "-M -L".
+# uwsgi_procname (str):		Define to "uWSGI" if you start uwsgi with
+#				--auto-procname option.
 #
 # If you would like to have multiple uWSGI instances running, you can
 # define multiple profiles:
@@ -39,6 +41,7 @@ rcvar=uwsgi_enable
 
 load_rc_config $name
 
+command=%%PREFIX%%/bin/uwsgi
 : ${uwsgi_enable="NO"}
 : ${uwsgi_profiles=""}
 : ${uwsgi_socket="/tmp/${name}.sock"}
@@ -47,6 +50,7 @@ load_rc_config $name
 : ${uwsgi_uid="80"}
 : ${uwsgi_gid="80"}
 : ${uwsgi_flags="-M -L"}
+: ${uwsgi_procname="${command}"}
 
 is_uwsgi_profile() {
     local profile
@@ -73,6 +77,7 @@ if [ -n "${uwsgi_profiles}" ]; then
 		eval uwsgi_uid=\${uwsgi_${profile}_uid:-"${uwsgi_uid}"}
 		eval uwsgi_gid=\${uwsgi_${profile}_gid:-"${uwsgi_uid}"}
 		eval uwsgi_flags=\${uwsgi_${profile}_flags:-"${uwsgi_flags}"}
+		eval uwsgi_procname=\${uwsgi_${profile}_procname:-"${uwsgi_procname}"}
 	elif [ -n "$1" ]; then
 		for profile in ${uwsgi_profiles}; do
 	            echo "Processing ${name} profile: ${profile}"
@@ -90,6 +95,7 @@ reload_precmd=reload_precmd
 brutalreload_cmd=brutalreload_cmd
 sig_stop="INT"
 extra_commands="reload brutalreload"
+procname=${uwsgi_procname}
 
 stop_postcmd()
 {