use USE_PYDISTUTILS

4 files changed, 6 insertions, 31 deletions

diff --git a/www/moinmoin/Makefile b/www/moinmoin/Makefile
index 105ee92a39e9..a7d9f42d8b84 100644
--- a/www/moinmoin/Makefile
+++ b/www/moinmoin/Makefile
@@ -19,6 +19,7 @@ EXTRACT_ONLY=	${DISTNAME}.tgz
 MAINTAINER=	perky@fallin.lv
 
 USE_PYTHON=	yes
+USE_PYDISTUTILS=	yes
 PLIST_SUB+=	PYTHON_SITELIB=${PYTHON_SITELIBDIR:S|^${LOCALBASE}/||}
 
 CGIUSER?=	moinmoin
@@ -26,7 +27,6 @@ CGIUSERID?=	192
 CGIROOT=	${PREFIX}/www/cgi-bin
 HTDOCSROOT=	${PREFIX}/www/data
 MOINDIR=	${PREFIX}/share/moin
-SETUP_CMD=	cd ${WRKSRC} && ${PYTHON_CMD} setup.py
 
 do-configure:
 	@# Add the username, uid, group and gid
@@ -38,17 +38,14 @@ post-patch:
 		${WRKSRC}/wiki/cgi-bin/moin_config.py > \
 		${WRKSRC}/wiki/cgi-bin/moin_config.py.default
 
-do-build:
-	${SETUP_CMD} build
+post-build:
 	@# Compile setuid wrapper
 	${CC} ${CFLAGS} -o ${WRKDIR}/moin \
 		-DPYTHON_PATH='"${PYTHON_CMD}"' \
 		-DMOIN_PREFIX='"${MOINDIR}"' \
 		${FILESDIR}/wrapper.c
 
-do-install:
-	@# Install MoinMoin
-	${SETUP_CMD} install
+post-install:
 	${INSTALL_DATA} ${DISTDIR}/twikidraw.jar ${MOINDIR}/htdocs/applets/TWikiDrawPlugin/
 
 	@# Install Wrapper
@@ -69,7 +66,6 @@ do-install:
 		${LN} -sf ${MOINDIR}/data/text.default ${MOINDIR}/data/text
 	-${LN} -sf ${MOINDIR}/htdocs ${HTDOCSROOT}/moin
 
-post-install:
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/www/pyweblib/Makefile b/www/pyweblib/Makefile
index bc6b06e3f63a..294c1ef1651a 100644
--- a/www/pyweblib/Makefile
+++ b/www/pyweblib/Makefile
@@ -13,16 +13,8 @@ MASTER_SITES=	http://www.stroeder.com/pylib/PyWebLib/download/ \
 
 MAINTAINER=	oddbjorn@tricknology.org
 
-BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
-RUN_DEPENDS=	python:${PORTSDIR}/lang/python
-
 USE_PYTHON=	yes
+USE_PYDISTUTILS=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME:S=-src==}
 
-do-build:
-	cd ${WRKSRC} && python setup.py build
-
-do-install:
-	cd ${WRKSRC} && python setup.py install
-
 .include <bsd.port.mk>
diff --git a/www/quixote/Makefile b/www/quixote/Makefile
index 25d9ec1751cf..d2ba20eb9f8a 100644
--- a/www/quixote/Makefile
+++ b/www/quixote/Makefile
@@ -16,7 +16,7 @@ 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>
 
@@ -24,15 +24,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:
 	@ PYTHONPATH=${PREFIX}/lib/${PYTHON_VERSION}/site-packages \
 	  ${PYTHON_CMD} ${SCRIPTDIR}/compile_ptl.py \
diff --git a/www/xist/Makefile b/www/xist/Makefile
index e7c7ce08fa7f..9e90a689007c 100644
--- a/www/xist/Makefile
+++ b/www/xist/Makefile
@@ -19,14 +19,7 @@ RUN_DEPENDS=	${PYXML} \
 		${PYTHON_SITELIBDIR}/mx/Tidy/mxTidy/mxTidy.so:${PORTSDIR}/devel/py-mx-experimental
 
 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
 
 post-install:
 .for file in doc2txt dtd2xsc xscmake