- Convert ports from korean/, shells/, x11/, x11-clocks/, x11-fm/,

  x11-fonts/, x11-toolkits and x11-wm to new USES=python

Approved by:	portmgr (implicit)

22 files changed, 34 insertions, 56 deletions

diff --git a/x11-toolkits/flowcanvas/Makefile b/x11-toolkits/flowcanvas/Makefile
index e8b5ad75dc69..e32245d95fba 100644
--- a/x11-toolkits/flowcanvas/Makefile
+++ b/x11-toolkits/flowcanvas/Makefile
@@ -18,8 +18,7 @@ LIB_DEPENDS=	libboost_date_time.so:${PORTSDIR}/devel/boost-libs \
 		libgnomecanvasmm-2.6.so:${PORTSDIR}/graphics/libgnomecanvasmm26 \
 		libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24
 
-USES=		tar:bzip2 pkgconfig
-USE_PYTHON_BUILD=yes
+USES=		tar:bzip2 pkgconfig python:build
 USE_LDCONFIG=	yes
 
 CFLAGS+=	-I${LOCALBASE}/include
diff --git a/x11-toolkits/hippo-canvas/Makefile b/x11-toolkits/hippo-canvas/Makefile
index 908f6e2b8d03..49421cc74286 100644
--- a/x11-toolkits/hippo-canvas/Makefile
+++ b/x11-toolkits/hippo-canvas/Makefile
@@ -14,9 +14,8 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py
 LIB_DEPENDS=	libcroco-0.6.so:${PORTSDIR}/textproc/libcroco
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo
 
-USES=		gmake libtool pathfix pkgconfig tar:bzip2
+USES=		gmake libtool pathfix pkgconfig python tar:bzip2
 USE_GNOME=	cairo gtk20 glib20 librsvg2 pygtk2 pango
-USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc --enable-python
 USE_LDCONFIG=	yes
diff --git a/x11-toolkits/py-Pmw/Makefile b/x11-toolkits/py-Pmw/Makefile
index 5a4117545543..7b6fb381fa2c 100644
--- a/x11-toolkits/py-Pmw/Makefile
+++ b/x11-toolkits/py-Pmw/Makefile
@@ -16,8 +16,8 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
 LIB_DEPENDS=	libBLT25.so:${PORTSDIR}/x11-toolkits/blt
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
+USES=		python
+USE_PYTHON=	distutils
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 PMWVERSION=	${DISTNAME:R:S/./_/g}
diff --git a/x11-toolkits/py-SquareMap/Makefile b/x11-toolkits/py-SquareMap/Makefile
index ba53a5e53a88..1fe3e1edf92e 100644
--- a/x11-toolkits/py-SquareMap/Makefile
+++ b/x11-toolkits/py-SquareMap/Makefile
@@ -13,9 +13,8 @@ COMMENT=	Hierarchic visualization control for wxPython
 
 LICENSE=	BSD2CLAUSE
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 USE_WX=		2.8
 WX_COMPS=	python
 
diff --git a/x11-toolkits/py-fltk/Makefile b/x11-toolkits/py-fltk/Makefile
index c0b4c7a4ea0c..31b801264b9f 100644
--- a/x11-toolkits/py-fltk/Makefile
+++ b/x11-toolkits/py-fltk/Makefile
@@ -15,9 +15,8 @@ COMMENT=	Python interface to FLTK window toolkit
 
 LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 USE_XORG=	x11
 
 MAKE_ENV+=	FLTK_HOME=${LOCALBASE}/bin
diff --git a/x11-toolkits/py-gnome-desktop/Makefile b/x11-toolkits/py-gnome-desktop/Makefile
index 2eb29af3c9e2..a6b6f54400ef 100644
--- a/x11-toolkits/py-gnome-desktop/Makefile
+++ b/x11-toolkits/py-gnome-desktop/Makefile
@@ -28,8 +28,7 @@ LIB_DEPENDS=	libgtop-2.0.so:${PORTSDIR}/devel/libgtop \
 		libevdocument.so:${PORTSDIR}/graphics/evince
 RUN_DEPENDS=	bug-buddy:${PORTSDIR}/devel/bug-buddy
 
-USES=		gmake libtool:keepla pathfix pkgconfig tar:bzip2
-USE_PYTHON=	2
+USES=		gmake libtool:keepla pathfix pkgconfig python:2 tar:bzip2
 USE_GNOME=	libgnomeprintui gnomepanel gnomedesktop \
 		gtksourceview libwnck nautilus2 pygnome2 metacity \
 		evolutiondataserver
diff --git a/x11-toolkits/py-gnome-extras/Makefile b/x11-toolkits/py-gnome-extras/Makefile
index 5d55a998f1dc..2881d6934f17 100644
--- a/x11-toolkits/py-gnome-extras/Makefile
+++ b/x11-toolkits/py-gnome-extras/Makefile
@@ -22,8 +22,7 @@ LIB_DEPENDS=	libgtkspell.so:${PORTSDIR}/textproc/gtkspell \
 		libgksu2.so:${PORTSDIR}/sysutils/libgksu \
 #		gdl-1.2:${PORTSDIR}/x11-toolkits/gdl
 
-USES=		gmake libtool pathfix pkgconfig tar:bzip2
-USE_PYTHON=	yes
+USES=		gmake libtool pathfix pkgconfig python tar:bzip2
 USE_GNOME=	libgtkhtml pygnome2 libgda4
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index 195fc2049b59..f9512951c734 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -22,8 +22,7 @@ OPTIONS_SUB=	yes
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/ORBit.so:${PORTSDIR}/devel/py-orbit
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/ORBit.so:${PORTSDIR}/devel/py-orbit
 
-USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
-USE_PYTHON=	2
+USES=		gettext gmake libtool:keepla pathfix pkgconfig python:2 tar:bzip2
 USE_LDCONFIG=	yes
 USE_GNOME=	libgnomeui pygtk2
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index 98ee4615aad6..0190e1cf0122 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -19,9 +19,8 @@ COMMENT=	Set of Python bindings for GTK+
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo
 
-USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
+USES=		gettext gmake libtool pathfix pkgconfig python:2 tar:bzip2
 USE_GNOME=	libglade2 pygobject
-USE_PYTHON=	2
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PYTHON="${PYTHON_VERSION}"
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/x11-toolkits/py-gtkglext/Makefile b/x11-toolkits/py-gtkglext/Makefile
index 866daffd67a7..9738cc3db9f9 100644
--- a/x11-toolkits/py-gtkglext/Makefile
+++ b/x11-toolkits/py-gtkglext/Makefile
@@ -16,8 +16,7 @@ BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-o
 LIB_DEPENDS=	libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl
 
-USES=		gmake libtool pathfix pkgconfig tar:bzip2
-USE_PYTHON=	yes
+USES=		gmake libtool pathfix pkgconfig python tar:bzip2
 USE_GNOME=	pygtk2
 GNU_CONFIGURE=	yes
 
diff --git a/x11-toolkits/py-gtksourceview/Makefile b/x11-toolkits/py-gtksourceview/Makefile
index a217594a58fa..68fbba88a8c6 100644
--- a/x11-toolkits/py-gtksourceview/Makefile
+++ b/x11-toolkits/py-gtksourceview/Makefile
@@ -13,9 +13,8 @@ DISTNAME=	pygtksourceview-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Python bindings for GtkSourceView 2
 
-USES=		gmake libtool:keepla pathfix pkgconfig tar:bzip2
+USES=		gmake libtool:keepla pathfix pkgconfig python tar:bzip2
 USE_GNOME=	gnomeprefix gtksourceview2 pygtk2
-USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-docs
 INSTALL_TARGET=	install-strip
diff --git a/x11-toolkits/py-gui/Makefile b/x11-toolkits/py-gui/Makefile
index b2d8ae022d11..6c7e9b8785e0 100644
--- a/x11-toolkits/py-gui/Makefile
+++ b/x11-toolkits/py-gui/Makefile
@@ -18,9 +18,8 @@ OPTIONS_DEFINE=	DOCS EXAMPLES OPENGL
 OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 
 USE_GNOME=	pygtk2
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
diff --git a/x11-toolkits/py-kiwi/Makefile b/x11-toolkits/py-kiwi/Makefile
index d394ea8df678..deecdfd4e293 100644
--- a/x11-toolkits/py-kiwi/Makefile
+++ b/x11-toolkits/py-kiwi/Makefile
@@ -15,11 +15,9 @@ LICENSE=	LGPL21
 
 NO_ARCH=	yes
 
-USES=		gettext uniquefiles:dirs
+USES=		gettext python uniquefiles:dirs
 USE_GNOME=	libglade2 pygtk2
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USE_PYTHON=	distutils autoplist
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
diff --git a/x11-toolkits/py-sexy/Makefile b/x11-toolkits/py-sexy/Makefile
index b349ad7b70e1..cad2b8b62134 100644
--- a/x11-toolkits/py-sexy/Makefile
+++ b/x11-toolkits/py-sexy/Makefile
@@ -17,9 +17,8 @@ LICENSE=	LGPL21
 
 LIB_DEPENDS=	libsexy.so:${PORTSDIR}/x11-toolkits/libsexy
 
-USES=		pkgconfig libtool
+USES=		libtool pkgconfig python
 USE_GNOME=	pygtk2
 GNU_CONFIGURE=	yes
-USE_PYTHON=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-tktreectrl/Makefile b/x11-toolkits/py-tktreectrl/Makefile
index 2f24e45cbbb6..a317f43b4984 100644
--- a/x11-toolkits/py-tktreectrl/Makefile
+++ b/x11-toolkits/py-tktreectrl/Makefile
@@ -15,9 +15,8 @@ LIB_DEPENDS=	libtreectrl.so.1:${PORTSDIR}/x11-toolkits/tktreectrl
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter \
 		${PYTHON_SITELIBDIR}/Pmw/__init__.py:${PORTSDIR}/x11-toolkits/py-Pmw
 
-USES=		tk:run zip
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
+USES=		python tk:run zip
+USE_PYTHON=	distutils
 PYDISTUTILS_PKGNAME=	TkinterTreectrl
 PYDISTUTILS_PKGVERSION=	${PORTVERSION:R}
 
diff --git a/x11-toolkits/py-traitsbackendwx/Makefile b/x11-toolkits/py-traitsbackendwx/Makefile
index 17840853671f..3dda80b9e006 100644
--- a/x11-toolkits/py-traitsbackendwx/Makefile
+++ b/x11-toolkits/py-traitsbackendwx/Makefile
@@ -15,9 +15,8 @@ COMMENT=	Wx backend for TraitsGUI
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}traits>=3.2.0:${PORTSDIR}/devel/py-traits
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 USE_WX=		3.0+
 WX_COMPS=	python
 
diff --git a/x11-toolkits/py-traitsgui/Makefile b/x11-toolkits/py-traitsgui/Makefile
index f291a8b2f38d..e736d204d692 100644
--- a/x11-toolkits/py-traitsgui/Makefile
+++ b/x11-toolkits/py-traitsgui/Makefile
@@ -15,9 +15,8 @@ COMMENT=	Gui toolkit derived from the Enthought python traits library
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}traitsbackendwx>=3.1.0:${PORTSDIR}/x11-toolkits/py-traitsbackendwx
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
diff --git a/x11-toolkits/py-vte/Makefile b/x11-toolkits/py-vte/Makefile
index eba2ec72302c..edd606250855 100644
--- a/x11-toolkits/py-vte/Makefile
+++ b/x11-toolkits/py-vte/Makefile
@@ -15,8 +15,8 @@ INSTALL_WRKSRC=	${BUILD_WRKSRC}
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
 
+USES=		python
 USE_GNOME=	vte pygtk2
-USE_PYTHON=	yes
 CONFIGURE_ARGS=	--enable-python \
 		--disable-Bsymbolic \
 		--disable-freetypetest
diff --git a/x11-toolkits/py-wax/Makefile b/x11-toolkits/py-wax/Makefile
index 374d1faabc9e..ecf116831d92 100644
--- a/x11-toolkits/py-wax/Makefile
+++ b/x11-toolkits/py-wax/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	User-friendly layer on top of wxPython
 
 NO_BUILD=	yes
-USE_PYTHON=	yes
+USES=		python
 USE_WX=		2.8
 WX_UNICODE=	yes
 WX_COMPS=	python:run
diff --git a/x11-toolkits/py-wxPython28/Makefile b/x11-toolkits/py-wxPython28/Makefile
index eec970c24f9d..13ce7fd010c0 100644
--- a/x11-toolkits/py-wxPython28/Makefile
+++ b/x11-toolkits/py-wxPython28/Makefile
@@ -18,10 +18,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}opengl>=0:${PORTSDIR}/graphics/py-opengl
 WRKSRC=		${WRKDIR}/${DISTNAME}/wxPython
 
 DIST_SUBDIR=	python
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PLIST_SUB=	PYTHON_VER=${PYTHON_VER}
-USES=		gettext gmake pkgconfig tar:bzip2
+USE_PYTHON=	distutils
+USES=		gettext gmake pkgconfig python tar:bzip2
 
 PYDISTUTILS_BUILDARGS=	\
 			WX_CONFIG="${WX_CONFIG}" \
diff --git a/x11-toolkits/py-wxPython30/Makefile b/x11-toolkits/py-wxPython30/Makefile
index 5f5d02c31970..42b62f9e9fac 100644
--- a/x11-toolkits/py-wxPython30/Makefile
+++ b/x11-toolkits/py-wxPython30/Makefile
@@ -16,14 +16,13 @@ DIST_SUBDIR=	python
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/wxPython
 
-USES=		tar:bzip2
-USE_PYTHON=	yes
+USES=		python tar:bzip2
 
 .if defined(WITH_WXVERSION_ONLY)
 
 PKGNAMESUFFIX=	-common
 
-PYTHON_PY3K_PLIST_HACK=	yes
+USE_PYTHON=	py3kplist
 
 do-build:
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -d ${PYTHON_SITELIBDIR} -f ${WRKSRC}/wxversion
@@ -44,8 +43,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}wxPython-common>0:${PORTSDIR}/x11-toolkits/p
 USES+=		gettext pkgconfig
 USE_WX=	3.0
 WANT_UNICODE=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USE_PYTHON=	distutils autoplist
 PYDISTUTILS_BUILDARGS=	WX_CONFIG="${WX_CONFIG}" \
 			WXPORT="${WXPORT}" \
 			NO_HEADERS=1 \
diff --git a/x11-toolkits/py-xlib/Makefile b/x11-toolkits/py-xlib/Makefile
index 80a22f8f3e61..c840ea807f1b 100644
--- a/x11-toolkits/py-xlib/Makefile
+++ b/x11-toolkits/py-xlib/Makefile
@@ -12,8 +12,7 @@ DISTNAME=	python-xlib-${PORTVERSION}
 MAINTAINER=	mwm@mired.org
 COMMENT=	X11 library for Python
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>