19 files changed, 27 insertions, 2 deletions

diff --git a/graphics/crystalentitylayer-devel/Makefile b/graphics/crystalentitylayer-devel/Makefile
index 2060b3e9d422..c90e70bcff26 100644
--- a/graphics/crystalentitylayer-devel/Makefile
+++ b/graphics/crystalentitylayer-devel/Makefile
@@ -50,7 +50,7 @@ CONFIGURE_ARGS+=	--enable-debug=no
 .endif
 
 .if!defined(WITHOUT_PYTHON)
-USE_PYTHON=	yes
+USE_PYTHON=	-2.4
 .include <${PORTSDIR}/Mk/bsd.python.mk>
 .else
 CONFIGURE_ARGS+=	--without-python
diff --git a/graphics/crystalentitylayer/Makefile b/graphics/crystalentitylayer/Makefile
index 3e5daa3ee0ca..6a7421f6614d 100644
--- a/graphics/crystalentitylayer/Makefile
+++ b/graphics/crystalentitylayer/Makefile
@@ -52,7 +52,7 @@ CONFIGURE_ARGS+=	--enable-debug=yes
 .endif
 
 .if!defined(WITHOUT_PYTHON)
-USE_PYTHON=	yes
+USE_PYTHON=	-2.4
 .include <${PORTSDIR}/Mk/bsd.python.mk>
 .else
 CONFIGURE_ARGS+=	--without-python
diff --git a/graphics/driconf/Makefile b/graphics/driconf/Makefile
index 44457ef17823..c6270e764353 100644
--- a/graphics/driconf/Makefile
+++ b/graphics/driconf/Makefile
@@ -19,6 +19,8 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolki
 USE_PYTHON=	yes
 NO_BUILD=	yes
 USE_GETTEXT=	yes
+INSTALLS_EGGINFO=	yes
+PYDISTUTILS_EGGINFODIR=	lib/driconf
 
 pre-patch:
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} \
diff --git a/graphics/gnofract4d/Makefile b/graphics/gnofract4d/Makefile
index eed2221b5ac2..4ab6b5592b7f 100644
--- a/graphics/gnofract4d/Makefile
+++ b/graphics/gnofract4d/Makefile
@@ -22,6 +22,8 @@ USE_PYDISTUTILS=yes
 USE_GCC=	3.4+
 
 PORTDOCS=	*
+INSTALLS_EGGINFO=	yes
+PYDISTUTILS_EGGINFODIR=	${PREFIX}/lib/gnofract4d
 
 .include <bsd.port.pre.mk>
 
diff --git a/graphics/imgseek/Makefile b/graphics/imgseek/Makefile
index b50e1bbc92bd..1de9a0c64caa 100644
--- a/graphics/imgseek/Makefile
+++ b/graphics/imgseek/Makefile
@@ -24,6 +24,7 @@ USE_PYTHON=	yes
 USE_BZIP2=	yes
 USE_QT_VER=	3
 MAKE_ENV+=	QTDIR="${QT_PREFIX}"
+PYDISTUTILS_NOEGGINFO=	yes
 
 post-patch:
 	${REINPLACE_CMD}\
diff --git a/graphics/mirage/Makefile b/graphics/mirage/Makefile
index da58cf13f9f5..3b444b0dd641 100644
--- a/graphics/mirage/Makefile
+++ b/graphics/mirage/Makefile
@@ -20,4 +20,6 @@ USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 USE_GETTEXT=	yes
 
+PYDISTUTILS_PKGNAME=	Mirage
+
 .include <bsd.port.mk>
diff --git a/graphics/py-amanith/Makefile b/graphics/py-amanith/Makefile
index 45273429f2c5..83fd71348b26 100644
--- a/graphics/py-amanith/Makefile
+++ b/graphics/py-amanith/Makefile
@@ -23,6 +23,7 @@ BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
 
 USE_PYTHON=	2.4+
 USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME=	PyAmanith
 
 post-patch:
 	${REINPLACE_CMD} -i "" -e 's|^swig-cpp.*|swig-opts = -c++|g' ${WRKSRC}/setup.cfg
diff --git a/graphics/py-cgkit/Makefile b/graphics/py-cgkit/Makefile
index d0446a61bbf7..f001ea2e17a9 100644
--- a/graphics/py-cgkit/Makefile
+++ b/graphics/py-cgkit/Makefile
@@ -24,6 +24,7 @@ USE_GL=		yes
 USE_XLIB=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
+PYDISTUTILS_PKGVERSION=	2.0.0alpha7
 
 .if defined(INSTALL_CGKIT_LIGHT)
 PLIST_SUB+=	CGKIT_LIGHT="@comment "
diff --git a/graphics/py-chart/Makefile b/graphics/py-chart/Makefile
index 857fba0e449f..a14d49ee6288 100644
--- a/graphics/py-chart/Makefile
+++ b/graphics/py-chart/Makefile
@@ -21,6 +21,7 @@ USE_GHOSTSCRIPT_RUN=	yes
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
+PYDISTUTILS_PKGNAME=	PyChart
 
 pre-everything::
 .if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
diff --git a/graphics/py-editobj/Makefile b/graphics/py-editobj/Makefile
index 7bfbd173ee18..546ab56a546f 100644
--- a/graphics/py-editobj/Makefile
+++ b/graphics/py-editobj/Makefile
@@ -18,6 +18,7 @@ COMMENT=	Create and display a Tkinter dialog box for editing any Python object
 DIST_SUBDIR=	python
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
+PYDISTUTILS_PKGNAME=	EditObj
 WRKSRC=		${WRKDIR}/EditObj-${PORTVERSION}
 EXAMPLESDIR=	${PREFIX}/share/examples/py-editobj
 
diff --git a/graphics/py-freeimagepy/Makefile b/graphics/py-freeimagepy/Makefile
index 2676d2726604..a7556c40d97a 100644
--- a/graphics/py-freeimagepy/Makefile
+++ b/graphics/py-freeimagepy/Makefile
@@ -22,5 +22,7 @@ WRKSRC=		${WRKDIR}/FreeImagePy
 USE_BZIP2=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME=	FreeImagePy
+PYDISTUTILS_PKGVERSION=	1.0.0
 
 .include <bsd.port.mk>
diff --git a/graphics/py-gd/Makefile b/graphics/py-gd/Makefile
index f6c002186ddf..a911326a6ac5 100644
--- a/graphics/py-gd/Makefile
+++ b/graphics/py-gd/Makefile
@@ -23,6 +23,7 @@ USE_XPM=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 USE_PYTHON_PREFIX=	yes
+PYDISTUTILS_PKGNAME=	gdmodule
 DISABLE_SIZE=	yes
 PYSETUP=	Setup.py
 EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
diff --git a/graphics/py-gdchart2/Makefile b/graphics/py-gdchart2/Makefile
index 6eb5317fba19..357273ac5116 100644
--- a/graphics/py-gdchart2/Makefile
+++ b/graphics/py-gdchart2/Makefile
@@ -24,6 +24,8 @@ LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}2
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME=	pygdchart
+PYDISTUTILS_PKGVERSION=	2.0.Beta
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/setup.py
diff --git a/graphics/py-graphviz/Makefile b/graphics/py-graphviz/Makefile
index 72890c5823fe..0cfe1dcf2119 100644
--- a/graphics/py-graphviz/Makefile
+++ b/graphics/py-graphviz/Makefile
@@ -20,6 +20,7 @@ RUN_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME=	pygraphviz
 PLIST_SUB=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S,^${LOCALBASE}/,,g}
 
 post-patch:
diff --git a/graphics/py-imaging/Makefile b/graphics/py-imaging/Makefile
index 56eabf9ab266..1d5e52d4e6b1 100644
--- a/graphics/py-imaging/Makefile
+++ b/graphics/py-imaging/Makefile
@@ -25,6 +25,8 @@ LATEST_LINK=	py-${PORTNAME}
 DIST_SUBDIR=	python
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
+PYDISTUTILS_PKGNAME=	PIL
+PYDISTUTILS_EGGINFODIR=	${PYTHON_SITELIBDIR}/PIL
 
 PORTDOCS=	*
 
diff --git a/graphics/py-ming/Makefile b/graphics/py-ming/Makefile
index d9ef9ca022d5..8bb4be4b55e7 100644
--- a/graphics/py-ming/Makefile
+++ b/graphics/py-ming/Makefile
@@ -23,6 +23,8 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/py_ext
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
+PYDISTUTILS_PKGNAME=	mingc
+PYDISTUTILS_PKGVERSION=	0.0.3a
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|g' ${WRKSRC}/setup.py
diff --git a/graphics/py-opengl/Makefile b/graphics/py-opengl/Makefile
index 5398fb05d426..12dcde35f6af 100644
--- a/graphics/py-opengl/Makefile
+++ b/graphics/py-opengl/Makefile
@@ -30,6 +30,7 @@ OPTIONSFILE?=	${PORT_DBDIR}/${PORTNAME}/options
 USE_GL=		yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
+PYDISTUTILS_PKGNAME=	PyOpenGL
 
 .include <bsd.port.pre.mk>
 
diff --git a/graphics/py-soya3d/Makefile b/graphics/py-soya3d/Makefile
index ac7a8535b5d4..6de270dcf6f6 100644
--- a/graphics/py-soya3d/Makefile
+++ b/graphics/py-soya3d/Makefile
@@ -36,6 +36,8 @@ USE_GL=		yes
 USE_GMAKE=	yes
 USE_XLIB=	yes
 
+PYDISTUTILS_PKGNAME=	Soya
+
 MANDIR=	${WRKDIR}/${DISTNAME}/manpage/man1
 MAN1=	soya_editor.1
 INSTALL_DIR=	${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
diff --git a/graphics/skencil/Makefile b/graphics/skencil/Makefile
index 53f093eece8c..b3e4214a9568 100644
--- a/graphics/skencil/Makefile
+++ b/graphics/skencil/Makefile
@@ -23,6 +23,7 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinte
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
+PYDISTUTILS_NOEGGINFO=	yes
 
 CONFFLAGS=	--tk-autoconf --tk-flags="-I${X11BASE}/include -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4 -L${LOCALBASE}/lib -ltk84 -ltcl84 -L${X11BASE}/lib -lX11"