use USE_PYDISTUTILS

11 files changed, 16 insertions, 89 deletions

diff --git a/textproc/py-4suite/Makefile b/textproc/py-4suite/Makefile
index f0a6276d69e4..c73685a261cb 100644
--- a/textproc/py-4suite/Makefile
+++ b/textproc/py-4suite/Makefile
@@ -15,11 +15,13 @@ DISTNAME=	4Suite-${PORTVERSION}
 
 MAINTAINER=	wjv@FreeBSD.org
 
-BUILD_DEPENDS=	${PYDISTUTILS} \
-		${PYXML}
+BUILD_DEPENDS=	${PYXML}
 RUN_DEPENDS=	${PYXML}
 
 USE_PYTHON=	yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_INSTALLARGS=	-c -O1 --prefix=${PREFIX} \
+		--install-data=${PREFIX}/share
 
 .include <bsd.port.pre.mk>
 .if ${PYTHON_VERSION} == "python1.5" || ${PYTHON_VERSION} == "python1.6"
@@ -38,13 +40,4 @@ post-patch:
 	  ${WRKSRC}/setup.py
 .endif
 
-do-build:
-	@ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \
-	  setup.py build
-
-do-install:
-	@ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \
-	  setup.py install -c -O1 --prefix=${PREFIX} \
-	  --install-data=${PREFIX}/share
-
 .include <bsd.port.post.mk>
diff --git a/textproc/py-csv/Makefile b/textproc/py-csv/Makefile
index ab0f295fdbf2..8c1b6d581932 100644
--- a/textproc/py-csv/Makefile
+++ b/textproc/py-csv/Makefile
@@ -13,16 +13,8 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	wjv@FreeBSD.org
 
-BUILD_DEPENDS=	${PYDISTUTILS}
-
 USE_PYTHON=	yes
+USE_PYDISTUTILS=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
-PYTHON_SETUP=	${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py
-
-do-build:
-	@ cd ${WRKSRC} && ${PYTHON_SETUP} build
-
-do-install:
-	@ cd ${WRKSRC} && ${PYTHON_SETUP} install --prefix=${PREFIX}
 
 .include <bsd.port.mk>
diff --git a/textproc/py-dsv/Makefile b/textproc/py-dsv/Makefile
index 694cd5814697..428b05dd6c82 100644
--- a/textproc/py-dsv/Makefile
+++ b/textproc/py-dsv/Makefile
@@ -15,15 +15,7 @@ DISTNAME=	${PORTNAME:U}-${PORTVERSION}
 
 MAINTAINER=	wjv@FreeBSD.org
 
-BUILD_DEPENDS=	${PYDISTUTILS}
-
 USE_PYTHON=	yes
-PYTHON_SETUP=	${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py
-
-do-build:
-	@ cd ${WRKSRC} && ${PYTHON_SETUP} build
-
-do-install:
-	@ cd ${WRKSRC} && ${PYTHON_SETUP} install -c -O1 --prefix=${PREFIX}
+USE_PYDISTUTILS=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/py-jaxml/Makefile b/textproc/py-jaxml/Makefile
index 1b5098272131..f7fc1fdbc6b0 100644
--- a/textproc/py-jaxml/Makefile
+++ b/textproc/py-jaxml/Makefile
@@ -15,13 +15,6 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 
 USE_PYTHON=	yes
-
-SETUP_CMD=	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py
-
-do-build:
-	@${SETUP_CMD} build
-
-do-install:
-	@${SETUP_CMD} install
+USE_PYDISTUTILS=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/py-martel/Makefile b/textproc/py-martel/Makefile
index e11d9d336ec2..c204a8392ef9 100644
--- a/textproc/py-martel/Makefile
+++ b/textproc/py-martel/Makefile
@@ -16,21 +16,14 @@ DISTNAME=	biopython-${BIOPYTHON_VERSION}
 
 MAINTAINER=	wjv@FreeBSD.org
 
-BUILD_DEPENDS=	${PYDISTUTILS}
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/mx/TextTools/__init__.py:${PORTSDIR}/lang/py-mx-base
 
 USE_PYTHON=	yes
+USE_PYDISTUTILS=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/Martel
 BIOPYTHON_VERSION=	1.00a4
-PYTHON_SETUP=	${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py
-
-do-build:
-	@ cd ${WRKSRC} && ${PYTHON_SETUP} build
 
 pre-install:
 	@ ${SH} ${PKGREQ} INSTALL
 
-do-install:
-	@ cd ${WRKSRC} && ${PYTHON_SETUP} install -c -O1 --prefix=${PREFIX}
-
 .include <bsd.port.mk>
diff --git a/textproc/py-sgrep/Makefile b/textproc/py-sgrep/Makefile
index 9e10b0dd8204..eb593b8391c1 100644
--- a/textproc/py-sgrep/Makefile
+++ b/textproc/py-sgrep/Makefile
@@ -16,12 +16,7 @@ DISTNAME=	pysgrep-${PORTVERSION}
 MAINTAINER=	ijliao@freebsd.org
 
 USE_PYTHON=	yes
+USE_PYDISTUTILS=	yes
 GNU_CONFIGURE=	yes
 
-do-build:
-	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py build)
-
-do-install:
-	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py install)
-
 .include <bsd.port.mk>
diff --git a/textproc/py-wordnet/Makefile b/textproc/py-wordnet/Makefile
index 0014d0f9e66c..ad775b8da229 100644
--- a/textproc/py-wordnet/Makefile
+++ b/textproc/py-wordnet/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	perky@fallin.lv
 RUN_DEPENDS=	${WORDNETBASE}/lexnames:${PORTSDIR}/textproc/wordnet
 
 USE_PYTHON=	yes
-SETUP_CMD=	cd ${WRKSRC} && ${PYTHON_CMD} setup.py
+USE_PYDISTUTILS=	yes
 WORDNETBASE?=	${LOCALBASE}/share/wordnet-${WORDNET_VERSION}
 WORDNET_VERSION?=	1.7
 
@@ -28,10 +28,4 @@ post-patch:
 		> ${WRKSRC}/wordnet.py.tmp && ${CAT} ${WRKSRC}/wordnet.py.tmp \
 		> ${WRKSRC}/wordnet.py
 
-do-build:
-	${SETUP_CMD} build
-
-do-install:
-	${SETUP_CMD} install -c -O1 --prefix=${PREFIX}
-
 .include <bsd.port.mk>
diff --git a/textproc/py-xml/Makefile b/textproc/py-xml/Makefile
index f0623d0bfed0..dfb959983282 100644
--- a/textproc/py-xml/Makefile
+++ b/textproc/py-xml/Makefile
@@ -15,13 +15,12 @@ DISTNAME=		PyXML-${PORTVERSION}
 
 MAINTAINER=		wjv@FreeBSD.org
 
-BUILD_DEPENDS=		${PYDISTUTILS}
-
 INSTALLS_SHLIB=		yes
 # On a system with more than one version of Python installed, you can force
 # this port to install for a specific version of Python by explicitly setting
 # ${PYTHON_VERSION} during build/installation.
 USE_PYTHON=		yes
+USE_PYDISTUTILS=	yes
 
 .include <bsd.port.pre.mk>
 
@@ -34,13 +33,6 @@ PLIST_SUB+=		PACKAGE_DIR=xml
 PLIST_SUB+=		PACKAGE_DIR=_xmlplus
 .endif
 
-do-build:
-	@ cd ${WRKSRC} && ${PYTHON_CMD} setup.py build
-
-do-install:
-	@ cd ${WRKSRC} && ${PYTHON_CMD} setup.py install -c -O1 \
-	  --prefix=${PREFIX}
-
 post-install:
 .if !defined(NOPORTDOCS)
 	@ ${MKDIR} ${DOCSDIR}
diff --git a/textproc/py-xmltools/Makefile b/textproc/py-xmltools/Makefile
index 989a80f7035b..d4d408c94160 100644
--- a/textproc/py-xmltools/Makefile
+++ b/textproc/py-xmltools/Makefile
@@ -15,6 +15,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 
 USE_PYTHON=	yes
+USE_PYDISTUTILS=	yes
 
 .include <bsd.port.pre.mk>
 
@@ -28,12 +29,4 @@ RUN_DEPENDS=	${PYXML} \
 		${PYTHON_SITELIBDIR}/GDK.py:${PORTSDIR}/x11-toolkits/py-gtk \
 		${PYTHON_SITELIBDIR}/${XMLDIR}/xpath/__init__.py:${PORTSDIR}/textproc/py-4suite
 
-SETUP_CMD=	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py
-
-do-build:
-	@${SETUP_CMD} build
-
-do-install:
-	@${SETUP_CMD} install
-
 .include <bsd.port.post.mk>
diff --git a/textproc/pybook/Makefile b/textproc/pybook/Makefile
index 98be0c56c2a2..b534363c7b8e 100644
--- a/textproc/pybook/Makefile
+++ b/textproc/pybook/Makefile
@@ -14,17 +14,12 @@ MASTER_SITES=	http://silmarill.org/pybook/
 MAINTAINER=	ports@FreeBSD.org
 
 USE_PYTHON=	yes
-
-SETUP_CMD=	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py
+USE_PYDISTUTILS=	yes
 
 post-patch:
 	@${PERL} -pi -e "s,python2,python,g" ${WRKSRC}/pybook.py
 
-do-build:
-	@${SETUP_CMD} build
-
-do-install:
-	@${SETUP_CMD} install
+post-install:
 	@${MV} -f ${PREFIX}/bin/pybook.py ${PREFIX}/bin/pybook
 
 .include <bsd.port.mk>
diff --git a/textproc/roap/Makefile b/textproc/roap/Makefile
index d35e4d3c7abc..608cfd777064 100644
--- a/textproc/roap/Makefile
+++ b/textproc/roap/Makefile
@@ -16,17 +16,12 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 
 USE_PYTHON=	yes
-
-SETUP_CMD=	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py
+USE_PYDISTUTILS=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 DOCS=	README README.ja USAGE USAGE.ja
 
-do-build:
-	@${SETUP_CMD} build
-
-do-install:
+post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/roap ${PREFIX}/bin
-	@${SETUP_CMD} install
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for file in ${DOCS}