diff --git a/graphics/py-graphviz/Makefile b/graphics/py-graphviz/Makefile index d7fdce2c4315..333d49acb413 100644 --- a/graphics/py-graphviz/Makefile +++ b/graphics/py-graphviz/Makefile @@ -25,6 +25,7 @@ WRKSRC= ${WRKDIR}/graphviz-${GV_VERSION}/agraph GV_VERSION?= 1.7.7 USE_PYTHON= yes +USE_PYDISTUTILS= yes SWIG_CMD= ${LOCALBASE}/bin/swig PLIST_SUB= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S,^${LOCALBASE}/,,g} @@ -33,13 +34,7 @@ post-patch: @${MKDIR} ${WRKSRC}/graphviz @${CP} ${DISTDIR}/graphviz/__init__.py ${WRKSRC}/graphviz -do-build: - @cd ${WRKSRC} && ( \ - ${SWIG_CMD} -python gv.i; \ - ${PYTHON_CMD} setup.py build; \ - ) - -do-install: - @cd ${WRKSRC} && ${PYTHON_CMD} setup.py install +pre-build: + @cd ${WRKSRC} && ${SWIG_CMD} -python gv.i .include diff --git a/graphics/py-opengl/Makefile b/graphics/py-opengl/Makefile index b756e7885e84..e8452d0af45f 100644 --- a/graphics/py-opengl/Makefile +++ b/graphics/py-opengl/Makefile @@ -23,24 +23,17 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/Numeric/Numeric.py:${PORTSDIR}/math/py-numeric ${PYTHON_SITELIBDIR}/PIL.pth:${PORTSDIR}/graphics/py-imaging USE_PYTHON= yes +USE_PYDISTUTILS= yes USE_MESA= yes OSMAJOR!= /usr/bin/uname -r | sed -e 's/\..*//' PLIST_SUB+= OSMAJOR=${OSMAJOR} \ PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S|^${LOCALBASE}/||g} -SETUP_CMD= cd ${WRKSRC} && ${PYTHON_CMD} setup.py - do-configure: @${PERL} -pi -e 's|%%LOCALBASE%%|${LOCALBASE}|g ; s|%%X11BASE%%|${X11BASE}|g' \ ${WRKSRC}/config.py ${WRKSRC}/Tkinter.py -do-build: - ${SETUP_CMD} build - -do-install: - ${SETUP_CMD} install -c -O1 --prefix=${PREFIX} - post-install: ${LOCALBASE}/bin/tclsh8.3 ${WRKSRC}/register.tcl diff --git a/graphics/py-paint/Makefile b/graphics/py-paint/Makefile index 79441dd5983b..1f4c4f085108 100644 --- a/graphics/py-paint/Makefile +++ b/graphics/py-paint/Makefile @@ -19,11 +19,11 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ USE_FREETYPE= yes USE_PYTHON= yes +USE_PYDISTUTILS= yes PLIST_SUB+= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S,^${LOCALBASE}/,,g} \ SHARE_SUBDIR=${SHARE_SUBDIR} WRKSRC= ${WRKDIR}/${PORTNAME} SHARE_SUBDIR= ${PKGNAMEPREFIX}${PORTNAME} -PYDIST_SETUP= cd ${WRKSRC} && ${PYTHON_CMD} setup.py INC_DIRS= ["${LOCALBASE}/include/freetype1","${LOCALBASE}/include","${X11BASE}/include","${LOCALBASE}/include/freetype1/freetype"] LIB_DIRS= ["${LOCALBASE}/lib","${X11BASE}/lib"] @@ -44,12 +44,8 @@ post-patch: ${CAT} ${file}${TMPSUFFIX} > ${file} .endfor -do-build: - ${PYDIST_SETUP} build - -do-install: - ${PYDIST_SETUP} install .if !defined(NOPORTDOCS) +post-install: ${MKDIR} ${PREFIX}/share/examples/${SHARE_SUBDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${PREFIX}/share/examples/${SHARE_SUBDIR} .endif diff --git a/graphics/skencil/Makefile b/graphics/skencil/Makefile index e9df51b3c9a1..1fb87a3f8c98 100644 --- a/graphics/skencil/Makefile +++ b/graphics/skencil/Makefile @@ -13,14 +13,14 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org -BUILD_DEPENDS= ${LOCALBASE}/include/${PYTHON_VERSION}/Imaging.h:${PORTSDIR}/graphics/py-imaging \ - ${PYDISTUTILS} +BUILD_DEPENDS= ${LOCALBASE}/include/${PYTHON_VERSION}/Imaging.h:${PORTSDIR}/graphics/py-imaging RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter \ ${PYTHON_SITELIBDIR}/_imaging.so:${PORTSDIR}/graphics/py-imaging \ ${PYTHON_SITELIBDIR}/reportlab/__init__.py:${PORTSDIR}/print/py-reportlab \ ${PYXML} USE_PYTHON= yes +USE_PYDISTUTILS= yes CONFFLAGS= --tk-autoconf --tk-flags="-I${X11BASE}/include -I${LOCALBASE}/include/tcl8.3 -I${LOCALBASE}/include/tk8.3 -L${LOCALBASE}/lib -ltk83 -ltcl83 -L${X11BASE}/lib -lX11" @@ -36,9 +36,6 @@ do-configure: ${SETENV} ${CONFIGURE_ENV} \ ${PYTHON_CMD} setup.py configure ${CONFFLAGS}) -do-build: - @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py build) - do-install: @${MKDIR} ${SKETCHDIR} .for dir in Filter Pax Plugins Resources Script Sketch diff --git a/graphics/sketch/Makefile b/graphics/sketch/Makefile index e9df51b3c9a1..1fb87a3f8c98 100644 --- a/graphics/sketch/Makefile +++ b/graphics/sketch/Makefile @@ -13,14 +13,14 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org -BUILD_DEPENDS= ${LOCALBASE}/include/${PYTHON_VERSION}/Imaging.h:${PORTSDIR}/graphics/py-imaging \ - ${PYDISTUTILS} +BUILD_DEPENDS= ${LOCALBASE}/include/${PYTHON_VERSION}/Imaging.h:${PORTSDIR}/graphics/py-imaging RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter \ ${PYTHON_SITELIBDIR}/_imaging.so:${PORTSDIR}/graphics/py-imaging \ ${PYTHON_SITELIBDIR}/reportlab/__init__.py:${PORTSDIR}/print/py-reportlab \ ${PYXML} USE_PYTHON= yes +USE_PYDISTUTILS= yes CONFFLAGS= --tk-autoconf --tk-flags="-I${X11BASE}/include -I${LOCALBASE}/include/tcl8.3 -I${LOCALBASE}/include/tk8.3 -L${LOCALBASE}/lib -ltk83 -ltcl83 -L${X11BASE}/lib -lX11" @@ -36,9 +36,6 @@ do-configure: ${SETENV} ${CONFIGURE_ENV} \ ${PYTHON_CMD} setup.py configure ${CONFFLAGS}) -do-build: - @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py build) - do-install: @${MKDIR} ${SKETCHDIR} .for dir in Filter Pax Plugins Resources Script Sketch