diff options
author | joerg <joerg@pkgsrc.org> | 2011-12-03 00:02:14 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2011-12-03 00:02:14 +0000 |
commit | bbde65f2e00b8129333e938dbda61639dcfc274d (patch) | |
tree | 91980d7516c0a1d7951f6b3e9a7efbf4077abf95 | |
parent | 92cdf9b29f1fecfb347d0f402bd4113590150e97 (diff) | |
download | pkgsrc-bbde65f2e00b8129333e938dbda61639dcfc274d.tar.gz |
Tag the 28 locations that result in a Python 3.1 package as supporting so.
Remove it from the default list for the rest.
29 files changed, 93 insertions, 30 deletions
diff --git a/databases/py-gdbm/Makefile b/databases/py-gdbm/Makefile index be0194cb56e..547e0af4efb 100644 --- a/databases/py-gdbm/Makefile +++ b/databases/py-gdbm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2011/11/03 12:21:41 obache Exp $ +# $NetBSD: Makefile,v 1.30 2011/12/03 00:02:14 joerg Exp $ # PKGNAME= ${PYPKGPREFIX}-gdbm-0 @@ -10,6 +10,7 @@ HOMEPAGE= http://www.python.org/doc/lib/module-gdbm.html COMMENT= Python interface to gdbm - GNU database manager PKG_DESTDIR_SUPPORT= user-destdir +PYTHON_VERSIONS_INCLUDE_3X= yes EVAL_PREFIX+= GDBMDIR=gdbm diff --git a/databases/py-psycopg2/Makefile b/databases/py-psycopg2/Makefile index cca2380883b..fcc89ba9de5 100644 --- a/databases/py-psycopg2/Makefile +++ b/databases/py-psycopg2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2011/06/16 09:03:11 adam Exp $ +# $NetBSD: Makefile,v 1.17 2011/12/03 00:02:14 joerg Exp $ DISTNAME= psycopg2-2.4.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,6 +12,7 @@ LICENSE= gnu-lgpl-v3 PKG_DESTDIR_SUPPORT= user-destdir +PYTHON_VERSIONS_INCLUDE_3X= yes PYDISTUTILSPKG= yes .include "../../lang/python/extension.mk" diff --git a/databases/py-sqlite3/Makefile b/databases/py-sqlite3/Makefile index 1e510230482..fdc9f7c757b 100644 --- a/databases/py-sqlite3/Makefile +++ b/databases/py-sqlite3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2011/06/17 01:02:56 reed Exp $ +# $NetBSD: Makefile,v 1.8 2011/12/03 00:02:14 joerg Exp $ PKGNAME= ${PYPKGPREFIX}-sqlite3-0 PKGREVISION= 2 @@ -15,6 +15,7 @@ USE_TOOLS+= patch EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/_sqlite PYDISTUTILSPKG= yes +PYTHON_VERSIONS_INCLUDE_3X= yes PYTHON_VERSIONS_ACCEPTED= 31 27 26 25 PY_SETUP_SUBST+= SQLITE_PREFIX=${BUILDLINK_PREFIX.sqlite3} PYSETUPINSTALLARGS+= --install-lib ${PREFIX}/${PYLIB}/lib-dynload diff --git a/devel/py-argparse/Makefile b/devel/py-argparse/Makefile index 32d2e88b46f..0fd1ebb63c0 100644 --- a/devel/py-argparse/Makefile +++ b/devel/py-argparse/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2010/07/24 17:46:59 gdt Exp $ +# $NetBSD: Makefile,v 1.3 2011/12/03 00:02:14 joerg Exp $ # VERSION= 1.1 @@ -14,6 +14,7 @@ COMMENT= Easy, declarative interface for creating command line tools LICENSE= apache-2.0 PKG_DESTDIR_SUPPORT= user-destdir +PYTHON_VERSIONS_INCLUDE_3X= yes USE_LANGUAGES= # none diff --git a/devel/py-curses/Makefile b/devel/py-curses/Makefile index 9617097b7b0..7ed2573bd5c 100644 --- a/devel/py-curses/Makefile +++ b/devel/py-curses/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2011/05/04 11:38:05 obache Exp $ +# $NetBSD: Makefile,v 1.36 2011/12/03 00:02:14 joerg Exp $ # PKGNAME= ${PYPKGPREFIX}-curses-0 @@ -11,6 +11,8 @@ COMMENT= Curses module for Python PKG_DESTDIR_SUPPORT= user-destdir +PYTHON_VERSIONS_INCLUDE_3X= yes + USE_NCURSES= yes # needs: filter getsyx getwin has_key immedok mvwinsnstr mvwinsstr ... # noqiflush pechochar putp putwin qiflush redrawwin setsyx syncok termattrs diff --git a/devel/py-cursespanel/Makefile b/devel/py-cursespanel/Makefile index a683deb384f..f045b3ccda0 100644 --- a/devel/py-cursespanel/Makefile +++ b/devel/py-cursespanel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2011/05/04 11:38:05 obache Exp $ +# $NetBSD: Makefile,v 1.19 2011/12/03 00:02:14 joerg Exp $ # PKGNAME= ${PYPKGPREFIX}-cursespanel-0 @@ -11,6 +11,8 @@ COMMENT= Curses panel module for Python PKG_DESTDIR_SUPPORT= user-destdir +PYTHON_VERSIONS_INCLUDE_3X= yes + USE_NCURSES= yes # filter getsyx getwin has_key immedok mvwinsnstr mvwinsstr ... # noqiflush pechochar putp putwin qiflush redrawwin setsyx syncok termattrs diff --git a/devel/py-generate/Makefile b/devel/py-generate/Makefile index cd90e7623cc..7da7de37a5b 100644 --- a/devel/py-generate/Makefile +++ b/devel/py-generate/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2011/10/15 11:46:04 obache Exp $ +# $NetBSD: Makefile,v 1.18 2011/12/03 00:02:14 joerg Exp $ # DISTNAME= generate-2.6 @@ -14,6 +14,8 @@ COMMENT= Python interface to Generate PKG_DESTDIR_SUPPORT= user-destdir +PYTHON_VERSIONS_INCLUDE_3X= yes + MAKE_ENV+= MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR} MAKE_ENV+= BINDIR=${DESTDIR}${PREFIX}/bin USE_TOOLS+= gmake diff --git a/devel/py-msgpack/Makefile b/devel/py-msgpack/Makefile index 6a4068aefd3..02198fd4743 100644 --- a/devel/py-msgpack/Makefile +++ b/devel/py-msgpack/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2011/10/02 15:51:13 dholland Exp $ +# $NetBSD: Makefile,v 1.4 2011/12/03 00:02:15 joerg Exp $ # DISTNAME= msgpack-python-0.1.10 @@ -13,6 +13,8 @@ LICENSE= apache-2.0 PKG_DESTDIR_SUPPORT= user-destdir +PYTHON_VERSIONS_INCLUDE_3X= yes + EGG_NAME= ${DISTNAME:S/-/_/} PYTHON_VERSIONS_INCOMPATIBLE= 24 diff --git a/devel/py-readline/Makefile b/devel/py-readline/Makefile index 494f02953ef..1ddf558bd6b 100644 --- a/devel/py-readline/Makefile +++ b/devel/py-readline/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2011/05/04 11:38:05 obache Exp $ +# $NetBSD: Makefile,v 1.21 2011/12/03 00:02:15 joerg Exp $ # PKGNAME= ${PYPKGPREFIX}-readline-0 @@ -11,6 +11,8 @@ COMMENT= Line editing support for Python PKG_DESTDIR_SUPPORT= user-destdir +PYTHON_VERSIONS_INCLUDE_3X= yes + EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/readline.c USE_GNU_READLINE= # defined diff --git a/lang/py-cxfreeze/Makefile b/lang/py-cxfreeze/Makefile index 6cb8ef87563..ce85856b85f 100644 --- a/lang/py-cxfreeze/Makefile +++ b/lang/py-cxfreeze/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2011/01/11 11:39:50 drochner Exp $ +# $NetBSD: Makefile,v 1.3 2011/12/03 00:02:15 joerg Exp $ # VERS= 4.2.2 @@ -14,6 +14,8 @@ LICENSE= python-software-foundation PKG_DESTDIR_SUPPORT= user-destdir +PYTHON_VERSIONS_INCLUDE_3X= yes + USE_LANGUAGES= c c++ PYDISTUTILSPKG= yes diff --git a/lang/python/pyversion.mk b/lang/python/pyversion.mk index 7dd40be49fb..f9338c6124d 100644 --- a/lang/python/pyversion.mk +++ b/lang/python/pyversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: pyversion.mk,v 1.91 2011/07/07 18:46:32 joerg Exp $ +# $NetBSD: pyversion.mk,v 1.92 2011/12/03 00:02:15 joerg Exp $ # This file determines which Python version is used as a dependency for # a package. @@ -19,7 +19,15 @@ # preferred over later ones. # # Possible values: 31 27 26 25 24 -# Default: 31 27 26 25 24 +# Default: (31) 27 26 25 24 +# +# PYTHON_VERSIONS_INCLUDE_3X +# Wether the default PYTHON_VERSIONS_ACCEPTED should include +# 3.x versions for for this package or not. +# This variable must be set before including bsd.prefs.mk. +# +# Possible values: yes no +# Default: no # # PYTHON_VERSIONS_INCOMPATIBLE # The Python versions that are NOT acceptable for the package. @@ -69,7 +77,11 @@ BUILD_DEFS+= PYTHON_VERSION_DEFAULT BUILD_DEFS_EFFECTS+= PYPACKAGE PYTHON_VERSION_DEFAULT?= 26 +.if ${PYTHON_VERSIONS_INCLUDE_3X:U:tl} == "yes" PYTHON_VERSIONS_ACCEPTED?= 31 27 26 25 24 +.else +PYTHON_VERSIONS_ACCEPTED?= 27 26 25 24 +.endif PYTHON_VERSIONS_INCOMPATIBLE?= # empty by default BUILDLINK_API_DEPENDS.python24?= python24>=2.4 diff --git a/mail/py-sendmail-admin/Makefile b/mail/py-sendmail-admin/Makefile index 80a987b4096..c9a21e699ae 100644 --- a/mail/py-sendmail-admin/Makefile +++ b/mail/py-sendmail-admin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2010/03/10 16:13:31 pettai Exp $ +# $NetBSD: Makefile,v 1.4 2011/12/03 00:02:15 joerg Exp $ # VER= 1.0 @@ -12,6 +12,8 @@ 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 + USE_LANGUAGES= # none PKG_DESTDIR_SUPPORT= user-destdir diff --git a/math/py-gmpy/Makefile b/math/py-gmpy/Makefile index d52fc97198f..f535a2da185 100644 --- a/math/py-gmpy/Makefile +++ b/math/py-gmpy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2010/11/08 02:46:57 obache Exp $ +# $NetBSD: Makefile,v 1.3 2011/12/03 00:02:15 joerg Exp $ # DISTNAME= gmpy-1.12 @@ -19,6 +19,8 @@ LICENSE= gnu-lgpl-v2.1 PKG_DESTDIR_SUPPORT= user-destdir +PYTHON_VERSIONS_INCLUDE_3X= yes + USE_LANGUAGES= c BUILD_TARGET= gmpy.so diff --git a/net/py-IP/Makefile b/net/py-IP/Makefile index 9592285e164..8bf0cbd4200 100644 --- a/net/py-IP/Makefile +++ b/net/py-IP/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2011/11/02 10:58:33 obache Exp $ +# $NetBSD: Makefile,v 1.16 2011/12/03 00:02:15 joerg Exp $ DISTNAME= IPy-0.75 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/IPy/IP/} @@ -12,6 +12,7 @@ LICENSE= modified-bsd PKG_DESTDIR_SUPPORT= user-destdir +PYTHON_VERSIONS_INCLUDE_3X= yes PYTHON_VERSIONS_INCOMPATIBLE= 24 do-test: diff --git a/net/py-soaplib/Makefile b/net/py-soaplib/Makefile index f75e8f9bd1a..b52ecfd313b 100644 --- a/net/py-soaplib/Makefile +++ b/net/py-soaplib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2008/06/12 02:14:42 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2011/12/03 00:02:16 joerg Exp $ # DISTNAME= soaplib-0.8-20000621 @@ -14,6 +14,8 @@ COMMENT= Implementation of the SOAP 1.1 protocol PKG_DESTDIR_SUPPORT= user-destdir +PYTHON_VERSIONS_INCLUDE_3X= yes + WRKSRC= ${WRKDIR} NO_BUILD= yes diff --git a/print/py-pslib/Makefile b/print/py-pslib/Makefile index bf2aa166b9f..99d72cc2bb4 100644 --- a/print/py-pslib/Makefile +++ b/print/py-pslib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2011/10/15 08:33:36 obache Exp $ +# $NetBSD: Makefile,v 1.9 2011/12/03 00:02:16 joerg Exp $ # DISTNAME= python-pslib_0.2.0.orig @@ -13,6 +13,8 @@ COMMENT= Python bindings for pslib PKG_DESTDIR_SUPPORT= user-destdir +PYTHON_VERSIONS_INCLUDE_3X= yes + WRKSRC= ${WRKDIR}/python-pslib-0.2.0 EGG_NAME= python_pslib-${PKGVERSION_NOREV} diff --git a/security/py-OpenSSL/Makefile b/security/py-OpenSSL/Makefile index 407f9769215..ba78433c266 100644 --- a/security/py-OpenSSL/Makefile +++ b/security/py-OpenSSL/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2011/05/20 11:05:33 adam Exp $ +# $NetBSD: Makefile,v 1.25 2011/12/03 00:02:16 joerg Exp $ DISTNAME= pyOpenSSL-0.12 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -12,6 +12,8 @@ LICENSE= apache-2.0 PKG_DESTDIR_SUPPORT= user-destdir +PYTHON_VERSIONS_INCLUDE_3X= yes + .include "../../lang/python/distutils.mk" .include "../../security/openssl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/py-crack/Makefile b/security/py-crack/Makefile index d79dc1ae1a3..780b5d6fbab 100644 --- a/security/py-crack/Makefile +++ b/security/py-crack/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2011/10/29 06:15:12 obache Exp $ +# $NetBSD: Makefile,v 1.10 2011/12/03 00:02:16 joerg Exp $ # DISTNAME= pycrack-0.01 @@ -14,6 +14,8 @@ LICENSE= gnu-gpl-v2 PKG_DESTDIR_SUPPORT= user-destdir +PYTHON_VERSIONS_INCLUDE_3X= yes + DEPENDS+= crack>=5.0:../../security/crack .include "../../lang/python/distutils.mk" diff --git a/security/py-crypto/Makefile b/security/py-crypto/Makefile index 00199ea3f33..d94773e3353 100644 --- a/security/py-crypto/Makefile +++ b/security/py-crypto/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2011/11/23 19:09:01 gls Exp $ +# $NetBSD: Makefile,v 1.24 2011/12/03 00:02:16 joerg Exp $ # DISTNAME= pycrypto-2.4.1 @@ -16,6 +16,8 @@ CONFLICTS+= ${PYPKGPREFIX}-amkCrypto-[0-9]* PKG_DESTDIR_SUPPORT= user-destdir +PYTHON_VERSIONS_INCLUDE_3X= yes + GNU_CONFIGURE= yes do-test: diff --git a/textproc/py-cElementTree/Makefile b/textproc/py-cElementTree/Makefile index 210d60bfa8f..5d0622e1ff9 100644 --- a/textproc/py-cElementTree/Makefile +++ b/textproc/py-cElementTree/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2011/08/22 12:40:38 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2011/12/03 00:02:16 joerg Exp $ # PKGNAME= ${PYPKGPREFIX}-cElementTree-0 @@ -11,6 +11,8 @@ COMMENT= C implementation of Python ElementTree API PKG_DESTDIR_SUPPORT= user-destdir +PYTHON_VERSIONS_INCLUDE_3X= yes + EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/_elementtree.c USE_TOOLS+= patch diff --git a/textproc/py-expat/Makefile b/textproc/py-expat/Makefile index b2f54f5a43f..6449add87bb 100644 --- a/textproc/py-expat/Makefile +++ b/textproc/py-expat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2011/05/04 11:38:06 obache Exp $ +# $NetBSD: Makefile,v 1.16 2011/12/03 00:02:16 joerg Exp $ # PKGNAME= ${PYPKGPREFIX}-expat-0 @@ -11,6 +11,8 @@ COMMENT= Python interface to expat PKG_DESTDIR_SUPPORT= user-destdir +PYTHON_VERSIONS_INCLUDE_3X= yes + EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/pyexpat.c PYDISTUTILSPKG= yes diff --git a/textproc/py-html2text/Makefile b/textproc/py-html2text/Makefile index 0dfd84f4ab1..716e3bcb590 100644 --- a/textproc/py-html2text/Makefile +++ b/textproc/py-html2text/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2011/06/12 11:59:20 schnoebe Exp $ +# $NetBSD: Makefile,v 1.22 2011/12/03 00:02:17 joerg Exp $ # DISTNAME= aaronsw-${GHNAME}-${GHVERSION}-0-g${GHCOMMIT} @@ -18,6 +18,8 @@ FETCH_USING= curl PKG_DESTDIR_SUPPORT= user-destdir +PYTHON_VERSIONS_INCLUDE_3X= yes + WRKSRC= ${WRKDIR}/aaronsw-${GHNAME}-${GHCOMMIT} NO_BUILD= yes diff --git a/textproc/py-yaml/Makefile b/textproc/py-yaml/Makefile index 733afab0d43..9b68fedd87f 100644 --- a/textproc/py-yaml/Makefile +++ b/textproc/py-yaml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2011/10/16 07:27:49 obache Exp $ +# $NetBSD: Makefile,v 1.8 2011/12/03 00:02:17 joerg Exp $ # DISTNAME= PyYAML-3.08 @@ -14,6 +14,8 @@ LICENSE= mit PKG_DESTDIR_SUPPORT= user-destdir +PYTHON_VERSIONS_INCLUDE_3X= yes + .include "../../lang/python/distutils.mk" .include "../../textproc/libyaml/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/ap2-wsgi/Makefile b/www/ap2-wsgi/Makefile index 4ee452fc702..04c78f5f2ef 100644 --- a/www/ap2-wsgi/Makefile +++ b/www/ap2-wsgi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2010/09/15 11:51:29 adam Exp $ +# $NetBSD: Makefile,v 1.13 2011/12/03 00:02:17 joerg Exp $ DISTNAME= mod_wsgi-${VERSION} PKGNAME= ${APACHE_PKG_PREFIX}-${PYPKGPREFIX}-wsgi-${VERSION} @@ -12,6 +12,8 @@ LICENSE= apache-2.0 PKG_DESTDIR_SUPPORT= user-destdir +PYTHON_VERSIONS_INCLUDE_3X= yes + APACHE_MODULE= yes VERSION= 3.3 diff --git a/www/py-rss2gen/Makefile b/www/py-rss2gen/Makefile index c0024bc6b80..0156b1ecd84 100644 --- a/www/py-rss2gen/Makefile +++ b/www/py-rss2gen/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2011/10/15 11:04:35 obache Exp $ +# $NetBSD: Makefile,v 1.5 2011/12/03 00:02:17 joerg Exp $ PYRSS2GENVER= 1.0.0 DISTNAME= PyRSS2Gen-${PYRSS2GENVER} @@ -14,5 +14,7 @@ LICENSE= modified-bsd PKG_DESTDIR_SUPPORT= user-destdir +PYTHON_VERSIONS_INCLUDE_3X= yes + .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/py-webcolors/Makefile b/www/py-webcolors/Makefile index 6a67eb9257a..6e4ad4bf3fb 100644 --- a/www/py-webcolors/Makefile +++ b/www/py-webcolors/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2011/07/15 13:37:23 obache Exp $ +# $NetBSD: Makefile,v 1.2 2011/12/03 00:02:17 joerg Exp $ # DISTNAME= webcolors-1.3.1 @@ -14,6 +14,8 @@ COMMENT= Library for working with color specifications for HTML and CSS PKG_DESTDIR_SUPPORT= user-destdir +PYTHON_VERSIONS_INCLUDE_3X= yes + USE_LANGUAGES= # none .include "../../lang/python/distutils.mk" diff --git a/x11/py-Tk/Makefile b/x11/py-Tk/Makefile index 1b6fcc7d39a..43972526e33 100644 --- a/x11/py-Tk/Makefile +++ b/x11/py-Tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2011/07/12 11:25:31 wiz Exp $ +# $NetBSD: Makefile,v 1.48 2011/12/03 00:02:17 joerg Exp $ # PKGNAME= ${PYPKGPREFIX}-Tk-0 @@ -11,6 +11,8 @@ COMMENT= Tkinter -- Python interface to Tcl/Tk PKG_DESTDIR_SUPPORT= user-destdir +PYTHON_VERSIONS_INCLUDE_3X= yes + EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/_tkinter.c \ ${PYSUBDIR}/Modules/tkappinit.c PYDISTUTILSPKG= yes diff --git a/x11/py-Xlib/Makefile b/x11/py-Xlib/Makefile index a6d32cd475c..c100b7e15fa 100644 --- a/x11/py-Xlib/Makefile +++ b/x11/py-Xlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2011/08/22 12:18:18 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2011/12/03 00:02:17 joerg Exp $ DISTNAME= python-xlib-0.14 PKGNAME= ${PYPKGPREFIX}-Xlib-0.14 @@ -12,6 +12,8 @@ LICENSE= gnu-gpl-v2 PKG_DESTDIR_SUPPORT= user-destdir +PYTHON_VERSIONS_INCLUDE_3X= yes + PYTHON_VERSIONS_INCOMPATIBLE= 24 25 EGG_NAME= python_xlib-0.12 diff --git a/x11/py-sip/Makefile b/x11/py-sip/Makefile index d251752e782..7553b0d8096 100644 --- a/x11/py-sip/Makefile +++ b/x11/py-sip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2011/11/07 11:22:21 drochner Exp $ +# $NetBSD: Makefile,v 1.27 2011/12/03 00:02:17 joerg Exp $ DISTNAME= sip-4.13 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,6 +11,8 @@ COMMENT= Tool to create Python bindings for C++ libraries PKG_DESTDIR_SUPPORT= user-destdir +PYTHON_VERSIONS_INCLUDE_3X= yes + CONFLICTS+= ${PYPKGPREFIX}-qt2-sip-* ${PYPKGPREFIX}-qt3-sip-* USE_LIBTOOL= yes |