summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mail/archivemail/Makefile2
-rw-r--r--mail/ask/Makefile2
-rw-r--r--mail/automx/Makefile2
-rw-r--r--mail/courier-pythonfilter/Makefile4
-rw-r--r--mail/fetchmail/Makefile2
-rw-r--r--mail/getmail/Makefile4
-rw-r--r--mail/gmail-notify/Makefile3
-rw-r--r--mail/gml/Makefile3
-rw-r--r--mail/isbg/Makefile4
-rw-r--r--mail/libmapi/Makefile3
-rw-r--r--mail/lookout/Makefile2
-rw-r--r--mail/mailfmt/Makefile2
-rw-r--r--mail/mailtray/Makefile4
-rw-r--r--mail/mbox2imap/Makefile2
-rw-r--r--mail/mboxcheck-applet/Makefile2
-rw-r--r--mail/muttils/Makefile6
-rw-r--r--mail/nohtml/Makefile2
-rw-r--r--mail/notmuch/Makefile3
-rw-r--r--mail/offlineimap/Makefile4
-rw-r--r--mail/postfix-policyd-spf-python/Makefile4
-rw-r--r--mail/py-Products.MailHost/Makefile6
-rw-r--r--mail/py-Products.SecureMailHost/Makefile6
-rw-r--r--mail/py-apolicy/Makefile5
-rw-r--r--mail/py-authres/Makefile4
-rw-r--r--mail/py-cyruslib/Makefile28
-rw-r--r--mail/py-libgmail/Makefile5
-rw-r--r--mail/py-milter/Makefile5
-rw-r--r--mail/py-ppolicy/Makefile6
-rw-r--r--mail/py-spambayes/Makefile5
-rw-r--r--mail/py-turbomail/Makefile5
-rw-r--r--mail/py-twistedMail/Makefile6
-rw-r--r--mail/py-zope.sendmail/Makefile5
-rw-r--r--mail/pymsgauth/Makefile3
-rw-r--r--mail/pysieved/Makefile3
-rw-r--r--mail/pyzor/Makefile6
-rw-r--r--mail/queue-repair/Makefile2
-rw-r--r--mail/rss2email3/Makefile5
-rw-r--r--mail/svnmailer/Makefile5
-rw-r--r--mail/tmda/Makefile2
-rw-r--r--mail/vmailmgr/Makefile3
40 files changed, 74 insertions, 101 deletions
diff --git a/mail/archivemail/Makefile b/mail/archivemail/Makefile
index 9c4920718ac4..d47897ddb57f 100644
--- a/mail/archivemail/Makefile
+++ b/mail/archivemail/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/
MAINTAINER= miwi@FreeBSD.org
COMMENT= Archive or delete mail older than N days
-USE_PYTHON= yes
+USES= python
NO_BUILD= yes
DOCS= CHANGELOG FAQ NEWS README TODO
diff --git a/mail/ask/Makefile b/mail/ask/Makefile
index 2907dc41d134..8b010f5be883 100644
--- a/mail/ask/Makefile
+++ b/mail/ask/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF/a-s-k/${PORTNAME}-beta/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Anti Spam Killer content filtering
-USE_PYTHON= yes
+USES= python
NO_BUILD= yes
ASKLIBDIR= ${PREFIX}/lib/${PORTNAME}
diff --git a/mail/automx/Makefile b/mail/automx/Makefile
index 2915c5b1c648..1efc3847eb59 100644
--- a/mail/automx/Makefile
+++ b/mail/automx/Makefile
@@ -20,7 +20,7 @@ GH_ACCOUNT= sys4
GH_TAGNAME= v${PORTVERSION}
GH_COMMIT= 2eb1c64
-USE_PYTHON= yes
+USES= python
USE_GITHUB= yes
NO_BUILD= yes
PORTDATA= *
diff --git a/mail/courier-pythonfilter/Makefile b/mail/courier-pythonfilter/Makefile
index 733f613f433c..5d9ee410bffe 100644
--- a/mail/courier-pythonfilter/Makefile
+++ b/mail/courier-pythonfilter/Makefile
@@ -11,8 +11,8 @@ COMMENT= Framework for courier filter development in python
BUILD_DEPENDS= courier-config:${PORTSDIR}/mail/courier
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
+USES= python
+USE_PYTHON= distutils
MAILOWN= courier
MAILGRP= courier
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index b12470ecc6df..4200149df156 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -59,7 +59,7 @@ CONFIGURE_ARGS+= --enable-POP2
.endif
.if ${PORT_OPTIONS:MX11}
-USE_PYTHON_RUN= yes
+USES+= python:run
RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tkinter>=0:${PORTSDIR}/x11-toolkits/py-tkinter
PLIST_SUB+= NOX11="@comment "
.else
diff --git a/mail/getmail/Makefile b/mail/getmail/Makefile
index 14938ea68999..569456d87cce 100644
--- a/mail/getmail/Makefile
+++ b/mail/getmail/Makefile
@@ -12,8 +12,8 @@ COMMENT= POP3/IMAP4 mail retriever with Maildir and command delivery
LICENSE= GPLv2
-USE_PYTHON= 2
-USE_PYDISTUTILS=yes
+USES= python:2
+USE_PYTHON= distutils
PORTDOCS= README BUGS CHANGELOG THANKS TODO *.txt *.html *.css
diff --git a/mail/gmail-notify/Makefile b/mail/gmail-notify/Makefile
index 31a7409b59de..d1282f8f9ad5 100644
--- a/mail/gmail-notify/Makefile
+++ b/mail/gmail-notify/Makefile
@@ -13,8 +13,7 @@ COMMENT= GMail Notifier
BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/x11-toolkits/py-gnome-extras:extract
USE_GNOME= pygtk2
-USE_PYTHON= yes
-USES= gmake pkgconfig
+USES= gmake pkgconfig python
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/mail/gml/Makefile b/mail/gml/Makefile
index c5af2256be24..6ff0f8f09e63 100644
--- a/mail/gml/Makefile
+++ b/mail/gml/Makefile
@@ -12,10 +12,9 @@ EXTRACT_SUFX= .tar
MAINTAINER= ports@FreeBSD.org
COMMENT= Mbox & Maildir to Gmail loader
-USE_PYTHON_RUN= 2
NO_WRKSUBDIR= yes
NO_BUILD= yes
-USES= dos2unix
+USES= dos2unix python:2,run
PLIST_FILES= bin/${PORTNAME}
PORTDOCS= README
diff --git a/mail/isbg/Makefile b/mail/isbg/Makefile
index 1fb5e97728a3..cb4241074a4d 100644
--- a/mail/isbg/Makefile
+++ b/mail/isbg/Makefile
@@ -19,8 +19,8 @@ GH_ACCOUNT= ook
GH_COMMIT= 44f46f0
NO_BUILD= yes
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
+USES= python
+USE_PYTHON= distutils
PLIST_FILES= bin/${PORTNAME}.py
diff --git a/mail/libmapi/Makefile b/mail/libmapi/Makefile
index f58e112b798e..335e074996ea 100644
--- a/mail/libmapi/Makefile
+++ b/mail/libmapi/Makefile
@@ -23,8 +23,7 @@ CODENAME= QUADRANT
DOWNLOADCODE= 244
USE_SQLITE= 3
-USES= gmake pathfix pkgconfig shebangfix
-USE_PYTHON= yes
+USES= gmake pathfix pkgconfig python shebangfix
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/mail/lookout/Makefile b/mail/lookout/Makefile
index 8b4249e0611f..9300a09ba4b2 100644
--- a/mail/lookout/Makefile
+++ b/mail/lookout/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://catb.org/~esr/lookout/
MAINTAINER= jmohacsi@bsd.hu
COMMENT= Convert Outlook97 addressbook export files to KDE KAB/GNOME gnomecard
-USE_PYTHON= yes
+USES= python
NO_BUILD= yes
PLIST_FILES= bin/lookout man/man1/lookout.1.gz
diff --git a/mail/mailfmt/Makefile b/mail/mailfmt/Makefile
index 44281b8dc8ed..1a3f53069b0b 100644
--- a/mail/mailfmt/Makefile
+++ b/mail/mailfmt/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.tundraware.com/Software/mailfmt/
MAINTAINER= ports@FreeBSD.org
COMMENT= Remove leading quotations from mail/news and wrap lines to fixed width
-USE_PYTHON= yes
+USES= python
OPTIONS_DEFINE= DOCS
post-install:
diff --git a/mail/mailtray/Makefile b/mail/mailtray/Makefile
index 6d4730d7dcfb..ef2ec586704c 100644
--- a/mail/mailtray/Makefile
+++ b/mail/mailtray/Makefile
@@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Display email status in tray
USE_GNOME= pygtk2
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils
.include <bsd.port.mk>
diff --git a/mail/mbox2imap/Makefile b/mail/mbox2imap/Makefile
index 426270adeeb9..db63f97ae7d1 100644
--- a/mail/mbox2imap/Makefile
+++ b/mail/mbox2imap/Makefile
@@ -13,7 +13,7 @@ EXTRACT_ONLY= # none
MAINTAINER= gahr@FreeBSD.org
COMMENT= Upload email stored in mbox file format to an IMAP server
-USE_PYTHON= yes
+USES= python
NO_BUILD= yes
PLIST_FILES= bin/${PORTNAME}
diff --git a/mail/mboxcheck-applet/Makefile b/mail/mboxcheck-applet/Makefile
index 4723ed4ce865..0d81add03a3a 100644
--- a/mail/mboxcheck-applet/Makefile
+++ b/mail/mboxcheck-applet/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://perso.orange.fr/seb128/fichiers/
MAINTAINER= ports@FreeBSD.org
COMMENT= Mailbox checking applet for GNOME 2
-USE_PYTHON= yes
+USES= python
USE_GNOME= pygnome2:run
NO_BUILD= yes
diff --git a/mail/muttils/Makefile b/mail/muttils/Makefile
index 2b7478cabf5e..567104dd8c50 100644
--- a/mail/muttils/Makefile
+++ b/mail/muttils/Makefile
@@ -15,10 +15,8 @@ CONFLICTS= zh-wenju-[0-9]* talkfilters-[0-9]* reed-[0-9]*
CHANGESET= 8bb26094df06
WRKSRC= ${WRKDIR}/blacktrash-${PORTNAME}-${CHANGESET}
-USE_PYTHON_BUILD= yes
-USE_PYTHON_RUN= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
PORTEXAMPLES= *
diff --git a/mail/nohtml/Makefile b/mail/nohtml/Makefile
index 69ea16a1f77f..2bccac7122bc 100644
--- a/mail/nohtml/Makefile
+++ b/mail/nohtml/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://www.tundraware.com/Software/nohtml/
MAINTAINER= nohtml@tundraware.com
COMMENT= Strip HTML attachments from email
-USE_PYTHON= yes
+USES= python
OPTIONS_DEFINE= DOCS
diff --git a/mail/notmuch/Makefile b/mail/notmuch/Makefile
index f24606e89b59..76705ad39a12 100644
--- a/mail/notmuch/Makefile
+++ b/mail/notmuch/Makefile
@@ -17,11 +17,10 @@ LIB_DEPENDS= libgmime-2.6.so:${PORTSDIR}/mail/gmime26 \
libtalloc.so:${PORTSDIR}/devel/talloc
HAS_CONFIGURE= yes
-USES= pkgconfig gmake
+USES= pkgconfig python:build gmake
CONFIGURE_ARGS= --prefix=${PREFIX} --mandir=${MANPREFIX}/man
USE_LDCONFIG= yes
-USE_PYTHON_BUILD= yes
MAKE_ENV+= PYTHONCMD=${PYTHON_CMD}
.include <bsd.port.mk>
diff --git a/mail/offlineimap/Makefile b/mail/offlineimap/Makefile
index 0c6cbb90d8a5..38c9b551edb6 100644
--- a/mail/offlineimap/Makefile
+++ b/mail/offlineimap/Makefile
@@ -28,8 +28,8 @@ GH_ACCOUNT= OfflineIMAP
GH_TAGNAME= v${DISTVERSION}
GH_COMMIT= 8bc2f35
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils
DOC_FILES= Changelog.maint.rst Changelog.rst \
docs/INSTALL.rst docs/MANUAL.rst \
diff --git a/mail/postfix-policyd-spf-python/Makefile b/mail/postfix-policyd-spf-python/Makefile
index 967fcb5807dc..233445aaf4c7 100644
--- a/mail/postfix-policyd-spf-python/Makefile
+++ b/mail/postfix-policyd-spf-python/Makefile
@@ -17,8 +17,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipaddr>0:${PORTSDIR}/devel/py-ipaddr \
${PYTHON_PKGNAMEPREFIX}spf>0:${PORTSDIR}/mail/py-spf \
${PYTHON_PKGNAMEPREFIX}authres>0:${PORTSDIR}/mail/py-authres
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= pypolicyd-spf
PORTDOCS= CHANGES \
diff --git a/mail/py-Products.MailHost/Makefile b/mail/py-Products.MailHost/Makefile
index 356a432aaf1d..e60216ebf1aa 100644
--- a/mail/py-Products.MailHost/Makefile
+++ b/mail/py-Products.MailHost/Makefile
@@ -13,9 +13,7 @@ COMMENT= Zope.sendmail integration for Zope 2
LICENSE= ZPL21
-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/mail/py-Products.SecureMailHost/Makefile b/mail/py-Products.SecureMailHost/Makefile
index e2fb1a4c67d5..00117a029651 100644
--- a/mail/py-Products.SecureMailHost/Makefile
+++ b/mail/py-Products.SecureMailHost/Makefile
@@ -13,9 +13,7 @@ COMMENT= Reimplementation of the standard Zope2 MailHost
LICENSE= ZPL21
-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/mail/py-apolicy/Makefile b/mail/py-apolicy/Makefile
index 0348cf4a9cb1..2bf0eb8e03ed 100644
--- a/mail/py-apolicy/Makefile
+++ b/mail/py-apolicy/Makefile
@@ -16,9 +16,8 @@ COMMENT= ACL system for Postfix, as a policy daemon
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/spf.py:${PORTSDIR}/mail/py-spf \
${PYTHON_SITELIBDIR}/IPy.py:${PORTSDIR}/net-mgmt/py-ipy
-USES= twisted
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
+USES= python twisted
+USE_PYTHON= distutils
NO_BUILD= yes
USE_RC_SUBR= apolicyd
diff --git a/mail/py-authres/Makefile b/mail/py-authres/Makefile
index a609b10f19c7..032ab0caf337 100644
--- a/mail/py-authres/Makefile
+++ b/mail/py-authres/Makefile
@@ -12,8 +12,8 @@ COMMENT= Python module for RFC 5451 Authentication-Results headers
LICENSE= APACHE20
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils
PLIST_SUB+= PORTNAME=${PORTNAME}
diff --git a/mail/py-cyruslib/Makefile b/mail/py-cyruslib/Makefile
index 1d04d1ac2f74..d3187ecc6eb5 100644
--- a/mail/py-cyruslib/Makefile
+++ b/mail/py-cyruslib/Makefile
@@ -1,24 +1,24 @@
# Created by: Dmitriy Kirhlarov <dimma@higis.ru>
# $FreeBSD$
-PORTNAME= cyruslib
-PORTVERSION= 0.5
-CATEGORIES= mail net python
-MASTER_SITES= http://oss.netfarm.it/download/
-PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-DISTNAME= ${PORTNAME}.py
+PORTNAME= cyruslib
+PORTVERSION= 0.5
+CATEGORIES= mail net python
+MASTER_SITES= http://oss.netfarm.it/download/
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+DISTNAME= ${PORTNAME}.py
EXTRACT_SUFX=
-MAINTAINER= dimma@higis.ru
-COMMENT= Cyrus imapd library for Python
+MAINTAINER= dimma@higis.ru
+COMMENT= Cyrus imapd library for Python
-NO_BUILD= yes
-NO_WRKSUBDIR= yes
-USE_PYTHON= yes
-USE_PYTHON_PREFIX= yes
-BINMODE= 644
+NO_BUILD= yes
+NO_WRKSUBDIR= yes
+USES= python
+USE_PYTHON= pythonprefix
+BINMODE= 644
-PLIST_FILES= %%PYTHON_SITELIBDIR%%/${DISTNAME}
+PLIST_FILES= %%PYTHON_SITELIBDIR%%/${DISTNAME}
do-extract:
${MKDIR} ${WRKDIR}
diff --git a/mail/py-libgmail/Makefile b/mail/py-libgmail/Makefile
index aba45aaf94d8..e079888c1462 100644
--- a/mail/py-libgmail/Makefile
+++ b/mail/py-libgmail/Makefile
@@ -13,8 +13,7 @@ COMMENT= Library to provide access to Gmail via Python
BUILD_DEPENDS= py*-mechanize>=0:${PORTSDIR}/www/py-mechanize
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/mail/py-milter/Makefile b/mail/py-milter/Makefile
index 8de4739d29cc..94907ae0b1fe 100644
--- a/mail/py-milter/Makefile
+++ b/mail/py-milter/Makefile
@@ -22,8 +22,7 @@ LIB_DEPENDS= libmilter.so:${PORTSDIR}/mail/sendmail
PYPORTNAME= ${PKGNAMEPREFIX:C/[0-9]+-//}${PORTNAME}
DIST_SUBDIR= python
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/mail/py-ppolicy/Makefile b/mail/py-ppolicy/Makefile
index 244ef84bcd82..3aa41f3fa49e 100644
--- a/mail/py-ppolicy/Makefile
+++ b/mail/py-ppolicy/Makefile
@@ -13,10 +13,8 @@ COMMENT= PPolicy is tool for extending Postfix checking capabilities
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/dns/__init__.py:${PORTSDIR}/dns/py-dnspython
-USES= twisted
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python twisted
+USE_PYTHON= distutils autoplist
NO_BUILD= yes
USE_RC_SUBR= ppolicyd
DOCSDIR?= ${PREFIX}/share/doc/py-${PORTNAME}
diff --git a/mail/py-spambayes/Makefile b/mail/py-spambayes/Makefile
index f811a854492e..a350b1dbf466 100644
--- a/mail/py-spambayes/Makefile
+++ b/mail/py-spambayes/Makefile
@@ -17,9 +17,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bsddb>0:${PORTSDIR}/databases/py-bsddb \
${PYTHON_PKGNAMEPREFIX}dns>=2.0:${PORTSDIR}/dns/py-dns \
${PYTHON_PKGNAMEPREFIX}lockfile>=0.2:${PORTSDIR}/devel/py-lockfile
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
USE_RC_SUBR= pyspamd
diff --git a/mail/py-turbomail/Makefile b/mail/py-turbomail/Makefile
index 015f7a3bd2f3..c5510b2e3f73 100644
--- a/mail/py-turbomail/Makefile
+++ b/mail/py-turbomail/Makefile
@@ -18,8 +18,7 @@ LICENSE= MIT
BUILD_DEPENDS= tg-admin:${PORTSDIR}/www/py-turbogears
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/mail/py-twistedMail/Makefile b/mail/py-twistedMail/Makefile
index 7e68f232e8da..5f3133fb4cb9 100644
--- a/mail/py-twistedMail/Makefile
+++ b/mail/py-twistedMail/Makefile
@@ -14,9 +14,7 @@ COMMENT= SMTP, IMAP, and POP protocol implementation with clients and servers
LICENSE= MIT
-USE_PYTHON= 2
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
-USES= tar:bzip2 twisted:names
+USE_PYTHON= distutils autoplist
+USES= python:2 tar:bzip2 twisted:names
.include <bsd.port.mk>
diff --git a/mail/py-zope.sendmail/Makefile b/mail/py-zope.sendmail/Makefile
index cdadd2ca6af2..4d45b7c85a9c 100644
--- a/mail/py-zope.sendmail/Makefile
+++ b/mail/py-zope.sendmail/Makefile
@@ -21,8 +21,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transact
${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \
${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/mail/pymsgauth/Makefile b/mail/pymsgauth/Makefile
index f4a04f589815..19b6fa66aa89 100644
--- a/mail/pymsgauth/Makefile
+++ b/mail/pymsgauth/Makefile
@@ -10,9 +10,8 @@ MASTER_SITES= http://pyropus.ca/software/pymsgauth/
MAINTAINER= ports@FreeBSD.org
COMMENT= Automatically process qsecretary confirmation requests
-USES= shebangfix
+USES= python shebangfix
SHEBANG_FILES= pymsgauth-clean pymsgauth-confirm pymsgauth-mail
-USE_PYTHON= yes
NO_BUILD= yes
SUB_FILES= pkg-message
diff --git a/mail/pysieved/Makefile b/mail/pysieved/Makefile
index 56abd95f187c..7ea447f4e1fc 100644
--- a/mail/pysieved/Makefile
+++ b/mail/pysieved/Makefile
@@ -11,8 +11,7 @@ MASTER_SITES= http://ports.internal.vlink.ru/distfiles/
MAINTAINER= dsh@wizard.volgograd.ru
COMMENT= Python Managesieve Server
-USES= tar:bzip2
-USE_PYTHON= yes
+USES= python tar:bzip2
USE_RC_SUBR= ${PORTNAME}
PORTEXAMPLES= pysieved.xinetd
diff --git a/mail/pyzor/Makefile b/mail/pyzor/Makefile
index 94ea56091a68..55fb219bbf04 100644
--- a/mail/pyzor/Makefile
+++ b/mail/pyzor/Makefile
@@ -12,10 +12,8 @@ COMMENT= Collaborative, networked system to detect and block spam
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdbm>=0:${PORTSDIR}/databases/py-gdbm
-USES= tar:bzip2
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python tar:bzip2
+USE_PYTHON= distutils autoplist
PLIST_FILES= man/man1/pyzor.1.gz \
man/man1/pyzord.1.gz
diff --git a/mail/queue-repair/Makefile b/mail/queue-repair/Makefile
index af868f81f5db..f725011f0184 100644
--- a/mail/queue-repair/Makefile
+++ b/mail/queue-repair/Makefile
@@ -12,7 +12,7 @@ COMMENT= Qmail queue diagnostic and repair tool
LICENSE= GPLv2
-USE_PYTHON= yes
+USES= python
OPTIONS_DEFINE= DOCS QMAIL_PORT
OPTIONS_DEFAULT= QMAIL_PORT
diff --git a/mail/rss2email3/Makefile b/mail/rss2email3/Makefile
index f627cfdbb7de..ba279faa94a0 100644
--- a/mail/rss2email3/Makefile
+++ b/mail/rss2email3/Makefile
@@ -20,9 +20,8 @@ GH_PROJECT= ${PORTNAME}
GH_TAGNAME= v${DISTVERSION}
GH_COMMIT= 2b7d0b6
-USE_PYTHON= 3.2+
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST=yes
+USES= python:3.2+
+USE_PYTHON= distutils autoplist
CONFLICTS_INSTALL= py*-rss2email-2.*
diff --git a/mail/svnmailer/Makefile b/mail/svnmailer/Makefile
index ff321324ea60..0026b6127567 100644
--- a/mail/svnmailer/Makefile
+++ b/mail/svnmailer/Makefile
@@ -14,9 +14,8 @@ COMMENT= Tool to post subversion repository commit information
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>0:${PORTSDIR}/devel/py-subversion
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USES= tar:bzip2
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
+USES= python:2 tar:bzip2
+USE_PYTHON= distutils
PYDISTUTILS_PKGVERSION= ${DISTVERSION}
PORTDOCS= *
diff --git a/mail/tmda/Makefile b/mail/tmda/Makefile
index de97f9de745e..f406f12e4db1 100644
--- a/mail/tmda/Makefile
+++ b/mail/tmda/Makefile
@@ -16,7 +16,7 @@ COMMENT= Python-based SPAM reduction system
OPTIONS_DEFINE= CDB DOCS EXAMPLES
CDB_RUN_DEPENDS=${PYTHON_SITELIBDIR}/cdbmodule.so:${PORTSDIR}/databases/py-cdb
-USE_PYTHON= yes
+USES= python
SUB_FILES= pkg-message
diff --git a/mail/vmailmgr/Makefile b/mail/vmailmgr/Makefile
index e892c99917a3..eabed06f1e45 100644
--- a/mail/vmailmgr/Makefile
+++ b/mail/vmailmgr/Makefile
@@ -13,9 +13,8 @@ COMMENT= Virtual domain manager for qmail
# get python paths (PYTHON_SITELIBDIR) in case we install the python API
-USES= gmake perl5
+USES= gmake perl5 python
USE_AUTOTOOLS= autoconf autoheader automake aclocal
-USE_PYTHON= yes
USE_PERL5= build
AUTOMAKE_ARGS+= --add-missing -Wno-portability