3 files changed, 136 insertions, 97 deletions

diff --git a/net/py-zsi/Makefile b/net/py-zsi/Makefile
index 3548fe44d28c..b38e7e697087 100644
--- a/net/py-zsi/Makefile
+++ b/net/py-zsi/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	zsi
-PORTVERSION=	1.22.6
+PORTVERSION=	1.5.0
+PORTEPOCH=	1
 CATEGORIES=	net python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pywebsvcs
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME:U}-${PORTVERSION:C|\.([^.]*)$|-\1|}
-EXTRACT_SUFX=	.tgz
+DISTNAME=	${PORTNAME:U}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A pure Python module that provides an implementation of SOAP 1.1
@@ -21,7 +21,6 @@ RUN_DEPENDS=	${PYXML}
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME:U}-1.2
 
 pre-install:
 	@ ${SH} ${PKGREQ} INSTALL
diff --git a/net/py-zsi/distinfo b/net/py-zsi/distinfo
index 370196f544f0..c0f4dbb5c23e 100644
--- a/net/py-zsi/distinfo
+++ b/net/py-zsi/distinfo
@@ -1,2 +1,2 @@
-MD5 (ZSI-1.22-6.tgz) = fb856af33d83fd883b334c0be8cc3309
-SIZE (ZSI-1.22-6.tgz) = 231571
+MD5 (ZSI-1.5.0.tar.gz) = 6a6790b9e004f2b7172385bc4f182fb6
+SIZE (ZSI-1.5.0.tar.gz) = 365962
diff --git a/net/py-zsi/pkg-plist b/net/py-zsi/pkg-plist
index 43d4082b83c9..afea2bfd1313 100644
--- a/net/py-zsi/pkg-plist
+++ b/net/py-zsi/pkg-plist
@@ -1,91 +1,131 @@
-%%PORTDOCS%%share/doc/zsi/CHANGES
-%%PORTDOCS%%share/doc/zsi/README
-%%PORTDOCS%%share/doc/zsi/c01-intro.tex
-%%PORTDOCS%%share/doc/zsi/c02-samples.tex
-%%PORTDOCS%%share/doc/zsi/c03-except.tex
-%%PORTDOCS%%share/doc/zsi/c04-utils.tex
-%%PORTDOCS%%share/doc/zsi/c05-parse.tex
-%%PORTDOCS%%share/doc/zsi/c06-tc.tex
-%%PORTDOCS%%share/doc/zsi/c07-writer.tex
-%%PORTDOCS%%share/doc/zsi/c08-fault.tex
-%%PORTDOCS%%share/doc/zsi/c09-resolve.tex
-%%PORTDOCS%%share/doc/zsi/c10-dispatch.tex
-%%PORTDOCS%%share/doc/zsi/version.tex
-%%PORTDOCS%%share/doc/zsi/zsi.css
-%%PORTDOCS%%share/doc/zsi/zsi.html
-%%PORTDOCS%%share/doc/zsi/zsi.pdf
-%%PORTDOCS%%share/doc/zsi/zsi.ps
-%%PORTDOCS%%share/doc/zsi/zsi.tex
-%%PORTDOCS%%share/doc/zsi/zsi.xsd
-%%PORTDOCS%%share/doc/zsi/zsixsd.tex
-%%PORTDOCS%%share/examples/zsi/interop/InteropTest.wsdl
-%%PORTDOCS%%share/examples/zsi/interop/InteropTestB.wsdl
-%%PORTDOCS%%share/examples/zsi/interop/README
-%%PORTDOCS%%share/examples/zsi/interop/client.py
-%%PORTDOCS%%share/examples/zsi/interop/cpackets.py
-%%PORTDOCS%%share/examples/zsi/interop/echoHeaderBindings.wsdl
-%%PORTDOCS%%share/examples/zsi/interop/sclasses.py
-%%PORTDOCS%%share/examples/zsi/interop/server.py
-%%PORTDOCS%%share/examples/zsi/samples/README
-%%PORTDOCS%%share/examples/zsi/samples/poly.py
-%%PORTDOCS%%share/examples/zsi/test/README
-%%PORTDOCS%%share/examples/zsi/test/cgicli.py
-%%PORTDOCS%%share/examples/zsi/test/t1.py
-%%PORTDOCS%%share/examples/zsi/test/t2.py
-%%PORTDOCS%%share/examples/zsi/test/t3.py
-%%PORTDOCS%%share/examples/zsi/test/t4.py
-%%PORTDOCS%%share/examples/zsi/test/t5.py
-%%PORTDOCS%%share/examples/zsi/test/t6.py
-%%PORTDOCS%%share/examples/zsi/test/t7.py
-%%PORTDOCS%%share/examples/zsi/test/tests.py
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/TC.py
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/TC.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/TC.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/TCapache.py
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/TCapache.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/TCapache.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/TCcompound.py
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/TCcompound.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/TCcompound.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/TCnumbers.py
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/TCnumbers.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/TCnumbers.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/TCtimes.py
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/TCtimes.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/TCtimes.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/auth.py
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/auth.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/auth.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/client.py
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/client.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/client.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/compat.py
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/compat.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/compat.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/dispatch.py
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/dispatch.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/dispatch.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/fault.py
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/fault.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/fault.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/parse.py
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/parse.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/parse.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/resolvers.py
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/resolvers.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/resolvers.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/version.py
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/version.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/version.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/writer.py
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/writer.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZSI/writer.pyo
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/ZSI
-%%PORTDOCS%%@dirrm share/examples/zsi/test
-%%PORTDOCS%%@dirrm share/examples/zsi/samples
-%%PORTDOCS%%@dirrm share/examples/zsi/interop
-%%PORTDOCS%%@dirrm share/examples/zsi
-%%PORTDOCS%%@dirrm share/doc/zsi
+bin/wsdl2py
+%%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/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/compat.py
+%%PYTHON_SITELIBDIR%%/ZSI/compat.pyc
+%%PYTHON_SITELIBDIR%%/ZSI/compat.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/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/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/wsdl2python.py
+%%PYTHON_SITELIBDIR%%/ZSI/wsdl2python.pyc
+%%PYTHON_SITELIBDIR%%/ZSI/wsdl2python.pyo
+%%PYTHON_SITELIBDIR%%/ZSI/wsdlInterface.py
+%%PYTHON_SITELIBDIR%%/ZSI/wsdlInterface.pyc
+%%PYTHON_SITELIBDIR%%/ZSI/wsdlInterface.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
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/c01-intro.tex
+%%PORTDOCS%%%%DOCSDIR%%/c02-samples.tex
+%%PORTDOCS%%%%DOCSDIR%%/c02a-coverage.tex
+%%PORTDOCS%%%%DOCSDIR%%/c03-except.tex
+%%PORTDOCS%%%%DOCSDIR%%/c04-utils.tex
+%%PORTDOCS%%%%DOCSDIR%%/c05-parse.tex
+%%PORTDOCS%%%%DOCSDIR%%/c06-tc.tex
+%%PORTDOCS%%%%DOCSDIR%%/c07-writer.tex
+%%PORTDOCS%%%%DOCSDIR%%/c08-fault.tex
+%%PORTDOCS%%%%DOCSDIR%%/c09-resolve.tex
+%%PORTDOCS%%%%DOCSDIR%%/c10-dispatch.tex
+%%PORTDOCS%%%%DOCSDIR%%/c11-wsdl.tex
+%%PORTDOCS%%%%DOCSDIR%%/version.tex
+%%PORTDOCS%%%%DOCSDIR%%/zsi.css
+%%PORTDOCS%%%%DOCSDIR%%/zsi.html
+%%PORTDOCS%%%%DOCSDIR%%/zsi.pdf
+%%PORTDOCS%%%%DOCSDIR%%/zsi.ps
+%%PORTDOCS%%%%DOCSDIR%%/zsi.tex
+%%PORTDOCS%%%%DOCSDIR%%/zsi.xsd
+%%PORTDOCS%%%%DOCSDIR%%/zsixsd.tex
+%%PORTDOCS%%%%EXAMPLESDIR%%/interop/InteropTest.wsdl
+%%PORTDOCS%%%%EXAMPLESDIR%%/interop/InteropTestB.wsdl
+%%PORTDOCS%%%%EXAMPLESDIR%%/interop/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/interop/client.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/interop/cpackets.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/interop/echoHeaderBindings.wsdl
+%%PORTDOCS%%%%EXAMPLESDIR%%/interop/sclasses.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/interop/server.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/samples/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/samples/poly.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/cgicli.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/test_t1.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/test_t2.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/test_t3.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/test_t4.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/test_t5.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/test_t6.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/test_t7.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/test_zsi.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/test_zsi_net.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/tests_bad.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/tests_good.py
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/test
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/samples
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/interop
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%PYTHON_SITELIBDIR%%/ZSI/wstools
+@dirrm %%PYTHON_SITELIBDIR%%/ZSI