devel/py-zsi: allow staging and minor fixes

- Allow staging
- Switch from easy_install to install
- Remove leading article from COMMENT
- Remove now useless NOPORTDOCS NOPORTEXAMPLES
- Use python auto plist

2 files changed, 14 insertions, 137 deletions

diff --git a/net/py-zsi/Makefile b/net/py-zsi/Makefile
index cd3b429a64ca..915bfaa4daf9 100644
--- a/net/py-zsi/Makefile
+++ b/net/py-zsi/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	zsi
 PORTVERSION=	2.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net python
 MASTER_SITES=	SF/pywebsvcs/ZSI/ZSI-${PORTVERSION}
@@ -10,30 +11,30 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME:U}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A pure Python module that provides an implementation of SOAP 1.1
+COMMENT=	Pure Python module that provides an implementation of SOAP 1.1
 
 BUILD_DEPENDS=	${PYXML}
 RUN_DEPENDS=	${PYXML}
 
 CONFLICTS=	py-zsi-devel-2.*
 
-USE_PYTHON=	2.5+
-USE_PYDISTUTILS=	easy_install
-PYDISTUTILS_PKGNAME=	ZSI
+USE_PYTHON=	2
+USE_PYDISTUTILS=yes
+PYDISTUTILS_AUTOPLIST=	yes
+
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
+PORTDOCS=	*
+PORTEXAMPLES=	*
 
-NO_STAGE=	yes
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for docfile in CHANGES README doc/zsi.* doc/*.tex
-	@${INSTALL_DATA} ${WRKSRC}/${docfile} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${docfile} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
-.if !defined(NOPORTEXAMPLES)
 .for subdir in interop samples test
-	@${MKDIR} ${EXAMPLESDIR}/${subdir}
-	@${CP} -rp ${WRKSRC}/${subdir}/* ${EXAMPLESDIR}/${subdir}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/${subdir}
+	${CP} -rp ${WRKSRC}/${subdir}/* ${STAGEDIR}${EXAMPLESDIR}/${subdir}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/net/py-zsi/pkg-plist b/net/py-zsi/pkg-plist
deleted file mode 100644
index 5d4047b883dd..000000000000
--- a/net/py-zsi/pkg-plist
+++ /dev/null
@@ -1,124 +0,0 @@
-bin/wsdl2dispatch
-bin/wsdl2py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
-%%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
-%%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%%/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
-%%PORTDOCS%%%%DOCSDIR%%/zsi.pdf
-%%PORTDOCS%%%%DOCSDIR%%/zsi.ps
-%%PORTDOCS%%%%DOCSDIR%%/zsi.tex
-%%PORTDOCS%%%%DOCSDIR%%/zsi.xsd
-%%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%%