From 4fc0b0ed6a186ccd83fc93c34cc9ed91862930d8 Mon Sep 17 00:00:00 2001 From: wiz Date: Sat, 25 Jan 2014 10:29:56 +0000 Subject: Mark packages as not ready for python-3.x where applicable; either because they themselves are not ready or because a dependency isn't. This is annotated by PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of x.y.z or PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-foo, py-bar respectively, please use the same style for other packages, and check during updates. Use versioned_dependencies.mk where applicable. Use REPLACE_PYTHON instead of handcoded alternatives, where applicable. Reorder Makefile sections into standard order, where applicable. Remove PYTHON_VERSIONS_INCLUDE_3X lines since that will be default with the next commit. Whitespace cleanups and other nits corrected, where necessary. --- mail/archivemail/Makefile | 5 +++-- mail/fetchmailconf/Makefile | 3 ++- mail/getmail/Makefile | 3 ++- mail/mailman/Makefile | 3 ++- mail/offlineimap/Makefile | 4 ++-- mail/py-libgmail/Makefile | 5 +++-- mail/py-sendmail-admin/Makefile | 4 +--- mail/rss2email/Makefile | 4 +--- mail/tmda/Makefile | 4 ++-- 9 files changed, 18 insertions(+), 17 deletions(-) (limited to 'mail') diff --git a/mail/archivemail/Makefile b/mail/archivemail/Makefile index 06564a0caf3..a15abbc0a88 100644 --- a/mail/archivemail/Makefile +++ b/mail/archivemail/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2012/10/08 12:19:02 asau Exp $ -# +# $NetBSD: Makefile,v 1.16 2014/01/25 10:30:12 wiz Exp $ DISTNAME= archivemail-0.9.0 PKGREVISION= 1 @@ -15,6 +14,8 @@ USE_LANGUAGES= # none INSTALLATION_DIRS= share/archivemail +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.9.0 + post-install: cd ${WRKSRC} && ${INSTALL_DATA} \ CHANGELOG FAQ MANIFEST PKG-INFO README TODO \ diff --git a/mail/fetchmailconf/Makefile b/mail/fetchmailconf/Makefile index 1696b91da37..c10da223485 100644 --- a/mail/fetchmailconf/Makefile +++ b/mail/fetchmailconf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.88 2013/06/04 22:16:36 tron Exp $ +# $NetBSD: Makefile,v 1.89 2014/01/25 10:30:12 wiz Exp $ DISTNAME= fetchmail-6.3.22 PKGNAME= ${DISTNAME:S/fetchmail/fetchmailconf/} @@ -31,6 +31,7 @@ INSTALL_TARGET= install-pythonPYTHON PLIST_SUBST+= PYSITELIB=${PYSITELIB} PYTHON_PATCH_SCRIPTS= fetchmailconf.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 6.3.22 post-install: ${INSTALL_SCRIPT} ${WRKSRC}/fetchmailconf.py ${DESTDIR}${PREFIX}/bin/fetchmailconf diff --git a/mail/getmail/Makefile b/mail/getmail/Makefile index 151c8fa2a0e..8868a4bf788 100644 --- a/mail/getmail/Makefile +++ b/mail/getmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.136 2013/08/26 11:17:32 schmonz Exp $ +# $NetBSD: Makefile,v 1.137 2014/01/25 10:30:12 wiz Exp $ DISTNAME= getmail-4.43.0 CATEGORIES= mail @@ -12,6 +12,7 @@ LICENSE= gnu-gpl-v2 USE_LANGUAGES= # none PYTHON_PATCH_SCRIPTS= *.py getmailcore/*.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 4.43.0 .include "../../lang/python/application.mk" .include "../../lang/python/distutils.mk" diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile index 4e876e6ea46..ece9212fdc8 100644 --- a/mail/mailman/Makefile +++ b/mail/mailman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.67 2013/07/12 10:44:57 jperkin Exp $ +# $NetBSD: Makefile,v 1.68 2014/01/25 10:30:12 wiz Exp $ DISTNAME= mailman-2.1.14-1 PKGNAME= mailman-2.1.14.1 @@ -69,6 +69,7 @@ RCD_SCRIPTS= mailman INSTALL_TEMPLATES+= ${FILESDIR}/INSTALL DEINSTALL_TEMPLATES+= ${FILESDIR}/DEINSTALL +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.1.14.1 PYTHON_PATCH_SCRIPTS+= Mailman/Archiver/pipermail.py PYTHON_PATCH_SCRIPTS+= Mailman/Post.py PYTHON_PATCH_SCRIPTS+= bin/msgfmt.py diff --git a/mail/offlineimap/Makefile b/mail/offlineimap/Makefile index 18c5b54d138..978f139c44b 100644 --- a/mail/offlineimap/Makefile +++ b/mail/offlineimap/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2012/10/08 12:19:19 asau Exp $ -# +# $NetBSD: Makefile,v 1.24 2014/01/25 10:30:12 wiz Exp $ DISTNAME= offlineimap-v6.5.2.1 PKGNAME= ${DISTNAME:S/-v/-/} @@ -20,6 +19,7 @@ WRKSRC= ${WRKDIR}/offlineimap INSTALLATION_DIRS= share/examples/offlineimap EGG_NAME= ${PKGNAME_NOREV} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 6.5.2.1 post-install: .for f in offlineimap.conf offlineimap.conf.minimal diff --git a/mail/py-libgmail/Makefile b/mail/py-libgmail/Makefile index 8653010fadf..f6120e2a83c 100644 --- a/mail/py-libgmail/Makefile +++ b/mail/py-libgmail/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2012/10/08 12:19:28 asau Exp $ -# +# $NetBSD: Makefile,v 1.8 2014/01/25 10:30:12 wiz Exp $ DISTNAME= libgmail-0.1.11 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -15,5 +14,7 @@ DEPENDS+= ${PYPKGPREFIX}-mechanize-[0-9]*:../../www/py-mechanize USE_LANGUAGES= # none +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-mechanize + .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/py-sendmail-admin/Makefile b/mail/py-sendmail-admin/Makefile index cbfd469c066..5ff637ec325 100644 --- a/mail/py-sendmail-admin/Makefile +++ b/mail/py-sendmail-admin/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2012/10/08 12:19:28 asau Exp $ -# +# $NetBSD: Makefile,v 1.9 2014/01/25 10:30:12 wiz Exp $ VER= 1.0 DISTNAME= sendmail-admin-${VER} @@ -13,7 +12,6 @@ HOMEPAGE= http://www.clapper.org/software/python/sendmail-admin/ COMMENT= Mailqs and rmmq, two scripts that ease Sendmail administration LICENSE= 2-clause-bsd -PYTHON_VERSIONS_INCLUDE_3X= yes PYTHON_SELF_CONFLICT= yes USE_LANGUAGES= # none diff --git a/mail/rss2email/Makefile b/mail/rss2email/Makefile index c8f4eabdd07..1cdc1063308 100644 --- a/mail/rss2email/Makefile +++ b/mail/rss2email/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2014/01/19 19:54:47 schmonz Exp $ -# +# $NetBSD: Makefile,v 1.36 2014/01/25 10:30:12 wiz Exp $ DISTNAME= v3.8 PKGNAME= rss2email-3.8 @@ -18,7 +17,6 @@ DEPENDS+= ${PYPKGPREFIX}-html2text>=3.0.1:../../textproc/py-html2text WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} -PYTHON_VERSIONS_INCLUDE_3X= yes PYTHON_VERSIONS_INCOMPATIBLE= 26 27 PYDISTUTILSPKG= yes diff --git a/mail/tmda/Makefile b/mail/tmda/Makefile index b3fc2668d80..0c0deb72d50 100644 --- a/mail/tmda/Makefile +++ b/mail/tmda/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2013/07/12 10:44:58 jperkin Exp $ -# +# $NetBSD: Makefile,v 1.50 2014/01/25 10:30:13 wiz Exp $ DISTNAME= tmda-1.1.12 PKGREVISION= 5 @@ -14,6 +13,7 @@ COMMENT= Python-based SPAM reduction system PYTHON_PATCH_SCRIPTS= ${TMDA_PROGRAMS} PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.1.12 PKG_SYSCONFSUBDIR= ${PKGBASE} -- cgit v1.2.3