This package should not self-conflict. Prefix the files in $SHAREDIR with

${PYPKGPREFIX} to avoid such an instance. Some people will run apps with
different versions of python, so we can handle that accordingly with
ALTERNATIVES. Bump PKGREVISION.

3 files changed, 59 insertions, 57 deletions

diff --git a/www/py-uwsgi/ALTERNATIVES b/www/py-uwsgi/ALTERNATIVES
index 2c0fda66e55..0b8d33ad681 100644
--- a/www/py-uwsgi/ALTERNATIVES
+++ b/www/py-uwsgi/ALTERNATIVES
@@ -1 +1,2 @@
 bin/uwsgi @PREFIX@/bin/uwsgi-@PYVERSSUFFIX@
+share/examples/py-uwsgi share/examples/@PYPKGPREFIX@-uwsgi/
diff --git a/www/py-uwsgi/Makefile b/www/py-uwsgi/Makefile
index 8bd6924197c..3dad659483e 100644
--- a/www/py-uwsgi/Makefile
+++ b/www/py-uwsgi/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.30 2015/04/03 15:21:59 rodent Exp $
+# $NetBSD: Makefile,v 1.31 2015/06/10 03:32:42 rodent Exp $
 
 DISTNAME=	uwsgi-2.0.10
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	www python
+PKGREVISION=	1
+CATEGORIES=	python www
 MASTER_SITES=	http://projects.unbit.it/downloads/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -13,20 +14,20 @@ LICENSE=	gnu-gpl-v2 # with linking exception
 USE_LANGUAGES=	c
 USE_TOOLS+=	pkg-config
 
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
+PLIST_SUBST+=	PYPKGPREFIX=${PYPKGPREFIX} PYVERSSUFFIX=${PYVERSSUFFIX}
 EGG_NAME=	${DISTNAME:S/uwsgi/uWSGI/}
 
 .include "options.mk"
 
 INSTALL_ENV+=		UWSGI_INCLUDES=${PREFIX}/include
 INSTALL_ENV+=		UWSGI_PROFILE_OVERRIDE="${UWSGI_DEBUG}${UWSGI_JSON}${UWSGI_PCRE}${UWSGI_SSL}${UWSGI_UUID}${UWSGI_XML}${UWSGI_YAML}"
-INSTALLATION_DIRS+=	share/examples/py-uwsgi
+INSTALLATION_DIRS+=	share/examples/${PYPKGPREFIX}-uwsgi
 
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/bin/uwsgi \
 		${DESTDIR}${PREFIX}/bin/uwsgi-${PYVERSSUFFIX}
 	${INSTALL_DATA} ${WRKSRC}/examples/* \
-		${DESTDIR}${PREFIX}/share/examples/py-uwsgi
+		${DESTDIR}${PREFIX}/share/examples/${PYPKGPREFIX}-uwsgi
 
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/www/py-uwsgi/PLIST b/www/py-uwsgi/PLIST
index fe4281f044e..d8839144ede 100644
--- a/www/py-uwsgi/PLIST
+++ b/www/py-uwsgi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2014/01/23 14:47:05 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2015/06/10 03:32:42 rodent Exp $
 bin/uwsgi-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -7,54 +7,54 @@ ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/uwsgidecorators.py
 ${PYSITELIB}/uwsgidecorators.pyc
 ${PYSITELIB}/uwsgidecorators.pyo
-share/examples/py-uwsgi/bootstrap.py
-share/examples/py-uwsgi/bootstrap2.py
-share/examples/py-uwsgi/bootstrap3.py
-share/examples/py-uwsgi/bootstrap4.py
-share/examples/py-uwsgi/bootstrap5.py
-share/examples/py-uwsgi/config.lua
-share/examples/py-uwsgi/config.ru
-share/examples/py-uwsgi/config17.ru
-share/examples/py-uwsgi/config2.lua
-share/examples/py-uwsgi/config2.ru
-share/examples/py-uwsgi/config30.ru
-share/examples/py-uwsgi/corostream.pl
-share/examples/py-uwsgi/debug.ini
-share/examples/py-uwsgi/fibers.ru
-share/examples/py-uwsgi/fibers.yml
-share/examples/py-uwsgi/flaskpost.py
-share/examples/py-uwsgi/heavytest.ini
-share/examples/py-uwsgi/heavytest.py
-share/examples/py-uwsgi/info_uwsgi.php
-share/examples/py-uwsgi/logic.ini
-share/examples/py-uwsgi/mega.xml
-share/examples/py-uwsgi/mjpeg_stream.py
-share/examples/py-uwsgi/mojoapp.pl
-share/examples/py-uwsgi/multi.ini
-share/examples/py-uwsgi/multi.xml
-share/examples/py-uwsgi/multiapp.py
-share/examples/py-uwsgi/protected.ini
-share/examples/py-uwsgi/router.lua
-share/examples/py-uwsgi/simple_app.py
-share/examples/py-uwsgi/simple_app_wsgi2.py
-share/examples/py-uwsgi/simple_logger.py
-share/examples/py-uwsgi/sites.xml
-share/examples/py-uwsgi/sputnik.ws
-share/examples/py-uwsgi/staticfilesnmp.py
-share/examples/py-uwsgi/taskqueue.py
-share/examples/py-uwsgi/uwsgi.xml
-share/examples/py-uwsgi/uwsgirouter.py
-share/examples/py-uwsgi/uwsgirouter2.py
-share/examples/py-uwsgi/uwsgirouter3.py
-share/examples/py-uwsgi/uwsgirouter4.py
-share/examples/py-uwsgi/uwsgirouter5.py
-share/examples/py-uwsgi/uwsgistatus.py
-share/examples/py-uwsgi/welcome.ini
-share/examples/py-uwsgi/welcome.py
-share/examples/py-uwsgi/welcome3.py
-share/examples/py-uwsgi/werkzeug.js
-share/examples/py-uwsgi/werkzeug.yml
-share/examples/py-uwsgi/werkzeug_strict.yml
-share/examples/py-uwsgi/xmlindex-html.xsl
-share/examples/py-uwsgi/xmlindex.ini
-share/examples/py-uwsgi/zmqgevent.ini
+share/examples/${PYPKGPREFIX}-uwsgi/bootstrap.py
+share/examples/${PYPKGPREFIX}-uwsgi/bootstrap2.py
+share/examples/${PYPKGPREFIX}-uwsgi/bootstrap3.py
+share/examples/${PYPKGPREFIX}-uwsgi/bootstrap4.py
+share/examples/${PYPKGPREFIX}-uwsgi/bootstrap5.py
+share/examples/${PYPKGPREFIX}-uwsgi/config.lua
+share/examples/${PYPKGPREFIX}-uwsgi/config.ru
+share/examples/${PYPKGPREFIX}-uwsgi/config17.ru
+share/examples/${PYPKGPREFIX}-uwsgi/config2.lua
+share/examples/${PYPKGPREFIX}-uwsgi/config2.ru
+share/examples/${PYPKGPREFIX}-uwsgi/config30.ru
+share/examples/${PYPKGPREFIX}-uwsgi/corostream.pl
+share/examples/${PYPKGPREFIX}-uwsgi/debug.ini
+share/examples/${PYPKGPREFIX}-uwsgi/fibers.ru
+share/examples/${PYPKGPREFIX}-uwsgi/fibers.yml
+share/examples/${PYPKGPREFIX}-uwsgi/flaskpost.py
+share/examples/${PYPKGPREFIX}-uwsgi/heavytest.ini
+share/examples/${PYPKGPREFIX}-uwsgi/heavytest.py
+share/examples/${PYPKGPREFIX}-uwsgi/info_uwsgi.php
+share/examples/${PYPKGPREFIX}-uwsgi/logic.ini
+share/examples/${PYPKGPREFIX}-uwsgi/mega.xml
+share/examples/${PYPKGPREFIX}-uwsgi/mjpeg_stream.py
+share/examples/${PYPKGPREFIX}-uwsgi/mojoapp.pl
+share/examples/${PYPKGPREFIX}-uwsgi/multi.ini
+share/examples/${PYPKGPREFIX}-uwsgi/multi.xml
+share/examples/${PYPKGPREFIX}-uwsgi/multiapp.py
+share/examples/${PYPKGPREFIX}-uwsgi/protected.ini
+share/examples/${PYPKGPREFIX}-uwsgi/router.lua
+share/examples/${PYPKGPREFIX}-uwsgi/simple_app.py
+share/examples/${PYPKGPREFIX}-uwsgi/simple_app_wsgi2.py
+share/examples/${PYPKGPREFIX}-uwsgi/simple_logger.py
+share/examples/${PYPKGPREFIX}-uwsgi/sites.xml
+share/examples/${PYPKGPREFIX}-uwsgi/sputnik.ws
+share/examples/${PYPKGPREFIX}-uwsgi/staticfilesnmp.py
+share/examples/${PYPKGPREFIX}-uwsgi/taskqueue.py
+share/examples/${PYPKGPREFIX}-uwsgi/uwsgi.xml
+share/examples/${PYPKGPREFIX}-uwsgi/uwsgirouter.py
+share/examples/${PYPKGPREFIX}-uwsgi/uwsgirouter2.py
+share/examples/${PYPKGPREFIX}-uwsgi/uwsgirouter3.py
+share/examples/${PYPKGPREFIX}-uwsgi/uwsgirouter4.py
+share/examples/${PYPKGPREFIX}-uwsgi/uwsgirouter5.py
+share/examples/${PYPKGPREFIX}-uwsgi/uwsgistatus.py
+share/examples/${PYPKGPREFIX}-uwsgi/welcome.ini
+share/examples/${PYPKGPREFIX}-uwsgi/welcome.py
+share/examples/${PYPKGPREFIX}-uwsgi/welcome3.py
+share/examples/${PYPKGPREFIX}-uwsgi/werkzeug.js
+share/examples/${PYPKGPREFIX}-uwsgi/werkzeug.yml
+share/examples/${PYPKGPREFIX}-uwsgi/werkzeug_strict.yml
+share/examples/${PYPKGPREFIX}-uwsgi/xmlindex-html.xsl
+share/examples/${PYPKGPREFIX}-uwsgi/xmlindex.ini
+share/examples/${PYPKGPREFIX}-uwsgi/zmqgevent.ini