summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net/py-zsi/Makefile11
-rw-r--r--net/py-zsi/PLIST70
-rw-r--r--net/py-zsi/distinfo10
-rw-r--r--net/py-zsi/patches/patch-aa31
4 files changed, 88 insertions, 34 deletions
diff --git a/net/py-zsi/Makefile b/net/py-zsi/Makefile
index ad5345640ae..37abfdcbfcc 100644
--- a/net/py-zsi/Makefile
+++ b/net/py-zsi/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2006/02/05 23:10:30 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2008/03/18 23:22:14 drochner Exp $
#
-DISTNAME= ZSI-1.5.0
+DISTNAME= ZSI-2.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION= 3
CATEGORIES= net python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pywebsvcs/}
@@ -15,11 +14,11 @@ PYDISTUTILSPKG= yes
PY_PATCHPLIST= yes
PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
-#DIST_SUBDIR= py-ZSI
-
post-extract:
${MV} ${WRKSRC}/scripts/wsdl2py \
- ${WRKSRC}/scripts/wsdl2py-${PYVERSSUFFIX}
+ ${WRKSRC}/scripts/wsdl2py${PYVERSSUFFIX}
+ ${MV} ${WRKSRC}/scripts/wsdl2dispatch \
+ ${WRKSRC}/scripts/wsdl2dispatch${PYVERSSUFFIX}
.include "../../lang/python/extension.mk"
.include "../../textproc/py-xml/buildlink3.mk"
diff --git a/net/py-zsi/PLIST b/net/py-zsi/PLIST
index 70e91fb1004..05afec7f732 100644
--- a/net/py-zsi/PLIST
+++ b/net/py-zsi/PLIST
@@ -1,5 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/12/24 10:30:34 recht Exp $
-bin/wsdl2py-${PYVERSSUFFIX}
+@comment $NetBSD: PLIST,v 1.2 2008/03/18 23:22:14 drochner Exp $
+bin/wsdl2dispatch${PYVERSSUFFIX}
+bin/wsdl2py${PYVERSSUFFIX}
+${PYSITELIB}/ZSI/ServiceContainer.py
+${PYSITELIB}/ZSI/ServiceContainer.pyc
+${PYSITELIB}/ZSI/ServiceContainer.pyo
${PYSITELIB}/ZSI/ServiceProxy.py
${PYSITELIB}/ZSI/ServiceProxy.pyc
${PYSITELIB}/ZSI/ServiceProxy.pyo
@@ -21,27 +25,66 @@ ${PYSITELIB}/ZSI/TCtimes.pyo
${PYSITELIB}/ZSI/__init__.py
${PYSITELIB}/ZSI/__init__.pyc
${PYSITELIB}/ZSI/__init__.pyo
+${PYSITELIB}/ZSI/address.py
+${PYSITELIB}/ZSI/address.pyc
+${PYSITELIB}/ZSI/address.pyo
${PYSITELIB}/ZSI/auth.py
${PYSITELIB}/ZSI/auth.pyc
${PYSITELIB}/ZSI/auth.pyo
${PYSITELIB}/ZSI/client.py
${PYSITELIB}/ZSI/client.pyc
${PYSITELIB}/ZSI/client.pyo
-${PYSITELIB}/ZSI/compat.py
-${PYSITELIB}/ZSI/compat.pyc
-${PYSITELIB}/ZSI/compat.pyo
+${PYSITELIB}/ZSI/digest_auth.py
+${PYSITELIB}/ZSI/digest_auth.pyc
+${PYSITELIB}/ZSI/digest_auth.pyo
${PYSITELIB}/ZSI/dispatch.py
${PYSITELIB}/ZSI/dispatch.pyc
${PYSITELIB}/ZSI/dispatch.pyo
${PYSITELIB}/ZSI/fault.py
${PYSITELIB}/ZSI/fault.pyc
${PYSITELIB}/ZSI/fault.pyo
+${PYSITELIB}/ZSI/generate/__init__.py
+${PYSITELIB}/ZSI/generate/__init__.pyc
+${PYSITELIB}/ZSI/generate/__init__.pyo
+${PYSITELIB}/ZSI/generate/commands.py
+${PYSITELIB}/ZSI/generate/commands.pyc
+${PYSITELIB}/ZSI/generate/commands.pyo
+${PYSITELIB}/ZSI/generate/containers.py
+${PYSITELIB}/ZSI/generate/containers.pyc
+${PYSITELIB}/ZSI/generate/containers.pyo
+${PYSITELIB}/ZSI/generate/pyclass.py
+${PYSITELIB}/ZSI/generate/pyclass.pyc
+${PYSITELIB}/ZSI/generate/pyclass.pyo
+${PYSITELIB}/ZSI/generate/utility.py
+${PYSITELIB}/ZSI/generate/utility.pyc
+${PYSITELIB}/ZSI/generate/utility.pyo
+${PYSITELIB}/ZSI/generate/wsdl2dispatch.py
+${PYSITELIB}/ZSI/generate/wsdl2dispatch.pyc
+${PYSITELIB}/ZSI/generate/wsdl2dispatch.pyo
+${PYSITELIB}/ZSI/generate/wsdl2python.py
+${PYSITELIB}/ZSI/generate/wsdl2python.pyc
+${PYSITELIB}/ZSI/generate/wsdl2python.pyo
${PYSITELIB}/ZSI/parse.py
${PYSITELIB}/ZSI/parse.pyc
${PYSITELIB}/ZSI/parse.pyo
${PYSITELIB}/ZSI/resolvers.py
${PYSITELIB}/ZSI/resolvers.pyc
${PYSITELIB}/ZSI/resolvers.pyo
+${PYSITELIB}/ZSI/schema.py
+${PYSITELIB}/ZSI/schema.pyc
+${PYSITELIB}/ZSI/schema.pyo
+${PYSITELIB}/ZSI/twisted/WSresource.py
+${PYSITELIB}/ZSI/twisted/WSresource.pyc
+${PYSITELIB}/ZSI/twisted/WSresource.pyo
+${PYSITELIB}/ZSI/twisted/WSsecurity.py
+${PYSITELIB}/ZSI/twisted/WSsecurity.pyc
+${PYSITELIB}/ZSI/twisted/WSsecurity.pyo
+${PYSITELIB}/ZSI/twisted/__init__.py
+${PYSITELIB}/ZSI/twisted/__init__.pyc
+${PYSITELIB}/ZSI/twisted/__init__.pyo
+${PYSITELIB}/ZSI/twisted/client.py
+${PYSITELIB}/ZSI/twisted/client.pyc
+${PYSITELIB}/ZSI/twisted/client.pyo
${PYSITELIB}/ZSI/typeinterpreter.py
${PYSITELIB}/ZSI/typeinterpreter.pyc
${PYSITELIB}/ZSI/typeinterpreter.pyo
@@ -51,12 +94,9 @@ ${PYSITELIB}/ZSI/version.pyo
${PYSITELIB}/ZSI/writer.py
${PYSITELIB}/ZSI/writer.pyc
${PYSITELIB}/ZSI/writer.pyo
-${PYSITELIB}/ZSI/wsdl2python.py
-${PYSITELIB}/ZSI/wsdl2python.pyc
-${PYSITELIB}/ZSI/wsdl2python.pyo
-${PYSITELIB}/ZSI/wsdlInterface.py
-${PYSITELIB}/ZSI/wsdlInterface.pyc
-${PYSITELIB}/ZSI/wsdlInterface.pyo
+${PYSITELIB}/ZSI/wstools/Namespaces.py
+${PYSITELIB}/ZSI/wstools/Namespaces.pyc
+${PYSITELIB}/ZSI/wstools/Namespaces.pyo
${PYSITELIB}/ZSI/wstools/TimeoutSocket.py
${PYSITELIB}/ZSI/wstools/TimeoutSocket.pyc
${PYSITELIB}/ZSI/wstools/TimeoutSocket.pyo
@@ -78,5 +118,13 @@ ${PYSITELIB}/ZSI/wstools/XMLname.pyo
${PYSITELIB}/ZSI/wstools/__init__.py
${PYSITELIB}/ZSI/wstools/__init__.pyc
${PYSITELIB}/ZSI/wstools/__init__.pyo
+${PYSITELIB}/ZSI/wstools/c14n.py
+${PYSITELIB}/ZSI/wstools/c14n.pyc
+${PYSITELIB}/ZSI/wstools/c14n.pyo
+${PYSITELIB}/ZSI/wstools/logging.py
+${PYSITELIB}/ZSI/wstools/logging.pyc
+${PYSITELIB}/ZSI/wstools/logging.pyo
@dirrm ${PYSITELIB}/ZSI/wstools
+@dirrm ${PYSITELIB}/ZSI/twisted
+@dirrm ${PYSITELIB}/ZSI/generate
@dirrm ${PYSITELIB}/ZSI
diff --git a/net/py-zsi/distinfo b/net/py-zsi/distinfo
index 1dcd06f4bd1..7e4ae6ef78c 100644
--- a/net/py-zsi/distinfo
+++ b/net/py-zsi/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 12:14:02 agc Exp $
+$NetBSD: distinfo,v 1.6 2008/03/18 23:22:14 drochner Exp $
-SHA1 (ZSI-1.5.0.tar.gz) = 53a0f02962fd9417103fd4a1d14515d2479108d1
-RMD160 (ZSI-1.5.0.tar.gz) = 0b16f3af63f35fff88ccf40b31e46d51c9e03ef0
-Size (ZSI-1.5.0.tar.gz) = 365962 bytes
-SHA1 (patch-aa) = 030157c727a75304c76691742a7d1813b925c4ab
+SHA1 (ZSI-2.0.tar.gz) = e691d9610f04afad9cf62f7990cfd3b4df47ff01
+RMD160 (ZSI-2.0.tar.gz) = 9fc0171e03f759cbab89046916d979c5505ba5b8
+Size (ZSI-2.0.tar.gz) = 805956 bytes
+SHA1 (patch-aa) = 9fa3a914a5bcd2302bce33f7661fb69c0754ddcc
diff --git a/net/py-zsi/patches/patch-aa b/net/py-zsi/patches/patch-aa
index c5b1f1955ad..89081c2bc92 100644
--- a/net/py-zsi/patches/patch-aa
+++ b/net/py-zsi/patches/patch-aa
@@ -1,13 +1,20 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/12/24 10:30:34 recht Exp $
+$NetBSD: patch-aa,v 1.2 2008/03/18 23:22:14 drochner Exp $
---- setup.py.orig 2003-10-16 11:19:09.000000000 +0200
-+++ setup.py 2003-10-16 11:22:30.000000000 +0200
-@@ -24,7 +24,7 @@
- version=_version,
- license="Python",
- packages=[ "ZSI", "ZSI.wstools" ],
-- scripts=["scripts/wsdl2py"],
-+ scripts=["scripts/wsdl2py-%s" % sys.version[0:3]],
- description="Zolera SOAP Infrastructure",
- author="Rich Salz",
- author_email="rsalz@datapower.com",
+--- setup.py.orig 2006-09-28 00:55:49.000000000 +0200
++++ setup.py
+@@ -3,8 +3,4 @@
+ import sys
+-try:
+- from setuptools import setup
+- hasSetuptools = True
+-except ImportError:
+- from distutils.core import setup
+- hasSetuptools = False
++from distutils.core import setup
++hasSetuptools = False
+
+@@ -52,3 +48,3 @@ if hasSetuptools:
+ else:
+- additional_params['scripts'] = ["scripts/wsdl2py", "scripts/wsdl2dispatch"]
++ additional_params['scripts'] = ["scripts/wsdl2py" + sys.version[0:3], "scripts/wsdl2dispatch" + sys.version[0:3]]
+