Python cleanup:

- USE_PYTHON* = 2.X -> USE_PYTHON* = 2
- USE_PYTHON* = 2.X+ -> USE_PYTHON* = yes
Reviewed by:	python (mva, rm)
Approved by:	portmgr-lurkers (mat)

25 files changed, 25 insertions, 25 deletions

diff --git a/audio/alsa-lib/Makefile b/audio/alsa-lib/Makefile
index effab3ca5129..6af107fffdbc 100644
--- a/audio/alsa-lib/Makefile
+++ b/audio/alsa-lib/Makefile
@@ -22,7 +22,7 @@ OPTIONS_SUB=	${OPTIONS_DEFINE}
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON=	-2.7
+USE_PYTHON=	2
 .else
 CONFIGURE_ARGS+=--disable-python
 .endif
diff --git a/audio/beets/Makefile b/audio/beets/Makefile
index eb6362162693..2b5f13a32a8e 100644
--- a/audio/beets/Makefile
+++ b/audio/beets/Makefile
@@ -20,7 +20,7 @@ MAN1=	beet.1
 MAN5=	beetsconfig.5
 
 NO_STAGE=	yes
-USE_PYTHON=	2.7+
+USE_PYTHON=	yes
 USE_PYDISTUTILS=	easy_install
 
 OPTIONS_DEFINE=	BEATPORT CHROMA DISCOGS LASTFM FFMPEG REPLAYGAIN WEB
diff --git a/audio/csound/Makefile b/audio/csound/Makefile
index 976eff94c57b..20cbcd510236 100644
--- a/audio/csound/Makefile
+++ b/audio/csound/Makefile
@@ -37,7 +37,7 @@ FLTK_DESC=	Build FLTK plugin and GUI
 CONFLICTS_INSTALL=	outguess-*
 
 SSP_UNSAFE=	yes
-USE_PYTHON=	2.6+
+USE_PYTHON=	yes
 USES=		bison gettext
 NO_STAGE=	yes
 USE_SCONS=	yes
diff --git a/audio/decibel-audio-player/Makefile b/audio/decibel-audio-player/Makefile
index a26dc7a3b81e..12fa67275e76 100644
--- a/audio/decibel-audio-player/Makefile
+++ b/audio/decibel-audio-player/Makefile
@@ -14,7 +14,7 @@ RUN_DEPENDS=	py*-dbus>=0.80:${PORTSDIR}/devel/py-dbus \
 
 LICENSE=	GPLv2
 
-USE_PYTHON=	2.5+
+USE_PYTHON=	yes
 USE_GNOME=	pygnome2 pygtk2
 USE_GSTREAMER=	python good bad
 USES=		gmake gettext
diff --git a/audio/jokosher/Makefile b/audio/jokosher/Makefile
index 7abe1c921fac..580ee51c5c24 100644
--- a/audio/jokosher/Makefile
+++ b/audio/jokosher/Makefile
@@ -13,7 +13,7 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xdg>0:${PORTSDIR}/devel/py-xdg
 
-USE_PYTHON=	-2.7
+USE_PYTHON=	2
 NO_STAGE=	yes
 USE_PYDISTUTILS=yes
 USE_GNOME=	gnomehier
diff --git a/audio/mbox/Makefile b/audio/mbox/Makefile
index 167475716267..4003270e6354 100644
--- a/audio/mbox/Makefile
+++ b/audio/mbox/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/ogg/__init__.py:${PORTSDIR}/audio/py-ogg \
 
 WRKSRC=		${WRKDIR}/mBox-${PORTVERSION}
 USE_BZIP2=	yes
-USE_PYTHON=	-2.7
+USE_PYTHON=	2
 USE_PYDISTUTILS=yes
 PYDISTUTILS_AUTOPLIST=	yes
 PYDISTUTILS_PKGNAME=	mBox
diff --git a/audio/mma/Makefile b/audio/mma/Makefile
index 4f034adac219..edaecb11c2b8 100644
--- a/audio/mma/Makefile
+++ b/audio/mma/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Musical MIDI Accompaniment generator
 
 USES=		shebangfix
-USE_PYTHON=	-2.7
+USE_PYTHON=	2
 NO_STAGE=	yes
 
 python_CMD=	${PYTHON_CMD}
diff --git a/audio/picard/Makefile b/audio/picard/Makefile
index e9f22428c258..2595b1bc1096 100644
--- a/audio/picard/Makefile
+++ b/audio/picard/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mutagen>=0:${PORTSDIR}/audio/py-mutagen \
 		${PYTHON_PKGNAMEPREFIX}qt4-xml>=0:${PORTSDIR}/textproc/py-qt4-xml
 
 USES=		gettext
-USE_PYTHON=	-2.7
+USE_PYTHON=	2
 USE_PYDISTUTILS=yes
 INSTALLS_ICONS=	yes
 
diff --git a/audio/pithos/Makefile b/audio/pithos/Makefile
index 79568f9626be..927a988c74d5 100644
--- a/audio/pithos/Makefile
+++ b/audio/pithos/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg \
 		${LOCALBASE}/libdata/pkgconfig/notify-python.pc:${PORTSDIR}/devel/py-notify \
 		${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus
 
-USE_PYTHON=	2.6+
+USE_PYTHON=	yes
 NO_STAGE=	yes
 USE_GNOME=	pygtk2
 USE_PYDISTUTILS=	easy_install
diff --git a/audio/puddletag/Makefile b/audio/puddletag/Makefile
index fb4e27e837ae..ae9622f938e9 100644
--- a/audio/puddletag/Makefile
+++ b/audio/puddletag/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	chromaprint>=0.4:${PORTSDIR}/audio/chromaprint \
 		${PYTHON_PKGNAMEPREFIX}qt4-svg>=4.5.0:${PORTSDIR}/graphics/py-qt4-svg \
 		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.5.0:${PORTSDIR}/x11-toolkits/py-qt4-gui
 
-USE_PYTHON=	2.6-2.7
+USE_PYTHON=	2
 USE_PYDISTUTILS=yes
 INSTALLS_ICONS=	yes
 NO_BUILD=	yes
diff --git a/audio/py-ao/Makefile b/audio/py-ao/Makefile
index 5af0dfb65992..ae580efde8b7 100644
--- a/audio/py-ao/Makefile
+++ b/audio/py-ao/Makefile
@@ -17,7 +17,7 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libao.so:${PORTSDIR}/audio/libao
 
-USE_PYTHON=		-2.7
+USE_PYTHON=		2
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
 PYDISTUTILS_PKGNAME=	pyao
diff --git a/audio/py-cddb/Makefile b/audio/py-cddb/Makefile
index c87fff536d90..9a43672955eb 100644
--- a/audio/py-cddb/Makefile
+++ b/audio/py-cddb/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	CDDB-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python module to fetch information on audio CDs from CDDB
 
-USE_PYTHON=		-2.7
+USE_PYTHON=		2
 USE_PYDISTUTILS=	yes
 USE_PYTHON_PREFIX=	yes
 PYDISTUTILS_AUTOPLIST=	yes
diff --git a/audio/py-eyed3/Makefile b/audio/py-eyed3/Makefile
index 42586b5d2136..7d4340ed4bc7 100644
--- a/audio/py-eyed3/Makefile
+++ b/audio/py-eyed3/Makefile
@@ -15,7 +15,7 @@ LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>0:${PORTSDIR}/devel/py-setuptools
 
-USE_PYTHON=	2.6-2.7
+USE_PYTHON=	2
 NO_STAGE=	yes
 USE_PYTHON_PREFIX=	yes
 USES=		gmake
diff --git a/audio/py-id3/Makefile b/audio/py-id3/Makefile
index 3cdbf2dda7a3..8a2a55d3a953 100644
--- a/audio/py-id3/Makefile
+++ b/audio/py-id3/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python module for retrieving and setting ID3 tags on MP3 files
 
 WRKSRC=		${WRKDIR}/id3-py-${PORTVERSION}
-USE_PYTHON=		-2.7
+USE_PYTHON=		2
 USE_PYDISTUTILS=	yes
 USE_PYTHON_PREFIX=	yes
 PYDISTUTILS_AUTOPLIST=	yes
diff --git a/audio/py-karaoke/Makefile b/audio/py-karaoke/Makefile
index 7c4269464b8f..db5d0af21d25 100644
--- a/audio/py-karaoke/Makefile
+++ b/audio/py-karaoke/Makefile
@@ -32,7 +32,7 @@ USE_XORG=	x11 xau xcb xdmcp
 USE_WX=		2.6+
 WX_COMPS=	python:lib
 
-USE_PYTHON=		-2.7
+USE_PYTHON=		2
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	py${PORTNAME}
 
diff --git a/audio/py-mad/Makefile b/audio/py-mad/Makefile
index 96cb00fc95e2..b7c4dd906d36 100644
--- a/audio/py-mad/Makefile
+++ b/audio/py-mad/Makefile
@@ -16,7 +16,7 @@ LICENSE=	LGPL20
 
 LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/mad
 
-USE_PYTHON=		-2.7
+USE_PYTHON=		2
 USE_PYDISTUTILS=	yes
 USE_PYTHON_PREFIX=	yes
 PYDISTUTILS_AUTOPLIST=	yes
diff --git a/audio/py-musicbrainz2/Makefile b/audio/py-musicbrainz2/Makefile
index 5b63b28346c7..ee88cf382a24 100644
--- a/audio/py-musicbrainz2/Makefile
+++ b/audio/py-musicbrainz2/Makefile
@@ -18,7 +18,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 LIB_DEPENDS=	libdiscid.so:${PORTSDIR}/audio/libdiscid
 
-USE_PYTHON=	-2.7
+USE_PYTHON=	2
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	python-musicbrainz2
 
diff --git a/audio/py-ogg/Makefile b/audio/py-ogg/Makefile
index c4c36b42aaac..ac6467a649a7 100644
--- a/audio/py-ogg/Makefile
+++ b/audio/py-ogg/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Object-oriented Python bindings for the ogg library
 
 LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg
 
-USE_PYTHON=		-2.7
+USE_PYTHON=		2
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
 PYDISTUTILS_PKGNAME=	pyogg
diff --git a/audio/py-shout/Makefile b/audio/py-shout/Makefile
index 851061cc31be..995f4211df96 100644
--- a/audio/py-shout/Makefile
+++ b/audio/py-shout/Makefile
@@ -17,7 +17,7 @@ EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
 
 USES=			pkgconfig
 NO_STAGE=	yes
-USE_PYTHON=		2.5+
+USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	${PORTNAME}-python
 
diff --git a/audio/py-vorbis/Makefile b/audio/py-vorbis/Makefile
index 95297621e2ec..c99c747a434b 100644
--- a/audio/py-vorbis/Makefile
+++ b/audio/py-vorbis/Makefile
@@ -16,7 +16,7 @@ BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/ogg/_ogg.so:${PORTSDIR}/audio/py-ogg
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/ogg/_ogg.so:${PORTSDIR}/audio/py-ogg
 LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
 
-USE_PYTHON=		-2.7
+USE_PYTHON=		2
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
 PYDISTUTILS_PKGNAME=	pyvorbis
diff --git a/audio/py-xmms/Makefile b/audio/py-xmms/Makefile
index f69a049ef772..3ce7e0ae3df8 100644
--- a/audio/py-xmms/Makefile
+++ b/audio/py-xmms/Makefile
@@ -15,7 +15,7 @@ COMMENT=	XMMS Remote Control Library for Python
 BUILD_DEPENDS=	${XMMS_CONFIG}:${PORTSDIR}/multimedia/xmms
 LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms
 
-USE_PYTHON=		-2.7
+USE_PYTHON=		2
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
 PYDISTUTILS_PKGNAME=	pyxmms
diff --git a/audio/pysol-sound-server/Makefile b/audio/pysol-sound-server/Makefile
index 2aa38baaf9ee..7eed84d4f46e 100644
--- a/audio/pysol-sound-server/Makefile
+++ b/audio/pysol-sound-server/Makefile
@@ -17,7 +17,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 USE_SDL=	mixer sdl
 USE_BZIP2=	yes
-USE_PYTHON=	-2.7
+USE_PYTHON=	2
 HAS_CONFIGURE=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
diff --git a/audio/pytone/Makefile b/audio/pytone/Makefile
index f5f908223c47..4b128871f828 100644
--- a/audio/pytone/Makefile
+++ b/audio/pytone/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
 
 USES=		ncurses
 NO_STAGE=	yes
-USE_PYTHON=	2.5+
+USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	PyTone
 
diff --git a/audio/sonice/Makefile b/audio/sonice/Makefile
index d14001aa829d..9b632993e8ab 100644
--- a/audio/sonice/Makefile
+++ b/audio/sonice/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS=	oggenc:${PORTSDIR}/audio/vorbis-tools \
 		${PYTHON_SITELIBDIR}/yaml/__init__.py:${PORTSDIR}/devel/py-yaml
 
 NO_STAGE=	yes
-USE_PYTHON=		-2.7
+USE_PYTHON=		2
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
 WRKSRC=		${WRKDIR}/sonice
diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile
index 5b6c987c0530..2720924564b9 100644
--- a/audio/streamtuner/Makefile
+++ b/audio/streamtuner/Makefile
@@ -69,7 +69,7 @@ PLIST_SUB+=	LOCAL="@comment "
 
 .if ${PORT_OPTIONS:MPYTHON}
 PLIST_SUB+=	PYTHON=""
-USE_PYTHON=	2.5+
+USE_PYTHON=	yes
 # we need to manually include this, because USE_PYTHON is defined
 # after including bsd.port.pre.mk
 .include "${PORTSDIR}/Mk/bsd.python.mk"