3 files changed, 38 insertions, 5 deletions

diff --git a/net/py-zsi-devel/Makefile b/net/py-zsi-devel/Makefile
index 736af666e126..fe6dea929410 100644
--- a/net/py-zsi-devel/Makefile
+++ b/net/py-zsi-devel/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	zsi
-PORTVERSION=	1.1
+PORTVERSION=	1.22.6
 CATEGORIES=	net python
-MASTER_SITES=	http://www.zolera.com/resources/opensrc/zsi/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	pywebsvcs
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
+DISTNAME=	${PORTNAME:U}-${PORTVERSION:C|\.([^.]*)$|-\1|}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	wjv@FreeBSD.org
@@ -19,7 +20,7 @@ RUN_DEPENDS=	${PYXML}
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME:U}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME:U}-1.2
 
 pre-install:
 	@ ${SH} ${PKGREQ} INSTALL
@@ -30,6 +31,10 @@ post-install:
 .for docfile in CHANGES README doc/zsi.* doc/*.tex
 	@ ${INSTALL_DATA} ${WRKSRC}/${docfile} ${DOCSDIR}
 .endfor
+.for subdir in interop samples test
+	@ ${MKDIR} ${EXAMPLESDIR}/${subdir}
+	@ ${INSTALL_DATA} ${WRKSRC}/${subdir}/* ${EXAMPLESDIR}/${subdir}
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/py-zsi-devel/distinfo b/net/py-zsi-devel/distinfo
index 6dce2d5f1865..853b69bcaaca 100644
--- a/net/py-zsi-devel/distinfo
+++ b/net/py-zsi-devel/distinfo
@@ -1 +1 @@
-MD5 (zsi11.tgz) = a79c69d59bfd26ecb7ea6392753bd972
+MD5 (ZSI-1.22-6.tgz) = fb856af33d83fd883b334c0be8cc3309
diff --git a/net/py-zsi-devel/pkg-plist b/net/py-zsi-devel/pkg-plist
index b4d853f08504..43d4082b83c9 100644
--- a/net/py-zsi-devel/pkg-plist
+++ b/net/py-zsi-devel/pkg-plist
@@ -10,6 +10,7 @@
 %%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
@@ -17,6 +18,26 @@
 %%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
@@ -41,6 +62,9 @@ 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
@@ -60,4 +84,8 @@ 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