- Added devel/py-setuptools as dependency

- Bumped PORTREVISION
- Fixed the issue with packing list, when you have
  previously installed setuptools on the system
- Fixed a typo in pkg-descr
- Replaced pkg-plist with PLIST_FILES

PR:		ports/107613
Submitted by:	Nicola Vitale <nivit at email.it>
Approved by:	alexbl (mentor, implicit), maintainer timeout (15 days)

5 files changed, 46 insertions, 19 deletions

diff --git a/devel/py-wsgiutils/Makefile b/devel/py-wsgiutils/Makefile
index 435f0198eee9..4d43052ea293 100644
--- a/devel/py-wsgiutils/Makefile
+++ b/devel/py-wsgiutils/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wsgiutils
 PORTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	devel textproc www python
 MASTER_SITES=	http://www.owlfish.com/software/wsgiutils/downloads/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,10 +16,19 @@ DISTNAME=	WSGIUtils-${PORTVERSION}
 MAINTAINER=	j.haarman@synantics.com
 COMMENT=	Utility libraries for development of simple WSGI programs
 
+BUILD_DEPENDS=	easy_install:${PORTSDIR}/devel/py-setuptools
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 
-PLIST_SUB=	PORTVERSION=${PORTVERSION} \
-		PYTHON_VERSION_NR=${_PYTHON_PORTBRANCH}
+PLIST_FILES=	${PYTHON_SITELIBDIR:S,${PREFIX}/,,}/${PYWSGIUTILS_EGG}
+PLIST_SUB=	PYWSGIUTILS_EGG="${PYWSGIUTILS_EGG}"
+
+SUB_FILES+=	pkg-deinstall pkg-install
+SUB_LIST+=	EGG="WSGIUtils==${PORTVERSION}" \
+		PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR}
+
+PYWSGIUTILS_EGG=	WSGIUtils-${PORTVERSION}-py${PYTHON_VER}.egg
 
 .include <bsd.port.mk>
diff --git a/devel/py-wsgiutils/files/pkg-deinstall.in b/devel/py-wsgiutils/files/pkg-deinstall.in
new file mode 100644
index 000000000000..8ee207b16f16
--- /dev/null
+++ b/devel/py-wsgiutils/files/pkg-deinstall.in
@@ -0,0 +1,17 @@
+#!/bin/sh
+# $FreeBSD$
+PKGNAME=$1
+#
+case $2 in
+    DEINSTALL)
+	easy_install -q -m -x -S %%PYTHON_SITELIBDIR%% %%EGG%%
+	;;
+    POST-DEINSTALL)
+	exit 0
+	;;
+    *)
+	echo "Unexpected Argument $2!!!"
+	exit 1
+	;;
+esac
+exit 0
diff --git a/devel/py-wsgiutils/files/pkg-install.in b/devel/py-wsgiutils/files/pkg-install.in
new file mode 100644
index 000000000000..9cddbe28f167
--- /dev/null
+++ b/devel/py-wsgiutils/files/pkg-install.in
@@ -0,0 +1,16 @@
+#!/bin/sh
+# $FreeBSD$
+PKGNAME=$1
+#
+case $2 in
+    POST-INSTALL)
+	easy_install -q -N -S %%PYTHON_SITELIBDIR%% %%EGG%%
+	;;
+    PRE-INSTALL)
+	;;
+    *)
+	echo "Unexpected Argument $2!!!"
+	exit 1
+	;;
+esac
+exit 0
diff --git a/devel/py-wsgiutils/pkg-descr b/devel/py-wsgiutils/pkg-descr
index 7dbb408c397f..5ad18ff0820a 100644
--- a/devel/py-wsgiutils/pkg-descr
+++ b/devel/py-wsgiutils/pkg-descr
@@ -1,7 +1,7 @@
 WSGIUtils is a package of standalone utility libraries that ease the development
 of simple WSGI programs.
 
-The package is divided into two main components which can be used individualy or
+The package is divided into two main components which can be used individually or
 in combination.
 
 wsgiServer is a multi-threaded WSGI web server based on SimpleHTTPServer.
diff --git a/devel/py-wsgiutils/pkg-plist b/devel/py-wsgiutils/pkg-plist
deleted file mode 100644
index f71c7da80d8e..000000000000
--- a/devel/py-wsgiutils/pkg-plist
+++ /dev/null
@@ -1,16 +0,0 @@
-%%PYTHON_SITELIBDIR%%/wsgiutils/SessionClient.py
-%%PYTHON_SITELIBDIR%%/wsgiutils/SessionClient.pyc
-%%PYTHON_SITELIBDIR%%/wsgiutils/SessionClient.pyo
-%%PYTHON_SITELIBDIR%%/wsgiutils/SessionServer.py
-%%PYTHON_SITELIBDIR%%/wsgiutils/SessionServer.pyc
-%%PYTHON_SITELIBDIR%%/wsgiutils/SessionServer.pyo
-%%PYTHON_SITELIBDIR%%/wsgiutils/__init__.py
-%%PYTHON_SITELIBDIR%%/wsgiutils/__init__.pyc
-%%PYTHON_SITELIBDIR%%/wsgiutils/__init__.pyo
-%%PYTHON_SITELIBDIR%%/wsgiutils/wsgiAdaptor.py
-%%PYTHON_SITELIBDIR%%/wsgiutils/wsgiAdaptor.pyc
-%%PYTHON_SITELIBDIR%%/wsgiutils/wsgiAdaptor.pyo
-%%PYTHON_SITELIBDIR%%/wsgiutils/wsgiServer.py
-%%PYTHON_SITELIBDIR%%/wsgiutils/wsgiServer.pyc
-%%PYTHON_SITELIBDIR%%/wsgiutils/wsgiServer.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/wsgiutils/