2 files changed, 14 insertions, 104 deletions

diff --git a/net/py-soappy-devel/Makefile b/net/py-soappy-devel/Makefile
index 8bd2ceccbee8..d161ee6dbd5c 100644
--- a/net/py-soappy-devel/Makefile
+++ b/net/py-soappy-devel/Makefile
@@ -10,32 +10,28 @@ PKGNAMESUFFIX=		-devel
 DISTNAME=		SOAPpy-${PORTVERSION}
 
 MAINTAINER=		ports@FreeBSD.org
-COMMENT=		A SOAP implementation
+COMMENT=		SOAP implementation
+
+BUILD_DEPENDS=		${PYTHON_SITELIBDIR}/fpconst.py:${PORTSDIR}/math/py-fpconst
+RUN_DEPENDS:=		${PYXML} \
+			${BUILD_DEPENDS}
 
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
-PYDISTUTILS_PKGNAME=	SOAPpy
-
-BUILD_DEPENDS+=		${PYTHON_SITELIBDIR}/fpconst.py:${PORTSDIR}/math/py-fpconst
-RUN_DEPENDS+=		${PYXML} \
-			${BUILD_DEPENDS}
+PYDISTUTILS_AUTOPLIST=	yes
 
 CONFLICTS=		py*-soappy-0.11.*
 
-.if !defined(NOPORTDOCS)
 PORTDOCS=		*
-.endif
+PORTDATA=		*
 
-NO_STAGE=	yes
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCSDIR}
-.endif
-	@${MKDIR} ${DATADIR}
-	@${INSTALL_DATA} ${WRKSRC}/contrib/* ${DATADIR}
-	@${INSTALL_DATA} ${WRKSRC}/tools/* ${DATADIR}
-	@${INSTALL_DATA} ${WRKSRC}/validate/* ${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/contrib/* ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/tools/* ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/validate/* ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/net/py-soappy-devel/pkg-plist b/net/py-soappy-devel/pkg-plist
deleted file mode 100644
index bfbb1a46689e..000000000000
--- a/net/py-soappy-devel/pkg-plist
+++ /dev/null
@@ -1,86 +0,0 @@
-%%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/GSIServer.py
-%%PYTHON_SITELIBDIR%%/SOAPpy/GSIServer.pyc
-%%PYTHON_SITELIBDIR%%/SOAPpy/GSIServer.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/c14n.py
-%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/c14n.pyc
-%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/c14n.pyo
-%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/logging.py
-%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/logging.pyc
-%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/logging.pyo
-%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/Namespaces.py
-%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/Namespaces.pyc
-%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/Namespaces.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
-%%DATADIR%%/interop2html.py
-%%DATADIR%%/server.pem
-%%DATADIR%%/silab.servers
-%%DATADIR%%/silabclient.py
-%%DATADIR%%/silabserver.py
-%%DATADIR%%/soap_cli.py
-%%DATADIR%%/soap_handler.py
-%%DATADIR%%/soapware.py
-@dirrm %%DATADIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/SOAPpy/wstools
-@dirrm %%PYTHON_SITELIBDIR%%/SOAPpy