4 files changed, 38 insertions, 28 deletions

diff --git a/net/py-zsi/Makefile b/net/py-zsi/Makefile
index b38e7e697087..23fd4606b8b2 100644
--- a/net/py-zsi/Makefile
+++ b/net/py-zsi/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zsi
-PORTVERSION=	1.5.0
+PORTVERSION=	1.7
 PORTEPOCH=	1
 CATEGORIES=	net python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -17,14 +17,9 @@ DISTNAME=	${PORTNAME:U}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A pure Python module that provides an implementation of SOAP 1.1
 
-RUN_DEPENDS=	${PYXML}
-
-USE_PYTHON=	yes
+USE_PYTHON=	2.0+
 USE_PYDISTUTILS=	yes
 
-pre-install:
-	@ ${SH} ${PKGREQ} INSTALL
-
 post-install:
 .if !defined(NOPORTDOCS)
 	@ ${MKDIR} ${DOCSDIR}
@@ -33,7 +28,7 @@ post-install:
 .endfor
 .for subdir in interop samples test
 	@ ${MKDIR} ${EXAMPLESDIR}/${subdir}
-	@ ${INSTALL_DATA} ${WRKSRC}/${subdir}/* ${EXAMPLESDIR}/${subdir}
+	@ ${CP} -rp ${WRKSRC}/${subdir}/* ${EXAMPLESDIR}/${subdir}
 .endfor
 .endif
 
diff --git a/net/py-zsi/distinfo b/net/py-zsi/distinfo
index c0f4dbb5c23e..0d0c431adac2 100644
--- a/net/py-zsi/distinfo
+++ b/net/py-zsi/distinfo
@@ -1,2 +1,2 @@
-MD5 (ZSI-1.5.0.tar.gz) = 6a6790b9e004f2b7172385bc4f182fb6
-SIZE (ZSI-1.5.0.tar.gz) = 365962
+MD5 (ZSI-1.7.tar.gz) = b7f817444ec302ba0015f62146b3349c
+SIZE (ZSI-1.7.tar.gz) = 414611
diff --git a/net/py-zsi/pkg-plist b/net/py-zsi/pkg-plist
index afea2bfd1313..115ad6d7eac2 100644
--- a/net/py-zsi/pkg-plist
+++ b/net/py-zsi/pkg-plist
@@ -1,4 +1,17 @@
-bin/wsdl2py
+bin/wsdl2dispatch.py
+bin/wsdl2py.py
+%%PYTHON_SITELIBDIR%%/ZSI/ServiceContainer.py
+%%PYTHON_SITELIBDIR%%/ZSI/ServiceContainer.pyc
+%%PYTHON_SITELIBDIR%%/ZSI/ServiceContainer.pyo
+%%PYTHON_SITELIBDIR%%/ZSI/wstools/Namespaces.py
+%%PYTHON_SITELIBDIR%%/ZSI/wstools/Namespaces.pyc
+%%PYTHON_SITELIBDIR%%/ZSI/wstools/Namespaces.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%%/ZSI/ServiceProxy.py
 %%PYTHON_SITELIBDIR%%/ZSI/ServiceProxy.pyc
 %%PYTHON_SITELIBDIR%%/ZSI/ServiceProxy.pyo
@@ -122,7 +135,26 @@ bin/wsdl2py
 %%PORTDOCS%%%%EXAMPLESDIR%%/test/test_zsi_net.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/test/tests_bad.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/test/tests_good.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/samples/Echo/Echo.wsdl
+%%PORTDOCS%%%%EXAMPLESDIR%%/samples/Echo/EchoClient.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/samples/Echo/EchoServer.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/samples/Echo/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/wsdl2py/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/wsdl2py/ServiceTest.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/wsdl2py/runTests.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/wsdl2py/test_AmazonWebService.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/wsdl2py/test_FreeDBService.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/wsdl2py/test_GlobalWeather_gw.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/wsdl2py/test_GlobalWeather_si.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/wsdl2py/test_TerraService.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/wsdl2py/test_ThreatService.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/wsdl2py/test_XMethodsQuery.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/wsdl2py/test_ZipCodeResolver.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/wsdl2py/test_compile.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/wsdl2py/test_wsdl2py.py
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/test/wsdl2py
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/test
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/samples/Echo
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/samples
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/interop
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
diff --git a/net/py-zsi/pkg-req b/net/py-zsi/pkg-req
deleted file mode 100644
index fd3eb3555f86..000000000000
--- a/net/py-zsi/pkg-req
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-PATH=$PATH:/usr/local/bin
-
-if [ "x$1" = "xINSTALL" -o "x$2" = "xINSTALL" ]; then
-  PYTHON_GT=`python -c 'import string, sys; \
-                        print string.split(sys.version)[0] >= "2.0" and 1'`
-  if [ "x${PYTHON_GT}" = "x1" ]; then
-    exit 0
-  else
-    echo "-----------------------------------------------------------"
-    echo "ZSI requires Python version 2.0 or greater -"
-    echo "  please update your Python installation before proceeding."
-    echo "-----------------------------------------------------------"
-    exit 1
-  fi
-fi