- Use easy_install to avoid deinstall errors

PR:		128257
Submitted by:	Wen Heping <wenheping___gmail.com>

2 files changed, 2 insertions, 128 deletions

diff --git a/net/py-zsi/Makefile b/net/py-zsi/Makefile
index cdde955c12c..3861f38e9cb 100644
--- a/net/py-zsi/Makefile
+++ b/net/py-zsi/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS=	${PYXML}
 CONFLICTS=	py-zsi-devel-2.*
 
 USE_PYTHON=	2.3+
-USE_PYDISTUTILS=	yes
+USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_PKGNAME=	ZSI
 
 post-install:
diff --git a/net/py-zsi/pkg-plist b/net/py-zsi/pkg-plist
index 1d817fdbb6a..5d4047b883d 100644
--- a/net/py-zsi/pkg-plist
+++ b/net/py-zsi/pkg-plist
@@ -1,128 +1,6 @@
 bin/wsdl2dispatch
 bin/wsdl2py
-%%PYTHON_SITELIBDIR%%/ZSI/ServiceContainer.py
-%%PYTHON_SITELIBDIR%%/ZSI/ServiceContainer.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/ServiceContainer.pyo
-%%PYTHON_SITELIBDIR%%/ZSI/ServiceProxy.py
-%%PYTHON_SITELIBDIR%%/ZSI/ServiceProxy.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/ServiceProxy.pyo
-%%PYTHON_SITELIBDIR%%/ZSI/TC.py
-%%PYTHON_SITELIBDIR%%/ZSI/TC.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/TC.pyo
-%%PYTHON_SITELIBDIR%%/ZSI/TCapache.py
-%%PYTHON_SITELIBDIR%%/ZSI/TCapache.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/TCapache.pyo
-%%PYTHON_SITELIBDIR%%/ZSI/TCcompound.py
-%%PYTHON_SITELIBDIR%%/ZSI/TCcompound.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/TCcompound.pyo
-%%PYTHON_SITELIBDIR%%/ZSI/TCnumbers.py
-%%PYTHON_SITELIBDIR%%/ZSI/TCnumbers.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/TCnumbers.pyo
-%%PYTHON_SITELIBDIR%%/ZSI/TCtimes.py
-%%PYTHON_SITELIBDIR%%/ZSI/TCtimes.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/TCtimes.pyo
-%%PYTHON_SITELIBDIR%%/ZSI/__init__.py
-%%PYTHON_SITELIBDIR%%/ZSI/__init__.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/__init__.pyo
-%%PYTHON_SITELIBDIR%%/ZSI/address.py
-%%PYTHON_SITELIBDIR%%/ZSI/address.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/address.pyo
-%%PYTHON_SITELIBDIR%%/ZSI/auth.py
-%%PYTHON_SITELIBDIR%%/ZSI/auth.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/auth.pyo
-%%PYTHON_SITELIBDIR%%/ZSI/client.py
-%%PYTHON_SITELIBDIR%%/ZSI/client.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/client.pyo
-%%PYTHON_SITELIBDIR%%/ZSI/digest_auth.py
-%%PYTHON_SITELIBDIR%%/ZSI/digest_auth.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/digest_auth.pyo
-%%PYTHON_SITELIBDIR%%/ZSI/dispatch.py
-%%PYTHON_SITELIBDIR%%/ZSI/dispatch.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/dispatch.pyo
-%%PYTHON_SITELIBDIR%%/ZSI/fault.py
-%%PYTHON_SITELIBDIR%%/ZSI/fault.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/fault.pyo
-%%PYTHON_SITELIBDIR%%/ZSI/generate/__init__.py
-%%PYTHON_SITELIBDIR%%/ZSI/generate/__init__.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/generate/__init__.pyo
-%%PYTHON_SITELIBDIR%%/ZSI/generate/commands.py
-%%PYTHON_SITELIBDIR%%/ZSI/generate/commands.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/generate/commands.pyo
-%%PYTHON_SITELIBDIR%%/ZSI/generate/containers.py
-%%PYTHON_SITELIBDIR%%/ZSI/generate/containers.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/generate/containers.pyo
-%%PYTHON_SITELIBDIR%%/ZSI/generate/pyclass.py
-%%PYTHON_SITELIBDIR%%/ZSI/generate/pyclass.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/generate/pyclass.pyo
-%%PYTHON_SITELIBDIR%%/ZSI/generate/utility.py
-%%PYTHON_SITELIBDIR%%/ZSI/generate/utility.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/generate/utility.pyo
-%%PYTHON_SITELIBDIR%%/ZSI/generate/wsdl2dispatch.py
-%%PYTHON_SITELIBDIR%%/ZSI/generate/wsdl2dispatch.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/generate/wsdl2dispatch.pyo
-%%PYTHON_SITELIBDIR%%/ZSI/generate/wsdl2python.py
-%%PYTHON_SITELIBDIR%%/ZSI/generate/wsdl2python.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/generate/wsdl2python.pyo
-%%PYTHON_SITELIBDIR%%/ZSI/parse.py
-%%PYTHON_SITELIBDIR%%/ZSI/parse.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/parse.pyo
-%%PYTHON_SITELIBDIR%%/ZSI/resolvers.py
-%%PYTHON_SITELIBDIR%%/ZSI/resolvers.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/resolvers.pyo
-%%PYTHON_SITELIBDIR%%/ZSI/schema.py
-%%PYTHON_SITELIBDIR%%/ZSI/schema.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/schema.pyo
-%%PYTHON_SITELIBDIR%%/ZSI/twisted/WSresource.py
-%%PYTHON_SITELIBDIR%%/ZSI/twisted/WSresource.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/twisted/WSresource.pyo
-%%PYTHON_SITELIBDIR%%/ZSI/twisted/WSsecurity.py
-%%PYTHON_SITELIBDIR%%/ZSI/twisted/WSsecurity.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/twisted/WSsecurity.pyo
-%%PYTHON_SITELIBDIR%%/ZSI/twisted/__init__.py
-%%PYTHON_SITELIBDIR%%/ZSI/twisted/__init__.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/twisted/__init__.pyo
-%%PYTHON_SITELIBDIR%%/ZSI/twisted/client.py
-%%PYTHON_SITELIBDIR%%/ZSI/twisted/client.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/twisted/client.pyo
-%%PYTHON_SITELIBDIR%%/ZSI/typeinterpreter.py
-%%PYTHON_SITELIBDIR%%/ZSI/typeinterpreter.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/typeinterpreter.pyo
-%%PYTHON_SITELIBDIR%%/ZSI/version.py
-%%PYTHON_SITELIBDIR%%/ZSI/version.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/version.pyo
-%%PYTHON_SITELIBDIR%%/ZSI/writer.py
-%%PYTHON_SITELIBDIR%%/ZSI/writer.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/writer.pyo
-%%PYTHON_SITELIBDIR%%/ZSI/wstools/Namespaces.py
-%%PYTHON_SITELIBDIR%%/ZSI/wstools/Namespaces.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/wstools/Namespaces.pyo
-%%PYTHON_SITELIBDIR%%/ZSI/wstools/TimeoutSocket.py
-%%PYTHON_SITELIBDIR%%/ZSI/wstools/TimeoutSocket.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/wstools/TimeoutSocket.pyo
-%%PYTHON_SITELIBDIR%%/ZSI/wstools/UserTuple.py
-%%PYTHON_SITELIBDIR%%/ZSI/wstools/UserTuple.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/wstools/UserTuple.pyo
-%%PYTHON_SITELIBDIR%%/ZSI/wstools/Utility.py
-%%PYTHON_SITELIBDIR%%/ZSI/wstools/Utility.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/wstools/Utility.pyo
-%%PYTHON_SITELIBDIR%%/ZSI/wstools/WSDLTools.py
-%%PYTHON_SITELIBDIR%%/ZSI/wstools/WSDLTools.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/wstools/WSDLTools.pyo
-%%PYTHON_SITELIBDIR%%/ZSI/wstools/XMLSchema.py
-%%PYTHON_SITELIBDIR%%/ZSI/wstools/XMLSchema.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/wstools/XMLSchema.pyo
-%%PYTHON_SITELIBDIR%%/ZSI/wstools/XMLname.py
-%%PYTHON_SITELIBDIR%%/ZSI/wstools/XMLname.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/wstools/XMLname.pyo
-%%PYTHON_SITELIBDIR%%/ZSI/wstools/__init__.py
-%%PYTHON_SITELIBDIR%%/ZSI/wstools/__init__.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/wstools/__init__.pyo
-%%PYTHON_SITELIBDIR%%/ZSI/wstools/c14n.py
-%%PYTHON_SITELIBDIR%%/ZSI/wstools/c14n.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/wstools/c14n.pyo
-%%PYTHON_SITELIBDIR%%/ZSI/wstools/logging.py
-%%PYTHON_SITELIBDIR%%/ZSI/wstools/logging.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/wstools/logging.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/app-dispatch-dict.tex
@@ -244,7 +122,3 @@ bin/wsdl2py
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/interop
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/ZSI/wstools
-@dirrm %%PYTHON_SITELIBDIR%%/ZSI/twisted
-@dirrm %%PYTHON_SITELIBDIR%%/ZSI/generate
-@dirrm %%PYTHON_SITELIBDIR%%/ZSI