1 files changed, 155 insertions, 68 deletions

diff --git a/net/py-zsi/pkg-plist b/net/py-zsi/pkg-plist
index 115ad6d7eac2..1d817fdbb6aa 100644
--- a/net/py-zsi/pkg-plist
+++ b/net/py-zsi/pkg-plist
@@ -1,17 +1,8 @@
-bin/wsdl2dispatch.py
-bin/wsdl2py.py
+bin/wsdl2dispatch
+bin/wsdl2py
 %%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,27 +24,66 @@ 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/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
@@ -63,12 +93,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,8 +117,21 @@ bin/wsdl2py.py
 %%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
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/app-dispatch-dict.tex
+%%PORTDOCS%%%%DOCSDIR%%/app-dispatch.tex
+%%PORTDOCS%%%%DOCSDIR%%/app-lowlevel.tex
+%%PORTDOCS%%%%DOCSDIR%%/app-pickler.tex
+%%PORTDOCS%%%%DOCSDIR%%/app-wsdl2dispatch.tex
+%%PORTDOCS%%%%DOCSDIR%%/app-wsdl2py.tex
+%%PORTDOCS%%%%DOCSDIR%%/bibliography.tex
 %%PORTDOCS%%%%DOCSDIR%%/c01-intro.tex
 %%PORTDOCS%%%%DOCSDIR%%/c02-samples.tex
 %%PORTDOCS%%%%DOCSDIR%%/c02a-coverage.tex
@@ -103,7 +143,13 @@ bin/wsdl2py.py
 %%PORTDOCS%%%%DOCSDIR%%/c08-fault.tex
 %%PORTDOCS%%%%DOCSDIR%%/c09-resolve.tex
 %%PORTDOCS%%%%DOCSDIR%%/c10-dispatch.tex
-%%PORTDOCS%%%%DOCSDIR%%/c11-wsdl.tex
+%%PORTDOCS%%%%DOCSDIR%%/client-hello-struct.tex
+%%PORTDOCS%%%%DOCSDIR%%/dispatch-rpc-hello-array.tex
+%%PORTDOCS%%%%DOCSDIR%%/dispatch-rpc-hello-struct.tex
+%%PORTDOCS%%%%DOCSDIR%%/guide.tex
+%%PORTDOCS%%%%DOCSDIR%%/guide01-intro.tex
+%%PORTDOCS%%%%DOCSDIR%%/guide02-wsdl2py.tex
+%%PORTDOCS%%%%DOCSDIR%%/guide03-wsdl2dispatch.tex
 %%PORTDOCS%%%%DOCSDIR%%/version.tex
 %%PORTDOCS%%%%DOCSDIR%%/zsi.css
 %%PORTDOCS%%%%DOCSDIR%%/zsi.html
@@ -111,53 +157,94 @@ bin/wsdl2py.py
 %%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%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/interop/InteropTest.wsdl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/interop/InteropTestB.wsdl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/interop/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/interop/client.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/interop/cpackets.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/interop/echoHeaderBindings.wsdl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/interop/sclasses.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/interop/server.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/samples/Echo/Echo.wsdl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/samples/Echo/EchoClient.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/samples/Echo/EchoServer.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/samples/Echo/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/samples/Echo/buildms.bat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/samples/Echo/echo.cs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/samples/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/samples/poly.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/cgicli.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/test_TCtimes.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/test_URI.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/test_list.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/test_rfc2617.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/test_t1.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/test_t2.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/test_t3.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/test_t4.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/test_t5.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/test_t6.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/test_t7.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/test_t8.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/test_t9.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/test_union.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/test_zsi.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/test_zsi_net.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/tests_bad.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/tests_good.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/BasicComm.wsdl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/DateService.wsdl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/EchoWSAddr200403.wsdl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/FinancialService.wsdl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/Racing.wsdl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/ServiceTest.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/SquareService.wsdl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/config.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/runTests.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/servers/BasicServer.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/servers/DateService.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/servers/EchoServer.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/servers/EchoWSAddr200403Server.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/servers/FinancialService.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/servers/SquareService.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/servers/WhiteMesa.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/servers/WolframSearchService.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/test_AWSECommerceService.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/test_AmazonS3.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/test_Attributes.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/test_Attributes.xsd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/test_BasicComm.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/test_Choice.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/test_Choice.xsd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/test_DateService.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/test_DerivedTypes.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/test_DerivedTypes.xsd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/test_Echo.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/test_EchoWSAddr200403.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/test_FinancialService.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/test_InfoBil.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/test_MapPoint.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/test_OpcDaGateway.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/test_Racing.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/test_Sabre.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/test_SquareService.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/test_TerraService.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/test_ThreatService.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/test_WhiteMesa.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/test_WolframSearch.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/test_XMethodsQuery.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wsdl2py/test_ZipCodeResolver.py
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/test/wsdl2py/servers
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/test/wsdl2py
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/test
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/samples/Echo
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/samples
+%%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