ports/107613: [PATCH] devel/py-wsgiutils: incorrect pkg-plist if setuptools is installed

[Nicola Vitale]

>Number:         107613
>Category:       ports
>Synopsis:       [PATCH] devel/py-wsgiutils: incorrect pkg-plist if setuptools is installed
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 06 13:40:14 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Nicola Vitale
>Release:        FreeBSD 6.2-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD furbetto.domo.sva 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #0: Sun Nov 19 17:14:26 CET 2006
>Description:
- If you install devel/py-setuptools before, and then devel/py-wsgiutils,
  the latter is installed as a Python egg, so the pkg-plist becomes
  incorrect:

===>  Deinstalling for devel/py-wsgiutils
===>   Deinstalling py24-wsgiutils-0.7
pkg_delete: file '/usr/local/lib/python2.4/site-packages/wsgiutils/SessionClient.py' doesn't exist
pkg_delete: file '/usr/local/lib/python2.4/site-packages/wsgiutils/SessionClient.pyc' doesn't exist
pkg_delete: file '/usr/local/lib/python2.4/site-packages/wsgiutils/SessionClient.pyo' doesn't exist
pkg_delete: file '/usr/local/lib/python2.4/site-packages/wsgiutils/SessionServer.py' doesn't exist
pkg_delete: file '/usr/local/lib/python2.4/site-packages/wsgiutils/SessionServer.pyc' doesn't exist
pkg_delete: file '/usr/local/lib/python2.4/site-packages/wsgiutils/SessionServer.pyo' doesn't exist
pkg_delete: file '/usr/local/lib/python2.4/site-packages/wsgiutils/__init__.py' doesn't exist
pkg_delete: file '/usr/local/lib/python2.4/site-packages/wsgiutils/__init__.pyc' doesn't exist
pkg_delete: file '/usr/local/lib/python2.4/site-packages/wsgiutils/__init__.pyo' doesn't exist
pkg_delete: file '/usr/local/lib/python2.4/site-packages/wsgiutils/wsgiAdaptor.py' doesn't exist
pkg_delete: file '/usr/local/lib/python2.4/site-packages/wsgiutils/wsgiAdaptor.pyc' doesn't exist
pkg_delete: file '/usr/local/lib/python2.4/site-packages/wsgiutils/wsgiAdaptor.pyo' doesn't exist
pkg_delete: file '/usr/local/lib/python2.4/site-packages/wsgiutils/wsgiServer.py' doesn't exist
pkg_delete: file '/usr/local/lib/python2.4/site-packages/wsgiutils/wsgiServer.pyc' doesn't exist
pkg_delete: file '/usr/local/lib/python2.4/site-packages/wsgiutils/wsgiServer.pyo' doesn't exist
pkg_delete: file '/usr/local/lib/python2.4/site-packages/wsgiutils/' doesn't exist
pkg_delete: unable to completely remove directory '/usr/local/lib/python2.4/site-packages/wsgiutils/'
pkg_delete: couldn't entirely delete package (perhaps the packing list is
incorrectly specified?)
  
Added file(s):
- files/pkg-deinstall.in
- files/pkg-install.in

Removed file(s):
- pkg-plist

Port maintainer (j.haarman at synantics.com) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
cd /usr/ports/devel/py-setuptools && make install clean
cd /usr/ports/devel/py-wsgiutils && make install deinstall clean

>Fix:
- Use setuptools (easy_install) as default

--- py24-wsgiutils-0.7_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/devel/py-wsgiutils/Makefile /usr/ports/devel/py-wsgiutils.with-setuptools/Makefile
--- /usr/ports/devel/py-wsgiutils/Makefile	Sat Jul 15 10:35:58 2006
+++ /usr/ports/devel/py-wsgiutils.with-setuptools/Makefile	Sat Jan  6 14:04:24 2007
@@ -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,20 @@
 MAINTAINER=	j.haarman at 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==${PYWSGIUTILS_VER}" \
+		PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR}
+
+PYWSGIUTILS_EGG=	WSGIUtils-${PORTVERSION}-${PYTHON_VERSION:S/thon//}.egg
+PYWSGIUTILS_VER=	${PORTVERSION}
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/devel/py-wsgiutils/files/pkg-deinstall.in /usr/ports/devel/py-wsgiutils.with-setuptools/files/pkg-deinstall.in
--- /usr/ports/devel/py-wsgiutils/files/pkg-deinstall.in	Thu Jan  1 01:00:00 1970
+++ /usr/ports/devel/py-wsgiutils.with-setuptools/files/pkg-deinstall.in	Thu Jan  4 14:48:50 2007
@@ -0,0 +1,17 @@
+#!/bin/sh
+# $FreeBSD: ports/devel/py-protocols-devel/files/pkg-deinstall.in,v 1.1 2007/01/04 13:48:50 nivit Exp $
+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 -ruN --exclude=CVS /usr/ports/devel/py-wsgiutils/files/pkg-install.in /usr/ports/devel/py-wsgiutils.with-setuptools/files/pkg-install.in
--- /usr/ports/devel/py-wsgiutils/files/pkg-install.in	Thu Jan  1 01:00:00 1970
+++ /usr/ports/devel/py-wsgiutils.with-setuptools/files/pkg-install.in	Thu Jan  4 14:48:50 2007
@@ -0,0 +1,16 @@
+#!/bin/sh
+# $FreeBSD: ports/devel/py-protocols-devel/files/pkg-install.in,v 1.1 2007/01/04 13:48:50 nivit Exp $
+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 -ruN --exclude=CVS /usr/ports/devel/py-wsgiutils/pkg-plist /usr/ports/devel/py-wsgiutils.with-setuptools/pkg-plist
--- /usr/ports/devel/py-wsgiutils/pkg-plist	Sat Jul 15 10:35:58 2006
+++ /usr/ports/devel/py-wsgiutils.with-setuptools/pkg-plist	Thu Jan  1 01:00:00 1970
@@ -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
- at dirrm %%PYTHON_SITELIBDIR%%/wsgiutils/
--- py24-wsgiutils-0.7_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: