aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sysutils/autojump/Makefile2
-rw-r--r--sysutils/bamf/Makefile3
-rw-r--r--sysutils/battray/Makefile4
-rw-r--r--sysutils/bsdploy/Makefile6
-rw-r--r--sysutils/byobu/Makefile2
-rw-r--r--sysutils/duplicity/Makefile5
-rw-r--r--sysutils/farbot/Makefile4
-rw-r--r--sysutils/feather/Makefile2
-rw-r--r--sysutils/flyback/Makefile2
-rw-r--r--sysutils/fusefs-wikipediafs/Makefile6
-rw-r--r--sysutils/ganglia-monitor-core/Makefile3
-rw-r--r--sysutils/gnome-schedule/Makefile3
-rw-r--r--sysutils/grub2-efi/Makefile3
-rw-r--r--sysutils/hachoir-metadata/Makefile4
-rw-r--r--sysutils/hachoir-subfile/Makefile4
-rw-r--r--sysutils/hachoir-urwid/Makefile4
-rw-r--r--sysutils/hachoir-wx/Makefile4
-rw-r--r--sysutils/hal/Makefile3
-rw-r--r--sysutils/hatop/Makefile2
-rw-r--r--sysutils/htop/Makefile4
-rw-r--r--sysutils/isomd5sum/Makefile3
-rw-r--r--sysutils/lfm/Makefile4
-rw-r--r--sysutils/moosefs-master/Makefile2
-rw-r--r--sysutils/nagios-statd/Makefile2
-rw-r--r--sysutils/openipmi/Makefile4
-rw-r--r--sysutils/pessulus/Makefile3
-rw-r--r--sysutils/py-XenAPI/Makefile2
-rw-r--r--sysutils/py-bcfg2/Makefile5
-rw-r--r--sysutils/py-danzfs/Makefile5
-rw-r--r--sysutils/py-drmaa/Makefile5
-rw-r--r--sysutils/py-execnet/Makefile5
-rw-r--r--sysutils/py-ezjailremote/Makefile5
-rw-r--r--sysutils/py-filelike/Makefile5
-rw-r--r--sysutils/py-halite/Makefile5
-rw-r--r--sysutils/py-nagiosplugin/Makefile5
-rw-r--r--sysutils/py-ploy/Makefile6
-rw-r--r--sysutils/py-ploy_ansible/Makefile6
-rw-r--r--sysutils/py-ploy_ec2/Makefile6
-rw-r--r--sysutils/py-ploy_ezjail/Makefile6
-rw-r--r--sysutils/py-ploy_fabric/Makefile6
-rw-r--r--sysutils/py-plumbum/Makefile5
-rw-r--r--sysutils/py-power/Makefile5
-rw-r--r--sysutils/py-psutil121/Makefile5
-rw-r--r--sysutils/py-ranger/Makefile4
-rw-r--r--sysutils/py-salt-api/Makefile5
-rw-r--r--sysutils/py-stdiff/Makefile16
-rw-r--r--sysutils/py-supervisor/Makefile5
-rw-r--r--sysutils/py-zdaemon/Makefile5
-rw-r--r--sysutils/pydf/Makefile3
-rw-r--r--sysutils/rdiff-backup-devel/Makefile4
-rw-r--r--sysutils/realsync/Makefile2
-rw-r--r--sysutils/rubygem-murder/Makefile2
-rw-r--r--sysutils/rubygem-smart_proxy_salt/Makefile2
-rw-r--r--sysutils/serpentine/Makefile3
-rw-r--r--sysutils/sievelog/Makefile4
-rw-r--r--sysutils/slurm-hpc/Makefile3
-rw-r--r--sysutils/tentakel/Makefile4
-rw-r--r--sysutils/tren/Makefile2
-rw-r--r--sysutils/upower/Makefile3
-rw-r--r--sysutils/x86info/Makefile3
-rw-r--r--sysutils/xe-guest-utilities/Makefile3
-rw-r--r--sysutils/xen-tools/Makefile3
-rw-r--r--sysutils/yum/Makefile3
-rw-r--r--sysutils/zeitgeist/Makefile3
64 files changed, 105 insertions, 152 deletions
diff --git a/sysutils/autojump/Makefile b/sysutils/autojump/Makefile
index 31f7c44d2c4c..a4c3e331d956 100644
--- a/sysutils/autojump/Makefile
+++ b/sysutils/autojump/Makefile
@@ -16,7 +16,7 @@ LICENSE= GPLv3
RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
NO_BUILD= yes
-USE_PYTHON_RUN= yes
+USES= python:run
SUB_FILES= pkg-install
PLIST_FILES= bin/autojump \
diff --git a/sysutils/bamf/Makefile b/sysutils/bamf/Makefile
index c4b132f4be0f..a70af2691f10 100644
--- a/sysutils/bamf/Makefile
+++ b/sysutils/bamf/Makefile
@@ -19,10 +19,9 @@ BUILD_DEPENDS= vapigen:${PORTSDIR}/lang/vala-vapigen \
LIB_DEPENDS= libgtop-2.0.so:${PORTSDIR}/devel/libgtop \
libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
-USES= pkgconfig gmake pathfix libtool
+USES= pkgconfig gmake pathfix libtool python:2
GNU_CONFIGURE= yes
USE_GNOME= gtk30 glib20 introspection:build libwnck3
-USE_PYTHON= 2
USE_XORG= x11
CONFIGURE_ARGS+=--disable-webapps \
diff --git a/sysutils/battray/Makefile b/sysutils/battray/Makefile
index dc6596111c9c..cc43c22135c8 100644
--- a/sysutils/battray/Makefile
+++ b/sysutils/battray/Makefile
@@ -12,7 +12,7 @@ COMMENT= Display notebook battery status in tray
LICENSE= BSD
USE_GNOME= pygtk2
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
+USES= python
+USE_PYTHON= distutils
.include <bsd.port.mk>
diff --git a/sysutils/bsdploy/Makefile b/sysutils/bsdploy/Makefile
index b113f1b0cbe3..0faa843dceb5 100644
--- a/sysutils/bsdploy/Makefile
+++ b/sysutils/bsdploy/Makefile
@@ -22,9 +22,7 @@ OPTIONS_DEFAULT= EC2
EC2_DESC= Support Amazon Web Services EC2 hosts
EC2_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ploy_ec2>0:${PORTSDIR}/sysutils/py-ploy_ec2
-USES= zip
-USE_PYTHON= -2.7
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:-2.7 zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/sysutils/byobu/Makefile b/sysutils/byobu/Makefile
index b89c343c3bc1..3599f8edc0bb 100644
--- a/sysutils/byobu/Makefile
+++ b/sysutils/byobu/Makefile
@@ -15,7 +15,7 @@ RUN_DEPENDS= screen:${PORTSDIR}/sysutils/screen \
GNU_CONFIGURE= yes
USE_AUTOTOOLS= aclocal automake
-USE_PYTHON= yes
+USES= python
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
OPTIONS_DEFINE= DOCS
diff --git a/sysutils/duplicity/Makefile b/sysutils/duplicity/Makefile
index 05268d42d9c5..44c708bef769 100644
--- a/sysutils/duplicity/Makefile
+++ b/sysutils/duplicity/Makefile
@@ -13,9 +13,8 @@ LIB_DEPENDS= librsync.so:${PORTSDIR}/net/librsync
RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg \
${PYTHON_PKGNAMEPREFIX}lockfile>=0:${PORTSDIR}/devel/py-lockfile
-USE_PYTHON= 2
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
USE_LDCONFIG= yes
OPTIONS_DEFINE= NLS DOCS SSH FTP FTPS S3 GDOCS CLOUDFILES GIO
diff --git a/sysutils/farbot/Makefile b/sysutils/farbot/Makefile
index d281ebb40da2..e72170b44040 100644
--- a/sysutils/farbot/Makefile
+++ b/sysutils/farbot/Makefile
@@ -16,8 +16,8 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
WRKSRC= ${WRKDIR}/${DISTNAME}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= farb
PYDISTUTILS_PKGVERSION= 0.1
diff --git a/sysutils/feather/Makefile b/sysutils/feather/Makefile
index ce0d7737866b..8d8a39562a1e 100644
--- a/sysutils/feather/Makefile
+++ b/sysutils/feather/Makefile
@@ -13,7 +13,7 @@ COMMENT= Python script for managing tarsnap backups
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=0:${PORTSDIR}/devel/py-yaml \
tarsnap>=0:${PORTSDIR}/sysutils/tarsnap
-USE_PYTHON= yes
+USES= python
NO_BUILD= yes
NO_INSTALL= yes
STRIP=
diff --git a/sysutils/flyback/Makefile b/sysutils/flyback/Makefile
index 20f2933609e4..f4b646a61a6f 100644
--- a/sysutils/flyback/Makefile
+++ b/sysutils/flyback/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS= rsync:${PORTSDIR}/net/rsync
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_PYTHON= yes
+USES= python
USE_GNOME= pygtk2 pygnome2 libglade2
SUB_FILES= flyback.sh
diff --git a/sysutils/fusefs-wikipediafs/Makefile b/sysutils/fusefs-wikipediafs/Makefile
index ffe7b0d62f05..abc28e60da5f 100644
--- a/sysutils/fusefs-wikipediafs/Makefile
+++ b/sysutils/fusefs-wikipediafs/Makefile
@@ -15,10 +15,8 @@ LICENSE= GPLv2
RUN_DEPENDS= py*-fusefs>=0.2:${PORTSDIR}/devel/py-fusefs
-USES= fuse
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST=yes
+USES= fuse python
+USE_PYTHON= distutils autoplist
PORTDOCS= AUTHORS ChangeLog HACKING NEWS README TODO
OPTIONS_DEFINE= DOCS
diff --git a/sysutils/ganglia-monitor-core/Makefile b/sysutils/ganglia-monitor-core/Makefile
index 5aa2d97717b5..f65dc4fc593d 100644
--- a/sysutils/ganglia-monitor-core/Makefile
+++ b/sysutils/ganglia-monitor-core/Makefile
@@ -25,8 +25,7 @@ OPTIONS_DEFINE= GMETAD
OPTIONS_DEFAULT= GMETAD
GMETAD_DESC= include gmetad
-USES= libtool pkgconfig
-USE_PYTHON= yes
+USES= libtool pkgconfig python
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-setuid=ganglia --enable-setgid=ganglia \
diff --git a/sysutils/gnome-schedule/Makefile b/sysutils/gnome-schedule/Makefile
index 361ff6a59ff2..b3b991a9f90b 100644
--- a/sysutils/gnome-schedule/Makefile
+++ b/sysutils/gnome-schedule/Makefile
@@ -20,8 +20,7 @@ OPTIONS_SUB= yes
BUILD_DEPENDS= yelp:${PORTSDIR}/x11/yelp
RUN_DEPENDS= yelp:${PORTSDIR}/x11/yelp
-USES= gmake pathfix
-USE_PYTHON= yes
+USES= gmake pathfix python
USE_GNOME= gnomeprefix pygnome2
INSTALLS_OMF= yes
GNU_CONFIGURE= yes
diff --git a/sysutils/grub2-efi/Makefile b/sysutils/grub2-efi/Makefile
index 3fad39c38710..59ecc1ad0a90 100644
--- a/sysutils/grub2-efi/Makefile
+++ b/sysutils/grub2-efi/Makefile
@@ -23,11 +23,10 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
SSP_UNSAFE= yes
USE_GCC= yes
-USE_PYTHON= yes
USE_AUTOTOOLS= automake aclocal autoconf
ACLOCAL_ARGS= -Im4
GNU_CONFIGURE= yes
-USES= bison gettext gmake tar:xz
+USES= bison gettext gmake python tar:xz
ONLY_FOR_ARCHS= amd64
MAKE_JOBS_UNSAFE= yes
diff --git a/sysutils/hachoir-metadata/Makefile b/sysutils/hachoir-metadata/Makefile
index 70c6a3018ecc..a2d944be25f2 100644
--- a/sysutils/hachoir-metadata/Makefile
+++ b/sysutils/hachoir-metadata/Makefile
@@ -13,8 +13,8 @@ COMMENT= Extract metadata from files
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/hachoir_parser/__init__.py:${PORTSDIR}/devel/hachoir-parser
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/hachoir_parser/__init__.py:${PORTSDIR}/devel/hachoir-parser
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
+USES= python
+USE_PYTHON= distutils
.include <bsd.port.pre.mk>
diff --git a/sysutils/hachoir-subfile/Makefile b/sysutils/hachoir-subfile/Makefile
index 8a8b658fdbe5..43b8a56dfbd6 100644
--- a/sysutils/hachoir-subfile/Makefile
+++ b/sysutils/hachoir-subfile/Makefile
@@ -12,7 +12,7 @@ COMMENT= Find subfiles in any binary stream
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/hachoir_parser/__init__.py:${PORTSDIR}/devel/hachoir-parser \
${PYTHON_SITELIBDIR}/hachoir_regex/__init__.py:${PORTSDIR}/devel/hachoir-regex
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
+USES= python
+USE_PYTHON= distutils
.include <bsd.port.mk>
diff --git a/sysutils/hachoir-urwid/Makefile b/sysutils/hachoir-urwid/Makefile
index c2eb5720abe2..20be8a072f58 100644
--- a/sysutils/hachoir-urwid/Makefile
+++ b/sysutils/hachoir-urwid/Makefile
@@ -12,7 +12,7 @@ COMMENT= Binary file explorer
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/hachoir_parser/__init__.py:${PORTSDIR}/devel/hachoir-parser \
${PYTHON_SITELIBDIR}/urwid/__init__.py:${PORTSDIR}/devel/py-urwid
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
+USES= python
+USE_PYTHON= distutils
.include <bsd.port.mk>
diff --git a/sysutils/hachoir-wx/Makefile b/sysutils/hachoir-wx/Makefile
index 60e00e4bb55a..49463554ae77 100644
--- a/sysutils/hachoir-wx/Makefile
+++ b/sysutils/hachoir-wx/Makefile
@@ -12,9 +12,9 @@ COMMENT= Hachoir GUI
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/hachoir_parser/__init__.py:${PORTSDIR}/devel/hachoir-parser
-USE_PYTHON= yes
+USES= python
+USE_PYTHON= distutils
USE_WX= 3.0+
WX_COMPS= python
-USE_PYDISTUTILS=yes
.include <bsd.port.mk>
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index 3c6b86aa95db..dace3266eda9 100644
--- a/sysutils/hal/Makefile
+++ b/sysutils/hal/Makefile
@@ -19,11 +19,10 @@ LIB_DEPENDS= libpolkit.so.2:${PORTSDIR}/sysutils/policykit \
RUN_DEPENDS= ${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids \
bash:${PORTSDIR}/shells/bash
-USES= gettext gmake libtool:keepla pathfix pkgconfig shebangfix
+USES= gettext gmake libtool:keepla pathfix pkgconfig python shebangfix
USE_GNOME= intlhack
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_PYTHON= yes
CONFIGURE_ARGS= --disable-gtk-doc \
--with-backend=freebsd \
--disable-docbook-docs \
diff --git a/sysutils/hatop/Makefile b/sysutils/hatop/Makefile
index f0c9f4a99ef7..a7abcc3c5b0b 100644
--- a/sysutils/hatop/Makefile
+++ b/sysutils/hatop/Makefile
@@ -11,7 +11,7 @@ COMMENT= Interactive real-time monitoring tool for the HAProxy unix socket
RUN_DEPENDS= ${LOCALBASE}/sbin/haproxy:${PORTSDIR}/net/haproxy
-USE_PYTHON= yes
+USES= python
NO_BUILD= yes
LICENSE= GPLv3
diff --git a/sysutils/htop/Makefile b/sysutils/htop/Makefile
index b8f0fa74b68e..7876f262ae6d 100644
--- a/sysutils/htop/Makefile
+++ b/sysutils/htop/Makefile
@@ -20,12 +20,10 @@ CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib -lexecinfo
CONFIGURE_ARGS= --with-proc=/compat/linux/proc --enable-unicode
-USES= ncurses libtool execinfo
+USES= ncurses libtool execinfo python:build
USE_AUTOTOOLS= autoconf aclocal automake
ACLOCAL_ARGS= -I ${ACLOCAL_DIR}
-USE_PYTHON_BUILD= yes
-
LSOF_RUN_DEPENDS= lsof:${PORTSDIR}/sysutils/lsof
post-patch:
diff --git a/sysutils/isomd5sum/Makefile b/sysutils/isomd5sum/Makefile
index b1891aff1f6c..839427514ce0 100644
--- a/sysutils/isomd5sum/Makefile
+++ b/sysutils/isomd5sum/Makefile
@@ -14,8 +14,7 @@ LICENSE= GPLv2
LIB_DEPENDS= libpopt.so:${PORTSDIR}/devel/popt
-USES= gmake tar:bzip2
-USE_PYTHON= yes
+USES= gmake python tar:bzip2
MAKE_ENV+= PYTHONPREFIX_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR} PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR}
MAKE_JOBS_UNSAFE= yes
diff --git a/sysutils/lfm/Makefile b/sysutils/lfm/Makefile
index a643516b7df7..22dc37621a96 100644
--- a/sysutils/lfm/Makefile
+++ b/sysutils/lfm/Makefile
@@ -15,8 +15,8 @@ LICENSE= GPLv3
OPTIONS_DEFINE= DOCS
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils
DOCS= ChangeLog NEWS README README.pyview TODO
diff --git a/sysutils/moosefs-master/Makefile b/sysutils/moosefs-master/Makefile
index ca24abd19640..482b689ab498 100644
--- a/sysutils/moosefs-master/Makefile
+++ b/sysutils/moosefs-master/Makefile
@@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/mfs-1.6.27
USERS= mfs
GROUPS= mfs
GNU_CONFIGURE= yes
-USE_PYTHON= yes
+USES= python
USE_RC_SUBR= mfsmaster mfsmetalogger mfscgiserv
SUB_FILES= pkg-message
diff --git a/sysutils/nagios-statd/Makefile b/sysutils/nagios-statd/Makefile
index 6b53b88c8abf..ed3ee42288e8 100644
--- a/sysutils/nagios-statd/Makefile
+++ b/sysutils/nagios-statd/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.twoevils.org/files/netsaint_statd/
MAINTAINER= jims@bluenotch.com
COMMENT= Daemon/client to check remote host information for Nagios
-USE_PYTHON= yes
+USES= python
USE_RC_SUBR= nagiosstatd
do-build:
diff --git a/sysutils/openipmi/Makefile b/sysutils/openipmi/Makefile
index d90c282b765e..ba69158354cb 100644
--- a/sysutils/openipmi/Makefile
+++ b/sysutils/openipmi/Makefile
@@ -57,7 +57,7 @@ CONFIGURE_ARGS+= --with-openssl=no
.endif
.if ${PORT_OPTIONS:MTKINTER}
-USE_PYTHON= yes
+USES+= python
WITH_PYTHON= yes
BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter \
${LOCALBASE}/lib/Tix8.4.3/Tix.tcl:${PORTSDIR}/x11-toolkits/tix
@@ -79,7 +79,7 @@ PLIST_SUB+= PERL="@comment "
.endif
.if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON= yes
+USES+= python
CONFIGURE_ARGS+= --with-python --with-swig
BUILD_DEPENDS+= swig:${PORTSDIR}/devel/swig13
PLIST_SUB+= PYTHON=""
diff --git a/sysutils/pessulus/Makefile b/sysutils/pessulus/Makefile
index a3497138d88b..8967327fefce 100644
--- a/sysutils/pessulus/Makefile
+++ b/sysutils/pessulus/Makefile
@@ -14,9 +14,8 @@ COMMENT= Lockdown editor for GNOME
OPTIONS_DEFINE= DOCS
-USES= gettext gmake tar:bzip2
+USES= gettext gmake python tar:bzip2
USE_GNOME= gnomeprefix intlhack pygnome2 pygnomedesktop
-USE_PYTHON= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/sysutils/py-XenAPI/Makefile b/sysutils/py-XenAPI/Makefile
index 4a83aa28f4be..8c2d275b007a 100644
--- a/sysutils/py-XenAPI/Makefile
+++ b/sysutils/py-XenAPI/Makefile
@@ -13,7 +13,7 @@ EXTRACT_ONLY=
MAINTAINER= bsdports@wayfair.com
COMMENT= Xen API Library for Python
-USE_PYTHON= 2
+USES= python:2
WRKSRC= ${WRKDIR}/${PORTNAME}
PLIST_FILES= %%PYTHON_SITELIBDIR%%/XenAPI.py \
%%PYTHON_SITELIBDIR%%/XenAPI.pyc \
diff --git a/sysutils/py-bcfg2/Makefile b/sysutils/py-bcfg2/Makefile
index 2eb66f9c4da5..8cce84b01ed6 100644
--- a/sysutils/py-bcfg2/Makefile
+++ b/sysutils/py-bcfg2/Makefile
@@ -23,9 +23,8 @@ GENSHI_DESC= Support Genshi Templates
.include <bsd.port.options.mk>
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
USE_RC_SUBR= bcfg2
SUB_LIST+= PYTHON_CMD=${PYTHON_CMD}
diff --git a/sysutils/py-danzfs/Makefile b/sysutils/py-danzfs/Makefile
index 95ad194a2c9b..53810695e14f 100644
--- a/sysutils/py-danzfs/Makefile
+++ b/sysutils/py-danzfs/Makefile
@@ -12,9 +12,8 @@ COMMENT= Provides a Python API for interacting with ZFS without using libzfs
LICENSE= BSD
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-USES= tar:xz
+USE_PYTHON= distutils
+USES= python tar:xz
WRKSRC= ${WRKDIR}/danzfs
diff --git a/sysutils/py-drmaa/Makefile b/sysutils/py-drmaa/Makefile
index 61478af630fb..114d796542f4 100644
--- a/sysutils/py-drmaa/Makefile
+++ b/sysutils/py-drmaa/Makefile
@@ -14,8 +14,7 @@ COMMENT= Interact with DRMAA-compliant distributed resource management systems
LICENSE= BSD
PROJECTHOST= drmaa-python
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/sysutils/py-execnet/Makefile b/sysutils/py-execnet/Makefile
index fdea9dca9b21..f6c989831b79 100644
--- a/sysutils/py-execnet/Makefile
+++ b/sysutils/py-execnet/Makefile
@@ -12,8 +12,7 @@ COMMENT= Distributed Python deployment and communication
LICENSE= MIT
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/sysutils/py-ezjailremote/Makefile b/sysutils/py-ezjailremote/Makefile
index 48fc44c40553..30e15d55f480 100644
--- a/sysutils/py-ezjailremote/Makefile
+++ b/sysutils/py-ezjailremote/Makefile
@@ -20,8 +20,7 @@ GH_ACCOUNT= tomster
GH_PROJECT= ezjail-remote
GH_COMMIT= 9ee5f8b
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/sysutils/py-filelike/Makefile b/sysutils/py-filelike/Makefile
index fe6ecfa7dff4..fe71d8fb1305 100644
--- a/sysutils/py-filelike/Makefile
+++ b/sysutils/py-filelike/Makefile
@@ -10,8 +10,7 @@ MASTER_SITES= CHEESESHOP
MAINTAINER= dikshie@sfc.wide.ad.jp
COMMENT= Python module for building and manipulating file-like object
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/sysutils/py-halite/Makefile b/sysutils/py-halite/Makefile
index 2fe0b6a67d9e..1b1b1307968c 100644
--- a/sysutils/py-halite/Makefile
+++ b/sysutils/py-halite/Makefile
@@ -15,8 +15,7 @@ LICENSE= APACHE20
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}salt>=0.17.0:${PORTSDIR}/sysutils/py-salt \
${PYTHON_PKGNAMEPREFIX}cherrypy>0:${PORTSDIR}/www/py-cherrypy
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/sysutils/py-nagiosplugin/Makefile b/sysutils/py-nagiosplugin/Makefile
index 7233a435eb52..b4be268d2147 100644
--- a/sysutils/py-nagiosplugin/Makefile
+++ b/sysutils/py-nagiosplugin/Makefile
@@ -13,9 +13,8 @@ COMMENT= Class library for writing Nagios (Icinga) plugins
LICENSE= ZPL21
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
regression-test: build
@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
diff --git a/sysutils/py-ploy/Makefile b/sysutils/py-ploy/Makefile
index 82b45b2f552d..6c2cb705280b 100644
--- a/sysutils/py-ploy/Makefile
+++ b/sysutils/py-ploy/Makefile
@@ -16,9 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lazy>0:${PORTSDIR}/devel/py-lazy \
${PYTHON_PKGNAMEPREFIX}paramiko>0:${PORTSDIR}/security/py-paramiko
-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/sysutils/py-ploy_ansible/Makefile b/sysutils/py-ploy_ansible/Makefile
index 079f1e023678..abd59a38d9aa 100644
--- a/sysutils/py-ploy_ansible/Makefile
+++ b/sysutils/py-ploy_ansible/Makefile
@@ -16,9 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ploy>=1.0.0:${PORTSDIR}/sysutils/py-ploy \
${PYTHON_PKGNAMEPREFIX}execnet>0:${PORTSDIR}/sysutils/py-execnet \
ansible>0:${PORTSDIR}/sysutils/ansible
-USES= zip
-USE_PYTHON= -2.7
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:-2.7 zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/sysutils/py-ploy_ec2/Makefile b/sysutils/py-ploy_ec2/Makefile
index 4d854186e978..d55a11bf3916 100644
--- a/sysutils/py-ploy_ec2/Makefile
+++ b/sysutils/py-ploy_ec2/Makefile
@@ -17,9 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ploy>=1.0.0:${PORTSDIR}/sysutils/py-ploy \
${PYTHON_PKGNAMEPREFIX}boto>=2.0:${PORTSDIR}/devel/py-boto \
${PYTHON_PKGNAMEPREFIX}lazy>0:${PORTSDIR}/devel/py-lazy
-USES= zip
-USE_PYTHON= -2.7
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:-2.7 zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/sysutils/py-ploy_ezjail/Makefile b/sysutils/py-ploy_ezjail/Makefile
index 79047b5d19e2..0b72e921cf36 100644
--- a/sysutils/py-ploy_ezjail/Makefile
+++ b/sysutils/py-ploy_ezjail/Makefile
@@ -16,9 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ploy>=1.0.0:${PORTSDIR}/sysutils/py-ploy \
${PYTHON_PKGNAMEPREFIX}lazy>0:${PORTSDIR}/devel/py-lazy
-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/sysutils/py-ploy_fabric/Makefile b/sysutils/py-ploy_fabric/Makefile
index 8c4b539e1f5a..d2ad14dc9682 100644
--- a/sysutils/py-ploy_fabric/Makefile
+++ b/sysutils/py-ploy_fabric/Makefile
@@ -16,9 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ploy>=1.0.0:${PORTSDIR}/sysutils/py-ploy \
${PYTHON_PKGNAMEPREFIX}fabric>=1.3.0:${PORTSDIR}/devel/py-fabric
-USES= zip
-USE_PYTHON= -2.7
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:-2.7 zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/sysutils/py-plumbum/Makefile b/sysutils/py-plumbum/Makefile
index bc5846185044..f0ad00f2b9a8 100644
--- a/sysutils/py-plumbum/Makefile
+++ b/sysutils/py-plumbum/Makefile
@@ -12,8 +12,7 @@ COMMENT= Shell combinators and more for python
LICENSE= MIT
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/sysutils/py-power/Makefile b/sysutils/py-power/Makefile
index e3734148b7ad..50d0509025f0 100644
--- a/sysutils/py-power/Makefile
+++ b/sysutils/py-power/Makefile
@@ -11,8 +11,7 @@ COMMENT= Cross-platform system power status information for Python
LICENSE= MIT
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/sysutils/py-psutil121/Makefile b/sysutils/py-psutil121/Makefile
index cd028de83833..b6e672cfb160 100644
--- a/sysutils/py-psutil121/Makefile
+++ b/sysutils/py-psutil121/Makefile
@@ -16,8 +16,7 @@ LICENSE= BSD3CLAUSE
PORTSCOUT= limit:^1\.2\.
-PYDISTUTILS_AUTOPLIST= yes
-USE_PYDISTUTILS=yes
-USE_PYTHON= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/sysutils/py-ranger/Makefile b/sysutils/py-ranger/Makefile
index db116f3174ff..d1628bd93e55 100644
--- a/sysutils/py-ranger/Makefile
+++ b/sysutils/py-ranger/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= linpct@gmail.com
COMMENT= Ranger is a file manager with VI key bindings
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils
post-patch:
@${REINPLACE_CMD} -e 's|setuptools|distutils.core|; s|share/man/man|man/man|;s|share/doc|doc|' ${WRKSRC}/${PYSETUP}
diff --git a/sysutils/py-salt-api/Makefile b/sysutils/py-salt-api/Makefile
index a6b37b1721c0..f3d3bcfa85a6 100644
--- a/sysutils/py-salt-api/Makefile
+++ b/sysutils/py-salt-api/Makefile
@@ -11,9 +11,8 @@ COMMENT= Exposes the fundamental aspects of Salt control to external sources
LICENSE= APACHE20
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}salt>0:${PORTSDIR}/sysutils/py-salt
RUN_DEPENDS:= ${BUILD_DEPENDS}
diff --git a/sysutils/py-stdiff/Makefile b/sysutils/py-stdiff/Makefile
index efea8d3734cb..2cb8aaf06136 100644
--- a/sysutils/py-stdiff/Makefile
+++ b/sysutils/py-stdiff/Makefile
@@ -1,15 +1,15 @@
# $FreeBSD$
-PORTNAME= stdiff
-PORTVERSION= 0.2.1
-CATEGORIES= sysutils python
-MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}/
+PORTNAME= stdiff
+PORTVERSION= 0.2.1
+CATEGORIES= sysutils python
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}/
-MAINTAINER= araujo@FreeBSD.org
-COMMENT= Spot The Difference is a file integrity checker
+MAINTAINER= araujo@FreeBSD.org
+COMMENT= Spot The Difference is a file integrity checker
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils
OPTIONS_DEFINE= DOCS
diff --git a/sysutils/py-supervisor/Makefile b/sysutils/py-supervisor/Makefile
index 344a33abb5cf..1a916fe8789e 100644
--- a/sysutils/py-supervisor/Makefile
+++ b/sysutils/py-supervisor/Makefile
@@ -28,9 +28,8 @@ BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
PORTDOCS= *.txt *.rst
-USE_PYTHON= 2
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
PIDDIR?= /var/run/supervisor
SUB_LIST= PYTHON_CMD=${PYTHON_CMD} \
diff --git a/sysutils/py-zdaemon/Makefile b/sysutils/py-zdaemon/Makefile
index e2f100b42302..378fa358047d 100644
--- a/sysutils/py-zdaemon/Makefile
+++ b/sysutils/py-zdaemon/Makefile
@@ -15,8 +15,7 @@ LICENSE= ZPL21
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zconfig>0:${PORTSDIR}/devel/py-zconfig
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/sysutils/pydf/Makefile b/sysutils/pydf/Makefile
index 8d308ceceb74..6aeaa586a5d4 100644
--- a/sysutils/pydf/Makefile
+++ b/sysutils/pydf/Makefile
@@ -17,8 +17,7 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
SUB_FILES= pkg-message
-USES= shebangfix
-USE_PYTHON= yes
+USES= python shebangfix
NO_BUILD= yes
SHEBANG_FILES= pydf
diff --git a/sysutils/rdiff-backup-devel/Makefile b/sysutils/rdiff-backup-devel/Makefile
index e8acd17122f2..c869b268b138 100644
--- a/sysutils/rdiff-backup-devel/Makefile
+++ b/sysutils/rdiff-backup-devel/Makefile
@@ -21,8 +21,8 @@ LIB_DEPENDS= librsync.so:${PORTSDIR}/net/librsync
CONFLICTS= rdiff-backup-[0-9]*
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
+USES= python
+USE_PYTHON= distutils
MAN1S= rdiff-backup.1 rdiff-backup-statistics.1
DOCS= CHANGELOG README COPYING FAQ.html
diff --git a/sysutils/realsync/Makefile b/sysutils/realsync/Makefile
index 0f645115e3f3..6ff80a890e6c 100644
--- a/sysutils/realsync/Makefile
+++ b/sysutils/realsync/Makefile
@@ -14,7 +14,7 @@ LICENSE= BSD2CLAUSE
RUN_DEPENDS= rsync:${PORTSDIR}/net/rsync \
sudo:${PORTSDIR}/security/sudo
-USE_PYTHON= yes
+USES= python
NO_BUILD= yes
SUB_FILES= pkg-message
diff --git a/sysutils/rubygem-murder/Makefile b/sysutils/rubygem-murder/Makefile
index 882ebcf16301..b393195220d5 100644
--- a/sysutils/rubygem-murder/Makefile
+++ b/sysutils/rubygem-murder/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES= RG
MAINTAINER= ruby@FreeBSD.org
COMMENT= Large scale deploys using BitTorrent
+USES= python
USE_RUBY= yes
-USE_PYTHON= yes
USE_RUBYGEMS= yes
RUBYGEM_AUTOPLIST= yes
diff --git a/sysutils/rubygem-smart_proxy_salt/Makefile b/sysutils/rubygem-smart_proxy_salt/Makefile
index 6f3538a08941..c2c31bb051d4 100644
--- a/sysutils/rubygem-smart_proxy_salt/Makefile
+++ b/sysutils/rubygem-smart_proxy_salt/Makefile
@@ -15,7 +15,7 @@ LICENSE= GPLv3
RUN_DEPENDS= foreman-proxy>=1.6.0:${PORTSDIR}/net/foreman-proxy \
${PYTHON_PKGNAMEPREFIX}salt>0:${PORTSDIR}/sysutils/py-salt
-USE_PYTHON= yes
+USES= python
USE_RUBY= yes
USE_RUBYGEMS= yes
RUBYGEM_AUTOPLIST= yes
diff --git a/sysutils/serpentine/Makefile b/sysutils/serpentine/Makefile
index 9dd6099a78ac..d8b53f8a1e4b 100644
--- a/sysutils/serpentine/Makefile
+++ b/sysutils/serpentine/Makefile
@@ -14,10 +14,9 @@ COMMENT= Gnome Audio Cd Burner
BUILD_DEPENDS= xmlproc_parse:${PORTSDIR}/textproc/py-xml
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USES= pkgconfig gmake tar:bzip2
+USES= pkgconfig gmake python tar:bzip2
GNU_CONFIGURE= yes
USE_GNOME= pygnomedesktop intlhack
USE_GSTREAMER= core gnomevfs python
-USE_PYTHON= yes
.include <bsd.port.mk>
diff --git a/sysutils/sievelog/Makefile b/sysutils/sievelog/Makefile
index a00ebe6009f1..5da8edb2de03 100644
--- a/sysutils/sievelog/Makefile
+++ b/sysutils/sievelog/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= jessekempf@gmail.com
COMMENT= Syslog message filter
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
+USES= python
+USE_PYTHON= distutils
SUB_FILES= pkg-message
diff --git a/sysutils/slurm-hpc/Makefile b/sysutils/slurm-hpc/Makefile
index 4307feeef920..c56ad576e399 100644
--- a/sysutils/slurm-hpc/Makefile
+++ b/sysutils/slurm-hpc/Makefile
@@ -22,9 +22,8 @@ LIB_DEPENDS= libsysinfo.so:${PORTSDIR}/devel/libsysinfo \
libhdf5.so:${PORTSDIR}/science/hdf5
GNU_CONFIGURE= yes
-USES= gmake libtool perl5 tar:bzip2
+USES= gmake libtool perl5 python tar:bzip2
USE_LDCONFIG= yes
-USE_PYTHON= yes
OPTIONS_DEFINE= DOCS MYSQL PGSQL GTK2
diff --git a/sysutils/tentakel/Makefile b/sysutils/tentakel/Makefile
index 6d0e09ba69a6..23a677be9939 100644
--- a/sysutils/tentakel/Makefile
+++ b/sysutils/tentakel/Makefile
@@ -13,8 +13,8 @@ COMMENT= Program for executing commands on many hosts in parallel
WRKSRC= ${WRKDIR}/${DISTNAME}/py
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
+USES= python
+USE_PYTHON= distutils
OPTIONS_DEFINE= DOCS
diff --git a/sysutils/tren/Makefile b/sysutils/tren/Makefile
index e86c1500c282..1f18e4933e51 100644
--- a/sysutils/tren/Makefile
+++ b/sysutils/tren/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://www.tundraware.com/Software/tren/
MAINTAINER= tren@tundraware.com
COMMENT= Powerful File And Directory Batch Renaming Tool
-USE_PYTHON= yes
+USES= python
PLIST_FILES= bin/tren.py man/man1/tren.1.gz
PORTDOCS= WHATSNEW.txt tren-license.txt tren.html tren.pdf tren.ps tren.rst
OPTIONS_DEFINE= DOCS
diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile
index c6c8109fa442..0281c9705125 100644
--- a/sysutils/upower/Makefile
+++ b/sysutils/upower/Makefile
@@ -27,11 +27,10 @@ MANPAGES_BUILD_DEPENDS= \
xsltproc:${PORTSDIR}/textproc/libxslt \
${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
-USES= gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
+USES= gettext gmake libtool:keepla pathfix pkgconfig python tar:bzip2
USE_GNOME= intlhack glib20 introspection:build,run
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_PYTHON= yes
CONFIGURE_ARGS= --disable-gtk-doc \
--with-backend=freebsd \
--localstatedir=/var
diff --git a/sysutils/x86info/Makefile b/sysutils/x86info/Makefile
index 391514ccb3b5..5f35870f1c4c 100644
--- a/sysutils/x86info/Makefile
+++ b/sysutils/x86info/Makefile
@@ -15,9 +15,8 @@ LIB_DEPENDS= libpci.so:${PORTSDIR}/devel/libpci
ONLY_FOR_ARCHS= i386 amd64
-USES= gmake pkgconfig tar:tgz
+USES= gmake pkgconfig python:build tar:tgz
ALL_TARGET= x86info lsmsr
-USE_PYTHON_BUILD=yes
PLIST_FILES= bin/lsmsr bin/x86info man/man8/lsmsr.8.gz man/man1/x86info.1.gz
diff --git a/sysutils/xe-guest-utilities/Makefile b/sysutils/xe-guest-utilities/Makefile
index 9ce020e82853..a6056fa39d34 100644
--- a/sysutils/xe-guest-utilities/Makefile
+++ b/sysutils/xe-guest-utilities/Makefile
@@ -18,8 +18,7 @@ GIT_PROJECT= freebsd-xen-tools-scripts
GIT_VERSION= 8cc7fe1
GITSRC= ${WRKDIR}/${GIT_ACCOUNT}-${GIT_PROJECT}-${GIT_VERSION}/src/
-USES= gmake
-USE_PYTHON= yes
+USES= gmake python
USE_RC_SUBR= xenguest
ONLY_FOR_ARCHS= amd64 i386
diff --git a/sysutils/xen-tools/Makefile b/sysutils/xen-tools/Makefile
index 5918ea311b57..8aadff24caa9 100644
--- a/sysutils/xen-tools/Makefile
+++ b/sysutils/xen-tools/Makefile
@@ -13,8 +13,7 @@ COMMENT= Xen tools within FreeBSD domU
MASTER_SITES= http://bits.xensource.com/oss-xen/release/${PORTVERSION}/
DISTFILES= xen-${PORTVERSION}.tar.gz
-USES= gmake
-USE_PYTHON= yes
+USES= gmake python
MAKE_ENV+= PYTHON=${PYTHON_CMD}
ONLY_FOR_ARCHS= amd64 i386 ia64
diff --git a/sysutils/yum/Makefile b/sysutils/yum/Makefile
index 6d8646c737b4..3dd7fc247f5f 100644
--- a/sysutils/yum/Makefile
+++ b/sysutils/yum/Makefile
@@ -20,8 +20,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/rpm:${PORTSDIR}/archivers/rpm4 \
${PYTHON_SITELIBDIR}/iniparse:${PORTSDIR}/devel/py-iniparse \
${PYTHON_SITELIBDIR}/urlgrabber:${PORTSDIR}/www/py-urlgrabber
-USE_PYTHON= yes
-USES= gettext gmake
+USES= gettext gmake python
MAKE_ARGS= MAKE=${MAKE_CMD} PYTHON=${PYTHON_CMD} \
prefix=${PREFIX} mandir=${MANPREFIX}/man sysconfdir=${PREFIX}/etc
diff --git a/sysutils/zeitgeist/Makefile b/sysutils/zeitgeist/Makefile
index e3a4b6e5fb66..139ff2ee07ea 100644
--- a/sysutils/zeitgeist/Makefile
+++ b/sysutils/zeitgeist/Makefile
@@ -19,9 +19,8 @@ RUN_DEPENDS= python:${PORTSDIR}/lang/python \
${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus
USE_GNOME= intlhack pygobject
-USE_PYTHON= yes
GNU_CONFIGURE= yes
-USES= gmake gettext pathfix
+USES= gmake gettext pathfix python
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib