2 files changed, 72 insertions, 71 deletions

diff --git a/x11-toolkits/py-gnome/Makefile b/x11-toolkits/py-gnome/Makefile
index 57a1cb6146ce..cb480197e7ea 100644
--- a/x11-toolkits/py-gnome/Makefile
+++ b/x11-toolkits/py-gnome/Makefile
@@ -14,26 +14,27 @@ DISTNAME=	gnome-python-${PORTVERSION}
 
 MAINTAINER=	nectar@FreeBSD.org
 
-BUILD_DEPENDS=	python1.5:${PORTSDIR}/lang/python15 ${PYGTK_DEP}
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12                  \
-		capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter       \
+BUILD_DEPENDS=	${PYGTK_DEP}
+LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12			\
+		capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter	\
 		panel_applet.4:${PORTSDIR}/x11/gnomecore
-RUN_DEPENDS=	python1.5:${PORTSDIR}/lang/python15 ${PYGTK_DEP}
+RUN_DEPENDS=	${PYGTK_DEP}
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_GMAKE=	yes
+USE_PYTHON=	yes
 USE_LIBTOOL=	yes
 LIBTOOLFILES=	configure pygnome/configure pygtk/configure
-CONFIGURE_ENV=	GLIB_CONFIG="${GLIB_CONFIG}" \
+CONFIGURE_ENV=	GLIB_CONFIG="${GLIB_CONFIG}"				\
 		GTK_CONFIG="${GTK_CONFIG}"
-CONFIGURE_ARGS=	--with-python=python1.5                                 \
+CONFIGURE_ARGS=	--with-python=${PYTHON_CMD}				\
 		--with-gnome-config=${X11BASE}/bin/gnome-config
 
 EG_SRC_DIR=	${WRKSRC}/pygnome/examples
 EG_DST_DIR=	${PREFIX}/share/examples/py-gnome
-PYGTK_DEP=	${LOCALBASE}/lib/python1.5/site-packages/_gtkmodule.so:${PORTSDIR}/x11-toolkits/py-gtk
+PYGTK_DEP=	${PYTHON_LIBDIR}/site-packages/_gtkmodule.so:${PORTSDIR}/x11-toolkits/py-gtk
 PLIST_COMPLETE= ${PKGDIR}/PLIST
 
 .if !defined(NOPORTDOCS)
diff --git a/x11-toolkits/py-gnome/pkg-plist b/x11-toolkits/py-gnome/pkg-plist
index d0c5718cf140..f134b3e7f6fb 100644
--- a/x11-toolkits/py-gnome/pkg-plist
+++ b/x11-toolkits/py-gnome/pkg-plist
@@ -1,66 +1,66 @@
-lib/python1.5/site-packages/_appletmodule.so
-lib/python1.5/site-packages/_cappletmodule.so
-lib/python1.5/site-packages/_gnomemodule.so
-lib/python1.5/site-packages/_gnomeuimodule.so
-lib/python1.5/site-packages/_gtkxmhtmlmodule.so
-lib/python1.5/site-packages/_zvtmodule.so
-lib/python1.5/site-packages/gettext.py
-lib/python1.5/site-packages/gettext.pyc
-lib/python1.5/site-packages/gettext.pyo
-lib/python1.5/site-packages/gnome/__init__.py
-lib/python1.5/site-packages/gnome/__init__.pyc
-lib/python1.5/site-packages/gnome/__init__.pyo
-lib/python1.5/site-packages/gnome/affine.py
-lib/python1.5/site-packages/gnome/affine.pyc
-lib/python1.5/site-packages/gnome/affine.pyo
-lib/python1.5/site-packages/gnome/applet.py
-lib/python1.5/site-packages/gnome/applet.pyc
-lib/python1.5/site-packages/gnome/applet.pyo
-lib/python1.5/site-packages/gnome/capplet.py
-lib/python1.5/site-packages/gnome/capplet.pyc
-lib/python1.5/site-packages/gnome/capplet.pyo
-lib/python1.5/site-packages/gnome/config.py
-lib/python1.5/site-packages/gnome/config.pyc
-lib/python1.5/site-packages/gnome/config.pyo
-lib/python1.5/site-packages/gnome/file.py
-lib/python1.5/site-packages/gnome/file.pyc
-lib/python1.5/site-packages/gnome/file.pyo
-lib/python1.5/site-packages/gnome/help.py
-lib/python1.5/site-packages/gnome/help.pyc
-lib/python1.5/site-packages/gnome/help.pyo
-lib/python1.5/site-packages/gnome/history.py
-lib/python1.5/site-packages/gnome/history.pyc
-lib/python1.5/site-packages/gnome/history.pyo
-lib/python1.5/site-packages/gnome/metadata.py
-lib/python1.5/site-packages/gnome/metadata.pyc
-lib/python1.5/site-packages/gnome/metadata.pyo
-lib/python1.5/site-packages/gnome/mime.py
-lib/python1.5/site-packages/gnome/mime.pyc
-lib/python1.5/site-packages/gnome/mime.pyo
-lib/python1.5/site-packages/gnome/score.py
-lib/python1.5/site-packages/gnome/score.pyc
-lib/python1.5/site-packages/gnome/score.pyo
-lib/python1.5/site-packages/gnome/triggers.py
-lib/python1.5/site-packages/gnome/triggers.pyc
-lib/python1.5/site-packages/gnome/triggers.pyo
-lib/python1.5/site-packages/gnome/ui.py
-lib/python1.5/site-packages/gnome/ui.pyc
-lib/python1.5/site-packages/gnome/ui.pyo
-lib/python1.5/site-packages/gnome/uiconsts.py
-lib/python1.5/site-packages/gnome/uiconsts.pyc
-lib/python1.5/site-packages/gnome/uiconsts.pyo
-lib/python1.5/site-packages/gnome/url.py
-lib/python1.5/site-packages/gnome/url.pyc
-lib/python1.5/site-packages/gnome/url.pyo
-lib/python1.5/site-packages/gnome/util.py
-lib/python1.5/site-packages/gnome/util.pyc
-lib/python1.5/site-packages/gnome/util.pyo
-lib/python1.5/site-packages/gnome/xmhtml.py
-lib/python1.5/site-packages/gnome/xmhtml.pyc
-lib/python1.5/site-packages/gnome/xmhtml.pyo
-lib/python1.5/site-packages/gnome/zvt.py
-lib/python1.5/site-packages/gnome/zvt.pyc
-lib/python1.5/site-packages/gnome/zvt.pyo
+lib/%%PYTHON_VERSION%%/site-packages/_appletmodule.so
+lib/%%PYTHON_VERSION%%/site-packages/_cappletmodule.so
+lib/%%PYTHON_VERSION%%/site-packages/_gnomemodule.so
+lib/%%PYTHON_VERSION%%/site-packages/_gnomeuimodule.so
+lib/%%PYTHON_VERSION%%/site-packages/_gtkxmhtmlmodule.so
+lib/%%PYTHON_VERSION%%/site-packages/_zvtmodule.so
+lib/%%PYTHON_VERSION%%/site-packages/gettext.py
+lib/%%PYTHON_VERSION%%/site-packages/gettext.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gettext.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gnome/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/gnome/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gnome/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gnome/affine.py
+lib/%%PYTHON_VERSION%%/site-packages/gnome/affine.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gnome/affine.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gnome/applet.py
+lib/%%PYTHON_VERSION%%/site-packages/gnome/applet.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gnome/applet.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gnome/capplet.py
+lib/%%PYTHON_VERSION%%/site-packages/gnome/capplet.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gnome/capplet.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gnome/config.py
+lib/%%PYTHON_VERSION%%/site-packages/gnome/config.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gnome/config.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gnome/file.py
+lib/%%PYTHON_VERSION%%/site-packages/gnome/file.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gnome/file.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gnome/help.py
+lib/%%PYTHON_VERSION%%/site-packages/gnome/help.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gnome/help.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gnome/history.py
+lib/%%PYTHON_VERSION%%/site-packages/gnome/history.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gnome/history.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gnome/metadata.py
+lib/%%PYTHON_VERSION%%/site-packages/gnome/metadata.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gnome/metadata.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gnome/mime.py
+lib/%%PYTHON_VERSION%%/site-packages/gnome/mime.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gnome/mime.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gnome/score.py
+lib/%%PYTHON_VERSION%%/site-packages/gnome/score.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gnome/score.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gnome/triggers.py
+lib/%%PYTHON_VERSION%%/site-packages/gnome/triggers.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gnome/triggers.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gnome/ui.py
+lib/%%PYTHON_VERSION%%/site-packages/gnome/ui.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gnome/ui.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gnome/uiconsts.py
+lib/%%PYTHON_VERSION%%/site-packages/gnome/uiconsts.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gnome/uiconsts.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gnome/url.py
+lib/%%PYTHON_VERSION%%/site-packages/gnome/url.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gnome/url.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gnome/util.py
+lib/%%PYTHON_VERSION%%/site-packages/gnome/util.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gnome/util.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gnome/xmhtml.py
+lib/%%PYTHON_VERSION%%/site-packages/gnome/xmhtml.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gnome/xmhtml.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gnome/zvt.py
+lib/%%PYTHON_VERSION%%/site-packages/gnome/zvt.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gnome/zvt.pyo
 share/examples/py-gnome/about.py
 share/examples/py-gnome/bookmarks-applet.py
 share/examples/py-gnome/calculator.py
@@ -76,5 +76,5 @@ share/examples/py-gnome/stock_demo.py
 share/examples/py-gnome/ted_demo.py
 share/examples/py-gnome/uiinfo_demo.py
 share/examples/py-gnome/zterm.py
-@dirrm lib/python1.5/site-packages/gnome
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/gnome
 @dirrm share/examples/py-gnome