Catch up with latest developments in bsd.python.mk.

Approved by:	sobomax

4 files changed, 20 insertions, 44 deletions

diff --git a/x11-toolkits/py-wxPython/Makefile b/x11-toolkits/py-wxPython/Makefile
index f994e354d7c..f0dbcbb8560 100644
--- a/x11-toolkits/py-wxPython/Makefile
+++ b/x11-toolkits/py-wxPython/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sobomax@FreeBSD.ORG
 
-BUILD_DEPENDS=	${PYDISTUTILS}
 LIB_DEPENDS=	wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk-devel
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl
 
@@ -23,23 +22,18 @@ WX_CONFIG=	${X11BASE}/bin/wx-config
 USE_GMAKE=	yes
 USE_NEWGCC=	yes
 USE_PYTHON=	yes
+USE_PYDISTUTILS=yes
 USE_GTK=	yes
 MAKE_ENV=	WX_CONFIG="${WX_CONFIG}"
-SETUP_ARGS=	WX_CONFIG="${WX_CONFIG}"
-SETUP_CMD=	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py \
-			${SETUP_ARGS}
-DEMO_DIR=	${PYTHON_SITELIBDIR:S/${LOCALBASE}/${PREFIX}/}/wxPython/demo
-PLIST_SUB=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S|^${LOCALBASE}/||g}
-
-do-build:
-	@${SETUP_CMD} build
+DEMO_DIR=	${PYTHONPREFIX_SITELIBDIR}/wxPython/demo
+
+post-build:
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/demo
 .if !defined(DEBUG_FLAGS)
 	@find ${WRKSRC} -name "*.so" | xargs strip
 .endif
 
-do-install:
-	@${SETUP_CMD} install -c -O1 --prefix=${PREFIX}
+post-install:
 	@${MKDIR} ${DEMO_DIR}
 .for glob in *.py *.pyc
 	@${INSTALL_DATA} ${WRKSRC}/demo/${glob} ${DEMO_DIR}
diff --git a/x11-toolkits/py-wxPython24/Makefile b/x11-toolkits/py-wxPython24/Makefile
index f994e354d7c..f0dbcbb8560 100644
--- a/x11-toolkits/py-wxPython24/Makefile
+++ b/x11-toolkits/py-wxPython24/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sobomax@FreeBSD.ORG
 
-BUILD_DEPENDS=	${PYDISTUTILS}
 LIB_DEPENDS=	wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk-devel
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl
 
@@ -23,23 +22,18 @@ WX_CONFIG=	${X11BASE}/bin/wx-config
 USE_GMAKE=	yes
 USE_NEWGCC=	yes
 USE_PYTHON=	yes
+USE_PYDISTUTILS=yes
 USE_GTK=	yes
 MAKE_ENV=	WX_CONFIG="${WX_CONFIG}"
-SETUP_ARGS=	WX_CONFIG="${WX_CONFIG}"
-SETUP_CMD=	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py \
-			${SETUP_ARGS}
-DEMO_DIR=	${PYTHON_SITELIBDIR:S/${LOCALBASE}/${PREFIX}/}/wxPython/demo
-PLIST_SUB=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S|^${LOCALBASE}/||g}
-
-do-build:
-	@${SETUP_CMD} build
+DEMO_DIR=	${PYTHONPREFIX_SITELIBDIR}/wxPython/demo
+
+post-build:
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/demo
 .if !defined(DEBUG_FLAGS)
 	@find ${WRKSRC} -name "*.so" | xargs strip
 .endif
 
-do-install:
-	@${SETUP_CMD} install -c -O1 --prefix=${PREFIX}
+post-install:
 	@${MKDIR} ${DEMO_DIR}
 .for glob in *.py *.pyc
 	@${INSTALL_DATA} ${WRKSRC}/demo/${glob} ${DEMO_DIR}
diff --git a/x11-toolkits/py-wxPython26/Makefile b/x11-toolkits/py-wxPython26/Makefile
index f994e354d7c..f0dbcbb8560 100644
--- a/x11-toolkits/py-wxPython26/Makefile
+++ b/x11-toolkits/py-wxPython26/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sobomax@FreeBSD.ORG
 
-BUILD_DEPENDS=	${PYDISTUTILS}
 LIB_DEPENDS=	wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk-devel
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl
 
@@ -23,23 +22,18 @@ WX_CONFIG=	${X11BASE}/bin/wx-config
 USE_GMAKE=	yes
 USE_NEWGCC=	yes
 USE_PYTHON=	yes
+USE_PYDISTUTILS=yes
 USE_GTK=	yes
 MAKE_ENV=	WX_CONFIG="${WX_CONFIG}"
-SETUP_ARGS=	WX_CONFIG="${WX_CONFIG}"
-SETUP_CMD=	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py \
-			${SETUP_ARGS}
-DEMO_DIR=	${PYTHON_SITELIBDIR:S/${LOCALBASE}/${PREFIX}/}/wxPython/demo
-PLIST_SUB=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S|^${LOCALBASE}/||g}
-
-do-build:
-	@${SETUP_CMD} build
+DEMO_DIR=	${PYTHONPREFIX_SITELIBDIR}/wxPython/demo
+
+post-build:
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/demo
 .if !defined(DEBUG_FLAGS)
 	@find ${WRKSRC} -name "*.so" | xargs strip
 .endif
 
-do-install:
-	@${SETUP_CMD} install -c -O1 --prefix=${PREFIX}
+post-install:
 	@${MKDIR} ${DEMO_DIR}
 .for glob in *.py *.pyc
 	@${INSTALL_DATA} ${WRKSRC}/demo/${glob} ${DEMO_DIR}
diff --git a/x11-toolkits/py-wxPython28/Makefile b/x11-toolkits/py-wxPython28/Makefile
index f994e354d7c..f0dbcbb8560 100644
--- a/x11-toolkits/py-wxPython28/Makefile
+++ b/x11-toolkits/py-wxPython28/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sobomax@FreeBSD.ORG
 
-BUILD_DEPENDS=	${PYDISTUTILS}
 LIB_DEPENDS=	wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk-devel
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl
 
@@ -23,23 +22,18 @@ WX_CONFIG=	${X11BASE}/bin/wx-config
 USE_GMAKE=	yes
 USE_NEWGCC=	yes
 USE_PYTHON=	yes
+USE_PYDISTUTILS=yes
 USE_GTK=	yes
 MAKE_ENV=	WX_CONFIG="${WX_CONFIG}"
-SETUP_ARGS=	WX_CONFIG="${WX_CONFIG}"
-SETUP_CMD=	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py \
-			${SETUP_ARGS}
-DEMO_DIR=	${PYTHON_SITELIBDIR:S/${LOCALBASE}/${PREFIX}/}/wxPython/demo
-PLIST_SUB=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S|^${LOCALBASE}/||g}
-
-do-build:
-	@${SETUP_CMD} build
+DEMO_DIR=	${PYTHONPREFIX_SITELIBDIR}/wxPython/demo
+
+post-build:
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/demo
 .if !defined(DEBUG_FLAGS)
 	@find ${WRKSRC} -name "*.so" | xargs strip
 .endif
 
-do-install:
-	@${SETUP_CMD} install -c -O1 --prefix=${PREFIX}
+post-install:
 	@${MKDIR} ${DEMO_DIR}
 .for glob in *.py *.pyc
 	@${INSTALL_DATA} ${WRKSRC}/demo/${glob} ${DEMO_DIR}