3 files changed, 94 insertions, 28 deletions

diff --git a/www/py-websvcs/Makefile b/www/py-websvcs/Makefile
index 580bf1699141..8620900976ac 100644
--- a/www/py-websvcs/Makefile
+++ b/www/py-websvcs/Makefile
@@ -6,44 +6,38 @@
 #
 
 PORTNAME=	websvcs
-PORTVERSION=	0.9.7
-PORTREVISION=	1
+PORTVERSION=	0.10.3
 CATEGORIES=	www python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	py${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	SOAPpy${PORTVERSION:S/.//g}
-EXTRACT_SUFX=	.tgz
+DISTNAME=	SOAPpy-${PORTVERSION}
 
 MAINTAINER=	perky@FreeBSD.org
 COMMENT=	Web service libraries includes SOAP, WSDL, UDDI, etc
 
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/fpconst.py:${PORTSDIR}/math/py-fpconst \
+		${PYXML}
+RUN_DEPENDS:=	${BUILD_DEPENDS}
+
 USE_PYTHON=	yes
+USE_PYDISTUTILS=	yes
 EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
-PLIST_SUB+=	EXAMPLESDIR=${EXAMPLESDIR:S,^${PREFIX}/,,g} \
-		DOCSDIR=${DOCSDIR:S,^${PREFIX}/,,g}
-NO_BUILD=	yes
 TOOLS=		interop2html
-PY_FILES=	SOAP
 
 do-patch:
 .for i in ${TOOLS}
 	@${MV} ${WRKSRC}/tools/$i.py ${WRKSRC}/tools/$i
 .endfor
 
-do-install:
-	${MKDIR} ${EXAMPLESDIR}
-	${MKDIR} ${DOCSDIR}
-.for f in ${PY_FILES}
-	${INSTALL_DATA} ${WRKSRC}/${f}.py ${PYTHON_SITELIBDIR}
-	@${PYTHON_CMD} -c "import py_compile; py_compile.compile('${PYTHON_SITELIBDIR}/${f}.py')"
-	@${PYTHON_CMD} -O -c "import py_compile; py_compile.compile('${PYTHON_SITELIBDIR}/${f}.py')"
-.endfor
+post-install:
 .for i in ${TOOLS}
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/$i ${PREFIX}/bin
 .endfor
 .if !defined(NOPORTDOCS)
+	${MKDIR} ${EXAMPLESDIR}
+	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/tests/*.py ${EXAMPLESDIR}
 .endif
diff --git a/www/py-websvcs/distinfo b/www/py-websvcs/distinfo
index 4f01ac710c0d..ab77c6bdad2d 100644
--- a/www/py-websvcs/distinfo
+++ b/www/py-websvcs/distinfo
@@ -1 +1 @@
-MD5 (SOAPpy097.tgz) = 1bbd42ce353a5e1ce6bc6ad181719bf6
+MD5 (SOAPpy-0.10.3.tar.gz) = b679a02ea99bb7a6a0652461b341556d
diff --git a/www/py-websvcs/pkg-plist b/www/py-websvcs/pkg-plist
index 6e985e074c5a..bae854c3ac72 100644
--- a/www/py-websvcs/pkg-plist
+++ b/www/py-websvcs/pkg-plist
@@ -1,23 +1,95 @@
 bin/interop2html
-%%PYTHON_SITELIBDIR%%/SOAP.py
-%%PYTHON_SITELIBDIR%%/SOAP.pyc
-%%PYTHON_SITELIBDIR%%/SOAP.pyo
+%%PYTHON_SITELIBDIR%%/SOAPpy/Client.py
+%%PYTHON_SITELIBDIR%%/SOAPpy/Client.pyc
+%%PYTHON_SITELIBDIR%%/SOAPpy/Client.pyo
+%%PYTHON_SITELIBDIR%%/SOAPpy/Config.py
+%%PYTHON_SITELIBDIR%%/SOAPpy/Config.pyc
+%%PYTHON_SITELIBDIR%%/SOAPpy/Config.pyo
+%%PYTHON_SITELIBDIR%%/SOAPpy/Errors.py
+%%PYTHON_SITELIBDIR%%/SOAPpy/Errors.pyc
+%%PYTHON_SITELIBDIR%%/SOAPpy/Errors.pyo
+%%PYTHON_SITELIBDIR%%/SOAPpy/NS.py
+%%PYTHON_SITELIBDIR%%/SOAPpy/NS.pyc
+%%PYTHON_SITELIBDIR%%/SOAPpy/NS.pyo
+%%PYTHON_SITELIBDIR%%/SOAPpy/Parser.py
+%%PYTHON_SITELIBDIR%%/SOAPpy/Parser.pyc
+%%PYTHON_SITELIBDIR%%/SOAPpy/Parser.pyo
+%%PYTHON_SITELIBDIR%%/SOAPpy/SOAP.py
+%%PYTHON_SITELIBDIR%%/SOAPpy/SOAP.pyc
+%%PYTHON_SITELIBDIR%%/SOAPpy/SOAP.pyo
+%%PYTHON_SITELIBDIR%%/SOAPpy/SOAPBuilder.py
+%%PYTHON_SITELIBDIR%%/SOAPpy/SOAPBuilder.pyc
+%%PYTHON_SITELIBDIR%%/SOAPpy/SOAPBuilder.pyo
+%%PYTHON_SITELIBDIR%%/SOAPpy/Server.py
+%%PYTHON_SITELIBDIR%%/SOAPpy/Server.pyc
+%%PYTHON_SITELIBDIR%%/SOAPpy/Server.pyo
+%%PYTHON_SITELIBDIR%%/SOAPpy/Types.py
+%%PYTHON_SITELIBDIR%%/SOAPpy/Types.pyc
+%%PYTHON_SITELIBDIR%%/SOAPpy/Types.pyo
+%%PYTHON_SITELIBDIR%%/SOAPpy/URLopener.py
+%%PYTHON_SITELIBDIR%%/SOAPpy/URLopener.pyc
+%%PYTHON_SITELIBDIR%%/SOAPpy/URLopener.pyo
+%%PYTHON_SITELIBDIR%%/SOAPpy/Utilities.py
+%%PYTHON_SITELIBDIR%%/SOAPpy/Utilities.pyc
+%%PYTHON_SITELIBDIR%%/SOAPpy/Utilities.pyo
+%%PYTHON_SITELIBDIR%%/SOAPpy/WSDL.py
+%%PYTHON_SITELIBDIR%%/SOAPpy/WSDL.pyc
+%%PYTHON_SITELIBDIR%%/SOAPpy/WSDL.pyo
+%%PYTHON_SITELIBDIR%%/SOAPpy/__init__.py
+%%PYTHON_SITELIBDIR%%/SOAPpy/__init__.pyc
+%%PYTHON_SITELIBDIR%%/SOAPpy/__init__.pyo
+%%PYTHON_SITELIBDIR%%/SOAPpy/version.py
+%%PYTHON_SITELIBDIR%%/SOAPpy/version.pyc
+%%PYTHON_SITELIBDIR%%/SOAPpy/version.pyo
+%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/TimeoutSocket.py
+%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/TimeoutSocket.pyc
+%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/TimeoutSocket.pyo
+%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/UserTuple.py
+%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/UserTuple.pyc
+%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/UserTuple.pyo
+%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/Utility.py
+%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/Utility.pyc
+%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/Utility.pyo
+%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/WSDLTools.py
+%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/WSDLTools.pyc
+%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/WSDLTools.pyo
+%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/XMLSchema.py
+%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/XMLSchema.pyc
+%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/XMLSchema.pyo
+%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/XMLname.py
+%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/XMLname.pyc
+%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/XMLname.pyo
+%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/__init__.py
+%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/__init__.pyc
+%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/__init__.pyo
+%%PORTDOCS%%%%DOCSDIR%%/attrs.txt
+%%PORTDOCS%%%%DOCSDIR%%/complexTypes.txt
+%%PORTDOCS%%%%DOCSDIR%%/quickstart.txt
+%%PORTDOCS%%%%DOCSDIR%%/simpleTypes.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/BabelfishWSDLTest.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/SOAPtest.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/TCtest.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/alanbushTest.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/cardClient.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/cardServer.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/fortuneTest.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/guidTest.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/itimeTest.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/echoClient.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/echoHeader.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/echoServer.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/excelTest.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/getNStest.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/largeDataTest.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/newsTest.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/quoteTest.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/speedTest.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/storageTest.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/testClient1.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/testWSDL.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/testleak.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/translateTest.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/weatherTest.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/whoisTest.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/wordFindTest.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/xmethods.py
+%%PORTDOCS%%@dirrm %%PYTHON_SITELIBDIR%%/SOAPpy/wstools
+%%PORTDOCS%%@dirrm %%PYTHON_SITELIBDIR%%/SOAPpy
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%%%DOCSDIR%%/attrs.txt
-%%PORTDOCS%%%%DOCSDIR%%/complexTypes.txt
-%%PORTDOCS%%%%DOCSDIR%%/quickstart.txt
-%%PORTDOCS%%%%DOCSDIR%%/simpleTypes.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%