From 6881df6a4c0580c6f1e791e8700778ea489dd113 Mon Sep 17 00:00:00 2001 From: wiz Date: Wed, 3 Oct 2012 22:14:00 +0000 Subject: Update for python25 removal. --- audio/py-audiotools/Makefile | 4 +--- audio/py-last/Makefile | 3 +-- databases/py-ckanclient/Makefile | 8 +------- databases/py-sqlite3/Makefile | 4 ++-- devel/py-at-spi2/Makefile | 4 +--- devel/py-gobject3/Makefile | 4 +--- devel/py-ipython012/Makefile | 4 +--- devel/py-pyev/Makefile | 4 +--- devel/py-setuptools/Makefile | 4 ++-- devel/py-stompclient/Makefile | 4 +--- doc/guide/files/creating.xml | 4 ++-- editors/zim/Makefile | 7 +------ games/py-trueskill/Makefile | 4 +--- inputmethod/ibus-el/Makefile | 3 +-- lang/py-psyco/Makefile | 4 ++-- math/py-networkx/Makefile | 4 +--- math/py-pytables/Makefile | 4 +--- misc/py-anki/Makefile.common | 4 +--- misc/py-carddav/Makefile | 4 +--- multimedia/mkv2mp4/Makefile | 4 +--- net/calypso/Makefile | 3 +-- net/coilmq/Makefile | 5 +---- net/py-boto/Makefile | 4 +--- pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh | 6 +++--- pkgtools/pkglint/files/makevars.map | 4 ++-- sysutils/py-dbus/Makefile | 3 +-- textproc/py-cssutils/Makefile | 4 +--- textproc/py-pdf-parser/Makefile | 4 ++-- wm/py-tyle/Makefile | 4 +--- www/libproxy/Makefile | 4 +--- www/py-beautifulsoup4/Makefile | 4 +--- x11/py-Xlib/Makefile | 4 +--- x11/py-gnome2-desktop/Makefile | 7 +++---- x11/py-kde4/Makefile | 4 +--- x11/py-qt4-qscintilla/Makefile | 4 +--- x11/py-qt4/Makefile | 3 +-- 36 files changed, 46 insertions(+), 106 deletions(-) diff --git a/audio/py-audiotools/Makefile b/audio/py-audiotools/Makefile index 27b72390bac..6d47f9aa414 100644 --- a/audio/py-audiotools/Makefile +++ b/audio/py-audiotools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2012/10/02 23:48:05 asau Exp $ +# $NetBSD: Makefile,v 1.7 2012/10/03 22:14:00 wiz Exp $ # DISTNAME= audiotools-2.18 @@ -14,8 +14,6 @@ LICENSE= gnu-gpl-v2 USE_LANGUAGES= c -PYTHON_VERSIONS_INCOMPATIBLE= 25 - REPLACE_INTERPRETER+= python REPLACE.python.old= /usr/bin/python REPLACE.python.new= ${PYTHONBIN} diff --git a/audio/py-last/Makefile b/audio/py-last/Makefile index f584979b08e..0ac25f461c6 100644 --- a/audio/py-last/Makefile +++ b/audio/py-last/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2012/10/02 23:48:06 asau Exp $ +# $NetBSD: Makefile,v 1.4 2012/10/03 22:14:00 wiz Exp $ # DISTNAME= pylast-0.5.11 @@ -12,7 +12,6 @@ COMMENT= Python interface to Last.fm LICENSE= apache-2.0 USE_LANGUAGES= # none -PYTHON_VERSIONS_INCOMPATIBLE= 25 PYTHON_VERSIONS_INCLUDE_3X= yes .include "../../lang/python/distutils.mk" diff --git a/databases/py-ckanclient/Makefile b/databases/py-ckanclient/Makefile index c7d8fa2f4e7..2d9e1cf269a 100644 --- a/databases/py-ckanclient/Makefile +++ b/databases/py-ckanclient/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2012/10/02 21:25:48 asau Exp $ +# $NetBSD: Makefile,v 1.8 2012/10/03 22:14:00 wiz Exp $ # DISTNAME= ckanclient-0.9 @@ -13,11 +13,5 @@ LICENSE= mit USE_LANGUAGES= # none -.include "../../lang/python/pyversion.mk" - -.if defined(PYPKGPREFIX) && !empty(PYPKGPREFIX:Mpy25) -DEPENDS+= ${PYPKGPREFIX}-simplejson-[0-9]*:../../converters/py-simplejson -.endif - .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/py-sqlite3/Makefile b/databases/py-sqlite3/Makefile index f2b6510ede1..1bf61e7965b 100644 --- a/databases/py-sqlite3/Makefile +++ b/databases/py-sqlite3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2012/10/02 21:25:50 asau Exp $ +# $NetBSD: Makefile,v 1.11 2012/10/03 22:14:00 wiz Exp $ PKGNAME= ${PYPKGPREFIX}-sqlite3-0 PKGREVISION= 3 @@ -14,7 +14,7 @@ EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/_sqlite PYDISTUTILSPKG= yes PYTHON_VERSIONS_INCLUDE_3X= yes -PYTHON_VERSIONS_ACCEPTED= 31 27 26 25 +PYTHON_VERSIONS_ACCEPTED= 31 27 26 PY_SETUP_SUBST+= SQLITE_PREFIX=${BUILDLINK_PREFIX.sqlite3} PYSETUPINSTALLARGS+= --install-lib ${PREFIX}/${PYLIB}/lib-dynload diff --git a/devel/py-at-spi2/Makefile b/devel/py-at-spi2/Makefile index fae1d9ff6f0..edaafda8e16 100644 --- a/devel/py-at-spi2/Makefile +++ b/devel/py-at-spi2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2012/09/15 10:04:19 obache Exp $ +# $NetBSD: Makefile,v 1.5 2012/10/03 22:14:01 wiz Exp $ # DISTNAME= pyatspi-2.5.4 @@ -19,8 +19,6 @@ DEPENDS+= at-spi2-atk-[0-9]*:../../devel/at-spi2-atk PKG_DESTDIR_SUPPORT= user-destdir -PYTHON_VERSIONS_INCOMPATIBLE= 25 - USE_LIBTOOL= yes USE_TOOLS+= pkg-config GNU_CONFIGURE= yes diff --git a/devel/py-gobject3/Makefile b/devel/py-gobject3/Makefile index 6d43f177347..c6135291dec 100644 --- a/devel/py-gobject3/Makefile +++ b/devel/py-gobject3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2012/10/02 17:10:51 tron Exp $ +# $NetBSD: Makefile,v 1.7 2012/10/03 22:14:01 wiz Exp $ # DISTNAME= pygobject-3.2.2 @@ -21,8 +21,6 @@ USE_TOOLS+= pkg-config gmake GNU_CONFIGURE= yes CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} -PYTHON_VERSIONS_INCOMPATIBLE= 25 - PKGCONFIG_OVERRIDE+= pygobject-3.2.pc.in PY_PATCHPLIST= yes PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} diff --git a/devel/py-ipython012/Makefile b/devel/py-ipython012/Makefile index 0b87831b619..db86387b643 100644 --- a/devel/py-ipython012/Makefile +++ b/devel/py-ipython012/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2012/04/18 09:16:15 dholland Exp $ +# $NetBSD: Makefile,v 1.3 2012/10/03 22:14:01 wiz Exp $ # DISTNAME= ipython-0.12 @@ -16,8 +16,6 @@ DEPENDS+= ${PYPKGPREFIX}-pexpect-[0-9]*:../../devel/py-pexpect PKG_DESTDIR_SUPPORT= user-destdir -PYTHON_VERSIONS_INCOMPATIBLE= 25 - USE_LANGUAGES= # none USE_TOOLS+= gunzip diff --git a/devel/py-pyev/Makefile b/devel/py-pyev/Makefile index 1f2c1b42038..34c105951bd 100644 --- a/devel/py-pyev/Makefile +++ b/devel/py-pyev/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2012/09/02 05:50:21 dholland Exp $ +# $NetBSD: Makefile,v 1.3 2012/10/03 22:14:01 wiz Exp $ # VERS= 0.8.1-4.04 @@ -16,8 +16,6 @@ PYDISTUTILSPKG= yes PKG_DESTDIR_SUPPORT= user-destdir -PYTHON_VERSIONS_INCOMPATIBLE= 25 - .include "../../devel/libev/buildlink3.mk" .include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-setuptools/Makefile b/devel/py-setuptools/Makefile index a58e3bc936a..6a2bcae7f42 100644 --- a/devel/py-setuptools/Makefile +++ b/devel/py-setuptools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2012/04/08 19:08:54 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2012/10/03 22:14:01 wiz Exp $ EGG_VERSION= 0.6c11 DISTNAME= setuptools-${EGG_VERSION} @@ -36,7 +36,7 @@ PYSETUPINSTALLARGS+= --root=/ FILES_SUBST+= PYSITELIB=${PREFIX}/${PYSITELIB} FILES_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} -.if ${OPSYS} == "Darwin" && ${PYPKGPREFIX} != "py25" +.if ${OPSYS} == "Darwin" DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat .endif diff --git a/devel/py-stompclient/Makefile b/devel/py-stompclient/Makefile index aa8f8ca7859..63d9a7ace84 100644 --- a/devel/py-stompclient/Makefile +++ b/devel/py-stompclient/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2012/08/15 05:50:11 dholland Exp $ +# $NetBSD: Makefile,v 1.3 2012/10/03 22:14:01 wiz Exp $ # DISTNAME= stompclient-0.3.2 @@ -15,7 +15,5 @@ PKG_DESTDIR_SUPPORT= user-destdir USE_LANGUAGES= # none -PYTHON_VERSIONS_INCOMPATIBLE= 25 - .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/doc/guide/files/creating.xml b/doc/guide/files/creating.xml index c887f590297..370936667ad 100644 --- a/doc/guide/files/creating.xml +++ b/doc/guide/files/creating.xml @@ -1,4 +1,4 @@ - + Creating a new pkgsrc package from scratch @@ -152,7 +152,7 @@ If the default Python versions are not supported by the software, set the the software is known to work with, from the most recent to the older one, e.g. -PYTHON_VERSIONS_ACCEPTED= 25 24 +PYTHON_VERSIONS_ACCEPTED= 31 27 26 diff --git a/editors/zim/Makefile b/editors/zim/Makefile index fbf73b094bc..ce82a50e824 100644 --- a/editors/zim/Makefile +++ b/editors/zim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2012/10/03 11:43:48 asau Exp $ +# $NetBSD: Makefile,v 1.9 2012/10/03 22:14:01 wiz Exp $ # DISTNAME= zim-0.56 @@ -41,11 +41,6 @@ SUBST_STAGE.man-path= pre-configure SUBST_FILES.man-path+= setup.py SUBST_SED.man-path= -e s,share/man/man1,${PKGMANDIR}/man1, -.include "../../lang/python/pyversion.mk" -.if ${PYPKGPREFIX} == "py25" -DEPENDS+= ${PYPKGPREFIX}-simplejson-[0-9]*:../../converters/py-simplejson -.endif - .include "../../lang/python/application.mk" .include "../../lang/python/extension.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" diff --git a/games/py-trueskill/Makefile b/games/py-trueskill/Makefile index a5ee16edec3..70c65781044 100644 --- a/games/py-trueskill/Makefile +++ b/games/py-trueskill/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2012/05/21 06:56:04 dholland Exp $ +# $NetBSD: Makefile,v 1.3 2012/10/03 22:14:01 wiz Exp $ # DISTNAME= trueskill-0.1.3 @@ -15,7 +15,5 @@ PKG_DESTDIR_SUPPORT= user-destdir USE_LANGUAGES= # none -PYTHON_VERSIONS_INCOMPATIBLE= 25 - .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/ibus-el/Makefile b/inputmethod/ibus-el/Makefile index 66036d5e6a5..e224d2576ce 100644 --- a/inputmethod/ibus-el/Makefile +++ b/inputmethod/ibus-el/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2012/04/22 13:59:42 obache Exp $ +# $NetBSD: Makefile,v 1.10 2012/10/03 22:14:02 wiz Exp $ # DISTNAME= ibus-el-0.3.2 @@ -18,7 +18,6 @@ PKG_DESTDIR_SUPPORT= user-destdir USE_LANGUAGES= # none EMACS_VERSIONS_ACCEPTED= emacs22 emacs23 emacs24 -PYTHON_VERSIONS_INCOMPATIBLE= 25 REPLACE_PYTHON= ibus-el-agent # then execute directly diff --git a/lang/py-psyco/Makefile b/lang/py-psyco/Makefile index 8cf46299e03..115e15dc225 100644 --- a/lang/py-psyco/Makefile +++ b/lang/py-psyco/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2012/10/02 20:11:50 asau Exp $ +# $NetBSD: Makefile,v 1.19 2012/10/03 22:14:02 wiz Exp $ DISTNAME= psyco-1.6-src EGG_NAME= ${DISTNAME:S/-src//} @@ -14,7 +14,7 @@ LICENSE= mit WRKSRC= ${WRKDIR}/${EGG_NAME} -PYTHON_VERSIONS_ACCEPTED= 26 25 +PYTHON_VERSIONS_ACCEPTED= 26 ONLY_FOR_PLATFORM= *-*-i386 .include "../../lang/python/distutils.mk" diff --git a/math/py-networkx/Makefile b/math/py-networkx/Makefile index 2d828fcbf76..338a5ab01a7 100644 --- a/math/py-networkx/Makefile +++ b/math/py-networkx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2012/09/11 23:04:31 asau Exp $ +# $NetBSD: Makefile,v 1.9 2012/10/03 22:14:02 wiz Exp $ # DISTNAME= networkx-1.7 @@ -12,7 +12,5 @@ HOMEPAGE= http://networkx.lanl.gov/ COMMENT= Python package for creating and manipulating graphs and networks LICENSE= modified-bsd -PYTHON_VERSIONS_INCOMPATIBLE= 25 - .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/py-pytables/Makefile b/math/py-pytables/Makefile index 45cd40091ef..7adf3739a72 100644 --- a/math/py-pytables/Makefile +++ b/math/py-pytables/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2012/09/11 23:04:32 asau Exp $ +# $NetBSD: Makefile,v 1.26 2012/10/03 22:14:02 wiz Exp $ # DISTNAME= tables-2.2.1 @@ -16,8 +16,6 @@ PKG_SUPPORTED_OPTIONS= lzo PKG_SUGGESTED_OPTIONS= .include "../../mk/bsd.options.mk" -PYTHON_VERSIONS_INCOMPATIBLE= 25 - PYDISTUTILSPKG= yes PYSETUPBUILDARGS= --hdf5=${BUILDLINK_PREFIX.hdf5} .if !empty(PKG_OPTIONS:Mlzo) diff --git a/misc/py-anki/Makefile.common b/misc/py-anki/Makefile.common index 2d5784e1043..9ddb9cb6482 100644 --- a/misc/py-anki/Makefile.common +++ b/misc/py-anki/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.3 2012/08/05 21:18:00 wiz Exp $ +# $NetBSD: Makefile.common,v 1.4 2012/10/03 22:14:02 wiz Exp $ # used by misc/py-libanki/Makefile DISTNAME= anki-1.2.11 @@ -17,6 +17,4 @@ USE_PKGLOCALEDIR= yes USE_LANGUAGES= # none DISTINFO_FILE= ${.CURDIR}/../../misc/py-anki/distinfo -PYTHON_VERSIONS_INCOMPATIBLE= 25 - .include "../../lang/python/distutils.mk" diff --git a/misc/py-carddav/Makefile b/misc/py-carddav/Makefile index 2df2bb44fa0..2ce6dcab380 100644 --- a/misc/py-carddav/Makefile +++ b/misc/py-carddav/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2012/08/23 10:13:53 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2012/10/03 22:14:02 wiz Exp $ # DISTNAME= pycarddav0.3.4 @@ -19,8 +19,6 @@ DEPENDS+= ${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml DEPENDS+= ${PYPKGPREFIX}-vobject-[0-9]*:../../textproc/py-vobject DEPENDS+= ${PYPKGPREFIX}-curl-[0-9]*:../../www/py-curl -PYTHON_VERSIONS_INCOMPATIBLE= 25 - USE_LANGUAGES= # none SUBST_CLASSES= env diff --git a/multimedia/mkv2mp4/Makefile b/multimedia/mkv2mp4/Makefile index 5136517171e..14e939cf384 100644 --- a/multimedia/mkv2mp4/Makefile +++ b/multimedia/mkv2mp4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2012/09/22 13:48:19 ryoon Exp $ +# $NetBSD: Makefile,v 1.14 2012/10/03 22:14:02 wiz Exp $ # SVNREV= 11 @@ -20,8 +20,6 @@ COMMENT= Remux mkv files to mp4 files compatible with standalone players WRKSRC= ${WRKDIR} REPLACE_PYTHON= ${DISTNAME}.py -# uses subprocess.check_call, which is new in 2.5 -PYTHON_VERSIONS_ACCEPTED= 25 27 26 INSTALLATION_DIRS= bin share/doc/mkv2mp4 diff --git a/net/calypso/Makefile b/net/calypso/Makefile index 2b7764f76a7..e5e0f3b34ff 100644 --- a/net/calypso/Makefile +++ b/net/calypso/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2012/04/08 19:09:09 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2012/10/03 22:14:02 wiz Exp $ DISTNAME= calypso-1.0 PKGREVISION= 1 @@ -19,7 +19,6 @@ PKG_DESTDIR_SUPPORT= user-destdir PYDISTUTILSPKG= yes PYTHON_VERSIONS_INCLUDE_3X= yes -PYTHON_VERSIONS_INCOMPATIBLE= 25 INSTALLATION_DIRS= share/examples/calypso diff --git a/net/coilmq/Makefile b/net/coilmq/Makefile index a013dc6990e..cf640e3e9ce 100644 --- a/net/coilmq/Makefile +++ b/net/coilmq/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2012/08/15 05:51:56 dholland Exp $ +# $NetBSD: Makefile,v 1.3 2012/10/03 22:14:02 wiz Exp $ # DISTNAME= CoilMQ-0.6.1 @@ -19,9 +19,6 @@ DEPENDS+= ${PYPKGPREFIX}-daemon>=1.5.5:../../devel/py-daemon USE_LANGUAGES= # none -# py-stompclient does not work on python25 -PYTHON_VERSIONS_INCOMPATIBLE= 25 - REPLACE_INTERPRETER+= python REPLACE.python.old= python REPLACE.python.new= ${PYTHONBIN} diff --git a/net/py-boto/Makefile b/net/py-boto/Makefile index 33807ac46ce..ceeb4ca8510 100644 --- a/net/py-boto/Makefile +++ b/net/py-boto/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2012/09/05 09:02:42 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2012/10/03 22:14:02 wiz Exp $ # DISTNAME= boto-2.5.2 @@ -17,8 +17,6 @@ REPLACE_PYTHON+= *.py REPLACE_PYTHON+= boto/*/*.py REPLACE_PYTHON+= bin/* -PYTHON_VERSIONS_INCOMPATIBLE= 24 25 - .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh b/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh index 7ea0b97df07..b907436cda3 100755 --- a/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh +++ b/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh @@ -1,6 +1,6 @@ #!/bin/sh -# $NetBSD: pkg_rolling-replace.sh,v 1.32 2012/04/30 13:59:39 gdt Exp $ +# $NetBSD: pkg_rolling-replace.sh,v 1.33 2012/10/03 22:14:03 wiz Exp $ # # Copyright (c) 2006 BBN Technologies Corp. All rights reserved. # @@ -451,8 +451,8 @@ while [ -n "$REPLACE_TODO" ]; do # Set PKGNAME_REQD to give underlying make processes a chance to # set options derived from the package name. For example, # the appropriate version of Python can be derived from the - # package name (so, when building py25-foo, use python-2.5, - # not python-2.6). + # package name (so, when building py26-foo, use python-2.6, + # not python-2.7). MAKE_SET_VARS="PKGNAME_REQD=${pkg}-*" if ! is_member $pkg $DEPENDS_CHECKED; then diff --git a/pkgtools/pkglint/files/makevars.map b/pkgtools/pkglint/files/makevars.map index a25550de9bb..dc42dfe9af7 100644 --- a/pkgtools/pkglint/files/makevars.map +++ b/pkgtools/pkglint/files/makevars.map @@ -1,4 +1,4 @@ -# $NetBSD: makevars.map,v 1.226 2012/09/16 20:03:50 cheusov Exp $ +# $NetBSD: makevars.map,v 1.227 2012/10/03 22:14:03 wiz Exp $ # # This file contains the guessed type of some variables, according to @@ -631,7 +631,7 @@ PTHREAD_OPTS List of { native optional require } [m:as,c:a,b:a] PTHREAD_TYPE Identifier [$system] # ^^ or "native" or "none". PY_PATCHLIST Yes [$package] -PYPKGPREFIX { py24 py25 py26 py27 py31 } [*:pu, pyversion.mk:s, *:] +PYPKGPREFIX { py26 py27 py31 py32 } [*:pu, pyversion.mk:s, *:] PYTHON_FOR_BUILD_ONLY Yes [$package] PYTHON_PATCH_SCRIPTS List of Pathmask [$package_list] PYTHON_VERSIONS_ACCEPTED List of Version [$package] diff --git a/sysutils/py-dbus/Makefile b/sysutils/py-dbus/Makefile index 92b2dc4e4aa..68fc050847c 100644 --- a/sysutils/py-dbus/Makefile +++ b/sysutils/py-dbus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2012/09/15 10:06:31 obache Exp $ +# $NetBSD: Makefile,v 1.26 2012/10/03 22:14:03 wiz Exp $ # DISTNAME= dbus-python-1.1.1 @@ -14,7 +14,6 @@ LICENSE= mit PKG_DESTDIR_SUPPORT= user-destdir -PYTHON_VERSIONS_INCOMPATIBLE= 25 PYTHON_VERSIONS_INCLUDE_3X= yes USE_TOOLS+= pkg-config gmake diff --git a/textproc/py-cssutils/Makefile b/textproc/py-cssutils/Makefile index 1f1c0178de8..c20d4a96fc5 100644 --- a/textproc/py-cssutils/Makefile +++ b/textproc/py-cssutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2012/05/05 21:47:22 dholland Exp $ +# $NetBSD: Makefile,v 1.7 2012/10/03 22:14:03 wiz Exp $ # DISTNAME= cssutils-0.9.9 @@ -17,8 +17,6 @@ PKG_DESTDIR_SUPPORT= user-destdir USE_LANGUAGES= #none -PYTHON_VERSIONS_INCOMPATIBLE= 25 - REPLACE_INTERPRETER+= python REPLACE.python.old= /usr/bin/env python REPLACE.python.new= ${PYTHONBIN} diff --git a/textproc/py-pdf-parser/Makefile b/textproc/py-pdf-parser/Makefile index 218775a8e57..0774e36a696 100644 --- a/textproc/py-pdf-parser/Makefile +++ b/textproc/py-pdf-parser/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2012/01/23 23:34:37 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2012/10/03 22:14:03 wiz Exp $ # DISTNAME= pdf-parser_V0_3_7 @@ -21,7 +21,7 @@ REPLACE_PYTHON= pdf-parser.py INSTALLATION_DIRS= bin -PYTHON_VERSIONS_ACCEPTED= 26 25 +PYTHON_VERSIONS_ACCEPTED= 26 do-build: diff --git a/wm/py-tyle/Makefile b/wm/py-tyle/Makefile index e7a91789058..4aab6e32e69 100644 --- a/wm/py-tyle/Makefile +++ b/wm/py-tyle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2012/04/08 19:09:15 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2012/10/03 22:14:03 wiz Exp $ # DISTNAME= pytyle-0.7.5 @@ -18,7 +18,5 @@ PKG_DESTDIR_SUPPORT= user-destdir USE_LANGUAGES= #none -PYTHON_VERSIONS_INCOMPATIBLE= 25 - .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/libproxy/Makefile b/www/libproxy/Makefile index 6e2edfc5b6a..3c4d678d419 100644 --- a/www/libproxy/Makefile +++ b/www/libproxy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2012/08/05 13:39:04 shattered Exp $ +# $NetBSD: Makefile,v 1.12 2012/10/03 22:14:03 wiz Exp $ # DISTNAME= libproxy-0.3.1 @@ -27,9 +27,7 @@ PKGCONFIG_OVERRIDE+= libproxy-1.0.pc.in # 0.3.0 doesn't install the python bindings even when they # are enabled, so comment out dependencies. -#PYTHON_VERSIONS_ACCEPTED= 25 27 26 #BUILDLINK_API_DEPENDS.python26+= python26>=2.6.2nb4 -#BUILDLINK_API_DEPENDS.python25+= python25>=2.5.4nb2 post-extract: ${RM} -rf ${WRKSRC}/test.d/.svn diff --git a/www/py-beautifulsoup4/Makefile b/www/py-beautifulsoup4/Makefile index 31d991a83c3..1d654d8e5e1 100644 --- a/www/py-beautifulsoup4/Makefile +++ b/www/py-beautifulsoup4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2012/06/04 06:36:35 dholland Exp $ +# $NetBSD: Makefile,v 1.4 2012/10/03 22:14:03 wiz Exp $ # DISTNAME= beautifulsoup4-4.1.0 @@ -17,8 +17,6 @@ PKG_DESTDIR_SUPPORT= user-destdir # cannot enable this until py-lxml supports it # (otherwise pbulk fails during indexing) #PYTHON_VERSIONS_INCLUDE_3X= yes -# multiple syntax errors during install -PYTHON_VERSIONS_INCOMPATIBLE= 25 do-test: cd ${WRKSRC} && ${PYTHONBIN} -m unittest discover -s bs4 diff --git a/x11/py-Xlib/Makefile b/x11/py-Xlib/Makefile index a84178cd9e3..23bd7e492a6 100644 --- a/x11/py-Xlib/Makefile +++ b/x11/py-Xlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2012/04/08 19:09:18 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2012/10/03 22:14:03 wiz Exp $ DISTNAME= python-xlib-0.14 PKGNAME= ${PYPKGPREFIX}-Xlib-0.14 @@ -14,8 +14,6 @@ PKG_DESTDIR_SUPPORT= user-destdir PYTHON_VERSIONS_INCLUDE_3X= yes -PYTHON_VERSIONS_INCOMPATIBLE= 25 - EGG_NAME= python_xlib-0.12 .include "../../lang/python/distutils.mk" diff --git a/x11/py-gnome2-desktop/Makefile b/x11/py-gnome2-desktop/Makefile index f4237561cb3..dd40f525a56 100644 --- a/x11/py-gnome2-desktop/Makefile +++ b/x11/py-gnome2-desktop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.67 2012/10/02 17:12:18 tron Exp $ +# $NetBSD: Makefile,v 1.68 2012/10/03 22:14:03 wiz Exp $ # DISTNAME= gnome-python-desktop-2.32.0 @@ -23,13 +23,12 @@ USE_TOOLS+= pkg-config gmake PKGCONFIG_OVERRIDE+= gnome-python-desktop-2.0.pc.in -# The "real" value here is: 27 26 25 +# The "real" value here is: 27 26 # but because of single-version deps of gnome bits this will only # ever work for the python version those gnome bits were built with. -PYTHON_VERSIONS_REALLY_ACCEPTED=27 26 25 +PYTHON_VERSIONS_REALLY_ACCEPTED=27 26 PYTHON_VERSIONS_ACCEPTED= ${PYTHON_VERSION_DEFAULT:M27} PYTHON_VERSIONS_ACCEPTED+= ${PYTHON_VERSION_DEFAULT:M26} -PYTHON_VERSIONS_ACCEPTED+= ${PYTHON_VERSION_DEFAULT:M25} .include "options.mk" diff --git a/x11/py-kde4/Makefile b/x11/py-kde4/Makefile index 185d6f494ea..ed560205eeb 100644 --- a/x11/py-kde4/Makefile +++ b/x11/py-kde4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2012/10/02 17:12:18 tron Exp $ +# $NetBSD: Makefile,v 1.15 2012/10/03 22:14:04 wiz Exp $ PKGNAME= ${PYPKGPREFIX}-kde4-${_KDE_VERSION} DISTNAME= pykde4-${_KDE_VERSION} @@ -12,8 +12,6 @@ COMMENT= Python bindings for the KDE integrated X11 desktop CMAKE_ARGS+= -DPYTHON_EXECUTABLE:FILEPATH=${PYTHONBIN} -PYTHON_VERSIONS_INCOMPATIBLE+= 25 - PY_PATCHPLIST= yes PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} diff --git a/x11/py-qt4-qscintilla/Makefile b/x11/py-qt4-qscintilla/Makefile index c9af327797d..37afdc6551e 100644 --- a/x11/py-qt4-qscintilla/Makefile +++ b/x11/py-qt4-qscintilla/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2012/10/02 17:12:18 tron Exp $ +# $NetBSD: Makefile,v 1.23 2012/10/03 22:14:04 wiz Exp $ # DISTNAME= QScintilla-gpl-2.6.2 @@ -14,8 +14,6 @@ LICENSE= gnu-gpl-v3 PKG_DESTDIR_SUPPORT= user-destdir -PYTHON_VERSIONS_INCOMPATIBLE+= 25 - WRKSRC= ${WRKDIR}/${DISTNAME}/Python USE_LIBTOOL= yes diff --git a/x11/py-qt4/Makefile b/x11/py-qt4/Makefile index 68e80a0ae32..00a73a026ae 100644 --- a/x11/py-qt4/Makefile +++ b/x11/py-qt4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.54 2012/10/02 17:12:18 tron Exp $ +# $NetBSD: Makefile,v 1.55 2012/10/03 22:14:04 wiz Exp $ PKGNAME= ${PYPKGPREFIX}-qt4-${PYQT_VERSION} PYQT_VERSION= 4.9.4 @@ -27,7 +27,6 @@ INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} PY_PATCHPLIST= yes PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} -PYTHON_VERSIONS_INCOMPATIBLE= 25 PYTHON_VERSIONS_INCLUDE_3X= yes BUILDLINK_TRANSFORM+= rm:-Wl,-R${WRKSRC}/qpy/QtCore -- cgit v1.2.3