: net/py-zsi-devel

- Add py-zsi-devel based on py-zsi [1]
- Update to 2.0-rc2

: net/py-zsi

- Add conflicts to py-zsi-devel

: Makefile

- Add py-zsi-devel

PR:		95487 [1]
Repocopy by:	marcus [1]

5 files changed, 141 insertions, 97 deletions

diff --git a/net/Makefile b/net/Makefile
index cbbc92268732..2f5cb8bac85e 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -575,6 +575,7 @@
     SUBDIR += py-xmlrpc
     SUBDIR += py-xmlrpclib
     SUBDIR += py-zsi
+    SUBDIR += py-zsi-devel
     SUBDIR += pygopherd
     SUBDIR += pynids
     SUBDIR += pypvm
diff --git a/net/py-zsi-devel/Makefile b/net/py-zsi-devel/Makefile
index ca1d34f475b7..73e062fde27a 100644
--- a/net/py-zsi-devel/Makefile
+++ b/net/py-zsi-devel/Makefile
@@ -5,31 +5,41 @@
 # $FreeBSD$
 #
 
-PORTNAME=	zsi
-PORTVERSION=	1.7
+PORTNAME=	ZSI
+DISTVERSION=	2.0-rc2
 PORTEPOCH=	1
 CATEGORIES=	net python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pywebsvcs
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME:U}-${PORTVERSION}
+PKGNAMESUFFIX=	-devel
+DISTNAME=	${PORTNAME}-${DISTVERSION}
 
 MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	A pure Python module that provides an implementation of SOAP 1.1
 
+BUILD_DEPENDS=	${PYXML}
+RUN_DEPENDS=	${PYXML}
+
+NO_LATEST_LINK=	yes
+CONFLICTS=	py-zsi-1.*
+
 USE_PYTHON=	2.0+
 USE_PYDISTUTILS=	yes
 
+DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}${PKGNAMESUFFIX}
+EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}${PKGNAMESUFFIX}
+PORTDOCS=	*
+
 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for docfile in CHANGES README doc/zsi.* doc/*.tex
-	@${INSTALL_DATA} ${WRKSRC}/${docfile} ${DOCSDIR}
+.for f in CHANGES README doc/zsi.* doc/*.tex
+	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
+.endif
 .for subdir in interop samples test
 	@${MKDIR} ${EXAMPLESDIR}/${subdir}
 	@${CP} -rp ${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 c11181de479f..5ee1e411d9db 100644
--- a/net/py-zsi-devel/distinfo
+++ b/net/py-zsi-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (ZSI-1.7.tar.gz) = b7f817444ec302ba0015f62146b3349c
-SHA256 (ZSI-1.7.tar.gz) = 4f80ff19dfca80714123098fc9baafaa6802ca2d0da65e9f6eacbdd43f7e794f
-SIZE (ZSI-1.7.tar.gz) = 414611
+MD5 (ZSI-2.0-rc2.tar.gz) = 25b3ab7a3ff8285d51c35c223359c060
+SHA256 (ZSI-2.0-rc2.tar.gz) = 289c02887250592132416d7d4113140bedd0cfa5a96281a34774ec0a60cec140
+SIZE (ZSI-2.0-rc2.tar.gz) = 410318
diff --git a/net/py-zsi-devel/pkg-plist b/net/py-zsi-devel/pkg-plist
index 115ad6d7eac2..c782874c9467 100644
--- a/net/py-zsi-devel/pkg-plist
+++ b/net/py-zsi-devel/pkg-plist
@@ -1,17 +1,84 @@
 bin/wsdl2dispatch.py
 bin/wsdl2py.py
+%%EXAMPLESDIR%%/interop/InteropTest.wsdl
+%%EXAMPLESDIR%%/interop/InteropTestB.wsdl
+%%EXAMPLESDIR%%/interop/README
+%%EXAMPLESDIR%%/interop/client.py
+%%EXAMPLESDIR%%/interop/cpackets.py
+%%EXAMPLESDIR%%/interop/echoHeaderBindings.wsdl
+%%EXAMPLESDIR%%/interop/sclasses.py
+%%EXAMPLESDIR%%/interop/server.py
+%%EXAMPLESDIR%%/interop/start
+%%EXAMPLESDIR%%/samples/Echo/Echo.wsdl
+%%EXAMPLESDIR%%/samples/Echo/EchoClient.py
+%%EXAMPLESDIR%%/samples/Echo/EchoServer.py
+%%EXAMPLESDIR%%/samples/Echo/README
+%%EXAMPLESDIR%%/samples/Echo/buildms.bat
+%%EXAMPLESDIR%%/samples/Echo/echo.cs
+%%EXAMPLESDIR%%/samples/README
+%%EXAMPLESDIR%%/samples/poly.py
+%%EXAMPLESDIR%%/test/README
+%%EXAMPLESDIR%%/test/cgicli.py
+%%EXAMPLESDIR%%/test/test_t1.py
+%%EXAMPLESDIR%%/test/test_t2.py
+%%EXAMPLESDIR%%/test/test_t3.py
+%%EXAMPLESDIR%%/test/test_t4.py
+%%EXAMPLESDIR%%/test/test_t5.py
+%%EXAMPLESDIR%%/test/test_t6.py
+%%EXAMPLESDIR%%/test/test_t7.py
+%%EXAMPLESDIR%%/test/test_t8.py
+%%EXAMPLESDIR%%/test/test_t9.py
+%%EXAMPLESDIR%%/test/test_zsi.py
+%%EXAMPLESDIR%%/test/test_zsi_net.py
+%%EXAMPLESDIR%%/test/tests_bad.py
+%%EXAMPLESDIR%%/test/tests_good.py
+%%EXAMPLESDIR%%/test/wsdl2py/.cvsignore
+%%EXAMPLESDIR%%/test/wsdl2py/README
+%%EXAMPLESDIR%%/test/wsdl2py/ServiceTest.py
+%%EXAMPLESDIR%%/test/wsdl2py/config.txt
+%%EXAMPLESDIR%%/test/wsdl2py/runTests.py
+%%EXAMPLESDIR%%/test/wsdl2py/servers/WhiteMesa.py
+%%EXAMPLESDIR%%/test/wsdl2py/stubs/CommonService_services.py
+%%EXAMPLESDIR%%/test/wsdl2py/stubs/CommonService_services_server.py
+%%EXAMPLESDIR%%/test/wsdl2py/stubs/CommonService_services_types.py
+%%EXAMPLESDIR%%/test/wsdl2py/stubs/EchoServer_services.py
+%%EXAMPLESDIR%%/test/wsdl2py/stubs/EchoServer_services_types.py
+%%EXAMPLESDIR%%/test/wsdl2py/stubs/OpcXmlDaSrv_services.py
+%%EXAMPLESDIR%%/test/wsdl2py/stubs/OpcXmlDaSrv_services_server.py
+%%EXAMPLESDIR%%/test/wsdl2py/stubs/OpcXmlDaSrv_services_types.py
+%%EXAMPLESDIR%%/test/wsdl2py/stubs/RPC_Literal_TestDefinitions_services.py
+%%EXAMPLESDIR%%/test/wsdl2py/stubs/RPC_Literal_TestDefinitions_services_server.py
+%%EXAMPLESDIR%%/test/wsdl2py/stubs/RPC_Literal_TestDefinitions_services_types.py
+%%EXAMPLESDIR%%/test/wsdl2py/stubs/SessionCreateRQService_services.py
+%%EXAMPLESDIR%%/test/wsdl2py/stubs/SessionCreateRQService_services_server.py
+%%EXAMPLESDIR%%/test/wsdl2py/stubs/SessionCreateRQService_services_types.py
+%%EXAMPLESDIR%%/test/wsdl2py/stubs/ZipCodeResolver_services.py
+%%EXAMPLESDIR%%/test/wsdl2py/stubs/ZipCodeResolver_services_server.py
+%%EXAMPLESDIR%%/test/wsdl2py/stubs/ZipCodeResolver_services_types.py
+%%EXAMPLESDIR%%/test/wsdl2py/stubs/test_Attributes_xsd_services_types.py
+%%EXAMPLESDIR%%/test/wsdl2py/stubs/test_Choice_xsd_services_types.py
+%%EXAMPLESDIR%%/test/wsdl2py/test_AmazonWebService.py
+%%EXAMPLESDIR%%/test/wsdl2py/test_Attributes.py
+%%EXAMPLESDIR%%/test/wsdl2py/test_Attributes.xsd
+%%EXAMPLESDIR%%/test/wsdl2py/test_Choice.py
+%%EXAMPLESDIR%%/test/wsdl2py/test_Choice.xsd
+%%EXAMPLESDIR%%/test/wsdl2py/test_Echo.py
+%%EXAMPLESDIR%%/test/wsdl2py/test_FreeDBService.py
+%%EXAMPLESDIR%%/test/wsdl2py/test_GlobalWeather_gw.py
+%%EXAMPLESDIR%%/test/wsdl2py/test_GlobalWeather_si.py
+%%EXAMPLESDIR%%/test/wsdl2py/test_MapPoint.py
+%%EXAMPLESDIR%%/test/wsdl2py/test_OpcDaGateway.py
+%%EXAMPLESDIR%%/test/wsdl2py/test_Sabre.py
+%%EXAMPLESDIR%%/test/wsdl2py/test_TerraService.py
+%%EXAMPLESDIR%%/test/wsdl2py/test_ThreatService.py
+%%EXAMPLESDIR%%/test/wsdl2py/test_WhiteMesa.py
+%%EXAMPLESDIR%%/test/wsdl2py/test_XMethodsQuery.py
+%%EXAMPLESDIR%%/test/wsdl2py/test_ZipCodeResolver.py
+%%EXAMPLESDIR%%/test/wsdl2py/test_compile.py
+%%EXAMPLESDIR%%/test/wsdl2py/test_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
@@ -33,21 +100,42 @@ bin/wsdl2py.py
 %%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/compat.py
-%%PYTHON_SITELIBDIR%%/ZSI/compat.pyc
-%%PYTHON_SITELIBDIR%%/ZSI/compat.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/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
@@ -63,12 +151,9 @@ bin/wsdl2py.py
 %%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/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
@@ -90,74 +175,20 @@ bin/wsdl2py.py
 %%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%%%%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%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%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
+@dirrm %%EXAMPLESDIR%%/test/wsdl2py/stubs
+@dirrm %%EXAMPLESDIR%%/test/wsdl2py/servers
+@dirrm %%EXAMPLESDIR%%/test/wsdl2py
+@dirrm %%EXAMPLESDIR%%/test
+@dirrm %%EXAMPLESDIR%%/samples/Echo
+@dirrm %%EXAMPLESDIR%%/samples
+@dirrm %%EXAMPLESDIR%%/interop
+@dirrm %%EXAMPLESDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/ZSI/wstools
+@dirrm %%PYTHON_SITELIBDIR%%/ZSI/generate
 @dirrm %%PYTHON_SITELIBDIR%%/ZSI
diff --git a/net/py-zsi/Makefile b/net/py-zsi/Makefile
index ca1d34f475b7..2319a2e1c6af 100644
--- a/net/py-zsi/Makefile
+++ b/net/py-zsi/Makefile
@@ -17,6 +17,8 @@ DISTNAME=	${PORTNAME:U}-${PORTVERSION}
 MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	A pure Python module that provides an implementation of SOAP 1.1
 
+CONFLICTS=	py-zsi-devel-2.*
+
 USE_PYTHON=	2.0+
 USE_PYDISTUTILS=	yes