20 files changed, 32 insertions, 164 deletions

diff --git a/devel/decompyle/Makefile b/devel/decompyle/Makefile
index 418634ff9d5a..8038a0de865b 100644
--- a/devel/decompyle/Makefile
+++ b/devel/decompyle/Makefile
@@ -14,17 +14,11 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/beta/g}
 MAINTAINER=	perky@fallin.lv
 
 USE_PYTHON=	yes
+USE_PYDISTUTILS=	yes
 PLIST_SUB=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S,${LOCALBASE}/,,g}
-DISTUTIL_CMD=	cd ${WRKSRC} && ${PYTHON_CMD} setup.py
 
 post-patch:
 	${PERL} -pi -e 's,/usr/bin/env python2,${PYTHON_CMD},' \
 		${WRKSRC}/scripts/decompyle
 
-do-build:
-	${DISTUTIL_CMD} build
-
-do-install:
-	${DISTUTIL_CMD} install
-
 .include <bsd.port.mk>
diff --git a/devel/happydoc/Makefile b/devel/happydoc/Makefile
index 84a58f99ae23..68893cc462e3 100644
--- a/devel/happydoc/Makefile
+++ b/devel/happydoc/Makefile
@@ -16,14 +16,7 @@ DISTNAME=	HappyDoc_r${PORTVERSION:S/./_/g}
 MAINTAINER=	ports@FreeBSD.org
 
 USE_PYTHON=	yes
-
+USE_PYDISTUTILS=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_r/-r/}
-SETUP_CMD=	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py
-
-do-build:
-	@${SETUP_CMD} build
-
-do-install:
-	@${SETUP_CMD} install
 
 .include <bsd.port.mk>
diff --git a/devel/idlefork/Makefile b/devel/idlefork/Makefile
index 7d7e609e3bb3..44de2f60cecf 100644
--- a/devel/idlefork/Makefile
+++ b/devel/idlefork/Makefile
@@ -16,17 +16,14 @@ MAINTAINER=	sobomax@FreeBSD.org
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
 
 USE_PYTHON=	yes
+USE_PYDISTUTILS=	yes
 
-SETUP_CMD=	cd ${WRKSRC} && ${PYTHON_CMD} setup.py
-
-do-build:
-	${SETUP_CMD} build
-
-do-install:
-	@printf "#!/bin/sh\nexec ${PYTHON_CMD} ${PREFIX}/lib/${PYTHON_VERSION}/site-packages/idlelib/idle.pyc\n" \
+pre-install:
+	@printf "#!/bin/sh\nexec ${PYTHON_CMD} ${PYTHON_SITELIBDIR}/idlelib/idle.pyc\n" \
 		> ${WRKSRC}/idle
-	${SETUP_CMD} install -c -O1 --prefix=${PREFIX}
+
 .if !defined(NOPORTDOCS)
+post-install:
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/[^c]*.txt ${DOCSDIR}
 .endif
diff --git a/devel/py-ansistyle/Makefile b/devel/py-ansistyle/Makefile
index 7285fd45cf89..7a648fcd9f09 100644
--- a/devel/py-ansistyle/Makefile
+++ b/devel/py-ansistyle/Makefile
@@ -16,13 +16,6 @@ DISTNAME=	ANSIStyle-${PORTVERSION}
 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/devel/py-ciphon/Makefile b/devel/py-ciphon/Makefile
index 0c515e88f1d9..5e1541aa472e 100644
--- a/devel/py-ciphon/Makefile
+++ b/devel/py-ciphon/Makefile
@@ -18,14 +18,9 @@ MAINTAINER=	ports@FreeBSD.org
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pyexpat.so:${PORTSDIR}/textproc/py-expat
 
 USE_PYTHON=	yes
+USE_PYDISTUTILS=	yes
 
-SETUP_CMD=	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py
-
-do-build:
-	@${SETUP_CMD} build
-
-do-install:
-	@${SETUP_CMD} install
+post-install:
 	@${MV} -f ${PREFIX}/bin/ciphon.py ${PREFIX}/bin/ciphon
 
 .include <bsd.port.mk>
diff --git a/devel/py-cxx/Makefile b/devel/py-cxx/Makefile
index ec5efd8101c6..89ffc31bf97b 100644
--- a/devel/py-cxx/Makefile
+++ b/devel/py-cxx/Makefile
@@ -17,13 +17,7 @@ DISTNAME=	PyCXX-V${PORTVERSION:S/r/-rc/}
 MAINTAINER=	ports@FreeBSD.org
 
 USE_PYTHON=	yes
-SETUP_CMD=	cd ${WRKSRC} && ${PYTHON_CMD} setup.py
-
-do-build:
-	@${SETUP_CMD} build
-
-do-install:
-	@${SETUP_CMD} install
+USE_PYDISTUTILS=	yes
 
 .if !defined(NOPORTDOCS)
 post-install:
diff --git a/devel/py-fileutils/Makefile b/devel/py-fileutils/Makefile
index 9ff3c29f24ea..aa5ca9d07759 100644
--- a/devel/py-fileutils/Makefile
+++ b/devel/py-fileutils/Makefile
@@ -16,13 +16,6 @@ DISTNAME=	FileUtils-${PORTVERSION}
 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/devel/py-game/Makefile b/devel/py-game/Makefile
index 778f6758b35e..d902e8a3fa4a 100644
--- a/devel/py-game/Makefile
+++ b/devel/py-game/Makefile
@@ -13,8 +13,7 @@ DISTNAME=	${PORTNAME:S/-//}-${PORTVERSION}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-BUILD_DEPENDS=	${PYDISTUTILS} \
-		${PYNUMERIC}
+BUILD_DEPENDS=	${PYNUMERIC}
 LIB_DEPENDS=	SDL_ttf.3:${PORTSDIR}/graphics/sdl_ttf \
 		SDL_image.10:${PORTSDIR}/graphics/sdl_image \
 		SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
@@ -24,7 +23,7 @@ RUN_DEPENDS=	${PYNUMERIC}
 SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 
 USE_PYTHON=	yes
-SETUP_CMD=	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD}
+USE_PYDISTUTILS=	yes
 MAKE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
 
 .include <bsd.port.pre.mk>
@@ -38,12 +37,8 @@ PYNUMERIC=	${PYTHON_SITELIBDIR}/Numeric/Numeric.py:${PORTSDIR}/math/py-numeric17
 do-configure:
 	@${SETUP_CMD} config.py
 
-do-build:
-	@${SETUP_CMD} setup.py build
-
-do-install:
-	@${SETUP_CMD} setup.py install
 .if !defined(NOPORTDOCS)
+post-install:
 	${MKDIR} ${PREFIX}/share/examples/py-game
 	${TAR} -C ${WRKSRC}/examples -cf - . | \
 		${TAR} --unlink -C ${PREFIX}/share/examples/py-game -xf -
diff --git a/devel/py-grouch/Makefile b/devel/py-grouch/Makefile
index eef902b0b18a..e28b8bc17b0f 100644
--- a/devel/py-grouch/Makefile
+++ b/devel/py-grouch/Makefile
@@ -14,10 +14,8 @@ DISTNAME=	Grouch-${PORTVERSION}
 
 MAINTAINER=	wjv@FreeBSD.org
 
-BUILD_DEPENDS=	${PYDISTUTILS}
-
 USE_PYTHON=	yes
-PYTHON_SETUP=	${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py
+USE_PYDISTUTILS=	yes
 
 .include <bsd.port.pre.mk>
 
@@ -25,15 +23,9 @@ PYTHON_SETUP=	${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/compiler/__init__.py:${PORTSDIR}/lang/py-compiler
 .endif
 
-do-build:
-	@ cd ${WRKSRC} && ${PYTHON_SETUP} build
-
 pre-install:
 	@ ${SH} ${PKGREQ} INSTALL
 
-do-install:
-	@ cd ${WRKSRC} && ${PYTHON_SETUP} install -c -O1 --prefix=${PREFIX}
-
 post-install:
 .if !defined(NOPORTDOCS)
 	@ ${MKDIR} ${DOCSDIR}
diff --git a/devel/py-log4py/Makefile b/devel/py-log4py/Makefile
index 7cf8ff56fed9..00bcdd406fe0 100644
--- a/devel/py-log4py/Makefile
+++ b/devel/py-log4py/Makefile
@@ -16,15 +16,10 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 
 USE_PYTHON=	yes
+USE_PYDISTUTILS=	yes
 
-SETUP_CMD=	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py
-
-do-build:
-	@${SETUP_CMD} build
-
-do-install:
-	@${SETUP_CMD} install
 .if !defined(NOPORTDOCS)
+post-install:
 	@${MKDIR} ${DOCSDIR}
 	${CP} -R ${WRKSRC}/doc/* ${DOCSDIR}
 .endif
diff --git a/devel/py-mx-experimental/Makefile b/devel/py-mx-experimental/Makefile
index af6c661411a8..20d811bb53cf 100644
--- a/devel/py-mx-experimental/Makefile
+++ b/devel/py-mx-experimental/Makefile
@@ -16,21 +16,13 @@ DISTNAME=	egenix-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	${PYDISTUTILS} \
-		${PREFIX}/include/gmp.h:${PORTSDIR}/math/libgmp4
+BUILD_DEPENDS=	${PREFIX}/include/gmp.h:${PORTSDIR}/math/libgmp4
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/mx/BeeBase/BeeBase.py:${PORTSDIR}/lang/py-mx-base
 
 USE_PYTHON=	yes
-
-SETUP_CMD=	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py
+USE_PYDISTUTILS=	yes
 
 post-patch:
 	@${PERL} -pi  -e "s|LIBGMPH|${PREFIX}/include|" ${WRKSRC}/mxEXPERIMENTAL.py
 
-do-build:
-	@${SETUP_CMD} build
-
-do-install:
-	@${SETUP_CMD} install
-
 .include <bsd.port.mk>
diff --git a/devel/py-ncurses/Makefile b/devel/py-ncurses/Makefile
index 3bb63380311c..c3ca808f1501 100644
--- a/devel/py-ncurses/Makefile
+++ b/devel/py-ncurses/Makefile
@@ -14,16 +14,7 @@ DISTNAME=	${PORTNAME:S/-//}-${PORTVERSION}
 
 MAINTAINER=	adsharma@sharmas.dhs.org
 
-BUILD_DEPENDS=	${PYDISTUTILS}
-
 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/devel/py-optik/Makefile b/devel/py-optik/Makefile
index 2acd09e0efc5..1e584cae8e36 100644
--- a/devel/py-optik/Makefile
+++ b/devel/py-optik/Makefile
@@ -16,17 +16,9 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Optik-${PORTVERSION}
 
 MAINTAINER=	ports@geeksrus.net
-BUILD_DEPENDS=	${PYDISTUTILS}
 
 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
 
 .if !defined(NOPORTDOCS)
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
diff --git a/devel/py-ro/Makefile b/devel/py-ro/Makefile
index bd1c74d82454..bf779075c181 100644
--- a/devel/py-ro/Makefile
+++ b/devel/py-ro/Makefile
@@ -17,14 +17,7 @@ DISTNAME=	Pyro-${PORTVERSION}
 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
 
 .if !defined(NOPORTDOCS)
 post-install:
diff --git a/devel/py-twisted/Makefile b/devel/py-twisted/Makefile
index 46a5d8eecb76..27ef64b31dc0 100644
--- a/devel/py-twisted/Makefile
+++ b/devel/py-twisted/Makefile
@@ -15,13 +15,12 @@ DISTNAME=	Twisted-${PORTVERSION}
 
 MAINTAINER=	wjv@FreeBSD.org
 
-BUILD_DEPENDS=	${PYDISTUTILS}
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/unittest.py:${PORTSDIR}/devel/py-unit \
 		${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter \
 
 USE_BZIP2=	yes
 USE_PYTHON=	yes
-PYTHON_SETUP=	${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py
+USE_PYDISTUTILS=	yes
 CPIO=		cpio --quiet -pdum -R
 MAN1=		coil.1 im.1 manhole.1 mktap.1 t-im.1 twistd.1
 
@@ -29,20 +28,13 @@ post-patch:
 	@ ${PERL} -pi -e 's/from pyunit import/import/g' \
 	  ${WRKSRC}/admin/runtests ${WRKSRC}/twisted/test/*.py
 
-do-build:
-	@ cd ${WRKSRC} && ${PYTHON_SETUP} build
-
-do-install:
-	@ cd ${WRKSRC} && ${PYTHON_SETUP} install -c -O1 \
-	  --prefix=${PREFIX}
+post-install:
 	@ ${MKDIR} ${DATADIR}/admin
 	@ ${INSTALL_SCRIPT} ${WRKSRC}/admin/accepttests \
 	  ${WRKSRC}/admin/runtests ${DATADIR}/admin
 .for manpage in ${MAN1}
 	@ ${INSTALL_MAN} ${WRKSRC}/doc/man/${manpage} ${MANPREFIX}/man/man1
 .endfor
-
-post-install:
 .if !defined(NOPORTDOCS)
 	@ ${MKDIR} ${DOCSDIR}/api
 	@ cd ${WRKSRC}/doc/api && find * \
diff --git a/devel/py-unit/Makefile b/devel/py-unit/Makefile
index b5b73c113207..aa57f291f33c 100644
--- a/devel/py-unit/Makefile
+++ b/devel/py-unit/Makefile
@@ -15,18 +15,9 @@ DISTNAME=	pyunit-${PORTVERSION}
 
 MAINTAINER=	shell@shellhung.org
 
-BUILD_DEPENDS=	${PYDISTUTILS}
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
 
 USE_PYTHON=	yes
-
-SETUP_CMD=	cd ${WRKSRC} && ${SETENV} \
-			${MAKE_ENV} ${PYTHON_CMD} setup.py
-
-do-build:
-	@${SETUP_CMD} build
-
-do-install:
-	@${SETUP_CMD} install -c -O1 --prefix=${PREFIX}
+USE_PYDISTUTILS=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-vmaps/Makefile b/devel/py-vmaps/Makefile
index 81dedc1794bc..5b4c86d751cc 100644
--- a/devel/py-vmaps/Makefile
+++ b/devel/py-vmaps/Makefile
@@ -17,15 +17,10 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 
 USE_PYTHON=	yes
+USE_PYDISTUTILS=	yes
 
-SETUP_CMD=	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py
-
-do-build:
-	@${SETUP_CMD} build
-
-do-install:
-	@${SETUP_CMD} install
 .if !defined(NOPORTDOCS)
+post-install:
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/Vmaps.html ${DOCSDIR}
 .endif
diff --git a/devel/pychecker/Makefile b/devel/pychecker/Makefile
index a825c19c008d..8ef2ed6218c7 100644
--- a/devel/pychecker/Makefile
+++ b/devel/pychecker/Makefile
@@ -14,17 +14,12 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	sobomax@FreeBSD.org
 
 USE_PYTHON=	yes
+USE_PYDISTUTILS=	yes
 
 DOCS=		CHANGELOG COPYRIGHT KNOWN_BUGS MAINTAINERS README TODO \
 		VERSION
 
-SETUP_CMD=	cd ${WRKSRC} && ${PYTHON_CMD} setup.py
-
-do-build:
-	${SETUP_CMD} build
-
-do-install:
-	${SETUP_CMD} install -c -O1 --prefix=${PREFIX}
+post-install:
 	@${MKDIR} ${DOCSDIR}
 .for file in ${DOCS}
 	@${INSTALL_MAN} ${WRKSRC}/${file} ${DOCSDIR}
diff --git a/devel/scons/Makefile b/devel/scons/Makefile
index 32c7e5f25e00..01ee65114b39 100644
--- a/devel/scons/Makefile
+++ b/devel/scons/Makefile
@@ -14,13 +14,6 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	perky@fallin.lv
 
 USE_PYTHON=	yes
-
-SETUP_CMD=	cd ${WRKSRC} && ${PYTHON_CMD} setup.py
-
-do-build:
-	${SETUP_CMD} build
-
-do-install:
-	${SETUP_CMD} install -c -O1 --prefix ${PREFIX}
+USE_PYDISTUTILS=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/wizard/Makefile b/devel/wizard/Makefile
index b866d4566afe..9a0d98cf7b57 100644
--- a/devel/wizard/Makefile
+++ b/devel/wizard/Makefile
@@ -16,14 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
 
 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
 
 .if !defined(NOPORTDOCS)
 post-install: