From owner-svn-ports-all@freebsd.org  Sun Dec 24 06:46:50 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4D585EA059E;
 Sun, 24 Dec 2017 06:46:50 +0000 (UTC)
 (envelope-from tobik@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 178076B662;
 Sun, 24 Dec 2017 06:46:50 +0000 (UTC)
 (envelope-from tobik@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBO6kn8X020758;
 Sun, 24 Dec 2017 06:46:49 GMT (envelope-from tobik@FreeBSD.org)
Received: (from tobik@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBO6knNr020756;
 Sun, 24 Dec 2017 06:46:49 GMT (envelope-from tobik@FreeBSD.org)
Message-Id: <201712240646.vBO6knNr020756@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tobik set sender to
 tobik@FreeBSD.org using -f
From: Tobias Kortkamp <tobik@FreeBSD.org>
Date: Sun, 24 Dec 2017 06:46:49 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r457125 - in head/www/uwsgi: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: tobik
X-SVN-Commit-Paths: in head/www/uwsgi: . files
X-SVN-Commit-Revision: 457125
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 24 Dec 2017 06:46:50 -0000

Author: tobik
Date: Sun Dec 24 06:46:48 2017
New Revision: 457125
URL: https://svnweb.freebsd.org/changeset/ports/457125

Log:
  www/uwsgi: Fix rc.d script when using the uwsgi-py3* packages
  
  PR:		224198
  Submitted by:	Christian Sturm <reezer@reezer.org>
  Approved by:	eugene@zhegan.in (maintainer timeout, 2 weeks)

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

Modified: head/www/uwsgi/Makefile
==============================================================================
--- head/www/uwsgi/Makefile	Sun Dec 24 04:26:17 2017	(r457124)
+++ head/www/uwsgi/Makefile	Sun Dec 24 06:46:48 2017	(r457125)
@@ -3,7 +3,7 @@
 
 PORTNAME=	uwsgi
 PORTVERSION=	2.0.15
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www python
 MASTER_SITES=	http://projects.unbit.it/downloads/
 
@@ -29,7 +29,9 @@ USERS=		uwsgi
 GROUPS=		uwsgi
 
 PLIST_FILES=	bin/uwsgi \
-		%%PYTHON_SITELIBDIR%%/uwsgidecorators.py
+		${PYTHON_SITELIBDIR}/uwsgidecorators.py
+
+SUB_LIST=	PYTHON_VER=${PYTHON_VER}
 
 OPTIONS_DEFINE=	DEBUG JSON PCRE XML
 

Modified: head/www/uwsgi/files/uwsgi.in
==============================================================================
--- head/www/uwsgi/files/uwsgi.in	Sun Dec 24 04:26:17 2017	(r457124)
+++ head/www/uwsgi/files/uwsgi.in	Sun Dec 24 06:46:48 2017	(r457125)
@@ -51,7 +51,7 @@ rcvar=uwsgi_enable
 
 load_rc_config $name
 
-command=%%PREFIX%%/bin/uwsgi
+command=%%PREFIX%%/bin/uwsgi-%%PYTHON_VER%%
 
 : ${uwsgi_enable="NO"}
 : ${uwsgi_socket="/tmp/${name}.sock"}