aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net/exabgp/Makefile2
-rw-r--r--net/exaddos/Makefile2
-rw-r--r--net/flowgrep/Makefile3
-rw-r--r--net/freeradius2/Makefile2
-rw-r--r--net/freeradius3/Makefile2
-rw-r--r--net/gnu-dico/Makefile2
-rw-r--r--net/googlecl/Makefile4
-rw-r--r--net/gtk-vnc/Makefile3
-rw-r--r--net/gtknetcat/Makefile3
-rw-r--r--net/honeyd/Makefile2
-rw-r--r--net/kippo/Makefile3
-rw-r--r--net/libproxy-python/Makefile2
-rw-r--r--net/neubot/Makefile3
-rw-r--r--net/nos-ttb/Makefile2
-rw-r--r--net/ntlmaps/Makefile3
-rw-r--r--net/openpgm/Makefile3
-rw-r--r--net/panoptis/Makefile2
-rw-r--r--net/pdb/Makefile5
-rw-r--r--net/polyorb/Makefile4
-rw-r--r--net/py-GeoIP/Makefile4
-rw-r--r--net/py-amqplib/Makefile5
-rw-r--r--net/py-avahi/Makefile2
-rw-r--r--net/py-beanstalkc/Makefile5
-rw-r--r--net/py-cloudfiles/Makefile5
-rw-r--r--net/py-dpkt/Makefile6
-rw-r--r--net/py-ec2-cli-tools/Makefile8
-rw-r--r--net/py-eventlet/Makefile5
-rw-r--r--net/py-gntp/Makefile5
-rw-r--r--net/py-google/Makefile5
-rw-r--r--net/py-impacket/Makefile6
-rw-r--r--net/py-iplib/Makefile5
-rw-r--r--net/py-ldaptor/Makefile6
-rw-r--r--net/py-libcloud/Makefile6
-rw-r--r--net/py-libdnet/Makefile4
-rw-r--r--net/py-libnet/Makefile5
-rw-r--r--net/py-medusa/Makefile5
-rw-r--r--net/py-msrplib/Makefile6
-rw-r--r--net/py-netaddr/Makefile5
-rw-r--r--net/py-netlib/Makefile5
-rw-r--r--net/py-netstring/Makefile5
-rw-r--r--net/py-novaclient/Makefile6
-rw-r--r--net/py-oauth/Makefile5
-rw-r--r--net/py-oauth2/Makefile5
-rw-r--r--net/py-pcap/Makefile5
-rw-r--r--net/py-pcapy/Makefile5
-rw-r--r--net/py-pcs/Makefile5
-rw-r--r--net/py-port-for/Makefile5
-rw-r--r--net/py-pybeanstalk/Makefile5
-rw-r--r--net/py-pynsq/Makefile8
-rw-r--r--net/py-pypcap/Makefile6
-rw-r--r--net/py-pysendfile/Makefile5
-rw-r--r--net/py-pyzmq/Makefile5
-rw-r--r--net/py-radix/Makefile5
-rw-r--r--net/py-s3cmd/Makefile5
-rw-r--r--net/py-smbpasswd/Makefile5
-rw-r--r--net/py-soappy-devel/Makefile5
-rw-r--r--net/py-soappy/Makefile27
-rw-r--r--net/py-soapy/Makefile4
-rw-r--r--net/py-speedtest-cli/Makefile5
-rw-r--r--net/py-tofu/Makefile6
-rw-r--r--net/py-tweepy/Makefile5
-rw-r--r--net/py-twistedPair/Makefile6
-rw-r--r--net/py-twitter-tools/Makefile8
-rw-r--r--net/py-twitter/Makefile5
-rw-r--r--net/py-txamqp/Makefile6
-rw-r--r--net/py-xmlrpc/Makefile5
-rw-r--r--net/py-xmlrpclib/Makefile3
-rw-r--r--net/py-yadis/Makefile6
-rw-r--r--net/py-zope.proxy/Makefile6
-rw-r--r--net/py-zsi/Makefile5
-rw-r--r--net/pygopherd/Makefile4
-rw-r--r--net/pynids/Makefile6
-rw-r--r--net/pyrad/Makefile5
-rw-r--r--net/pythondirector/Makefile6
-rw-r--r--net/rabbitmq-c/Makefile3
-rw-r--r--net/reposado/Makefile4
-rw-r--r--net/samba4/Makefile3
-rw-r--r--net/scapy/Makefile5
-rw-r--r--net/scribe/Makefile3
-rw-r--r--net/service-discovery-applet/Makefile3
-rw-r--r--net/sippy_b2bua/Makefile5
-rw-r--r--net/spideroak/Makefile3
-rw-r--r--net/splatd/Makefile5
-rw-r--r--net/sprinkle/Makefile2
-rw-r--r--net/tcpwatch/Makefile6
-rw-r--r--net/tigervnc/Makefile3
-rw-r--r--net/turses/Makefile5
-rw-r--r--net/xorp/Makefile3
88 files changed, 163 insertions, 253 deletions
diff --git a/net/exabgp/Makefile b/net/exabgp/Makefile
index dfae90329720..9d5be65c024a 100644
--- a/net/exabgp/Makefile
+++ b/net/exabgp/Makefile
@@ -17,7 +17,7 @@ USE_GITHUB= yes
GH_ACCOUNT= Exa-Networks
GH_TAGNAME= ${PORTVERSION}
GH_COMMIT= 2224194
-USE_PYTHON= yes
+USES= python
SUB_FILES= pkg-message exabgp.sh
SUB_LIST= PYTHON_LIBDIR=${PYTHON_LIBDIR} PYTHON_CMD=${PYTHON_CMD} \
PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR}
diff --git a/net/exaddos/Makefile b/net/exaddos/Makefile
index ba7a2aa55fbe..9eeddcbabe74 100644
--- a/net/exaddos/Makefile
+++ b/net/exaddos/Makefile
@@ -20,7 +20,7 @@ USE_GITHUB= yes
GH_ACCOUNT= Exa-Networks
GH_TAGNAME= ${PORTVERSION}
GH_COMMIT= 4e93fc1
-USE_PYTHON= yes
+USES= python
SUB_FILES= pkg-message exaddos.sh exaddos.conf.sample
SUB_LIST= PYTHON_LIBDIR=${PYTHON_LIBDIR} PYTHON_CMD=${PYTHON_CMD} \
PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR}
diff --git a/net/flowgrep/Makefile b/net/flowgrep/Makefile
index e3482c926b9b..6146dcbdeab8 100644
--- a/net/flowgrep/Makefile
+++ b/net/flowgrep/Makefile
@@ -12,8 +12,7 @@ COMMENT= TCP stream/UDP/IP payload 'grep' utility
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/nidsmodule.so:${PORTSDIR}/net/pynids
-USE_PYTHON= yes
-
+USES= python
NO_BUILD= yes
PLIST_FILES= sbin/flowgrep man/man8/flowgrep.8.gz
diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile
index 1e5ef3d518fc..d4ebe57e2a18 100644
--- a/net/freeradius2/Makefile
+++ b/net/freeradius2/Makefile
@@ -200,7 +200,7 @@ PLIST_SUB+= RLMPERL="@comment "
.endif
.if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON= yes
+USES+= python
CONFIGURE_ARGS+=--with-rlm_python \
--with-rlm-python-lib-dir=${PYTHON_LIBDIR} \
--with-rlm-python-include-dir=${PYTHON_INCLUDEDIR}
diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile
index 25035085be3d..8d64d1c5b1d5 100644
--- a/net/freeradius3/Makefile
+++ b/net/freeradius3/Makefile
@@ -181,7 +181,7 @@ PLIST_SUB+= RLMPERL="@comment "
.endif
.if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON= yes
+USES+= python
CONFIGURE_ARGS+=--with-rlm_python \
--with-rlm-python-lib-dir=${PYTHON_LIBDIR} \
--with-rlm-python-include-dir=${PYTHON_INCLUDEDIR}
diff --git a/net/gnu-dico/Makefile b/net/gnu-dico/Makefile
index 6ce6f34d2de1..aa8aabe776e3 100644
--- a/net/gnu-dico/Makefile
+++ b/net/gnu-dico/Makefile
@@ -30,7 +30,7 @@ GSASL_DESC= GSASL support
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON= yes
+USES+= python
CONFIGURE_ENV+= PYTHON_CONFIG=${PYTHON_CMD}-config
PLIST_SUB+= PYTHON=""
.else
diff --git a/net/googlecl/Makefile b/net/googlecl/Makefile
index bd322226b978..4b4d0cafe5f3 100644
--- a/net/googlecl/Makefile
+++ b/net/googlecl/Makefile
@@ -13,8 +13,8 @@ LICENSE= APACHE20
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdata>0:${PORTSDIR}/devel/py-gdata
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
+USES= python
+USE_PYTHON= distutils
OPTIONS_DEFINE= DOCS
diff --git a/net/gtk-vnc/Makefile b/net/gtk-vnc/Makefile
index b294b18cad43..622c813d3bb2 100644
--- a/net/gtk-vnc/Makefile
+++ b/net/gtk-vnc/Makefile
@@ -18,9 +18,8 @@ LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \
CONFLICTS= gtk-vnc-0.4.[0-9]*
USE_GNOME= pygtk2
-USES= gettext gmake libtool pathfix pkgconfig
+USES= gettext gmake libtool pathfix pkgconfig python
USE_LDCONFIG= yes
-USE_PYTHON= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/net/gtknetcat/Makefile b/net/gtknetcat/Makefile
index b94e9d0a359c..d3fe02aa72a1 100644
--- a/net/gtknetcat/Makefile
+++ b/net/gtknetcat/Makefile
@@ -18,9 +18,8 @@ LICENSE= GPLv3
BUILD_DEPENDS= p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
-USES= gmake
+USES= gmake python
USE_GNOME= intlhack pygtk2
-USE_PYTHON= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/net/honeyd/Makefile b/net/honeyd/Makefile
index c3337cfa5b83..f6ab6896319f 100644
--- a/net/honeyd/Makefile
+++ b/net/honeyd/Makefile
@@ -26,7 +26,7 @@ CONFIGURE_ARGS= --with-libdnet=${LOCALBASE} \
EXTRA_PATCHES= ${FILESDIR}/honeyd-1.5c-libevent2.patch:-p1
.if defined(WITH_PYTHON)
-USE_PYTHON= yes
+USES+= python
CONFIGURE_ARGS+= --with-python
.else
CONFIGURE_ARGS+= --without-python
diff --git a/net/kippo/Makefile b/net/kippo/Makefile
index 24b15bd07c43..23ef5977b0d0 100644
--- a/net/kippo/Makefile
+++ b/net/kippo/Makefile
@@ -15,8 +15,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypt
${PYTHON_PKGNAMEPREFIX}zope.interface>0:${PORTSDIR}/devel/py-zope.interface
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USE_PYTHON= yes
-USES= twisted:run,conch,web
+USES= python twisted:run,conch,web
NO_BUILD= yes
USE_RC_SUBR= kippo
diff --git a/net/libproxy-python/Makefile b/net/libproxy-python/Makefile
index c897c59cbabe..45e5e78a3e27 100644
--- a/net/libproxy-python/Makefile
+++ b/net/libproxy-python/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS= libproxy.so:${PORTSDIR}/net/libproxy
MASTERDIR= ${.CURDIR}/../libproxy
DESCR= ${.CURDIR}/pkg-descr
PLIST= ${.CURDIR}/pkg-plist
-USE_PYTHON= yes
+USES+= python
LIBPROXY_SLAVE= python
diff --git a/net/neubot/Makefile b/net/neubot/Makefile
index 3cbd989dd5fb..eb76a704668d 100644
--- a/net/neubot/Makefile
+++ b/net/neubot/Makefile
@@ -13,8 +13,7 @@ LICENSE= GPLv3
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
-USE_PYTHON= 2
-
+USES= python:2
NO_BUILD= yes
USERS= _neubot
diff --git a/net/nos-ttb/Makefile b/net/nos-ttb/Makefile
index 225987123bc7..f9bd2530cb3e 100644
--- a/net/nos-ttb/Makefile
+++ b/net/nos-ttb/Makefile
@@ -15,7 +15,7 @@ COMMENT= NOS teletekst browser
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pygtk-2.0.pc:${PORTSDIR}/x11-toolkits/py-gtk2
NO_BUILD= yes
-USE_PYTHON= yes
+USES= python
do-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/share/ttb
diff --git a/net/ntlmaps/Makefile b/net/ntlmaps/Makefile
index 726bd53ed4b6..7ae4edc34356 100644
--- a/net/ntlmaps/Makefile
+++ b/net/ntlmaps/Makefile
@@ -10,8 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= kevlo@FreeBSD.org
COMMENT= Proxy that authenticates the user using the NTLM protocol
-USE_PYTHON= yes
-USES= dos2unix
+USES= dos2unix python
DOCS= COPYING Install.txt changelog.txt readme.txt research.txt
diff --git a/net/openpgm/Makefile b/net/openpgm/Makefile
index ab2721b32ad9..53c0ecae3aa9 100644
--- a/net/openpgm/Makefile
+++ b/net/openpgm/Makefile
@@ -14,9 +14,8 @@ COMMENT= Implementation of the PGM reliable multicast protocol
LICENSE= LGPL3
GNU_CONFIGURE= yes
-USES= pathfix perl5 tar:bzip2 libtool
+USES= pathfix perl5 tar:bzip2 libtool python
USE_LDCONFIG= yes
-USE_PYTHON= yes
WRKSRC= ${WRKDIR}/${DISTNAME}/openpgm/pgm
OPTIONS_DEFINE= DOCS EXAMPLES
diff --git a/net/panoptis/Makefile b/net/panoptis/Makefile
index 06998b9af588..99dfdc7f12d0 100644
--- a/net/panoptis/Makefile
+++ b/net/panoptis/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libccgnu2.so:${PORTSDIR}/devel/commoncpp
GNU_CONFIGURE= yes
-USE_PYTHON= yes
+USES= python
PLIST_FILES= bin/panoptis \
bin/mail.py \
bin/pview.py \
diff --git a/net/pdb/Makefile b/net/pdb/Makefile
index 9b7c8af5494f..e9d23d6bcd41 100644
--- a/net/pdb/Makefile
+++ b/net/pdb/Makefile
@@ -12,8 +12,7 @@ COMMENT= Packet Debugger
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pcs/__init__.py:${PORTSDIR}/net/py-pcs
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-USE_PYTHON_PREFIX= yes
+USES= python
+USE_PYTHON= distutils pythonprefix
.include <bsd.port.mk>
diff --git a/net/polyorb/Makefile b/net/polyorb/Makefile
index 0c548506a727..12eff1e97620 100644
--- a/net/polyorb/Makefile
+++ b/net/polyorb/Makefile
@@ -14,14 +14,12 @@ LICENSE= GPLv3
BUILD_DEPENDS= xmlada>=3.2:${PORTSDIR}/textproc/xmlada
-USES= ada gmake
+USES= ada gmake python:build
GNU_CONFIGURE= yes
NO_MTREE= yes
YEAR= 2014
WRKSRC= ${WRKDIR}/polyorb-${YEAR}-src
-USE_PYTHON_BUILD= yes
-
MAKE_ENV= PROCESSORS=${MAKE_JOBS_NUMBER}
CONFIGURE_ENV= PYTHON=${PYTHON_CMD} \
ac_cv_prog_CXXCPP="cpp -E" \
diff --git a/net/py-GeoIP/Makefile b/net/py-GeoIP/Makefile
index c7d73af48f0c..1b5b49b1dbe6 100644
--- a/net/py-GeoIP/Makefile
+++ b/net/py-GeoIP/Makefile
@@ -21,8 +21,8 @@ GH_PROJECT= geoip-api-python
GH_TAGNAME= v${PORTVERSION}
GH_COMMIT= 993f63c
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
+USES= python
+USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= GeoIP-Python
EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME}
diff --git a/net/py-amqplib/Makefile b/net/py-amqplib/Makefile
index 6c25f599b0e0..4b19fed0af5a 100644
--- a/net/py-amqplib/Makefile
+++ b/net/py-amqplib/Makefile
@@ -15,8 +15,7 @@ COMMENT= AMQP Client Library
PROJECTHOST= py-amqplib
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/net/py-avahi/Makefile b/net/py-avahi/Makefile
index 9c8d24197796..26298f11c7a5 100644
--- a/net/py-avahi/Makefile
+++ b/net/py-avahi/Makefile
@@ -25,7 +25,7 @@ PLIST= ${.CURDIR}/pkg-plist
AVAHI_SLAVE= python
USE_GNOME= pygtk2
-USE_PYTHON= yes
+USES= python
MANPAGES= avahi-bookmarks.1 avahi-discover.1
post-patch:
diff --git a/net/py-beanstalkc/Makefile b/net/py-beanstalkc/Makefile
index 55d1f222ff2b..af90bb637b1c 100644
--- a/net/py-beanstalkc/Makefile
+++ b/net/py-beanstalkc/Makefile
@@ -15,9 +15,8 @@ LICENSE= APACHE20
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose \
${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
OPTIONS_DEFINE= YAML
OPTIONS_DEFAULT= YAML
diff --git a/net/py-cloudfiles/Makefile b/net/py-cloudfiles/Makefile
index 497b5bf397de..036e0fc6b77c 100644
--- a/net/py-cloudfiles/Makefile
+++ b/net/py-cloudfiles/Makefile
@@ -12,8 +12,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= freebsd@contenidosonline.com.ar
COMMENT= Python language bindings for Cloud Files API
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/net/py-dpkt/Makefile b/net/py-dpkt/Makefile
index bc4bd4d5a75e..5b843c1ab1aa 100644
--- a/net/py-dpkt/Makefile
+++ b/net/py-dpkt/Makefile
@@ -12,10 +12,8 @@ COMMENT= Python fast, simple packet creation / parsing module
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-USE_PYTHON_PREFIX= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist pythonprefix
OPTIONS_DEFINE= DOCS EXAMPLES
diff --git a/net/py-ec2-cli-tools/Makefile b/net/py-ec2-cli-tools/Makefile
index d30280117e17..bf21f7a14221 100644
--- a/net/py-ec2-cli-tools/Makefile
+++ b/net/py-ec2-cli-tools/Makefile
@@ -16,10 +16,8 @@ LICENSE= MIT
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>=1.0:${PORTSDIR}/devel/py-boto \
bash>=0:${PORTSDIR}/shells/bash
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-USES= shebangfix
-SHEBANG_FILES= bin/ec2getsnaps bin/ec2hostcache bin/ec2ssh
+USE_PYTHON= distutils autoplist
+USES= python shebangfix
+SHEBANG_FILES= bin/ec2getsnaps bin/ec2hostcache bin/ec2ssh
.include <bsd.port.mk>
diff --git a/net/py-eventlet/Makefile b/net/py-eventlet/Makefile
index dcc7433bde25..691b6ce1c7f2 100644
--- a/net/py-eventlet/Makefile
+++ b/net/py-eventlet/Makefile
@@ -17,9 +17,8 @@ LICENSE= MIT
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}greenlet>=0.3:${PORTSDIR}/devel/py-greenlet
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
regression-test: build
@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
diff --git a/net/py-gntp/Makefile b/net/py-gntp/Makefile
index 25ed3b721640..88200d635a5b 100644
--- a/net/py-gntp/Makefile
+++ b/net/py-gntp/Makefile
@@ -19,9 +19,8 @@ OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options
OPTIONS_DEFINE= DOCS
USE_GITHUB= yes
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.options.mk>
diff --git a/net/py-google/Makefile b/net/py-google/Makefile
index 34b1d7f6eb78..80934b98b5b3 100644
--- a/net/py-google/Makefile
+++ b/net/py-google/Makefile
@@ -13,9 +13,8 @@ COMMENT= Python wrapper for the Google web API
RUN_DEPENDS= ${PYXML}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
PORTDOCS= *
DOCSDIR= ${PREFIX}/share/doc/py-google
diff --git a/net/py-impacket/Makefile b/net/py-impacket/Makefile
index 01bc86b4ebec..0f05e371808f 100644
--- a/net/py-impacket/Makefile
+++ b/net/py-impacket/Makefile
@@ -16,10 +16,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pcapy>=0:${PORTSDIR}/net/py-pcapy \
${PYTHON_PKGNAMEPREFIX}pycrypto>=0:${PORTSDIR}/security/py-pycrypto
-USES= dos2unix
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST=yes
+USES= dos2unix python
+USE_PYTHON= distutils autoplist
PORTDOCS= *
diff --git a/net/py-iplib/Makefile b/net/py-iplib/Makefile
index 1f5076a42860..6f07eba11354 100644
--- a/net/py-iplib/Makefile
+++ b/net/py-iplib/Makefile
@@ -11,8 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Convert amongst many different IPv4 notations
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/net/py-ldaptor/Makefile b/net/py-ldaptor/Makefile
index f4201f751bb4..e9e3c983071c 100644
--- a/net/py-ldaptor/Makefile
+++ b/net/py-ldaptor/Makefile
@@ -16,10 +16,8 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pyparsing.py:${PORTSDIR}/devel/py-parsing \
GITVERSION= aad8ded658b36337a08aeb7402b6b67eb8771bea
-USES= gettext twisted
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= gettext python twisted
+USE_PYTHON= distutils autoplist
PYDISTUTILS_INSTALL_TARGET= install_locale install
PYDISTUTILS_BUILD_TARGET= build_locale build
diff --git a/net/py-libcloud/Makefile b/net/py-libcloud/Makefile
index b37bc192e1ce..790672e5b6e4 100644
--- a/net/py-libcloud/Makefile
+++ b/net/py-libcloud/Makefile
@@ -15,10 +15,8 @@ COMMENT= Standard client library for many popular cloud providers
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= tar:bzip2
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python tar:bzip2
+USE_PYTHON= distutils autoplist
post-extract:
@${MV} ${WRKSRC}/libcloud/test ${WRKSRC}/test # no need to install tests
diff --git a/net/py-libdnet/Makefile b/net/py-libdnet/Makefile
index a00714da485e..431b07048c6f 100644
--- a/net/py-libdnet/Makefile
+++ b/net/py-libdnet/Makefile
@@ -20,9 +20,9 @@ PLIST_FILES= %%PYTHON_SITELIBDIR%%/dnet.so \
LIBDNET_SLAVE= yes
-USE_PYTHON= yes
+USES= python
+USE_PYTHON= distutils
CONFIGURE_ARGS= --with-python=${PYTHON_CMD}
-PYDISTUTILS_PKGNAME= dnet
.if defined(MAINTAINER_MODE)
regression-test: install
diff --git a/net/py-libnet/Makefile b/net/py-libnet/Makefile
index 589cb2dee275..3be1286fc206 100644
--- a/net/py-libnet/Makefile
+++ b/net/py-libnet/Makefile
@@ -14,9 +14,8 @@ LICENSE= GPLv3
LIB_DEPENDS= libnet.so:${PORTSDIR}/net/libnet
-USE_PYTHON= yes
-USE_PYTHON_PREFIX= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils pythonprefix
USE_GITHUB= yes
GH_ACCOUNT= allfro
diff --git a/net/py-medusa/Makefile b/net/py-medusa/Makefile
index d71294d4b522..5da216c0d802 100644
--- a/net/py-medusa/Makefile
+++ b/net/py-medusa/Makefile
@@ -14,9 +14,8 @@ COMMENT= Asynchronous socket-based server framework for Python
OPTIONS_DEFINE= DOCS EXAMPLES
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME}
diff --git a/net/py-msrplib/Makefile b/net/py-msrplib/Makefile
index 963dbb76272b..df6fd2a2054e 100644
--- a/net/py-msrplib/Makefile
+++ b/net/py-msrplib/Makefile
@@ -24,9 +24,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gnutls>=1.1.6:${PORTSDIR}/security/py-gnut
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_PKGNAME=python_${PORTNAME}
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/net/py-netaddr/Makefile b/net/py-netaddr/Makefile
index 46cad10763e6..8e85427ab5cb 100644
--- a/net/py-netaddr/Makefile
+++ b/net/py-netaddr/Makefile
@@ -17,9 +17,8 @@ WRKSRC= ${WRKDIR}/${DISTNAME}
USE_GITHUB= yes
GH_ACCOUNT= drkjam
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
diff --git a/net/py-netlib/Makefile b/net/py-netlib/Makefile
index c97f32a98542..e757c798ce4b 100644
--- a/net/py-netlib/Makefile
+++ b/net/py-netlib/Makefile
@@ -15,8 +15,7 @@ LICENSE= MIT
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}asn1>0:${PORTSDIR}/devel/py-asn1 \
${PYTHON_PKGNAMEPREFIX}openssl>0:${PORTSDIR}/security/py-openssl
-PYDISTUTILS_AUTOPLIST= yes
-USE_PYDISTUTILS=yes
-USE_PYTHON= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/net/py-netstring/Makefile b/net/py-netstring/Makefile
index 85b9942ac80d..7faf018321c2 100644
--- a/net/py-netstring/Makefile
+++ b/net/py-netstring/Makefile
@@ -11,8 +11,7 @@ DISTNAME= python-${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Python module implementing the netstring protocol
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/net/py-novaclient/Makefile b/net/py-novaclient/Makefile
index 52e7b71c8b42..ec0c2e9c549d 100644
--- a/net/py-novaclient/Makefile
+++ b/net/py-novaclient/Makefile
@@ -15,10 +15,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}argparse>=0:${PORTSDIR}/devel/py-argparse \
${PYTHON_PKGNAMEPREFIX}prettytable>=0:${PORTSDIR}/devel/py-prettytable \
${PKGNAMEPREFIX}httplib2>=0:${PORTSDIR}/www/py-httplib2
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_NOEGGINFO= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist noegginfo
post-patch:
@${REINPLACE_CMD} -e 's,install_requires.*,,' ${WRKSRC}/setup.py
diff --git a/net/py-oauth/Makefile b/net/py-oauth/Makefile
index edd846748403..e3ecf20eecc1 100644
--- a/net/py-oauth/Makefile
+++ b/net/py-oauth/Makefile
@@ -11,8 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wen@FreeBSD.org
COMMENT= Python Library for OAuth
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/net/py-oauth2/Makefile b/net/py-oauth2/Makefile
index e6dfe062d051..4a469f1b167e 100644
--- a/net/py-oauth2/Makefile
+++ b/net/py-oauth2/Makefile
@@ -16,8 +16,7 @@ LICENSE= MIT
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}httplib2>0:${PORTSDIR}/www/py-httplib2
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/net/py-pcap/Makefile b/net/py-pcap/Makefile
index 00a78f1a4c50..d12a3f2f9e54 100644
--- a/net/py-pcap/Makefile
+++ b/net/py-pcap/Makefile
@@ -15,8 +15,7 @@ LICENSE= BSD
BUILD_DEPENDS= swig:${PORTSDIR}/devel/swig13
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/net/py-pcapy/Makefile b/net/py-pcapy/Makefile
index 53bf7db88460..0047d7948f00 100644
--- a/net/py-pcapy/Makefile
+++ b/net/py-pcapy/Makefile
@@ -16,9 +16,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
FETCH_BEFORE_ARGS=-o ${DISTFILES}
-USES= dos2unix
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
+USES= dos2unix python
+USE_PYTHON= distutils
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
diff --git a/net/py-pcs/Makefile b/net/py-pcs/Makefile
index 04eeefddc624..4de89b398f9d 100644
--- a/net/py-pcs/Makefile
+++ b/net/py-pcs/Makefile
@@ -17,9 +17,8 @@ PORTEXAMPLES= *
BUILD_DEPENDS= cython>=0.11.2:${PORTSDIR}/lang/cython
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-USE_PYTHON_PREFIX= yes
+USES= python
+USE_PYTHON= distutils pythonprefix
OPTIONS_DEFINE= DOCS EXAMPLES
diff --git a/net/py-port-for/Makefile b/net/py-port-for/Makefile
index 16ead6dfe936..966174d64c93 100644
--- a/net/py-port-for/Makefile
+++ b/net/py-port-for/Makefile
@@ -14,9 +14,8 @@ COMMENT= Python utility and library that helps with TCP ports management
LICENSE= MIT
# Python3 Ready
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
post-patch:
@${REINPLACE_CMD} '/DEFAULT_CONFIG_PATH/ s|/etc|${PREFIX}&|' ${WRKSRC}/port_for/store.py
diff --git a/net/py-pybeanstalk/Makefile b/net/py-pybeanstalk/Makefile
index a79d8f2babd0..c6469be529c6 100644
--- a/net/py-pybeanstalk/Makefile
+++ b/net/py-pybeanstalk/Makefile
@@ -10,9 +10,8 @@ COMMENT= Pure python client library for beanstalkd queue
LICENSE= GPLv2
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
WRKSRC= ${WRKDIR}/${PORTVERSION}
diff --git a/net/py-pynsq/Makefile b/net/py-pynsq/Makefile
index 60762d434883..1583f95129b3 100644
--- a/net/py-pynsq/Makefile
+++ b/net/py-pynsq/Makefile
@@ -21,11 +21,9 @@ OPTIONS_DEFINE= TESTS
TESTS_DESC= Install tools to run test suite
OPTIONSFILE?= ${PORT_DBDIR}/py-${PORTNAME}/options
-USE_GITHUB= yes
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-
+USES= python
+USE_PYTHON= distutils autoplist
+USE_GITHUB= yes
GH_ACCOUNT= bitly
GH_TAGNAME= v${PORTVERSION}
GH_COMMIT= b64f3f3
diff --git a/net/py-pypcap/Makefile b/net/py-pypcap/Makefile
index 5614b3503608..e00f43a451b5 100644
--- a/net/py-pypcap/Makefile
+++ b/net/py-pypcap/Makefile
@@ -13,10 +13,8 @@ COMMENT= Simplified object-oriented Python extension module for libpcap
BUILD_DEPENDS= pyrexc:${PORTSDIR}/devel/pyrex
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_PKGNAME= pcap
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
post-patch:
@${RM} ${WRKDIR}/${PORTNAME}-${PORTVERSION}/pcap.c
diff --git a/net/py-pysendfile/Makefile b/net/py-pysendfile/Makefile
index c4d6dc618879..18c4243f378b 100644
--- a/net/py-pysendfile/Makefile
+++ b/net/py-pysendfile/Makefile
@@ -15,8 +15,7 @@ LICENSE= MIT
CONFLICTS_INSTALL= py*-sendfile-[0-9]*
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/net/py-pyzmq/Makefile b/net/py-pyzmq/Makefile
index 5991d39792b1..6b217bb20e23 100644
--- a/net/py-pyzmq/Makefile
+++ b/net/py-pyzmq/Makefile
@@ -14,9 +14,8 @@ LICENSE= LGPL3
LIB_DEPENDS= libzmq.so:${PORTSDIR}/net/libzmq4
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.pre.mk>
diff --git a/net/py-radix/Makefile b/net/py-radix/Makefile
index dd3ffa253ba0..1f54424ea390 100644
--- a/net/py-radix/Makefile
+++ b/net/py-radix/Makefile
@@ -12,8 +12,7 @@ DISTNAME= py-${PORTNAME}-${PORTVERSION}
MAINTAINER= lerik@nolink.net
COMMENT= Python radix-tree implementation
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/net/py-s3cmd/Makefile b/net/py-s3cmd/Makefile
index bb9ee6561cc2..dfb5a81f3d53 100644
--- a/net/py-s3cmd/Makefile
+++ b/net/py-s3cmd/Makefile
@@ -11,9 +11,8 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= clsung@FreeBSD.org
COMMENT= Unix-like tools to manipulate stored files from the command line
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dateutil>0:${PORTSDIR}/devel/py-dateutil
diff --git a/net/py-smbpasswd/Makefile b/net/py-smbpasswd/Makefile
index 0dde7dfe41f6..2b6a9bc50fc1 100644
--- a/net/py-smbpasswd/Makefile
+++ b/net/py-smbpasswd/Makefile
@@ -18,8 +18,7 @@ COMMENT= SMB/CIFS password generation utility for Python
LICENSE= GPLv2
# Python3 ready
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/net/py-soappy-devel/Makefile b/net/py-soappy-devel/Makefile
index d161ee6dbd5c..4e47986213aa 100644
--- a/net/py-soappy-devel/Makefile
+++ b/net/py-soappy-devel/Makefile
@@ -16,9 +16,8 @@ BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/fpconst.py:${PORTSDIR}/math/py-fpconst
RUN_DEPENDS:= ${PYXML} \
${BUILD_DEPENDS}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
CONFLICTS= py*-soappy-0.11.*
diff --git a/net/py-soappy/Makefile b/net/py-soappy/Makefile
index 2524645f1283..2e2ac5325ee5 100644
--- a/net/py-soappy/Makefile
+++ b/net/py-soappy/Makefile
@@ -1,23 +1,22 @@
# Created by: Alexander Leidinger
# $FreeBSD$
-PORTNAME= soappy
-PORTVERSION= 0.11.6
-PORTREVISION= 1
-CATEGORIES= net python
-MASTER_SITES= SF/pywebsvcs/SOAP.py/${PORTVERSION}
-PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-DISTNAME= SOAPpy-${PORTVERSION}
+PORTNAME= soappy
+PORTVERSION= 1.11.6
+PORTREVISION= 1
+CATEGORIES= net python
+MASTER_SITES= SF/pywebsvcs/SOAP.py/${PORTVERSION}
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+DISTNAME= SOAPpy-${PORTVERSION}
-MAINTAINER= 5u623l20@gmail.com
-COMMENT= SOAP implementation
+MAINTAINER= 5u623l20@gmail.com
+COMMENT= SOAP implementation
-LICENSE= BSD3CLAUSE
+LICENSE= BSD3CLAUSE
-PORTSCOUT= skipv:0.12.0 # This is a release candidate and is ports tree py*-soappy-devel
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+PORTSCOUT= skipv:0.12.0 # This is a release candidate and is ports tree py*-soappy-devel
+USES= python
+USE_PYTHON= distutils autoplist
BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/fpconst.py:${PORTSDIR}/math/py-fpconst
RUN_DEPENDS:= ${BUILD_DEPENDS}
diff --git a/net/py-soapy/Makefile b/net/py-soapy/Makefile
index 44aa45c69567..9fbad598babe 100644
--- a/net/py-soapy/Makefile
+++ b/net/py-soapy/Makefile
@@ -14,8 +14,8 @@ LICENSE= PSFL
RUN_DEPENDS= ${PYXML}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME}
diff --git a/net/py-speedtest-cli/Makefile b/net/py-speedtest-cli/Makefile
index fbcc50e11aca..e30c9f544cd8 100644
--- a/net/py-speedtest-cli/Makefile
+++ b/net/py-speedtest-cli/Makefile
@@ -13,8 +13,7 @@ COMMENT= Command line interface for testing internet bandwidth
LICENSE= APACHE20
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/net/py-tofu/Makefile b/net/py-tofu/Makefile
index ccdc306298f1..d94ed33cf853 100644
--- a/net/py-tofu/Makefile
+++ b/net/py-tofu/Makefile
@@ -12,10 +12,8 @@ MAINTAINER= acm@FreeBSD.org
COMMENT= Practical high-level network game engine
DIST_SUBDIR= python
-USE_PYTHON= yes
-USES= twisted tar:bzip2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python twisted tar:bzip2
+USE_PYTHON= distutils autoplist
WRKSRC= ${WRKDIR}/Tofu-${PORTVERSION}
EXAMPLESDIR= ${PREFIX}/share/examples/py-tofu
PORTEXAMPLES= *
diff --git a/net/py-tweepy/Makefile b/net/py-tweepy/Makefile
index 58534cd014f5..db8a9e5a0fb1 100644
--- a/net/py-tweepy/Makefile
+++ b/net/py-tweepy/Makefile
@@ -12,8 +12,7 @@ COMMENT= Twitter API library for Python!
LICENSE= MIT
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/net/py-twistedPair/Makefile b/net/py-twistedPair/Makefile
index ca9d78e97f88..6ad600f21bb6 100644
--- a/net/py-twistedPair/Makefile
+++ b/net/py-twistedPair/Makefile
@@ -14,9 +14,7 @@ COMMENT= Twisted Pair can do low level TCP work
LICENSE= MIT
-USE_PYTHON= 2
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
-USES= tar:bzip2 twisted
+USE_PYTHON= distutils autoplist
+USES= python:2 tar:bzip2 twisted
.include <bsd.port.mk>
diff --git a/net/py-twitter-tools/Makefile b/net/py-twitter-tools/Makefile
index 7911c51e8c4d..1fa292985715 100644
--- a/net/py-twitter-tools/Makefile
+++ b/net/py-twitter-tools/Makefile
@@ -12,11 +12,9 @@ COMMENT= Python API and command-line toolset for Twitter
LICENSE= MIT
-USE_GITHUB= yes
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-
+USES= python
+USE_PYTHON= distutils autoplist
+USE_GITHUB= yes
GH_ACCOUNT= sixohsix
GH_PROJECT= twitter
GH_TAGNAME= ${DISTNAME}
diff --git a/net/py-twitter/Makefile b/net/py-twitter/Makefile
index 83406baf149a..0c747d17ed1c 100644
--- a/net/py-twitter/Makefile
+++ b/net/py-twitter/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}httplib2>=0:${PORTSDIR}/www/py-httplib2 \
${PYTHON_PKGNAMEPREFIX}oauth2>=0:${PORTSDIR}/net/py-oauth2 \
${PYTHON_PKGNAMEPREFIX}simplejson>=0:${PORTSDIR}/devel/py-simplejson
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/net/py-txamqp/Makefile b/net/py-txamqp/Makefile
index 72bdcde65089..456bc8dd4f32 100644
--- a/net/py-txamqp/Makefile
+++ b/net/py-txamqp/Makefile
@@ -15,10 +15,8 @@ COMMENT= Twisted Python library for the AMQP messaging protocol
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}thrift>0:${PORTSDIR}/devel/py-thrift
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-USES= twisted
+USES= python:2 twisted
+USE_PYTHON= distutils autoplist
WRKSRC= ${WRKDIR}/python-${PORTNAME}-${PORTVERSION}
diff --git a/net/py-xmlrpc/Makefile b/net/py-xmlrpc/Makefile
index 34c3ec5f1c7f..460faf6c3b25 100644
--- a/net/py-xmlrpc/Makefile
+++ b/net/py-xmlrpc/Makefile
@@ -15,9 +15,8 @@ COMMENT= Fast implementation of the xmlrpc spec for Python
LICENSE= LGPL21 # (or later)
LICENSE_FILE= ${WRKSRC}/COPYING
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME}
diff --git a/net/py-xmlrpclib/Makefile b/net/py-xmlrpclib/Makefile
index 28431b1ba231..d97066e43012 100644
--- a/net/py-xmlrpclib/Makefile
+++ b/net/py-xmlrpclib/Makefile
@@ -10,8 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Python implementation of the XML-RPC protocol
-USE_PYTHON= yes
-USES= zip
+USES= python zip
DOCSDIR= ${PREFIX}/share/doc/py-xmlrpclib
EXAMPLESDIR= ${PREFIX}/share/examples/py-xmlrpclib
diff --git a/net/py-yadis/Makefile b/net/py-yadis/Makefile
index 2ddfa37b464e..38fe286b9c8c 100644
--- a/net/py-yadis/Makefile
+++ b/net/py-yadis/Makefile
@@ -14,9 +14,7 @@ COMMENT= Python support for the Yadis service discovery protocol
BROKEN= fails checksum
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_PKGNAME= python-yadis
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/net/py-zope.proxy/Makefile b/net/py-zope.proxy/Makefile
index f19aa0852502..09b97f792f88 100644
--- a/net/py-zope.proxy/Makefile
+++ b/net/py-zope.proxy/Makefile
@@ -16,9 +16,7 @@ LICENSE= ZPL21
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.3.0:${PORTSDIR}/devel/py-zope.interface
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/net/py-zsi/Makefile b/net/py-zsi/Makefile
index d20c65fee171..3291f71436aa 100644
--- a/net/py-zsi/Makefile
+++ b/net/py-zsi/Makefile
@@ -18,9 +18,8 @@ RUN_DEPENDS= ${PYXML}
CONFLICTS= py-zsi-devel-2.*
-USE_PYTHON= 2
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
OPTIONS_DEFINE= DOCS EXAMPLES
diff --git a/net/pygopherd/Makefile b/net/pygopherd/Makefile
index 067f84fa5a31..46a43eedb6cf 100644
--- a/net/pygopherd/Makefile
+++ b/net/pygopherd/Makefile
@@ -12,8 +12,8 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Multiprotocol Information Server
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils
PYDISTUTILS_PKGVERSION= 2.0.15
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/net/pynids/Makefile b/net/pynids/Makefile
index fb48198aa286..0eeee6d68a9c 100644
--- a/net/pynids/Makefile
+++ b/net/pynids/Makefile
@@ -15,11 +15,9 @@ COMMENT= Python interface to libnids
PATCH_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
LIB_DEPENDS= libnet.so:${PORTSDIR}/net/libnet
-USES= pkgconfig
+USES= pkgconfig python
USE_GNOME= glib20
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-USE_PYTHON_PREFIX= yes
+USE_PYTHON= distutils autoplist pythonprefix
PLIST_FILES= %%PYTHON_SITELIBDIR%%/nidsmodule.so
diff --git a/net/pyrad/Makefile b/net/pyrad/Makefile
index 2be78c529b69..0957ed7f421d 100644
--- a/net/pyrad/Makefile
+++ b/net/pyrad/Makefile
@@ -11,9 +11,8 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= steve@energistic.com
COMMENT= Python implementation of RADIUS client
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
PORTEXAMPLES= *
diff --git a/net/pythondirector/Makefile b/net/pythondirector/Makefile
index 50277c396fa1..08cb813d1340 100644
--- a/net/pythondirector/Makefile
+++ b/net/pythondirector/Makefile
@@ -12,10 +12,8 @@ COMMENT= TCP load balancer written in Python
LICENSE= MIT
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
-USES= twisted:run
+USE_PYTHON= distutils autoplist
+USES= python twisted:run
PORTDOCS= *
diff --git a/net/rabbitmq-c/Makefile b/net/rabbitmq-c/Makefile
index be1991082f55..c5653232429f 100644
--- a/net/rabbitmq-c/Makefile
+++ b/net/rabbitmq-c/Makefile
@@ -25,8 +25,7 @@ CONFLICTS= rabbitmq-c-devel-[0-9]*
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
-USES= gmake libtool tar:bzip2
-USE_PYTHON= yes
+USES= gmake libtool python tar:bzip2
USE_LDCONFIG= yes
USE_AUTOTOOLS= aclocal autoconf automake autoheader libtoolize
AUTOMAKE_ARGS= -i --add-missing
diff --git a/net/reposado/Makefile b/net/reposado/Makefile
index 0a47a482555f..597f1a3546fe 100644
--- a/net/reposado/Makefile
+++ b/net/reposado/Makefile
@@ -18,8 +18,8 @@ GH_TAGNAME= 1bcf4f0
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils
SUB_FILES= pkg-message
diff --git a/net/samba4/Makefile b/net/samba4/Makefile
index 07faffcb3fd6..007c42101bc6 100644
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -64,8 +64,7 @@ DESTDIRNAME= --destdir
CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LDFLAGS="${PTHREAD_LIBS}"
-USE_PYTHON= 2
-USES= shebangfix compiler perl5 pkgconfig iconv readline cpe
+USES= shebangfix compiler perl5 pkgconfig python:2 iconv readline cpe
USE_PERL5= build
USE_LDCONFIG= ${SAMBA4_LIBDIR}
WAF_TOOL= buildtools/bin/waf
diff --git a/net/scapy/Makefile b/net/scapy/Makefile
index 569f66910a82..61733103cdf5 100644
--- a/net/scapy/Makefile
+++ b/net/scapy/Makefile
@@ -13,9 +13,8 @@ COMMENT= Powerful interactive packet manipulation program in python
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/dnet.so:${PORTSDIR}/net/py-libdnet \
${PYTHON_SITELIBDIR}/pcap.py:${PORTSDIR}/net/py-pcap
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
OPTIONS_DEFINE= PYX PYCRYPTO PYGNUPLOT GRAPH P0F_BASE QUESO_BASE NMAP MANUF
PYX_DESC= PostScript and PDF graphs drawing
diff --git a/net/scribe/Makefile b/net/scribe/Makefile
index a57650502f86..77d13a53372b 100644
--- a/net/scribe/Makefile
+++ b/net/scribe/Makefile
@@ -31,9 +31,8 @@ CONFIGURE_ARGS= --with-boost-filesystem=boost_filesystem \
--with-boost-system=boost_system \
PY_PREFIX="${PREFIX}"
USE_AUTOTOOLS= aclocal automake autoconf
-USE_PYTHON= yes
USE_RC_SUBR= ${PORTNAME}
-USES= gmake perl5
+USES= gmake perl5 python
post-patch:
${REINPLACE_CMD} -e 's/^AM_INIT_AUTOMAKE/#/' ${WRKSRC}/configure.ac
diff --git a/net/service-discovery-applet/Makefile b/net/service-discovery-applet/Makefile
index d0120a57a17e..ad1c776f3281 100644
--- a/net/service-discovery-applet/Makefile
+++ b/net/service-discovery-applet/Makefile
@@ -14,8 +14,7 @@ COMMENT= GNOME applet that shows available network services using mDNS
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/avahi/__init__.py:${PORTSDIR}/net/py-avahi
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/avahi/__init__.py:${PORTSDIR}/net/py-avahi
-USES= gettext gmake pathfix
-USE_PYTHON= yes
+USES= gettext gmake pathfix python
USE_GNOME= gnomeprefix intlhack pygnomedesktop
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
diff --git a/net/sippy_b2bua/Makefile b/net/sippy_b2bua/Makefile
index cdfe16945aad..3a5b2d66d9cc 100644
--- a/net/sippy_b2bua/Makefile
+++ b/net/sippy_b2bua/Makefile
@@ -11,9 +11,8 @@ DISTNAME= sippy-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
COMMENT= SIP Back-to-back user agent (B2BUA) server with Radius support
-USE_PYTHON= yes
-USES= twisted
-USE_PYDISTUTILS= yes
+USE_PYTHON= distutils
+USES= python twisted
PYDISTUTILS_PKGNAME= sippy
DOCSDIR= ${PREFIX}/share/doc/${PYDISTUTILS_PKGNAME}
diff --git a/net/spideroak/Makefile b/net/spideroak/Makefile
index 18f562f69c4b..eba25aa42b98 100644
--- a/net/spideroak/Makefile
+++ b/net/spideroak/Makefile
@@ -38,8 +38,7 @@ SUB_FILES= pkg-message
USE_LINUX= yes
USE_LINUX_APPS= xorglibs
-USE_PYTHON= 2
-USES= desktop-file-utils
+USES= desktop-file-utils python:2
.include <bsd.port.options.mk>
diff --git a/net/splatd/Makefile b/net/splatd/Makefile
index 5cb53ab8265a..aac28695c57b 100644
--- a/net/splatd/Makefile
+++ b/net/splatd/Makefile
@@ -18,12 +18,11 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
OPTIONS_DEFINE= DOCS
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
+USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= splat
USE_RC_SUBR= splatd
SUB_LIST= PYTHON_CMD=${PYTHON_CMD}
-USES= twisted
+USES= python twisted
post-install:
${INSTALL_DATA} ${WRKSRC}/splat.conf ${STAGEDIR}${PREFIX}/etc/splat.conf.sample
diff --git a/net/sprinkle/Makefile b/net/sprinkle/Makefile
index 8c0e35716633..134fd1bccc0d 100644
--- a/net/sprinkle/Makefile
+++ b/net/sprinkle/Makefile
@@ -12,7 +12,7 @@ COMMENT= Stomp messaging broker written in Python
LICENSE= GPLv3
NO_BUILD= yes
-USE_PYTHON= yes
+USES= python
WRKSRC= ${WRKDIR}/sprinkle-dist
OPTIONS_DEFINE= DOCS
diff --git a/net/tcpwatch/Makefile b/net/tcpwatch/Makefile
index cdbeb2817547..a02f8d7f28b9 100644
--- a/net/tcpwatch/Makefile
+++ b/net/tcpwatch/Makefile
@@ -14,9 +14,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinte
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_PKGVERSION= 1.2.1
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/net/tigervnc/Makefile b/net/tigervnc/Makefile
index b899cacbc8cd..f974a55f862f 100644
--- a/net/tigervnc/Makefile
+++ b/net/tigervnc/Makefile
@@ -26,10 +26,9 @@ CONFLICTS= tridiavnc-[0-9]* \
tightvnc-[0-9]* \
vnc-[0-9]*
-USES= cmake gmake libtool pkgconfig
+USES= cmake gmake libtool pkgconfig python
USE_GL= gl
USE_AUTOTOOLS= autoconf:env automake:env libtoolize:env
-USE_PYTHON= yes
USE_LDCONFIG= yes
USE_OPENSSL= yes
diff --git a/net/turses/Makefile b/net/turses/Makefile
index a1f2d7c1a8c9..7a60b0395213 100644
--- a/net/turses/Makefile
+++ b/net/turses/Makefile
@@ -23,9 +23,8 @@ OPTIONS_DEFINE= TESTS
TESTS_DESC= Install tools for unit tests
TESTS_BUILD_DEPENDS= ${TEST_DEPENDS}
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
regression-test: build
@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
diff --git a/net/xorp/Makefile b/net/xorp/Makefile
index c4d27ad33afc..6b2ff23ceabe 100644
--- a/net/xorp/Makefile
+++ b/net/xorp/Makefile
@@ -19,9 +19,8 @@ CONFLICTS_INSTALL= xorp-devel-*
EXTRACT_AFTER_ARGS= --no-same-owner --no-same-permissions -s /^xorp/${DISTNAME}/
GROUPS= xorp
-USES= tar:bzip2 ncurses scons shebangfix compiler:env
+USES= tar:bzip2 ncurses scons shebangfix compiler:env python:2,build
USE_OPENSSL= yes
-USE_PYTHON_BUILD= 2
USE_RC_SUBR= xorp
SHEBANG_FILES= xrl/scripts/clnt-gen xrl/scripts/tgt-gen
python_OLD_CMD= .*python