10 files changed, 17 insertions, 25 deletions

diff --git a/comms/congruity/Makefile b/comms/congruity/Makefile
index 94abd82b69e9..dafd4713f961 100644
--- a/comms/congruity/Makefile
+++ b/comms/congruity/Makefile
@@ -15,8 +15,7 @@ LICENSE=	GPLv2
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libconcord>=0:${PORTSDIR}/comms/py-libconcord
 
 MAKE_ARGS=	MANDIR=${PREFIX}/man
-USES=		tar:bzip2 gmake desktop-file-utils
-USE_PYTHON=	2.7+
+USES=		desktop-file-utils gmake tar:bzip2 python:2.7+
 USE_WX=		2.8+
 WANT_UNICODE=	yes
 WX_COMPS=	python
diff --git a/comms/gammu/Makefile b/comms/gammu/Makefile
index 7efddf05cef9..768800570111 100644
--- a/comms/gammu/Makefile
+++ b/comms/gammu/Makefile
@@ -22,10 +22,9 @@ OPTIONS_DEFINE=	BASH
 
 CMAKE_ARGS+=	-DINSTALL_LIBDATA_DIR=${LOCALBASE}/libdata
 
-USES=		cmake gettext pkgconfig shebangfix
+USES=		cmake gettext pkgconfig python shebangfix
 SHEBANG_FILES=	utils/jadmaker utils/gammu-config
 bash_CMD=	/bin/sh
-USE_PYTHON=	yes
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 
diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile
index 14a559322765..30e45636ee32 100644
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@@ -38,7 +38,7 @@ LIB_DEPENDS=	libcppunit.so:${PORTSDIR}/devel/cppunit \
 		libgsl.so:${PORTSDIR}/math/gsl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		iconv cmake:outsource perl5 shebangfix
+USES=		iconv cmake:outsource perl5 python:2.7 shebangfix
 SHEBANG_FILES=	grc/freedesktop/grc_setup_freedesktop.in
 CMAKE_ARGS+=	-DSWIG_EXECUTABLE:STRING="${LOCALBASE}/bin/swig2.0"
 CMAKE_ARGS+=	-DICONV_PREFIX:STRING="${ICONV_PREFIX}" \
@@ -47,7 +47,6 @@ CMAKE_ARGS+=	-DICONV_PREFIX:STRING="${ICONV_PREFIX}" \
 # for detailed debugging uncomment the next line
 #CMAKE_ARGS+=	--debug-output --trace
 DOCSDIR=	share/doc/${PORTNAME}-${PORTVERSION}
-USE_PYTHON=	2.6-2.8
 USE_WX=		3.0+
 USE_QT4=	gui xml qmake moc rcc uic
 WX_COMPS=	wx wx:build wx:run python:build python:run
diff --git a/comms/hamlib/Makefile b/comms/hamlib/Makefile
index 1c96f2a4f220..12f143a8bab3 100644
--- a/comms/hamlib/Makefile
+++ b/comms/hamlib/Makefile
@@ -15,9 +15,8 @@ LICENSE=	LGPL20
 BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
 LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
 
-USES=		perl5 libtool:keepla pkgconfig pathfix tcl
+USES=		perl5 libtool:keepla pkgconfig pathfix python tcl
 USE_GNOME=	libxml2
-USE_PYTHON=	yes
 USE_AUTOTOOLS=	autoconf
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/comms/py-bulksms/Makefile b/comms/py-bulksms/Makefile
index 4dc0afbc1794..b07d58a0b3f1 100644
--- a/comms/py-bulksms/Makefile
+++ b/comms/py-bulksms/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	craig001@lerwick.hopto.org
 COMMENT=	Python client for the BulkSMS.co.uk HTTP API
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
+USES=			python
+USE_PYTHON=		distutils
 PYDISTUTILS_PKGNAME=	BulkSMS
 PYDISTUTILS_PKGVERSION=	1.0
 
diff --git a/comms/py-libconcord/Makefile b/comms/py-libconcord/Makefile
index 64b8cf4af554..695f8fc14729 100644
--- a/comms/py-libconcord/Makefile
+++ b/comms/py-libconcord/Makefile
@@ -16,9 +16,8 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libconcord.so:${PORTSDIR}/comms/libconcord
 
 USE_LDCONFIG=	yes
-USES=		tar:bzip2
+USES=		python:2.7+ tar:bzip2
 WRKSRC_SUBDIR=	libconcord/bindings/python
-USE_PYTHON=	2.7+
-USE_PYDISTUTILS=yes
+USE_PYTHON=	distutils
 
 .include <bsd.port.mk>
diff --git a/comms/py-lirc/Makefile b/comms/py-lirc/Makefile
index 265942d2985e..43278768844b 100644
--- a/comms/py-lirc/Makefile
+++ b/comms/py-lirc/Makefile
@@ -19,9 +19,8 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	%%PYTHON_SITELIBDIR%%/pylircmodule.so
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-USE_PYTHON_PREFIX=	yes
+USES=			python
+USE_PYTHON=		distutils pythonprefix
 PYDISTUTILS_PKGNAME=	pylirc
 
 .include <bsd.port.mk>
diff --git a/comms/py-serial/Makefile b/comms/py-serial/Makefile
index 3278a3a8a87c..df96188749d2 100644
--- a/comms/py-serial/Makefile
+++ b/comms/py-serial/Makefile
@@ -11,13 +11,12 @@ DISTNAME=	py${PORTNAME}-${PORTVERSION}
 MAINTAINER=	sbz@FreeBSD.org
 COMMENT=	Serial port encapsulation library for Python
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-USE_PYTHON_PREFIX=	yes
+USES=			python
+USE_PYTHON=		distutils pythonprefix
 PYDISTUTILS_PKGNAME=	py${PORTNAME}
 
-DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
-EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
+DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
+EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
diff --git a/comms/pyla/Makefile b/comms/pyla/Makefile
index 1970c7f814ac..34aadfd68b73 100644
--- a/comms/pyla/Makefile
+++ b/comms/pyla/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Hylafax client written in Python
 WRKSRC=		${WRKDIR}/${PORTNAME}
 DATADIR=	${PREFIX}/lib/pyla
 
-USE_PYTHON=	yes
+USES=		python
 PLIST=		${WRKDIR}/pkg-plist
 
 .include <bsd.port.pre.mk>
diff --git a/comms/quisk/Makefile b/comms/quisk/Makefile
index 6447bbe342a9..d3915da0cfcf 100644
--- a/comms/quisk/Makefile
+++ b/comms/quisk/Makefile
@@ -19,11 +19,10 @@ LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3 \
 		libasound.so:${PORTSDIR}/audio/alsa-lib \
 		libpulse.so:${PORTSDIR}/audio/pulseaudio
 
-USE_PYTHON=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 USE_WX=		3.0+
 WX_COMPS=	python
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST=	yes
 
 post-extract:
 	${RM} ${WRKSRC}/_quisk.so ${WRKSRC}/sdriqpkg/sdriq.so