pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Update for python25 removal.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/314f6aa38c19
branches:  trunk
changeset: 609481:314f6aa38c19
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Oct 03 22:14:00 2012 +0000

description:
Update for python25 removal.

diffstat:

 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(-)

diffs (truncated from 656 to 300 lines):

diff -r 0e608730162b -r 314f6aa38c19 audio/py-audiotools/Makefile
--- a/audio/py-audiotools/Makefile      Wed Oct 03 22:10:26 2012 +0000
+++ b/audio/py-audiotools/Makefile      Wed Oct 03 22:14:00 2012 +0000
@@ -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 @@
 
 USE_LANGUAGES= c
 
-PYTHON_VERSIONS_INCOMPATIBLE=  25
-
 REPLACE_INTERPRETER+=  python
 REPLACE.python.old=    /usr/bin/python
 REPLACE.python.new=    ${PYTHONBIN}
diff -r 0e608730162b -r 314f6aa38c19 audio/py-last/Makefile
--- a/audio/py-last/Makefile    Wed Oct 03 22:10:26 2012 +0000
+++ b/audio/py-last/Makefile    Wed Oct 03 22:14:00 2012 +0000
@@ -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 @@
 LICENSE=       apache-2.0
 
 USE_LANGUAGES=                 # none
-PYTHON_VERSIONS_INCOMPATIBLE=  25
 PYTHON_VERSIONS_INCLUDE_3X=    yes
 
 .include "../../lang/python/distutils.mk"
diff -r 0e608730162b -r 314f6aa38c19 databases/py-ckanclient/Makefile
--- a/databases/py-ckanclient/Makefile  Wed Oct 03 22:10:26 2012 +0000
+++ b/databases/py-ckanclient/Makefile  Wed Oct 03 22:14:00 2012 +0000
@@ -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 @@
 
 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 -r 0e608730162b -r 314f6aa38c19 databases/py-sqlite3/Makefile
--- a/databases/py-sqlite3/Makefile     Wed Oct 03 22:10:26 2012 +0000
+++ b/databases/py-sqlite3/Makefile     Wed Oct 03 22:14:00 2012 +0000
@@ -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 @@
 
 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 -r 0e608730162b -r 314f6aa38c19 devel/py-at-spi2/Makefile
--- a/devel/py-at-spi2/Makefile Wed Oct 03 22:10:26 2012 +0000
+++ b/devel/py-at-spi2/Makefile Wed Oct 03 22:14:00 2012 +0000
@@ -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 @@
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
-PYTHON_VERSIONS_INCOMPATIBLE=  25
-
 USE_LIBTOOL=   yes
 USE_TOOLS+=    pkg-config
 GNU_CONFIGURE= yes
diff -r 0e608730162b -r 314f6aa38c19 devel/py-gobject3/Makefile
--- a/devel/py-gobject3/Makefile        Wed Oct 03 22:10:26 2012 +0000
+++ b/devel/py-gobject3/Makefile        Wed Oct 03 22:14:00 2012 +0000
@@ -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 @@
 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 -r 0e608730162b -r 314f6aa38c19 devel/py-ipython012/Makefile
--- a/devel/py-ipython012/Makefile      Wed Oct 03 22:10:26 2012 +0000
+++ b/devel/py-ipython012/Makefile      Wed Oct 03 22:14:00 2012 +0000
@@ -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 @@
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
-PYTHON_VERSIONS_INCOMPATIBLE=  25
-
 USE_LANGUAGES= # none
 USE_TOOLS+=    gunzip
 
diff -r 0e608730162b -r 314f6aa38c19 devel/py-pyev/Makefile
--- a/devel/py-pyev/Makefile    Wed Oct 03 22:10:26 2012 +0000
+++ b/devel/py-pyev/Makefile    Wed Oct 03 22:14:00 2012 +0000
@@ -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 @@
 
 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 -r 0e608730162b -r 314f6aa38c19 devel/py-setuptools/Makefile
--- a/devel/py-setuptools/Makefile      Wed Oct 03 22:10:26 2012 +0000
+++ b/devel/py-setuptools/Makefile      Wed Oct 03 22:14:00 2012 +0000
@@ -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 @@
 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 -r 0e608730162b -r 314f6aa38c19 devel/py-stompclient/Makefile
--- a/devel/py-stompclient/Makefile     Wed Oct 03 22:10:26 2012 +0000
+++ b/devel/py-stompclient/Makefile     Wed Oct 03 22:14:00 2012 +0000
@@ -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 @@
 
 USE_LANGUAGES= # none
 
-PYTHON_VERSIONS_INCOMPATIBLE=  25
-
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 0e608730162b -r 314f6aa38c19 doc/guide/files/creating.xml
--- a/doc/guide/files/creating.xml      Wed Oct 03 22:10:26 2012 +0000
+++ b/doc/guide/files/creating.xml      Wed Oct 03 22:14:00 2012 +0000
@@ -1,4 +1,4 @@
-<!-- $NetBSD: creating.xml,v 1.11 2012/08/14 11:32:21 wiz Exp $ -->
+<!-- $NetBSD: creating.xml,v 1.12 2012/10/03 22:14:01 wiz Exp $ -->
 
 <chapter id="creating">
 <title>Creating a new pkgsrc package from scratch</title>
@@ -152,7 +152,7 @@
 the software is known to work with, from the most recent to the older
 one, e.g.
 <programlisting>
-PYTHON_VERSIONS_ACCEPTED=       25 24
+PYTHON_VERSIONS_ACCEPTED=       31 27 26
 </programlisting></para>
 
 <para>
diff -r 0e608730162b -r 314f6aa38c19 editors/zim/Makefile
--- a/editors/zim/Makefile      Wed Oct 03 22:10:26 2012 +0000
+++ b/editors/zim/Makefile      Wed Oct 03 22:14:00 2012 +0000
@@ -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_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 -r 0e608730162b -r 314f6aa38c19 games/py-trueskill/Makefile
--- a/games/py-trueskill/Makefile       Wed Oct 03 22:10:26 2012 +0000
+++ b/games/py-trueskill/Makefile       Wed Oct 03 22:14:00 2012 +0000
@@ -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 @@
 
 USE_LANGUAGES= # none
 
-PYTHON_VERSIONS_INCOMPATIBLE=  25
-
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 0e608730162b -r 314f6aa38c19 inputmethod/ibus-el/Makefile
--- a/inputmethod/ibus-el/Makefile      Wed Oct 03 22:10:26 2012 +0000
+++ b/inputmethod/ibus-el/Makefile      Wed Oct 03 22:14:00 2012 +0000
@@ -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 @@
 
 USE_LANGUAGES= # none
 EMACS_VERSIONS_ACCEPTED=       emacs22 emacs23 emacs24
-PYTHON_VERSIONS_INCOMPATIBLE=  25
 
 REPLACE_PYTHON=        ibus-el-agent
 # then execute directly
diff -r 0e608730162b -r 314f6aa38c19 lang/py-psyco/Makefile
--- a/lang/py-psyco/Makefile    Wed Oct 03 22:10:26 2012 +0000
+++ b/lang/py-psyco/Makefile    Wed Oct 03 22:14:00 2012 +0000
@@ -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 @@
 
 WRKSRC=                ${WRKDIR}/${EGG_NAME}
 
-PYTHON_VERSIONS_ACCEPTED=      26 25
+PYTHON_VERSIONS_ACCEPTED=      26
 ONLY_FOR_PLATFORM=             *-*-i386
 
 .include "../../lang/python/distutils.mk"
diff -r 0e608730162b -r 314f6aa38c19 math/py-networkx/Makefile
--- a/math/py-networkx/Makefile Wed Oct 03 22:10:26 2012 +0000
+++ b/math/py-networkx/Makefile Wed Oct 03 22:14:00 2012 +0000
@@ -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 @@
 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 -r 0e608730162b -r 314f6aa38c19 math/py-pytables/Makefile
--- a/math/py-pytables/Makefile Wed Oct 03 22:10:26 2012 +0000
+++ b/math/py-pytables/Makefile Wed Oct 03 22:14:00 2012 +0000
@@ -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_SUGGESTED_OPTIONS=



Home | Main Index | Thread Index | Old Index