summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/moss/Makefile3
-rw-r--r--audio/py-daap/Makefile4
-rw-r--r--audio/py-karaoke/Makefile4
-rw-r--r--audio/py-musicbrainz/Makefile3
-rw-r--r--audio/py-musique/Makefile4
-rw-r--r--audio/py-mutagen/Makefile3
-rw-r--r--audio/py-xmms/Makefile3
-rw-r--r--audio/solfege/Makefile3
-rw-r--r--audio/sonata/Makefile4
-rw-r--r--biology/py-mol/Makefile3
-rw-r--r--cad/py-MyHDL/Makefile4
-rw-r--r--cad/py-simpy/Makefile3
-rw-r--r--chat/fugu/Makefile4
-rw-r--r--converters/py-cjkcodecs/Makefile4
-rw-r--r--converters/py-jpCodecs/Makefile4
-rw-r--r--databases/gourmet/Makefile3
-rw-r--r--databases/gramps/Makefile4
-rw-r--r--databases/gramps2/Makefile4
-rw-r--r--databases/py-IndexedCatalog/Makefile4
-rw-r--r--databases/py-PgSQL/Makefile4
-rw-r--r--databases/py-ZODB/Makefile4
-rw-r--r--databases/py-bdb-xml/Makefile4
-rw-r--r--databases/py-bsddb3/Makefile4
-rw-r--r--databases/py-ldap/Makefile3
-rw-r--r--databases/py-mssql/Makefile4
-rw-r--r--databases/py-pgnotify/Makefile3
-rw-r--r--databases/py-postgresql/Makefile3
-rw-r--r--databases/py-psycopg/Makefile3
-rw-r--r--databases/py-psycopg2/Makefile3
-rw-r--r--databases/py-sqlite/Makefile4
-rw-r--r--databases/py-sqlite2/Makefile3
-rw-r--r--databases/py-sybase/Makefile4
-rw-r--r--databases/py-table/Makefile3
-rw-r--r--devel/ExmanIDE/Makefile4
-rw-r--r--devel/boaconstructor/Makefile3
-rw-r--r--devel/bzr/Makefile4
-rw-r--r--devel/codeville/Makefile5
-rw-r--r--devel/eric3/Makefile3
-rw-r--r--devel/ko-po-check/Makefile4
-rw-r--r--devel/meld/Makefile3
-rw-r--r--devel/mercurial/Makefile4
-rw-r--r--devel/py-InlineEgg/Makefile4
-rw-r--r--devel/py-Pyro/Makefile3
-rw-r--r--devel/py-TPG/Makefile4
-rw-r--r--devel/py-ZopeInterface/Makefile3
-rw-r--r--devel/py-at-spi/Makefile4
-rw-r--r--devel/py-cheetah/Makefile3
-rw-r--r--devel/py-ctypes/Makefile3
-rw-r--r--devel/py-cursespanel/Makefile4
-rw-r--r--devel/py-game/Makefile4
-rw-r--r--devel/py-gobject/Makefile.common3
-rw-r--r--devel/py-kqueue/Makefile3
-rw-r--r--devel/py-pexpect/Makefile3
-rw-r--r--devel/py-setuptools/Makefile4
-rw-r--r--devel/py-urwid/Makefile4
-rw-r--r--devel/roundup/Makefile4
-rw-r--r--devel/stgit/Makefile3
-rw-r--r--devel/tailor/Makefile3
-rw-r--r--filesystems/fuse-gmailfs/Makefile4
-rw-r--r--filesystems/fuse-wikipediafs/Makefile4
-rw-r--r--fonts/mftrace/Makefile3
-rw-r--r--fonts/py-TTFQuery/Makefile3
-rw-r--r--fonts/py-fonttools/Makefile3
-rw-r--r--games/jools/Makefile3
-rw-r--r--games/pysol/Makefile4
-rw-r--r--geography/py-proj/Makefile3
-rw-r--r--graphics/Mesa/Makefile.common3
-rw-r--r--graphics/py-OpenGL/Makefile4
-rw-r--r--graphics/py-biggles/Makefile3
-rw-r--r--graphics/py-gnuplot/Makefile3
-rw-r--r--graphics/py-gtkglext/Makefile4
-rw-r--r--graphics/py-matplotlib-gtk2/Makefile4
-rw-r--r--graphics/py-matplotlib/Makefile4
-rw-r--r--ham/gnuradio-howto/Makefile4
-rw-r--r--mail/getmail/Makefile3
-rw-r--r--mail/mailman/Makefile3
-rw-r--r--mail/offlineimap/Makefile3
-rw-r--r--mail/py-libgmail/Makefile4
-rw-r--r--mail/rss2email/Makefile3
-rw-r--r--mail/tmda/Makefile3
-rw-r--r--math/gnumeric/Makefile3
-rw-r--r--math/py-Numeric/Makefile3
-rw-r--r--math/py-Scientific/Makefile4
-rw-r--r--math/py-ephem/Makefile3
-rw-r--r--math/py-numarray/Makefile3
-rw-r--r--math/py-pytables/Makefile3
-rw-r--r--math/py-rpy/Makefile3
-rw-r--r--meta-pkgs/gnuradio/Makefile.common3
-rw-r--r--misc/koffice/Makefile3
-rw-r--r--misc/openoffice2/Makefile3
-rw-r--r--misc/orca/Makefile4
-rw-r--r--misc/pyqt_memaid/Makefile4
-rw-r--r--multimedia/gstreamer0.8/Makefile4
-rw-r--r--multimedia/py-gstreamer0.10/Makefile3
-rw-r--r--net/bittornado/Makefile.common4
-rw-r--r--net/bittorrent/Makefile.common4
-rw-r--r--net/clive/Makefile3
-rw-r--r--net/nicotine/Makefile4
-rw-r--r--net/py-boto/Makefile4
-rw-r--r--net/py-dns/Makefile4
-rw-r--r--net/py-google/Makefile4
-rw-r--r--net/py-kenosis/Makefile3
-rw-r--r--net/py-libdnet/Makefile3
-rw-r--r--net/py-mimelib/Makefile4
-rw-r--r--net/py-soappy/Makefile4
-rw-r--r--net/py-spreadmodule/Makefile4
-rw-r--r--net/py-twisted/Makefile4
-rw-r--r--net/pygopherd/Makefile4
-rw-r--r--net/scapy/Makefile4
-rw-r--r--net/youtube-dl/Makefile4
-rw-r--r--print/py-pslib/Makefile3
-rw-r--r--print/scribus/Makefile4
-rw-r--r--security/mixminion/Makefile4
-rw-r--r--security/py-OpenSSL/Makefile4
-rw-r--r--security/py-SSLCrypto/Makefile4
-rw-r--r--security/py-denyhosts/Makefile3
-rw-r--r--security/py-gnupg/Makefile4
-rw-r--r--security/py-m2crypto/Makefile4
-rw-r--r--security/py-mcrypt/Makefile3
-rw-r--r--security/py-paramiko/Makefile3
-rw-r--r--security/py-prewikka/Makefile3
-rw-r--r--security/py-tlslite/Makefile3
-rw-r--r--sysutils/duplicity/Makefile4
-rw-r--r--sysutils/py-gnome-menus/Makefile3
-rw-r--r--sysutils/rdiff-backup/Makefile3
-rw-r--r--sysutils/xenkernel3/Makefile3
-rw-r--r--sysutils/xentools12/Makefile4
-rw-r--r--sysutils/xentools20/Makefile3
-rw-r--r--sysutils/xentools3-hvm/Makefile3
-rw-r--r--sysutils/xentools3/Makefile3
-rw-r--r--textproc/asciidoc/Makefile3
-rw-r--r--textproc/doclifter/Makefile3
-rw-r--r--textproc/py-FourSuite/Makefile4
-rw-r--r--textproc/py-HappyDoc/Makefile4
-rw-r--r--textproc/py-SimpleParse/Makefile4
-rw-r--r--textproc/py-X/Makefile3
-rw-r--r--textproc/py-csv/Makefile4
-rw-r--r--textproc/py-elementtree/Makefile4
-rw-r--r--textproc/py-feedparser/Makefile3
-rw-r--r--textproc/py-gdick/Makefile4
-rw-r--r--textproc/py-gnosis-utils/Makefile3
-rw-r--r--textproc/py-html2text/Makefile4
-rw-r--r--textproc/py-libxslt/Makefile3
-rw-r--r--textproc/py-textile/Makefile3
-rw-r--r--textproc/py-yaml/Makefile3
-rw-r--r--textproc/rubber/Makefile3
-rw-r--r--time/gdeskcal/Makefile3
-rw-r--r--time/py-dateutil/Makefile4
-rw-r--r--time/py-mxDateTime/Makefile4
-rw-r--r--time/wxRemind/Makefile4
-rw-r--r--www/ap-python/Makefile4
-rw-r--r--www/ap2-python/Makefile3
-rw-r--r--www/ap2-wsgi/Makefile4
-rw-r--r--www/ja-trac/Makefile3
-rw-r--r--www/py-clearsilver/Makefile3
-rw-r--r--www/py-curl/Makefile3
-rw-r--r--www/py-django/Makefile4
-rw-r--r--www/py-jonpy/Makefile3
-rw-r--r--www/py-moin/Makefile3
-rw-r--r--www/py-nevow/Makefile4
-rw-r--r--www/py-webpy/Makefile4
-rw-r--r--www/trac/Makefile3
-rw-r--r--www/zopeedit/Makefile4
-rw-r--r--x11/modular-xorg-server/buildlink3.mk7
-rw-r--r--x11/py-gnome2-desktop/Makefile4
-rw-r--r--x11/py-qt3-base/Makefile.common3
-rw-r--r--x11/py-qt3-sip/Makefile3
-rw-r--r--x11/py-wxWidgets/Makefile4
-rw-r--r--x11/rox-session/Makefile4
169 files changed, 236 insertions, 360 deletions
diff --git a/audio/moss/Makefile b/audio/moss/Makefile
index c99213f5b06..62200446a3e 100644
--- a/audio/moss/Makefile
+++ b/audio/moss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/08/23 10:38:01 minskim Exp $
+# $NetBSD: Makefile,v 1.16 2008/04/25 20:39:06 joerg Exp $
DISTNAME= moss-0.1.13
PKGREVISION= 3
@@ -12,7 +12,6 @@ COMMENT= MP3/OGG Streaming Server
DEPENDS+= ${PYPKGPREFIX}-ogg>=1.3:../../audio/py-ogg
DEPENDS+= ${PYPKGPREFIX}-vorbis>=1.3:../../audio/py-vorbis
-PYTHON_VERSIONS_INCOMPATIBLE= 20 15
PYTHON_PATCH_SCRIPTS= ${WRKSRC}/*.py
RCD_SCRIPTS= moss
diff --git a/audio/py-daap/Makefile b/audio/py-daap/Makefile
index ca716512713..5b6a66a9ea3 100644
--- a/audio/py-daap/Makefile
+++ b/audio/py-daap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/06/11 17:38:35 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/04/25 20:39:06 joerg Exp $
#
DISTNAME= PythonDaap-0.7
@@ -10,8 +10,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://jerakeen.org/PythonDaap/
COMMENT= Python binding for DAAP
-PYTHON_VERSIONS_ACCEPTED= 24 23
-
PYSETUP= setup.py
PLIST_SUBST+= PYSITELIB=${PYSITELIB:Q}
diff --git a/audio/py-karaoke/Makefile b/audio/py-karaoke/Makefile
index 7ba3c366ed1..e1f62078dae 100644
--- a/audio/py-karaoke/Makefile
+++ b/audio/py-karaoke/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/11/26 22:44:53 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2008/04/25 20:39:06 joerg Exp $
#
DISTNAME= pykaraoke-0.5.1
@@ -15,7 +15,7 @@ COMMENT= Free Python-based karaoke player
#DEPENDS+= timidity-[0-9]*:../../audio/timidity
USE_DIRS+= xdg-1.4
-PYTHON_VERSIONS_ACCEPTED= 24
+PYTHON_VERSIONS_ACCEPTED= 25 24
PYDISTUTILSPKG= yes
# supposedly needed, but I couldn't find out why
diff --git a/audio/py-musicbrainz/Makefile b/audio/py-musicbrainz/Makefile
index b52e2483911..74da624e8b6 100644
--- a/audio/py-musicbrainz/Makefile
+++ b/audio/py-musicbrainz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/12/07 14:37:28 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/04/25 20:39:06 joerg Exp $
DISTNAME= python-musicbrainz2-0.4.0
PKGNAME= ${DISTNAME:S/python/${PYPKGPREFIX}/}
@@ -9,7 +9,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://musicbrainz.org/doc/PythonMusicBrainz2
COMMENT= Python interface to the MusicBrainz XML web service
-PYTHON_VERSIONS_ACCEPTED= 24 23
PYDISTUTILSPKG= yes
DEPENDS+= ${PYPKGPREFIX}-ctypes>=1.0.0:../../devel/py-ctypes
diff --git a/audio/py-musique/Makefile b/audio/py-musique/Makefile
index a91e8d46f5f..0d8843650af 100644
--- a/audio/py-musique/Makefile
+++ b/audio/py-musique/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/03/15 16:50:42 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2008/04/25 20:39:06 joerg Exp $
#
DISTNAME= pymusique-0.5
@@ -23,7 +23,7 @@ DEPENDS+= ${PYPKGPREFIX}-mcrypt-[0-9]*:../../security/py-mcrypt
DEPENDS+= ${PYPKGPREFIX}-libxml2-[0-9]*:../../textproc/py-libxml2
DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
-PYTHON_VERSIONS_ACCEPTED= 24
+PYTHON_VERSIONS_ACCEPTED= 25 24
PYDISTUTILSPKG= yes
diff --git a/audio/py-mutagen/Makefile b/audio/py-mutagen/Makefile
index d4871147d6d..5e645ff808f 100644
--- a/audio/py-mutagen/Makefile
+++ b/audio/py-mutagen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/01/25 23:33:19 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2008/04/25 20:39:06 joerg Exp $
#
DISTNAME= mutagen-1.10
@@ -12,7 +12,6 @@ COMMENT= Audio metadata handling for Python
USE_LANGUAGES= # none
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED= 24 23
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/py-xmms/Makefile b/audio/py-xmms/Makefile
index aa2dc0594fa..5c7fb36e68f 100644
--- a/audio/py-xmms/Makefile
+++ b/audio/py-xmms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/10/04 20:44:19 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2008/04/25 20:39:06 joerg Exp $
DISTNAME= pyxmms-2.02
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -11,7 +11,6 @@ HOMEPAGE= http://people.via.ecp.fr/~flo/index.en.xhtml\#PyXMMS_and_PyXMMS-remote
COMMENT= Python interface to XMMS
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
NO_CONFIGURE= yes
SUBST_CLASSES+= paths
diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile
index bd837b2f8fb..ab517f3a6d1 100644
--- a/audio/solfege/Makefile
+++ b/audio/solfege/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2007/09/21 13:03:28 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2008/04/25 20:39:06 joerg Exp $
#
DISTNAME= solfege-3.8.0
@@ -25,7 +25,6 @@ USE_TOOLS+= gmake gm4 makeinfo pkg-config msgfmt bash:run
REPLACE_BASH= lesson-files/bin/csound-play-harmonic-interval.sh
-PYTHON_VERSIONS_ACCEPTED= 24 23
PYTHON_PATCH_SCRIPTS= *.py *.py.in */*.py */*.py.in
PYCOMPILEALL= ${BUILDLINK_PREFIX.${PYPACKAGE}}/${PYLIB}/compileall.py
diff --git a/audio/sonata/Makefile b/audio/sonata/Makefile
index b23a73ae703..a3f2fb3fed5 100644
--- a/audio/sonata/Makefile
+++ b/audio/sonata/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/03/14 14:24:22 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2008/04/25 20:39:06 joerg Exp $
#
DISTNAME= sonata-1.4.2
@@ -12,7 +12,7 @@ COMMENT= Elegant GTK2 client for the Music Player Daemon
DEPENDS+= musicpd>0:../../audio/musicpd
-PYTHON_VERSIONS_ACCEPTED= 24
+PYTHON_VERSIONS_ACCEPTED= 25 24
PY_PATCHPLIST= yes
PYDISTUTILSPKG= yes
USE_DIRS+= xdg-1.4
diff --git a/biology/py-mol/Makefile b/biology/py-mol/Makefile
index d5573caaf72..e717a8cb405 100644
--- a/biology/py-mol/Makefile
+++ b/biology/py-mol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/08/12 03:19:18 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2008/04/25 20:39:06 joerg Exp $
DISTNAME= pymol-0_98-src
PKGNAME= ${PYPKGPREFIX}-mol-0.98
@@ -11,7 +11,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://pymol.sourceforge.net/
COMMENT= Molecular Visualization System
-PYTHON_VERSIONS_ACCEPTED= 24 23
WRKSRC= ${WRKDIR}/pymol-0.98
PYDISTUTILSPKG= yes
diff --git a/cad/py-MyHDL/Makefile b/cad/py-MyHDL/Makefile
index 346aa54c1df..c2899e59557 100644
--- a/cad/py-MyHDL/Makefile
+++ b/cad/py-MyHDL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/05/04 16:58:05 drochner Exp $
+# $NetBSD: Makefile,v 1.14 2008/04/25 20:39:06 joerg Exp $
#
DISTNAME= myhdl-0.5.1
@@ -11,7 +11,7 @@ HOMEPAGE= http://jandecaluwe.com/Tools/MyHDL/Overview.html
COMMENT= Hardware description in Python
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED= 24
+PYTHON_VERSIONS_ACCEPTED= 25 24
do-test:
cd ${WRKSRC}/myhdl/test && ${PYTHONBIN} test_all.py
diff --git a/cad/py-simpy/Makefile b/cad/py-simpy/Makefile
index e32ca1b9cdb..967167fc368 100644
--- a/cad/py-simpy/Makefile
+++ b/cad/py-simpy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/02/05 19:44:15 markd Exp $
+# $NetBSD: Makefile,v 1.6 2008/04/25 20:39:06 joerg Exp $
#
DISTNAME= SimPy-1.8
@@ -11,7 +11,6 @@ HOMEPAGE= http://simpy.sourceforge.net/
COMMENT= Discrete event simulation framework
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED= 24 23
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/fugu/Makefile b/chat/fugu/Makefile
index ac6f040bf64..5bdfc57a35f 100644
--- a/chat/fugu/Makefile
+++ b/chat/fugu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2007/02/22 19:26:11 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2008/04/25 20:39:06 joerg Exp $
#
DISTNAME= fugu-1.0
@@ -11,7 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://fugu.gale.org/
COMMENT= Graphical client for the gale secure instant messaging system
-PYTHON_VERSIONS_ACCEPTED= 20 21 # no 22 - uses Makefile.pre.in
+PYTHON_VERSIONS_ACCEPTED= 21 # no 22 - uses Makefile.pre.in
PYTHON_PATCH_SCRIPTS= puffdisp.py pygale/authcache.py pygale/prettypuff.py
GNU_CONFIGURE= YES
diff --git a/converters/py-cjkcodecs/Makefile b/converters/py-cjkcodecs/Makefile
index 11c22f60ffc..8ea56f39968 100644
--- a/converters/py-cjkcodecs/Makefile
+++ b/converters/py-cjkcodecs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/08/23 11:28:37 minskim Exp $
+# $NetBSD: Makefile,v 1.9 2008/04/25 20:39:06 joerg Exp $
#
DISTNAME= cjkcodecs-1.1.1
@@ -13,7 +13,7 @@ COMMENT= Python Unicode codecs for Chinese, Japanese, and Korean encodings
PYDISTUTILSPKG= yes
PYBINMODULE= yes
-PYTHON_VERSIONS_ACCEPTED= 23 22 21
+PYTHON_VERSIONS_ACCEPTED= 23 21
post-install:
@strip ${PREFIX}/${PYSITELIB}/cjkcodecs/*.so
diff --git a/converters/py-jpCodecs/Makefile b/converters/py-jpCodecs/Makefile
index 2c8eadcdf2a..513a91339f4 100644
--- a/converters/py-jpCodecs/Makefile
+++ b/converters/py-jpCodecs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/06/04 12:10:49 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2008/04/25 20:39:06 joerg Exp $
DISTNAME= JapaneseCodecs-1.4.11
PKGNAME= ${PYPKGPREFIX}-jpCodecs-1.4.11
@@ -13,7 +13,7 @@ COMMENT= Python Unicode codecs for Japanese charsets
PYDISTUTILSPKG= yes
PYBINMODULE= yes
-PYTHON_VERSIONS_ACCEPTED= 24 23 22 21
+PYTHON_VERSIONS_ACCEPTED= 25 24 23 21
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/gourmet/Makefile b/databases/gourmet/Makefile
index 31a79569eb0..a53c0a19db2 100644
--- a/databases/gourmet/Makefile
+++ b/databases/gourmet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/09/21 13:03:30 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2008/04/25 20:39:06 joerg Exp $
#
DISTNAME= gourmet-0.8.5.14
@@ -13,7 +13,6 @@ COMMENT= Recipe database
USE_DIRS+= xdg-1.2
USE_PKGLOCALEDIR= yes
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED= 23 24
.include "../../lang/python/application.mk"
.include "../../lang/python/extension.mk"
diff --git a/databases/gramps/Makefile b/databases/gramps/Makefile
index e19ab024302..03add757878 100644
--- a/databases/gramps/Makefile
+++ b/databases/gramps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2008/03/06 14:53:48 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2008/04/25 20:39:07 joerg Exp $
#
DISTNAME= gramps-1.0.11
@@ -17,7 +17,7 @@ GNU_CONFIGURE= yes
USE_TOOLS+= msgconv msgfmt pkg-config
CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
-PYTHON_VERSIONS_ACCEPTED= 24
+PYTHON_VERSIONS_ACCEPTED= 25 24
MESSAGE_SUBST+= PYPKGPREFIX=${PYPKGPREFIX}
diff --git a/databases/gramps2/Makefile b/databases/gramps2/Makefile
index 410cbaaa93c..903f97cd00f 100644
--- a/databases/gramps2/Makefile
+++ b/databases/gramps2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2008/03/06 14:53:48 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2008/04/25 20:39:07 joerg Exp $
#
DISTNAME= gramps-2.2.10
@@ -22,7 +22,7 @@ CONFIGURE_ARGS+= --disable-mime-install --enable-packager-mode
CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
MAKE_JOBS_SAFE= no
# i18n support with other python versions appears to not work
-PYTHON_VERSIONS_ACCEPTED= 24
+PYTHON_VERSIONS_ACCEPTED= 25 24
MESSAGE_SUBST+= PYPKGPREFIX=${PYPKGPREFIX}
GCONF_SCHEMAS+= gramps.schemas
diff --git a/databases/py-IndexedCatalog/Makefile b/databases/py-IndexedCatalog/Makefile
index cd4fd569163..829206505c8 100644
--- a/databases/py-IndexedCatalog/Makefile
+++ b/databases/py-IndexedCatalog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/05/28 14:26:34 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2008/04/25 20:39:07 joerg Exp $
#
DISTNAME= IndexedCatalog-0.6.0
@@ -11,7 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://async.com.br/projects/IndexedCatalog/
COMMENT= Indexed Catalog extension for standalone ZODB
-PYTHON_VERSIONS_ACCEPTED= 23 22
+PYTHON_VERSIONS_ACCEPTED= 23
PYDISTUTILSPKG= yes
PYBINMODULE= yes
diff --git a/databases/py-PgSQL/Makefile b/databases/py-PgSQL/Makefile
index 1f1a7da417e..8c59822a568 100644
--- a/databases/py-PgSQL/Makefile
+++ b/databases/py-PgSQL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/03/13 17:38:48 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2008/04/25 20:39:07 joerg Exp $
#
DISTNAME= pyPgSQL-2.4
@@ -15,7 +15,7 @@ WRKSRC= ${WRKDIR}/pypgsql
PYDISTUTILSPKG= YES
PYBINMODULE= YES
PY_PATCHPLIST= YES
-PYTHON_VERSIONS_ACCEPTED= 24 23 22 21
+PYTHON_VERSIONS_ACCEPTED= 25 24 23 21
.include "../../lang/python/extension.mk"
.include "../../lang/python/application.mk"
diff --git a/databases/py-ZODB/Makefile b/databases/py-ZODB/Makefile
index 39657773458..eceb9789667 100644
--- a/databases/py-ZODB/Makefile
+++ b/databases/py-ZODB/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/04 21:29:10 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2008/04/25 20:39:07 joerg Exp $
#
DISTNAME= ZODB3-3.2.1
@@ -14,7 +14,7 @@ COMMENT= Standalone distro of Zope Object Database
PY_PATCHPLIST= yes
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED= 23 22
+PYTHON_VERSIONS_ACCEPTED= 23
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/py-bdb-xml/Makefile b/databases/py-bdb-xml/Makefile
index 5f3de734f1b..54a52cbbb32 100644
--- a/databases/py-bdb-xml/Makefile
+++ b/databases/py-bdb-xml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/01/12 11:36:31 adam Exp $
+# $NetBSD: Makefile,v 1.13 2008/04/25 20:39:07 joerg Exp $
DISTNAME= dbxml-1.2.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/db/bdb-/}
@@ -18,8 +18,6 @@ NO_CONFIGURE= YES
USE_LANGUAGES= c c++
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
-
.include "../../lang/python/extension.mk"
PYSETUPBUILDARGS+= --with-berkeleydb=${BUILDLINK_PREFIX.db4} \
--with-xerces=${BUILDLINK_PREFIX.xerces-c} \
diff --git a/databases/py-bsddb3/Makefile b/databases/py-bsddb3/Makefile
index fcdda7ff112..38b868385f6 100644
--- a/databases/py-bsddb3/Makefile
+++ b/databases/py-bsddb3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2008/04/21 20:11:58 drochner Exp $
+# $NetBSD: Makefile,v 1.28 2008/04/25 20:39:07 joerg Exp $
#
DISTNAME= bsddb3-4.6.3
@@ -20,7 +20,7 @@ PYBINMODULE= yes
.include "../../mk/pthread.buildlink3.mk"
.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "native"
-PYTHON_VERSIONS_INCOMPATIBLE= 15 20 21
+PYTHON_VERSIONS_INCOMPATIBLE= 15 21
.endif
do-test:
diff --git a/databases/py-ldap/Makefile b/databases/py-ldap/Makefile
index c624aa486a7..877d11a9a25 100644
--- a/databases/py-ldap/Makefile
+++ b/databases/py-ldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2008/01/18 05:06:31 tnn Exp $
+# $NetBSD: Makefile,v 1.35 2008/04/25 20:39:07 joerg Exp $
DISTNAME= python-ldap-2.3.1
PKGNAME= ${DISTNAME:S/python/${PYPKGPREFIX}/}
@@ -10,7 +10,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://sourceforge.net/projects/python-ldap/
COMMENT= LDAP client API for Python
-PYTHON_VERSIONS_ACCEPTED= 23 24
PYDISTUTILSPKG= yes
PY_LDAP_LIBRARY_DIRS= ${BUILDLINK_PREFIX.openldap-client}/lib
diff --git a/databases/py-mssql/Makefile b/databases/py-mssql/Makefile
index 59929622e3a..f0607fcf76c 100644
--- a/databases/py-mssql/Makefile
+++ b/databases/py-mssql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/06/15 16:08:39 obache Exp $
+# $NetBSD: Makefile,v 1.7 2008/04/25 20:39:07 joerg Exp $
#
DISTNAME= pymssql-0.8.0
@@ -12,7 +12,7 @@ COMMENT= Python interface to MS SQL
BUILDLINK_API_DEPENDS.freetds+= freetds>=0.63
-PYTHON_VERSIONS_ACCEPTED= 24
+PYTHON_VERSIONS_ACCEPTED= 25 24
PYBINMODULE= yes
PYDISTUTILSPKG= yes
diff --git a/databases/py-pgnotify/Makefile b/databases/py-pgnotify/Makefile
index d4804b8f082..c4872bf1800 100644
--- a/databases/py-pgnotify/Makefile
+++ b/databases/py-pgnotify/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2008/01/06 03:38:36 darcy Exp $
+# $NetBSD: Makefile,v 1.10 2008/04/25 20:39:07 joerg Exp $
#
DISTNAME= pgnotify-0.1
@@ -20,7 +20,6 @@ USE_TOOLS+= gmake
PYDISTUTILSPKG= yes
PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX}
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/py-postgresql/Makefile b/databases/py-postgresql/Makefile
index c6c8171d512..4633c54fd2c 100644
--- a/databases/py-postgresql/Makefile
+++ b/databases/py-postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2008/03/13 17:38:48 joerg Exp $
+# $NetBSD: Makefile,v 1.52 2008/04/25 20:39:07 joerg Exp $
DISTNAME= PyGreSQL-3.8.1
PKGNAME= ${PYPKGPREFIX}-postgresql-3.8.1
@@ -20,7 +20,6 @@ MAKE_ENV+= INSTALLED_LIBPQ=1
PY_PATCHPLIST= yes
PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX:Q}
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
PYDISTUTILSPKG= yes
PYBINMODULE= yes
diff --git a/databases/py-psycopg/Makefile b/databases/py-psycopg/Makefile
index 6f54b6fe834..73c1533bd21 100644
--- a/databases/py-psycopg/Makefile
+++ b/databases/py-psycopg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2008/03/13 17:38:48 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2008/04/25 20:39:07 joerg Exp $
#
DISTNAME= psycopg-1.1.21
@@ -18,7 +18,6 @@ CONFIGURE_ARGS+= \
--with-postgres-libraries=${PGSQL_PREFIX}/lib
BUILD_TARGET= default
-PYTHON_VERSIONS_ACCEPTED= 24 23 22 21
PY_PATCHPLIST= yes
.include "../../lang/python/extension.mk"
diff --git a/databases/py-psycopg2/Makefile b/databases/py-psycopg2/Makefile
index a6eba67fdf9..5614cbd3858 100644
--- a/databases/py-psycopg2/Makefile
+++ b/databases/py-psycopg2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/03/13 17:38:48 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2008/04/25 20:39:08 joerg Exp $
#
DISTNAME= psycopg2-2.0.5.1
@@ -14,7 +14,6 @@ COMMENT= PostgreSQL database adapter for Python
PKG_DESTDIR_SUPPORT= user-destdir
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED= 24 23
.include "../../lang/python/extension.mk"
.include "../../mk/pgsql.buildlink3.mk"
diff --git a/databases/py-sqlite/Makefile b/databases/py-sqlite/Makefile
index 4ede8944a55..62fb840b0e2 100644
--- a/databases/py-sqlite/Makefile
+++ b/databases/py-sqlite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/10/04 20:53:46 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2008/04/25 20:39:08 joerg Exp $
DISTNAME= pysqlite-1.0.1
PKGNAME= ${PYPKGPREFIX}-sqlite-1.0.1
@@ -12,7 +12,7 @@ COMMENT= SQLite database adapter for Python
PYDISTUTILSPKG= yes
PY_PATCHPLIST= yes
-PYTHON_VERSIONS_ACCEPTED= 24 23 22 21
+PYTHON_VERSIONS_ACCEPTED= 25 24 23 21
WRKSRC= ${WRKDIR}/pysqlite
.include "../../databases/sqlite/buildlink3.mk"
diff --git a/databases/py-sqlite2/Makefile b/databases/py-sqlite2/Makefile
index 7a03e4dd8f5..e6b73dafb61 100644
--- a/databases/py-sqlite2/Makefile
+++ b/databases/py-sqlite2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2008/04/11 15:27:22 abs Exp $
+# $NetBSD: Makefile,v 1.10 2008/04/25 20:39:08 joerg Exp $
DISTNAME= pysqlite-2.3.5
PKGNAME= ${PYPKGPREFIX}-sqlite2-2.3.5
@@ -10,7 +10,6 @@ HOMEPAGE= http://initd.org/tracker/pysqlite
COMMENT= SQLite database adapter for Python
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_INCOMPATIBLE= 15 20 21 22
do-postinstall-test: .PHONY
${PYTHONBIN} -c "from pysqlite2 import test;test.test()"
diff --git a/databases/py-sybase/Makefile b/databases/py-sybase/Makefile
index aad42105c04..e20732ef0e0 100644
--- a/databases/py-sybase/Makefile
+++ b/databases/py-sybase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/06/16 10:58:23 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2008/04/25 20:39:08 joerg Exp $
#
DISTNAME= sybase-0.36
@@ -11,8 +11,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.object-craft.com.au/projects/sybase/
COMMENT= Sybase interface for Python using FreeTDS
-PYTHON_VERSIONS_ACCEPTED= 21 22 23 24
-
PYSETUPBUILDARGS= build_ext -D HAVE_FREETDS=61 -U WANT_BULKCOPY
PYDISTUTILSPKG= yes
diff --git a/databases/py-table/Makefile b/databases/py-table/Makefile
index 71d8826f382..173c77e40ae 100644
--- a/databases/py-table/Makefile
+++ b/databases/py-table/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/10/04 20:53:46 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2008/04/25 20:39:08 joerg Exp $
#
DISTNAME= pytable-0.8.3a
@@ -18,7 +18,6 @@ MAKE_ENV+= BINDIR=${PREFIX}/bin
USE_TOOLS+= gmake
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX:Q}
.include "../../lang/python/extension.mk"
diff --git a/devel/ExmanIDE/Makefile b/devel/ExmanIDE/Makefile
index 10356c54b25..7bf8690ccb6 100644
--- a/devel/ExmanIDE/Makefile
+++ b/devel/ExmanIDE/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/04/22 09:22:07 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2008/04/25 20:39:08 joerg Exp $
DISTNAME= ExmanIDE-0.9.4
PKGREVISION= 4
@@ -15,8 +15,6 @@ WRKSRC= ${WRKDIR}/${PKGBASE}
NO_CONFIGURE= yes
NO_BUILD= yes
-PYTHON_VERSIONS_ACCEPTED?= 24 23
-
SUBST_CLASSES+= mod
SUBST_MESSAGE.mod= Fixing deprecated module names.
SUBST_STAGE.mod= post-patch
diff --git a/devel/boaconstructor/Makefile b/devel/boaconstructor/Makefile
index 779f315d61f..f1220665cda 100644
--- a/devel/boaconstructor/Makefile
+++ b/devel/boaconstructor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/03/03 17:45:34 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2008/04/25 20:39:08 joerg Exp $
#
VERSION= 0.4.4
@@ -15,7 +15,6 @@ COMMENT= Python IDE
PKG_DESTDIR_SUPPORT= user-destdir
EXTRACT_OPTS_ZIP= -aqo
-PYTHON_VERSIONS_ACCEPTED= 23 24
BOADIR= ${PREFIX}/share/boa-constructor-${VERSION}
diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index a3b6c047b8b..f2364461d05 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2008/04/16 14:44:43 xtraeme Exp $
+# $NetBSD: Makefile,v 1.23 2008/04/25 20:39:08 joerg Exp $
#
DISTNAME= bzr-1.3.1
@@ -18,7 +18,7 @@ PY_PATCHPLIST= yes
PYDISTUTILSPKG= yes
TEST_TARGET= check
-PYTHON_VERSIONS_ACCEPTED= 24
+PYTHON_VERSIONS_ACCEPTED= 25 24
PYTHON_PATCH_SCRIPTS= bzr bzrlib/weave.py
.include "../../mk/bsd.prefs.mk"
diff --git a/devel/codeville/Makefile b/devel/codeville/Makefile
index 04cb1cb9083..1910152443d 100644
--- a/devel/codeville/Makefile
+++ b/devel/codeville/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2008/01/12 11:36:31 adam Exp $
+# $NetBSD: Makefile,v 1.16 2008/04/25 20:39:08 joerg Exp $
DISTNAME= Codeville-0.1.16
PKGNAME= codeville-0.1.16
@@ -12,9 +12,6 @@ COMMENT= Distributed revision control system
PYDISTUTILSPKG= yes
-# XXX we don't need threads, but db3 is linked against libpthread
-PYTHON_VERSIONS_ACCEPTED= 23 24
-
.include "../../lang/python/application.mk"
.include "../../lang/python/extension.mk"
.include "../../databases/py-bsddb3/buildlink3.mk"
diff --git a/devel/eric3/Makefile b/devel/eric3/Makefile
index f96f6bd9171..8c637551c7a 100644
--- a/devel/eric3/Makefile
+++ b/devel/eric3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2007/02/22 19:01:17 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2008/04/25 20:39:08 joerg Exp $
#
DISTNAME= eric-3.8.1
@@ -16,7 +16,6 @@ NO_BUILD= yes
USE_LANGUAGES=
PY_PATCHPLIST= yes
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
CONFIGURE_ARGS+= -b ${PREFIX:Q}/bin
CONFIGURE_ARGS+= -d ${PREFIX:Q}/${PYSITELIB:Q}
diff --git a/devel/ko-po-check/Makefile b/devel/ko-po-check/Makefile
index 8ba57ae136c..bf5be53e28a 100644
--- a/devel/ko-po-check/Makefile
+++ b/devel/ko-po-check/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/06/10 21:54:07 minskim Exp $
+# $NetBSD: Makefile,v 1.6 2008/04/25 20:39:08 joerg Exp $
DISTNAME= ko-po-check-0.8
PKGREVISION= 1
@@ -11,7 +11,7 @@ COMMENT= Korean .po file checker
GNU_CONFIGURE= yes
-PYTHON_VERSIONS_INCOMPATIBLE+= 23 22 21 20 15
+PYTHON_VERSIONS_ACCEPTED= 25 24
CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
PYTHON_PATCH_SCRIPTS= ${WRKSRC}/scripts/ko-po-check.in
diff --git a/devel/meld/Makefile b/devel/meld/Makefile
index 27b63938dc3..7a0d34c6d11 100644
--- a/devel/meld/Makefile
+++ b/devel/meld/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/04/16 12:34:13 abs Exp $
+# $NetBSD: Makefile,v 1.8 2008/04/25 20:39:08 joerg Exp $
#
DISTNAME= meld-1.1.5.1
@@ -14,7 +14,6 @@ MAINTAINER= dieter.NetBSD@pandora.be
HOMEPAGE= http://meld.sourceforge.net/
COMMENT= Visual diff and merge tool
-PYTHON_VERSIONS_ACCEPTED= 25 24 23
USE_DIRS+= xdg-1.3
USE_DIRS+= gnome2-1.6
USE_PKGLOCALEDIR= YES
diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index 431e1663ff4..26281a0f177 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/04/10 23:34:51 bjs Exp $
+# $NetBSD: Makefile,v 1.17 2008/04/25 20:39:08 joerg Exp $
#
DISTNAME= mercurial-1.0
@@ -18,8 +18,6 @@ PY_PATCHPLIST= yes
PYDISTUTILSPKG= yes
USE_TOOLS+= gmake
-PYTHON_VERSIONS_ACCEPTED= 24 23
-
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
MAKE_ENV+= PYTHONBIN=${PYTHONBIN:Q}
diff --git a/devel/py-InlineEgg/Makefile b/devel/py-InlineEgg/Makefile
index 4a536374d40..f262d189b61 100644
--- a/devel/py-InlineEgg/Makefile
+++ b/devel/py-InlineEgg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/03/04 21:29:27 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2008/04/25 20:39:08 joerg Exp $
#
DISTNAME= InlineEgg-1.08
@@ -16,7 +16,7 @@ LICENSE= inlineegg-license
PY_PATCHPLIST= YES
PYDISTUTILSPKG= YES
-PYTHON_VERSIONS_ACCEPTED= 24 23 22 21
+PYTHON_VERSIONS_ACCEPTED= 25 24 23 21
PYTHON_PATCH_SCRIPTS= examples/example1.py examples/example2.py \
examples/example3.py examples/example4.py \
examples/example5.py examples/example6.py \
diff --git a/devel/py-Pyro/Makefile b/devel/py-Pyro/Makefile
index b96d0bb083d..a12f14b445a 100644
--- a/devel/py-Pyro/Makefile
+++ b/devel/py-Pyro/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/06/17 21:01:29 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2008/04/25 20:39:08 joerg Exp $
#
DISTNAME= Pyro-3.4
@@ -13,7 +13,6 @@ COMMENT= Distributed Object Technology system in Python
PY_PATCHPLIST= yes
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
PLIST_SUBST+= PYVERSSUFFIX="-${PYVERSSUFFIX}"
MAKE_ENV+= PKGSRC="1"
MAKE_ENV+= PYVERSSUFFIX="-${PYVERSSUFFIX}"
diff --git a/devel/py-TPG/Makefile b/devel/py-TPG/Makefile
index 956226ebce9..13629b9930e 100644
--- a/devel/py-TPG/Makefile
+++ b/devel/py-TPG/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/10/04 21:36:00 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2008/04/25 20:39:08 joerg Exp $
#
DISTNAME= TPG-2.1.6
@@ -10,7 +10,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://christophe.delord.free.fr/en/tpg/
COMMENT= ToyParserGenerator for Python
-PYTHON_VERSIONS_ACCEPTED= 23 22
+PYTHON_VERSIONS_ACCEPTED= 23
PYDISTUTILSPKG= yes
.include "../../lang/python/extension.mk"
diff --git a/devel/py-ZopeInterface/Makefile b/devel/py-ZopeInterface/Makefile
index 2030900b41f..cc639922010 100644
--- a/devel/py-ZopeInterface/Makefile
+++ b/devel/py-ZopeInterface/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/08/26 16:42:25 kristerw Exp $
+# $NetBSD: Makefile,v 1.6 2008/04/25 20:39:08 joerg Exp $
#
DISTNAME= ZopeInterface-3.0.1
@@ -13,7 +13,6 @@ HOMEPAGE= http://www.zope.org/
COMMENT= The zope.interface package used in Zope 3 and Twisted
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
pre-build:
${RM} ${WRKSRC}/Dependencies/zope.interface-ZopeInterface-3.0.1/zope.interface/*.orig
diff --git a/devel/py-at-spi/Makefile b/devel/py-at-spi/Makefile
index bebe270599b..444f0367400 100644
--- a/devel/py-at-spi/Makefile
+++ b/devel/py-at-spi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/04/21 20:05:24 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2008/04/25 20:39:08 joerg Exp $
#
DISTNAME= at-spi-1.22.1
@@ -13,7 +13,7 @@ COMMENT= Assistive Technology Service Provider Interface
NO_BUILD= yes
PY_PATCHPLIST= yes
-PYTHON_VERSIONS_ACCEPTED= 24
+PYTHON_VERSIONS_ACCEPTED= 25 24
PYATSPIDIR= ${PREFIX}/${PYSITELIB}/pyatspi
do-install:
diff --git a/devel/py-cheetah/Makefile b/devel/py-cheetah/Makefile
index 6eaa71b3c23..fbb615ce0be 100644
--- a/devel/py-cheetah/Makefile
+++ b/devel/py-cheetah/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/10/31 23:15:54 shannonjr Exp $
+# $NetBSD: Makefile,v 1.8 2008/04/25 20:39:08 joerg Exp $
#
DISTNAME= Cheetah-2.0
@@ -15,7 +15,6 @@ COMMENT= Python-powered template engine and code-generator
PYDISTUTILSPKG= yes
PYBINMODULE= yes
PYSETUP= setup.py
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-ctypes/Makefile b/devel/py-ctypes/Makefile
index b916bb70599..4cadb88ff09 100644
--- a/devel/py-ctypes/Makefile
+++ b/devel/py-ctypes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2007/07/13 14:58:38 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2008/04/25 20:39:08 joerg Exp $
DISTNAME= ctypes-1.0.2
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -9,7 +9,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://starship.python.net/crew/theller/ctypes/
COMMENT= Foreign Function Interface package for Python
-PYTHON_VERSIONS_ACCEPTED= 24 23
PYDISTUTILSPKG= yes
do-test:
diff --git a/devel/py-cursespanel/Makefile b/devel/py-cursespanel/Makefile
index 0fa05f8f8d5..1752225d0d6 100644
--- a/devel/py-cursespanel/Makefile
+++ b/devel/py-cursespanel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:08:51 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2008/04/25 20:39:08 joerg Exp $
#
PKGNAME= ${PYPKGPREFIX}-cursespanel-0
@@ -17,7 +17,7 @@ EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/_curses_panel.c
PYDISTUTILSPKG= yes
PYBINMODULE= yes
PY_PATCHPLIST= yes
-PYTHON_VERSIONS_ACCEPTED= 24 23 22 21
+PYTHON_VERSIONS_ACCEPTED= 25 24 23 21
PY_SETUP_SUBST= NCURSESPREFIX=${BUILDLINK_PREFIX.ncurses}
diff --git a/devel/py-game/Makefile b/devel/py-game/Makefile
index 3bb26bad468..fbc5a3e1c98 100644
--- a/devel/py-game/Makefile
+++ b/devel/py-game/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/06/12 16:28:06 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2008/04/25 20:39:08 joerg Exp $
#
DISTNAME= pygame-1.7.1release
@@ -14,8 +14,6 @@ COMMENT= Set of Python modules designed for writing games
PY_PATCHPLIST= yes
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
-
.include "../../audio/SDL_mixer/buildlink3.mk"
.include "../../devel/SDL_ttf/buildlink3.mk"
.include "../../graphics/SDL_image/buildlink3.mk"
diff --git a/devel/py-gobject/Makefile.common b/devel/py-gobject/Makefile.common
index 594ed020f59..4aa7db65bfa 100644
--- a/devel/py-gobject/Makefile.common
+++ b/devel/py-gobject/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2008/04/16 12:24:50 abs Exp $
+# $NetBSD: Makefile.common,v 1.8 2008/04/25 20:39:09 joerg Exp $
#
DISTNAME= pygobject-2.14.1
@@ -19,6 +19,5 @@ PATCHDIR= ${.CURDIR}/../../devel/py-gobject/patches
DISTINFO_FILE= ${.CURDIR}/../../devel/py-gobject/distinfo
PKGCONFIG_OVERRIDE+= pygobject-2.0.pc.in
-PYTHON_VERSIONS_ACCEPTED= 25 24 23
PY_PATCHPLIST= yes
CONFLICTS+= ${PYPKGPREFIX}-gtk2<2.8.4
diff --git a/devel/py-kqueue/Makefile b/devel/py-kqueue/Makefile
index 170495f304b..a1d107e67ed 100644
--- a/devel/py-kqueue/Makefile
+++ b/devel/py-kqueue/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/06/02 17:29:30 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2008/04/25 20:39:09 joerg Exp $
DISTNAME= py-kqueue-2.0
PKGNAME= ${PYPKGPREFIX}-kqueue-2.0
@@ -10,7 +10,6 @@ MAINTAINER= jdolecek@NetBSD.org
COMMENT= Python interface to kqueue(2) and kevent(2) system calls
PYDISTUTILSPKG= # defined
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
# need to get definition of PKG_HAVE_KQUEUE
.include "../../mk/bsd.prefs.mk"
diff --git a/devel/py-pexpect/Makefile b/devel/py-pexpect/Makefile
index 860a0ed5e13..cbdbe672096 100644
--- a/devel/py-pexpect/Makefile
+++ b/devel/py-pexpect/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/04/25 20:31:10 tnn Exp $
+# $NetBSD: Makefile,v 1.12 2008/04/25 20:39:09 joerg Exp $
DISTNAME= pexpect-2.3
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,6 @@ COMMENT= Pure Python Expect-like module
PKG_DESTDIR_SUPPORT= user-destdir
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED= 25 24 23
NO_CONFIGURE= yes
.include "../../lang/python/extension.mk"
diff --git a/devel/py-setuptools/Makefile b/devel/py-setuptools/Makefile
index f8b880ef186..3091bacd35b 100644
--- a/devel/py-setuptools/Makefile
+++ b/devel/py-setuptools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2007/08/09 13:22:14 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2008/04/25 20:39:09 joerg Exp $
#
EGG_VERSION= 0.6c6
@@ -14,7 +14,7 @@ COMMENT= New Python packaging system
PKG_DESTDIR_SUPPORT= user-destdir
-PYTHON_VERSIONS_ACCEPTED= 24
+PYTHON_VERSIONS_ACCEPTED= 25 24
USE_TOOLS+= unzip
PY_PATCHPLIST= yes
diff --git a/devel/py-urwid/Makefile b/devel/py-urwid/Makefile
index a194e435818..e932a7e247d 100644
--- a/devel/py-urwid/Makefile
+++ b/devel/py-urwid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/12/22 00:18:08 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2008/04/25 20:39:09 joerg Exp $
DISTNAME= urwid-0.9.8.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT= Curses-based Python user interface library
DEPENDS+= ${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED= 24
+PYTHON_VERSIONS_ACCEPTED= 25 24
REPLACE_PYTHON= *.py */*.py
.include "../../lang/python/application.mk"
diff --git a/devel/roundup/Makefile b/devel/roundup/Makefile
index 331c4fa1489..1eae94b8f97 100644
--- a/devel/roundup/Makefile
+++ b/devel/roundup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2007/01/07 09:13:51 rillig Exp $
+# $NetBSD: Makefile,v 1.31 2008/04/25 20:39:09 joerg Exp $
DISTNAME= roundup-1.1.2
CATEGORIES= devel
@@ -12,8 +12,6 @@ PYDISTUTILSPKG= yes
PY_PATCHPLIST= yes
USE_LANGUAGES=
-PYTHON_VERSIONS_ACCEPTED= 24 23
-
PYTHON_PATCH_SCRIPTS+= cgi-bin/roundup.cgi demo.py roundup/admin.py
PYTHON_PATCH_SCRIPTS+= roundup/backends/locking.py
PYTHON_PATCH_SCRIPTS+= roundup/cgi/TAL/talgettext.py
diff --git a/devel/stgit/Makefile b/devel/stgit/Makefile
index 44cfcd171d1..d6dd011af8b 100644
--- a/devel/stgit/Makefile
+++ b/devel/stgit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/04/10 12:12:24 bjs Exp $
+# $NetBSD: Makefile,v 1.9 2008/04/25 20:39:09 joerg Exp $
DISTNAME= stgit-0.14.2
CATEGORIES= devel
@@ -20,7 +20,6 @@ USE_TOOLS+= bash:run perl gmake
REPLACE_PERL= Documentation/build-docdep.perl
REPLACE_BASH= contrib/stg-*
-PYTHON_VERSIONS_ACCEPTED?=24 23
PYTHON_PATCH_SCRIPTS= *.py stgit/*.py stg
PYDISTUTILSPKG= yes
PYSETUPINSTALLARGS= --prefix=${PREFIX}
diff --git a/devel/tailor/Makefile b/devel/tailor/Makefile
index 5cff760fc04..603e209d392 100644
--- a/devel/tailor/Makefile
+++ b/devel/tailor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/04/16 08:47:27 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2008/04/25 20:39:09 joerg Exp $
#
DISTNAME= tailor-0.9.31
@@ -11,7 +11,6 @@ COMMENT= Tool to migrate changesets between various version control systems
#LICENSE= GPLv3
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED= 24 23
PYTHON_PATCH_SCRIPTS= tailor
diff --git a/filesystems/fuse-gmailfs/Makefile b/filesystems/fuse-gmailfs/Makefile
index ee41c19666f..9dfc68089f1 100644
--- a/filesystems/fuse-gmailfs/Makefile
+++ b/filesystems/fuse-gmailfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/03/03 19:31:31 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2008/04/25 20:39:09 joerg Exp $
#
DISTNAME= gmailfs-0.7.2
@@ -13,7 +13,7 @@ COMMENT= FUSE filesystem which uses Google mail for free space
PKG_DESTDIR_SUPPORT= user-destdir
NO_BUILD= yes
-PYTHON_VERSIONS_ACCEPTED= 24
+PYTHON_VERSIONS_ACCEPTED= 25 24
PYTHON_PATCH_SCRIPTS= gmailfs.py mount.gmailfs
CONF_FILES= ${PREFIX}/share/examples/gmailfs/gmailfs.conf \
diff --git a/filesystems/fuse-wikipediafs/Makefile b/filesystems/fuse-wikipediafs/Makefile
index 8d5e73aa981..acdeb069516 100644
--- a/filesystems/fuse-wikipediafs/Makefile
+++ b/filesystems/fuse-wikipediafs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/08/25 11:51:44 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2008/04/25 20:39:09 joerg Exp $
#
DISTNAME= wikipediafs-0.3
@@ -10,7 +10,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://wikipediafs.sourceforge.net/
COMMENT= FUSE filesystem for accessing the wikipedia
-PYTHON_VERSIONS_ACCEPTED= 24
+PYTHON_VERSIONS_ACCEPTED= 25 24
PLIST_SUBST+= PYSITELIB=${PYSITELIB:Q}
diff --git a/fonts/mftrace/Makefile b/fonts/mftrace/Makefile
index 5345b88fb88..4bb6ec6804e 100644
--- a/fonts/mftrace/Makefile
+++ b/fonts/mftrace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2008/03/03 20:17:12 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2008/04/25 20:39:09 joerg Exp $
DISTNAME= mftrace-1.2.14
CATEGORIES= fonts
@@ -21,7 +21,6 @@ CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
MAKE_FILE= GNUmakefile
PLIST_SUBST+= PYSITELIB=${PYSITELIB:Q}
-PYTHON_VERSIONS_ACCEPTED= 24 23 22 21
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PYSITELIB}
diff --git a/fonts/py-TTFQuery/Makefile b/fonts/py-TTFQuery/Makefile
index db3058b6ea9..bcc2a08c0a3 100644
--- a/fonts/py-TTFQuery/Makefile
+++ b/fonts/py-TTFQuery/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/06/04 16:46:08 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2008/04/25 20:39:09 joerg Exp $
#
DISTNAME= TTFQuery-0.2.6
@@ -14,7 +14,6 @@ COMMENT= Query TTF font files for metadata and font outlines
DEPENDS+= ${PYPKGPREFIX}-fonttools>=2.0b1:../../fonts/py-fonttools
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/fonts/py-fonttools/Makefile b/fonts/py-fonttools/Makefile
index 2f7e2dd8f26..eff1e81fa82 100644
--- a/fonts/py-fonttools/Makefile
+++ b/fonts/py-fonttools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/06/02 23:38:10 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2008/04/25 20:39:09 joerg Exp $
#
DISTNAME= fonttools-2.0b1
@@ -14,7 +14,6 @@ COMMENT= Library for manipulating fonts
WRKSRC= ${WRKDIR}/fonttools
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
.include "../../lang/python/extension.mk"
.include "../../math/py-Numeric/buildlink3.mk"
diff --git a/games/jools/Makefile b/games/jools/Makefile
index 0a678bd9a58..4d9c054039a 100644
--- a/games/jools/Makefile
+++ b/games/jools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/07/17 23:39:24 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2008/04/25 20:39:09 joerg Exp $
#
DISTNAME= jools-0.20
@@ -12,7 +12,6 @@ COMMENT= Bejeweled clone
DEPENDS+= ${PYPKGPREFIX}-game>=1.4:../../devel/py-game
-PYTHON_VERSIONS_ACCEPTED= 21 22 23 24
PYDISTUTILSPKG= YES
post-install:
diff --git a/games/pysol/Makefile b/games/pysol/Makefile
index 21fd7ad65a3..db533bfc3e2 100644
--- a/games/pysol/Makefile
+++ b/games/pysol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2008/03/04 06:59:05 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2008/04/25 20:39:09 joerg Exp $
#
DISTNAME= pysol-4.81
@@ -17,7 +17,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
NO_BUILD= yes
PLIST_SRC= ${WRKDIR}/PLIST.src
-PYTHON_VERSIONS_ACCEPTED= 22 21 20 15
+PYTHON_VERSIONS_ACCEPTED= 21 15
CARDSETS= pysol-cardsets-4.40
diff --git a/geography/py-proj/Makefile b/geography/py-proj/Makefile
index b14dce665fa..f09dffbaaa7 100644
--- a/geography/py-proj/Makefile
+++ b/geography/py-proj/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/01/03 13:40:44 gdt Exp $
+# $NetBSD: Makefile,v 1.7 2008/04/25 20:39:09 joerg Exp $
#
DISTNAME= pyproj-1.8.3
@@ -11,7 +11,6 @@ HOMEPAGE= http://code.google.com/p/pyproj/
COMMENT= Python wrapper for proj
PYDISTUTILSPKG= true
-PYTHON_VERSIONS_ACCEPTED= 24 23
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${PKGNAME}
diff --git a/graphics/Mesa/Makefile.common b/graphics/Mesa/Makefile.common
index 81110c53575..2113a7a2994 100644
--- a/graphics/Mesa/Makefile.common
+++ b/graphics/Mesa/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.58 2008/04/24 07:40:23 bjs Exp $
+# $NetBSD: Makefile.common,v 1.59 2008/04/25 20:39:09 joerg Exp $
#
# This Makefile fragment is included either directly or indirectly (through
# Makefile.lib) by all packages that are built from the Mesa sources.
@@ -24,6 +24,7 @@ MAINTAINER= bjs@NetBSD.org
HOMEPAGE= http://www.mesa3d.org/
PKG_DESTDIR_SUPPORT= user-destdir
+MAKE_JOBS= no
WRKSRC= ${WRKDIR}/Mesa-${MESA_VERSION}
BUILDING_MESA= yes
diff --git a/graphics/py-OpenGL/Makefile b/graphics/py-OpenGL/Makefile
index e0077dfdd62..b6bc692344e 100644
--- a/graphics/py-OpenGL/Makefile
+++ b/graphics/py-OpenGL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/07/16 15:09:40 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/04/25 20:39:09 joerg Exp $
#
DISTNAME= PyOpenGL-3.0.0a6
@@ -10,7 +10,7 @@ MAINTAINER= cube@cubidou.net
HOMEPAGE= http://pyopengl.sourceforge.net/
COMMENT= Pyhton bindings for OpenGL
-PYTHON_VERSIONS_ACCEPTED= 24
+PYTHON_VERSIONS_ACCEPTED= 25 24
PYDISTUTILSPKG= YES
PY_PATCHPLIST= YES
diff --git a/graphics/py-biggles/Makefile b/graphics/py-biggles/Makefile
index c48edcca2c2..1228084a178 100644
--- a/graphics/py-biggles/Makefile
+++ b/graphics/py-biggles/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/02/22 19:26:35 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2008/04/25 20:39:09 joerg Exp $
#
DISTNAME= python-biggles-1.6.3
@@ -13,7 +13,6 @@ COMMENT= Python module for creating 2D scientific plots
PYDISTUTILSPKG= yes
PYBINMODULE= yes
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
.include "../../lang/python/extension.mk"
.include "../../math/py-Numeric/buildlink3.mk"
diff --git a/graphics/py-gnuplot/Makefile b/graphics/py-gnuplot/Makefile
index 7340f05d840..83e7d6b5a74 100644
--- a/graphics/py-gnuplot/Makefile
+++ b/graphics/py-gnuplot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/06/02 23:37:24 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2008/04/25 20:39:09 joerg Exp $
#
DISTNAME= gnuplot-py-1.7
@@ -12,7 +12,6 @@ HOMEPAGE= http://gnuplot-py.sourceforge.net/
COMMENT= Python package that interfaces to gnuplot
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
.include "../../lang/python/extension.mk"
.include "../../math/py-Numeric/buildlink3.mk"
diff --git a/graphics/py-gtkglext/Makefile b/graphics/py-gtkglext/Makefile
index 96dd2cad370..2d01a185166 100644
--- a/graphics/py-gtkglext/Makefile
+++ b/graphics/py-gtkglext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/03/15 16:51:09 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2008/04/25 20:39:09 joerg Exp $
#
DISTNAME= pygtkglext-1.1.0
@@ -18,7 +18,7 @@ USE_LIBTOOL= yes
USE_TOOLS+= pkg-config
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED= 24
+PYTHON_VERSIONS_ACCEPTED= 25 24
PKGCONFIG_OVERRIDE+= pygtkglext.pc.in
diff --git a/graphics/py-matplotlib-gtk2/Makefile b/graphics/py-matplotlib-gtk2/Makefile
index bbc9437d7f7..46f5df48dcb 100644
--- a/graphics/py-matplotlib-gtk2/Makefile
+++ b/graphics/py-matplotlib-gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/03/15 16:51:25 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2008/04/25 20:39:09 joerg Exp $
#
DISTNAME= matplotlib-0.87.2
@@ -16,7 +16,7 @@ PY_PATCHPLIST= yes
PYDISTUTILSPKG= yes
USE_LANGUAGES= c c++
-PYTHON_VERSIONS_ACCEPTED= 24
+PYTHON_VERSIONS_ACCEPTED= 25 24
.include "../../lang/python/extension.mk"
.include "../../graphics/py-matplotlib/buildlink3.mk"
diff --git a/graphics/py-matplotlib/Makefile b/graphics/py-matplotlib/Makefile
index cd54401546a..543f51ad4a0 100644
--- a/graphics/py-matplotlib/Makefile
+++ b/graphics/py-matplotlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2008/04/18 13:51:53 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2008/04/25 20:39:09 joerg Exp $
#
DISTNAME= matplotlib-0.87.2
@@ -16,8 +16,6 @@ USE_TOOLS+= pkg-config
PY_PATCHPLIST= yes
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED= 24 23
-
.include "../../lang/python/extension.mk"
PLIST_VARS+= subprocess
diff --git a/ham/gnuradio-howto/Makefile b/ham/gnuradio-howto/Makefile
index 517f390e57d..db465b12c19 100644
--- a/ham/gnuradio-howto/Makefile
+++ b/ham/gnuradio-howto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/08/12 08:34:05 wulf Exp $
+# $NetBSD: Makefile,v 1.9 2008/04/25 20:39:09 joerg Exp $
DISTNAME= gr-howto-write-a-block-${VERSION}
CATEGORIES= ham
@@ -8,8 +8,6 @@ COMMENT= Documentation on creating GNU Radio signal processing blocks
.include "../../meta-pkgs/gnuradio/Makefile.common"
PY_PATCHPLIST= yes
-PYTHON_VERSIONS_ACCEPTED= 24 23
-
PYTHON_PATCH_SCRIPTS+= src/python/qa_howto.py
PYTHON_PATCH_SCRIPTS+= doc/qa_howto_1.py
PYTHON_PATCH_SCRIPTS+= doc/make_numbered_listing.py
diff --git a/mail/getmail/Makefile b/mail/getmail/Makefile
index e090604e1a2..69302880398 100644
--- a/mail/getmail/Makefile
+++ b/mail/getmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2008/03/27 04:46:58 schmonz Exp $
+# $NetBSD: Makefile,v 1.78 2008/04/25 20:39:10 joerg Exp $
DISTNAME= getmail-4.8.1
CATEGORIES= mail
@@ -10,7 +10,6 @@ COMMENT= Secure, flexible, reliable, easy-to-use fetchmail replacement
PKG_DESTDIR_SUPPORT= user-destdir
-PYTHON_VERSIONS_ACCEPTED?= 24 23
PYTHON_PATCH_SCRIPTS= *.py getmailcore/*.py
PYDISTUTILSPKG= yes
diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index 0b5f3a418e4..f3114f17500 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2008/04/16 12:15:28 abs Exp $
+# $NetBSD: Makefile,v 1.50 2008/04/25 20:39:10 joerg Exp $
DISTNAME= mailman-2.1.9
CATEGORIES= mail www
@@ -64,7 +64,6 @@ RCD_SCRIPTS= mailman
INSTALL_TEMPLATES+= ${FILESDIR}/INSTALL
DEINSTALL_TEMPLATES+= ${FILESDIR}/DEINSTALL
-PYTHON_VERSIONS_ACCEPTED= 25 24 23 22 21
PYTHON_PATCH_SCRIPTS+= Mailman/Archiver/pipermail.py
PYTHON_PATCH_SCRIPTS+= Mailman/Post.py
PYTHON_PATCH_SCRIPTS+= admin/bin/faq2ht.py
diff --git a/mail/offlineimap/Makefile b/mail/offlineimap/Makefile
index 797fac10dea..f6def18c8cb 100644
--- a/mail/offlineimap/Makefile
+++ b/mail/offlineimap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/02/16 15:46:21 tonio Exp $
+# $NetBSD: Makefile,v 1.15 2008/04/25 20:39:10 joerg Exp $
#
DISTNAME= offlineimap_${_OFFLINEIMAP_VER}
@@ -15,7 +15,6 @@ WRKSRC= ${WRKDIR}/offlineimap
# This is only to placate pkglint
_OFFLINEIMAP_VER= 4.0.16
-PYTHON_VERSIONS_ACCEPTED= 22 23 24
PYDISTUTILSPKG= yes
PYTHON_PATCH_SCRIPTS= bin/offlineimap
PLIST_SUBST+= PYSITELIB=${PYSITELIB:Q}
diff --git a/mail/py-libgmail/Makefile b/mail/py-libgmail/Makefile
index 2259b44ff3f..11eb77773aa 100644
--- a/mail/py-libgmail/Makefile
+++ b/mail/py-libgmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/05/04 20:08:54 agc Exp $
+# $NetBSD: Makefile,v 1.2 2008/04/25 20:39:10 joerg Exp $
#
DISTNAME= libgmail-0.1.5.1
@@ -10,7 +10,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://sourceforge.net/projects/libgmail/
COMMENT= Python bindings to access Google mail
-PYTHON_VERSIONS_ACCEPTED= 24
+PYTHON_VERSIONS_ACCEPTED= 25 24
PYSETUP= setup.py
PLIST_SUBST+= PYSITELIB=${PYSITELIB:Q}
diff --git a/mail/rss2email/Makefile b/mail/rss2email/Makefile
index ba660d9f508..461f5fae826 100644
--- a/mail/rss2email/Makefile
+++ b/mail/rss2email/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2008/03/04 17:57:19 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2008/04/25 20:39:10 joerg Exp $
#
DISTNAME= rss2email-2.62
@@ -20,7 +20,6 @@ WRKSRC= ${WRKDIR}
USE_TOOLS+= tr
NO_BUILD= yes
PYTHON_PATCH_SCRIPTS= *.py
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
SUBST_CLASSES+= bin
SUBST_STAGE.bin= do-configure
diff --git a/mail/tmda/Makefile b/mail/tmda/Makefile
index 647c976386e..245f247b65c 100644
--- a/mail/tmda/Makefile
+++ b/mail/tmda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2007/08/11 14:52:54 schmonz Exp $
+# $NetBSD: Makefile,v 1.42 2008/04/25 20:39:10 joerg Exp $
#
DISTNAME= tmda-1.1.12
@@ -12,7 +12,6 @@ MAINTAINER= schmonz@NetBSD.org
HOMEPAGE= http://tmda.net/
COMMENT= Python-based SPAM reduction system
-PYTHON_VERSIONS_ACCEPTED= 24 23
PYTHON_PATCH_SCRIPTS= ${TMDA_PROGRAMS}
PY_PATCHPLIST= yes
PYCOMPILEALL= ${BUILDLINK_PREFIX.${PYPACKAGE}}/${PYLIB}/compileall.py
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 3fd4e80ac1f..d8dd3ebc644 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.128 2008/03/07 21:33:33 wiz Exp $
+# $NetBSD: Makefile,v 1.129 2008/04/25 20:39:10 joerg Exp $
#
DISTNAME= gnumeric-1.8.2
@@ -24,7 +24,6 @@ REPLACE_PERL+= plugins/perl-func/perl_func.pl
CONFIGURE_ARGS+= --with-python
CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
-PYTHON_VERSIONS_ACCEPTED= 24 23
.include "../../lang/python/application.mk"
.include "../../devel/py-gobject/buildlink3.mk"
diff --git a/math/py-Numeric/Makefile b/math/py-Numeric/Makefile
index 051128bb982..e42102c802c 100644
--- a/math/py-Numeric/Makefile
+++ b/math/py-Numeric/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2008/04/16 12:18:26 abs Exp $
+# $NetBSD: Makefile,v 1.46 2008/04/25 20:39:10 joerg Exp $
DISTNAME= Numeric-24.2
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,6 @@ COMMENT= Adds multidimensional numeric arrays to Python
PKG_DESTDIR_SUPPORT= user-destdir
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED= 25 24 23 22
PYBINMODULE= yes
PYSETUP= setup.py
diff --git a/math/py-Scientific/Makefile b/math/py-Scientific/Makefile
index 0621225e793..bda8e8285e2 100644
--- a/math/py-Scientific/Makefile
+++ b/math/py-Scientific/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/06/02 23:33:30 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2008/04/25 20:39:10 joerg Exp $
DISTNAME= ScientificPython-2.4.5
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/Python//}
@@ -13,8 +13,6 @@ COMMENT= Python modules for scientific computing
CONFLICTS+= py-Scientific-*
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
-
PYDISTUTILSPKG= yes
PYBINMODULE= yes
diff --git a/math/py-ephem/Makefile b/math/py-ephem/Makefile
index 0d1bfda5225..dcc9640fe74 100644
--- a/math/py-ephem/Makefile
+++ b/math/py-ephem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/11/13 22:49:51 gdt Exp $
+# $NetBSD: Makefile,v 1.3 2008/04/25 20:39:10 joerg Exp $
#
DISTNAME= pyephem-3.7b
@@ -17,7 +17,6 @@ NO_BIN_ON_FTP= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
PYDISTUTILSPKG= true
-PYTHON_VERSIONS_ACCEPTED= 23 24
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${PKGNAME}
diff --git a/math/py-numarray/Makefile b/math/py-numarray/Makefile
index 58f8b704bce..20860b94ca2 100644
--- a/math/py-numarray/Makefile
+++ b/math/py-numarray/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/04/12 22:43:04 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2008/04/25 20:39:10 joerg Exp $
#
DISTNAME= numarray-1.5.2
@@ -11,7 +11,6 @@ HOMEPAGE= http://www.stsci.edu/resources/software_hardware/numarray
COMMENT= Array manipulation
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
PLIST_VARS+= blas
.if exists(/System/Library/Frameworks/vecLib.framework/Headers)
diff --git a/math/py-pytables/Makefile b/math/py-pytables/Makefile
index d0e8b735f7c..59504efcafd 100644
--- a/math/py-pytables/Makefile
+++ b/math/py-pytables/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/04/10 15:59:10 drochner Exp $
+# $NetBSD: Makefile,v 1.15 2008/04/25 20:39:10 joerg Exp $
#
DISTNAME= pytables-1.3.3
@@ -26,7 +26,6 @@ PYSETUPBUILDARGS+= --ucl=${BUILDLINK_PREFIX.ucl}
.include "../../devel/ucl/buildlink3.mk"
.endif
PYSETUPINSTALLARGS= ${PYSETUPBUILDARGS}
-PYTHON_VERSIONS_ACCEPTED= 24 23
PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
post-extract:
diff --git a/math/py-rpy/Makefile b/math/py-rpy/Makefile
index f899489e9d1..efc4992a1d7 100644
--- a/math/py-rpy/Makefile
+++ b/math/py-rpy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2007/11/07 19:49:36 markd Exp $
+# $NetBSD: Makefile,v 1.21 2008/04/25 20:39:10 joerg Exp $
#
DISTNAME= rpy-0.99.0
@@ -12,7 +12,6 @@ HOMEPAGE= http://rpy.sourceforge.net/
COMMENT= R interface for Python
PYDISTUTILSPKG= YES
-PYTHON_VERSIONS_ACCEPTED= 24 23
BUILDLINK_API_DEPENDS.R+= R>=2.6.0
diff --git a/meta-pkgs/gnuradio/Makefile.common b/meta-pkgs/gnuradio/Makefile.common
index 9fb97e2288e..6f1ec7bd414 100644
--- a/meta-pkgs/gnuradio/Makefile.common
+++ b/meta-pkgs/gnuradio/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2007/09/18 06:41:30 wiz Exp $
+# $NetBSD: Makefile.common,v 1.12 2008/04/25 20:39:10 joerg Exp $
#
# This Makefile fragment is included at the top of package Makefiles for
# GNU Radio distributed packages (they all share common configure and build
@@ -21,7 +21,6 @@ USE_TOOLS+= gmake automake autoconf pkg-config
BUILD_DEPENDS+=doxygen>=1.5.1:../../devel/doxygen
PY_PATCHPLIST= yes
-PYTHON_VERSIONS_ACCEPTED= 24 23
#LICENSE= gplv3
diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile
index ed3dcb014c8..c9f28df9029 100644
--- a/misc/koffice/Makefile
+++ b/misc/koffice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.100 2008/01/18 05:08:36 tnn Exp $
+# $NetBSD: Makefile,v 1.101 2008/04/25 20:39:10 joerg Exp $
DISTNAME= koffice-1.6.3
PKGREVISION= 6
@@ -27,7 +27,6 @@ GCC_REQD+= 2.95.3
PTHREAD_OPTS+= require
-PYTHON_VERSIONS_ACCEPTED= 24 23 # needs shared library
CONFIGURE_ENV+= PYTHONDIR=${LOCALBASE:Q}
CONFIGURE_ENV+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
diff --git a/misc/openoffice2/Makefile b/misc/openoffice2/Makefile
index 6690ba43920..5332394874e 100644
--- a/misc/openoffice2/Makefile
+++ b/misc/openoffice2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2008/04/21 08:17:25 abs Exp $
+# $NetBSD: Makefile,v 1.43 2008/04/25 20:39:10 joerg Exp $
#
OO_VER= 2.4.0
@@ -171,7 +171,6 @@ post-install:
.include "../../mk/compiler.mk"
-PYTHON_VERSIONS_ACCEPTED= 25 24 23 22
.include "../../lang/python/application.mk"
.include "../../databases/db4/buildlink3.mk"
diff --git a/misc/orca/Makefile b/misc/orca/Makefile
index 381dbfb6dd9..3e179055044 100644
--- a/misc/orca/Makefile
+++ b/misc/orca/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/01/11 13:53:03 drochner Exp $
+# $NetBSD: Makefile,v 1.6 2008/04/25 20:39:10 joerg Exp $
#
DISTNAME= orca-2.20.3
@@ -15,7 +15,7 @@ USE_LIBTOOL= yes
USE_TOOLS+= intltool pkg-config gmake msgfmt
USE_DIRS+= xdg-1.1
-PYTHON_VERSIONS_ACCEPTED= 24
+PYTHON_VERSIONS_ACCEPTED= 25 24
CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
PY_PATCHPLIST= yes
diff --git a/misc/pyqt_memaid/Makefile b/misc/pyqt_memaid/Makefile
index 1f355d4c019..b0fcf5cb835 100644
--- a/misc/pyqt_memaid/Makefile
+++ b/misc/pyqt_memaid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/08/22 15:33:40 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2008/04/25 20:39:10 joerg Exp $
#
DISTNAME= pyqt_memaid_0.2.4
@@ -12,7 +12,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://memaid.sourceforge.net/
COMMENT= MemAid flash card program (py-qt3 interface)
-PYTHON_VERSIONS_ACCEPTED= 24 23 22 21
+PYTHON_VERSIONS_ACCEPTED= 25 24 23 21
USE_LANGUAGES= c
NO_BUILD= yes
diff --git a/multimedia/gstreamer0.8/Makefile b/multimedia/gstreamer0.8/Makefile
index f3768002604..6b96c6dc65d 100644
--- a/multimedia/gstreamer0.8/Makefile
+++ b/multimedia/gstreamer0.8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/03/06 14:53:52 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2008/04/25 20:39:10 joerg Exp $
#
DISTNAME= gstreamer-0.8.11
@@ -32,8 +32,6 @@ PKGCONFIG_OVERRIDE+= pkgconfig/gstreamer.pc.in
REQD_DIRS+= ${GST0.8_DBDIR}
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
-
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "NetBSD"
diff --git a/multimedia/py-gstreamer0.10/Makefile b/multimedia/py-gstreamer0.10/Makefile
index 0056dc40d3d..e8f49ae3c04 100644
--- a/multimedia/py-gstreamer0.10/Makefile
+++ b/multimedia/py-gstreamer0.10/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/04/11 19:58:30 drochner Exp $
+# $NetBSD: Makefile,v 1.8 2008/04/25 20:39:10 joerg Exp $
#
DISTNAME= gst-python-0.10.11
@@ -15,7 +15,6 @@ USE_LIBTOOL= yes
USE_TOOLS+= pkg-config gmake
GNU_CONFIGURE= yes
CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
-PYTHON_VERSIONS_ACCEPTED= 23 24
PY_PATCHPLIST= yes
PKGCONFIG_OVERRIDE+= pkgconfig/gst-python.pc.in
diff --git a/net/bittornado/Makefile.common b/net/bittornado/Makefile.common
index a03b5b30837..fb1ca339ca8 100644
--- a/net/bittornado/Makefile.common
+++ b/net/bittornado/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2008/02/04 14:42:14 wiz Exp $
+# $NetBSD: Makefile.common,v 1.13 2008/04/25 20:39:10 joerg Exp $
#
DISTNAME= BitTornado-0.3.18
@@ -13,5 +13,3 @@ DISTINFO_FILE= ${.CURDIR}/../../net/bittornado/distinfo
PATCHDIR= ${.CURDIR}/../../net/bittornado/patches
WRKSRC= ${WRKDIR}/BitTornado-CVS
-
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
diff --git a/net/bittorrent/Makefile.common b/net/bittorrent/Makefile.common
index b504303dc91..d34089fbbd5 100644
--- a/net/bittorrent/Makefile.common
+++ b/net/bittorrent/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2006/02/26 22:43:33 tron Exp $
+# $NetBSD: Makefile.common,v 1.18 2008/04/25 20:39:11 joerg Exp $
DISTNAME= BitTorrent-4.4.0
CATEGORIES= net
@@ -11,5 +11,3 @@ COMMENT= File sharing tool
DISTINFO_FILE= ${.CURDIR}/../../net/bittorrent/distinfo
FILESDIR= ${.CURDIR}/../../net/bittorrent/files
PATCHDIR= ${.CURDIR}/../../net/bittorrent/patches
-
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
diff --git a/net/clive/Makefile b/net/clive/Makefile
index 3b2f2ca19a0..2fda6344134 100644
--- a/net/clive/Makefile
+++ b/net/clive/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/04/22 23:05:49 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2008/04/25 20:39:11 joerg Exp $
#
DISTNAME= clive-0.4.10
@@ -13,7 +13,6 @@ COMMENT= Command line video extraction tool for user-uploaded video hosts
GNU_CONFIGURE= yes
USE_LANGUAGES= # none
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
PY_PATCHPLIST= yes
REPLACE_INTERPRETER+= env_python
diff --git a/net/nicotine/Makefile b/net/nicotine/Makefile
index 84b4f0d507d..bef8c960273 100644
--- a/net/nicotine/Makefile
+++ b/net/nicotine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2008/03/15 16:52:34 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2008/04/25 20:39:11 joerg Exp $
#
DISTNAME= nicotine-1.0.8
@@ -13,7 +13,7 @@ COMMENT= Client for soulseek, a peer-to-peer network for music
USE_PKGLOCALEDIR= yes
-PYTHON_VERSIONS_ACCEPTED= 24
+PYTHON_VERSIONS_ACCEPTED= 25 24
PY_PATCHPLIST= yes
PYDISTUTILSPKG= yes
diff --git a/net/py-boto/Makefile b/net/py-boto/Makefile
index a02f85c20a5..3930be36e48 100644
--- a/net/py-boto/Makefile
+++ b/net/py-boto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/02/06 07:08:11 bjs Exp $
+# $NetBSD: Makefile,v 1.2 2008/04/25 20:39:11 joerg Exp $
#
DISTNAME= boto-1.0a
@@ -14,7 +14,7 @@ COMMENT= Python interface to Amazon web services
PKG_DESTDIR_SUPPORT= user-destdir
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED= 24
+PYTHON_VERSIONS_ACCEPTED= 25 24
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/py-dns/Makefile b/net/py-dns/Makefile
index 48ce5de8cb6..d70d7827467 100644
--- a/net/py-dns/Makefile
+++ b/net/py-dns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2008/04/25 19:32:44 tnn Exp $
+# $NetBSD: Makefile,v 1.16 2008/04/25 20:39:11 joerg Exp $
DISTNAME= dnspython-1.6.0
PKGNAME= ${PYPKGPREFIX}-dns-1.6.0
@@ -13,7 +13,5 @@ PKG_DESTDIR_SUPPORT= user-destdir
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED= 25 24 23
-
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/py-google/Makefile b/net/py-google/Makefile
index 4ca205c489d..1bb5e0d7741 100644
--- a/net/py-google/Makefile
+++ b/net/py-google/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2007/02/22 19:26:59 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2008/04/25 20:39:11 joerg Exp $
#
DISTNAME= pygoogle-0.6
@@ -13,8 +13,6 @@ COMMENT= Call the Google web API from Python
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
-
.include "../../lang/python/extension.mk"
.include "../../net/py-soappy/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/py-kenosis/Makefile b/net/py-kenosis/Makefile
index 63c1a86eddd..a2db8103076 100644
--- a/net/py-kenosis/Makefile
+++ b/net/py-kenosis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/06/07 12:53:48 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2008/04/25 20:39:11 joerg Exp $
#
DISTNAME= kenosis-0.941
@@ -11,7 +11,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://kenosis.sourceforge.net/
COMMENT= P2P RPC system
-PYTHON_VERSIONS_ACCEPTED= 23 24
PYDISTUTILSPKG= yes
PYSETUP= kenosis_setup.py
diff --git a/net/py-libdnet/Makefile b/net/py-libdnet/Makefile
index 189ee42bd56..8344c1d4f72 100644
--- a/net/py-libdnet/Makefile
+++ b/net/py-libdnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/03/07 17:35:39 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2008/04/25 20:39:11 joerg Exp $
#
DISTNAME= libdnet-1.12
@@ -14,7 +14,6 @@ COMMENT= Python wrapper for libdnet
GNU_CONFIGURE= yes
PYDISTUTILSPKG= yes
PYSETUPSUBDIR= python
-PYTHON_VERSIONS_ACCEPTED= 24 23
.include "../../lang/python/extension.mk"
.include "../../net/libdnet/buildlink3.mk"
diff --git a/net/py-mimelib/Makefile b/net/py-mimelib/Makefile
index 09680dd928e..4bb39571db7 100644
--- a/net/py-mimelib/Makefile
+++ b/net/py-mimelib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/04/17 12:22:00 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2008/04/25 20:39:11 joerg Exp $
#
DISTNAME= email-2.5
@@ -14,7 +14,7 @@ COMMENT= Email package for Python
PYDISTUTILSPKG= yes
# This pkg (or an older version of it) comes with 2.2 and later;
# 2.1 is the primary target (particulary for Zope).
-PYTHON_VERSIONS_ACCEPTED= 21 22 23
+PYTHON_VERSIONS_ACCEPTED= 25 24 23 21
.include "../../lang/python/extension.mk"
diff --git a/net/py-soappy/Makefile b/net/py-soappy/Makefile
index c8ab2f759d1..5d61e0338e8 100644
--- a/net/py-soappy/Makefile
+++ b/net/py-soappy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/06/07 12:52:24 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2008/04/25 20:39:11 joerg Exp $
#
DISTNAME= SOAPpy-0.11.4
@@ -14,8 +14,6 @@ COMMENT= SOAP implementation
PYDISTUTILSPKG= YES
PY_PATCHPLIST= YES
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
-
.include "../../lang/python/extension.mk"
.include "../../math/py-fpconst/buildlink3.mk"
.include "../../textproc/py-xml/buildlink3.mk"
diff --git a/net/py-spreadmodule/Makefile b/net/py-spreadmodule/Makefile
index 736b1395550..13ec4ea5a43 100644
--- a/net/py-spreadmodule/Makefile
+++ b/net/py-spreadmodule/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/02/05 23:10:30 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2008/04/25 20:39:11 joerg Exp $
#
DISTNAME= SpreadModule-1.4
@@ -14,7 +14,7 @@ COMMENT= Python bindings for the Spread messaging service
PYDISTUTILSPKG= YES
-PYTHON_VERSIONS_ACCEPTED= 24 23 22 21
+PYTHON_VERSIONS_ACCEPTED= 25 24 23 21
SUBST_CLASSES+= setup
SUBST_STAGE.setup= post-patch
diff --git a/net/py-twisted/Makefile b/net/py-twisted/Makefile
index b015c3e0ea6..3019fbcc68e 100644
--- a/net/py-twisted/Makefile
+++ b/net/py-twisted/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/03/04 21:30:23 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2008/04/25 20:39:11 joerg Exp $
#
DISTNAME= ${TWISTED_DISTNAME}
@@ -16,7 +16,7 @@ PYDISTUTILSPKG= yes
PLIST_SUBST+= PYVERSSUFFIX="-${PYVERSSUFFIX}"
MAKE_ENV+= PKGSRC="1" PYVERSSUFFIX="-${PYVERSSUFFIX}"
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
+PYTHON_VERSIONS_ACCEPTED= 25 24 23
.include "../../net/py-twisted/Makefile.common"
.include "../../lang/python/extension.mk"
diff --git a/net/pygopherd/Makefile b/net/pygopherd/Makefile
index 4707e37b4e1..06ce972bf11 100644
--- a/net/pygopherd/Makefile
+++ b/net/pygopherd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/07/04 20:54:52 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2008/04/25 20:39:11 joerg Exp $
#
DISTNAME= pygopherd_2.0.9
@@ -44,7 +44,7 @@ PYTHON_PATCH_SCRIPTS+= pygopherd/gopherentryTest.py
PYTHON_PATCH_SCRIPTS+= pygopherd/initializationTest.py
PYTHON_PATCH_SCRIPTS+= pygopherd/testutil.py
-PYTHON_VERSIONS_ACCEPTED= 23 22
+PYTHON_VERSIONS_ACCEPTED= 23
SUBST_CLASSES+= man
SUBST_STAGE.man= post-patch
diff --git a/net/scapy/Makefile b/net/scapy/Makefile
index a9b90354e10..1f61d92a924 100644
--- a/net/scapy/Makefile
+++ b/net/scapy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2007/01/03 15:02:51 adrianp Exp $
+# $NetBSD: Makefile,v 1.5 2008/04/25 20:39:11 joerg Exp $
#
DISTNAME= scapy-1.0.5
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.secdev.org/projects/scapy/
COMMENT= Interactive packet manipulation program
NO_BUILD= yes
-PYTHON_VERSIONS_ACCEPTED= 24
+PYTHON_VERSIONS_ACCEPTED= 25 24
PYTHON_PATCH_SCRIPTS= scapy.py
.include "options.mk"
diff --git a/net/youtube-dl/Makefile b/net/youtube-dl/Makefile
index 1df5bae6717..e64764dd115 100644
--- a/net/youtube-dl/Makefile
+++ b/net/youtube-dl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/03/09 22:38:19 tnn Exp $
+# $NetBSD: Makefile,v 1.5 2008/04/25 20:39:11 joerg Exp $
#
DISTNAME= youtube-dl
@@ -15,7 +15,7 @@ DIST_SUBDIR= ${PKGNAME_NOREV}
PKG_DESTDIR_SUPPORT= user-destdir
USE_LANGUAGES= # none
-PYTHON_VERSIONS_ACCEPTED= 24
+PYTHON_VERSIONS_ACCEPTED= 25 24
WRKSRC= ${WRKDIR}
INSTALLATION_DIRS= bin
diff --git a/print/py-pslib/Makefile b/print/py-pslib/Makefile
index c4b04c33d8c..8eb786d7793 100644
--- a/print/py-pslib/Makefile
+++ b/print/py-pslib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/06/07 13:03:24 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2008/04/25 20:39:11 joerg Exp $
#
DISTNAME= python-pslib_0.2.0.orig
@@ -13,7 +13,6 @@ COMMENT= Python bindings for pslib
WRKSRC= ${WRKDIR}/python-pslib-0.2.0
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED= 24 23
.include "../../lang/python/extension.mk"
.include "../../print/pslib/buildlink3.mk"
diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index 41a77e02f16..398fb358be3 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2008/01/14 12:54:10 drochner Exp $
+# $NetBSD: Makefile,v 1.54 2008/04/25 20:39:11 joerg Exp $
DISTNAME= scribus-1.3.3.11
CATEGORIES= print
@@ -25,7 +25,7 @@ CONFIGURE_ARGS+= --with-qt-dir=${QTDIR:Q} \
--with-extra-includes=${LOCALBASE}/include
# XXX should work with other Python versions, but there are
# stupid assumptions in the configure script
-PYTHON_VERSIONS_ACCEPTED= 24
+PYTHON_VERSIONS_ACCEPTED= 25 24
CONFIGURE_ARGS+= --with-pythondir=${LOCALBASE:Q}
# avoid CUPS libs to be pulled in
CONFIGURE_ENV+= ac_cv_prog_hacups=no
diff --git a/security/mixminion/Makefile b/security/mixminion/Makefile
index 485cc4b083a..f0b0527dcb4 100644
--- a/security/mixminion/Makefile
+++ b/security/mixminion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2008/01/18 05:09:38 tnn Exp $
+# $NetBSD: Makefile,v 1.10 2008/04/25 20:39:11 joerg Exp $
#
DISTNAME= Mixminion-0.0.7.1
@@ -14,7 +14,7 @@ COMMENT= Mixminion impedes message traffic analysis
BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.7d
CRYPTO= YES
-PYTHON_VERSIONS_ACCEPTED= 23 22 21
+PYTHON_VERSIONS_ACCEPTED= 23 21
PYDISTUTILSPKG= YES
TEST_TARGET= test
diff --git a/security/py-OpenSSL/Makefile b/security/py-OpenSSL/Makefile
index 2871d06b8d5..ab316bd39cf 100644
--- a/security/py-OpenSSL/Makefile
+++ b/security/py-OpenSSL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/01/18 05:09:40 tnn Exp $
+# $NetBSD: Makefile,v 1.14 2008/04/25 20:39:11 joerg Exp $
#
DISTNAME= pyOpenSSL-0.6
@@ -11,7 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://pyopenssl.sourceforge.net/
COMMENT= Python interface to the OpenSSL library
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
+PYTHON_VERSIONS_ACCEPTED= 25 24 23
PYDISTUTILSPKG= yes
PYBINMODULE= yes
diff --git a/security/py-SSLCrypto/Makefile b/security/py-SSLCrypto/Makefile
index 4345ec54ea0..c1fb17ca667 100644
--- a/security/py-SSLCrypto/Makefile
+++ b/security/py-SSLCrypto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/01/18 05:09:41 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2008/04/25 20:39:11 joerg Exp $
#
DISTNAME= SSLCrypto-0.1.1
@@ -13,7 +13,7 @@ COMMENT= Python bindings for openssl
DEPENDS+= py24-pyrex>=0.9.4.1:../../lang/py-pyrex
-PYTHON_VERSIONS_ACCEPTED= 24
+PYTHON_VERSIONS_ACCEPTED= 25 24
PLIST_SUBST+= PYSITELIB=${PYSITELIB:Q}
diff --git a/security/py-denyhosts/Makefile b/security/py-denyhosts/Makefile
index 4c61f0a4c5c..8e3555f93f0 100644
--- a/security/py-denyhosts/Makefile
+++ b/security/py-denyhosts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/08/20 07:31:38 taca Exp $
+# $NetBSD: Makefile,v 1.4 2008/04/25 20:39:11 joerg Exp $
#
VER= 2.6
@@ -15,7 +15,6 @@ COMMENT= Watch auth log for invalid ssh login attempts and block hosts
PKG_DESTDIR_SUPPORT= user-destdir
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED= 24 23
CONF_FILES+= ${PREFIX}/share/denyhosts/denyhosts.cfg-dist \
${PREFIX}/etc/denyhosts.conf
diff --git a/security/py-gnupg/Makefile b/security/py-gnupg/Makefile
index 0c1d6636f97..445742ba900 100644
--- a/security/py-gnupg/Makefile
+++ b/security/py-gnupg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/11/18 23:38:12 tron Exp $
+# $NetBSD: Makefile,v 1.13 2008/04/25 20:39:11 joerg Exp $
DISTNAME= GnuPGInterface-0.3.2
PKGNAME= ${PYPKGPREFIX}-gnupg-0.3.2
@@ -12,7 +12,7 @@ COMMENT= Python module for GnuPG interface
DEPENDS+= gnupg>=1.0.0:../../security/gnupg
-PYTHON_VERSIONS_ACCEPTED= 24 23 22 21
+PYTHON_VERSIONS_ACCEPTED= 25 24 23 21
PYDISTUTILSPKG= yes
.include "../../lang/python/extension.mk"
diff --git a/security/py-m2crypto/Makefile b/security/py-m2crypto/Makefile
index a0cde8bf4d8..94ec1c9f5f7 100644
--- a/security/py-m2crypto/Makefile
+++ b/security/py-m2crypto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2008/01/24 11:14:26 tnn Exp $
+# $NetBSD: Makefile,v 1.22 2008/04/25 20:39:11 joerg Exp $
#
DISTNAME= m2crypto-0.13
@@ -16,7 +16,7 @@ HOMEPAGE= http://sandbox.rulemaker.net/ngps/m2/
COMMENT= Crypto and SSL toolkit for Python
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED= 24 23 22 21
+PYTHON_VERSIONS_ACCEPTED= 25 24 23 21
# constness is very different between openssl versions,
# it seems, and 0.9.7i is the version which currently is
diff --git a/security/py-mcrypt/Makefile b/security/py-mcrypt/Makefile
index 17fdef9053f..ef3f4a3df76 100644
--- a/security/py-mcrypt/Makefile
+++ b/security/py-mcrypt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/02/22 19:27:09 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2008/04/25 20:39:12 joerg Exp $
#
DISTNAME= python-mcrypt-1.1
@@ -13,7 +13,6 @@ COMMENT= Python interface to mcrypt library
PYBINMODULE= yes
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
.include "../../lang/python/extension.mk"
.include "../../security/libmcrypt/buildlink3.mk"
diff --git a/security/py-paramiko/Makefile b/security/py-paramiko/Makefile
index 68baa71e76d..ab225a49875 100644
--- a/security/py-paramiko/Makefile
+++ b/security/py-paramiko/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/12/14 13:35:04 bjs Exp $
+# $NetBSD: Makefile,v 1.4 2008/04/25 20:39:12 joerg Exp $
#
DISTNAME= paramiko-1.7.1
@@ -12,7 +12,6 @@ HOMEPAGE= http://www.lag.net/paramiko/
COMMENT= SSH2 protocol library
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED= 23 24
.include "../../lang/python/extension.mk"
.include "../../security/py-amkCrypto/buildlink3.mk"
diff --git a/security/py-prewikka/Makefile b/security/py-prewikka/Makefile
index bedb99f8d86..9e557e85e6d 100644
--- a/security/py-prewikka/Makefile
+++ b/security/py-prewikka/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2008/03/06 14:53:54 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2008/04/25 20:39:12 joerg Exp $
#
DISTNAME= prewikka-${VERSION}
@@ -25,7 +25,6 @@ USE_TOOLS+= msgfmt
PYDISTUTILSPKG= yes
PYBINMODULE= yes
PYSETUP= setup.py
-PYTHON_VERSIONS_ACCEPTED= 24 23
PYTHON_PATCH_SCRIPTS= scripts/prewikka-httpd
PREWIKKA_USER?= prewikka
PREWIKKA_GROUP?= prewikka
diff --git a/security/py-tlslite/Makefile b/security/py-tlslite/Makefile
index 754a78b019e..0cae1da69e0 100644
--- a/security/py-tlslite/Makefile
+++ b/security/py-tlslite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/02/28 05:34:25 schmonz Exp $
+# $NetBSD: Makefile,v 1.2 2008/04/25 20:39:12 joerg Exp $
#
DISTNAME= tlslite-0.3.8
@@ -11,7 +11,6 @@ HOMEPAGE= http://trevp.net/tlslite/
COMMENT= SSL 3.0, TLS 1.0, and TLS 1.1 in Python
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED?= 24 23 22
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/duplicity/Makefile b/sysutils/duplicity/Makefile
index aefefae8f93..7f5f78b662e 100644
--- a/sysutils/duplicity/Makefile
+++ b/sysutils/duplicity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/02/06 07:17:00 bjs Exp $
+# $NetBSD: Makefile,v 1.12 2008/04/25 20:39:12 joerg Exp $
DISTNAME= duplicity-0.4.9
CATEGORIES= sysutils net
@@ -12,7 +12,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
BUILDLINK_API_DEPENDS.librsync+= librsync>=0.9.6
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED= 24
+PYTHON_VERSIONS_ACCEPTED= 25 24
.include "../../devel/py-pexpect/buildlink3.mk"
.include "../../devel/librsync/buildlink3.mk"
diff --git a/sysutils/py-gnome-menus/Makefile b/sysutils/py-gnome-menus/Makefile
index a87de2a15a6..f7775bf90b1 100644
--- a/sysutils/py-gnome-menus/Makefile
+++ b/sysutils/py-gnome-menus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/04/25 18:02:24 tnn Exp $
+# $NetBSD: Makefile,v 1.12 2008/04/25 20:39:12 joerg Exp $
#
DISTNAME= gnome-menus-2.22.1
@@ -18,7 +18,6 @@ USE_LIBTOOL= yes
CONFIGURE_ARGS+= --enable-python
BUILD_DIRS= python
INSTALL_DIRS= python
-PYTHON_VERSIONS_ACCEPTED= 25 24 23
PY_PATCHPLIST= yes
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.0
diff --git a/sysutils/rdiff-backup/Makefile b/sysutils/rdiff-backup/Makefile
index be1e2193507..2acf27b1ebe 100644
--- a/sysutils/rdiff-backup/Makefile
+++ b/sysutils/rdiff-backup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2007/01/14 15:24:33 obache Exp $
+# $NetBSD: Makefile,v 1.27 2008/04/25 20:39:12 joerg Exp $
#
DISTNAME= rdiff-backup-1.0.5
@@ -10,7 +10,6 @@ HOMEPAGE= http://www.nongnu.org/rdiff-backup/
COMMENT= Remote incremental backup utility
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
SUBST_CLASSES+= path
SUBST_STAGE.path= post-patch
diff --git a/sysutils/xenkernel3/Makefile b/sysutils/xenkernel3/Makefile
index a15c113f4f8..e1f584bfb06 100644
--- a/sysutils/xenkernel3/Makefile
+++ b/sysutils/xenkernel3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/04/25 20:11:17 tnn Exp $
+# $NetBSD: Makefile,v 1.13 2008/04/25 20:39:12 joerg Exp $
#
VERSION= 3.1.3
@@ -22,7 +22,6 @@ WRKSRC= ${WRKDIR}/xen-${VERSION}
NO_CONFIGURE= yes
USE_TOOLS+= gmake
-PYTHON_VERSIONS_ACCEPTED= 25 24 23
PY_PATCHPLIST= NO
SUBST_CLASSES+= py
diff --git a/sysutils/xentools12/Makefile b/sysutils/xentools12/Makefile
index 7a659a3e91c..3658d68ce9c 100644
--- a/sysutils/xentools12/Makefile
+++ b/sysutils/xentools12/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/10/07 12:59:15 kano Exp $
+# $NetBSD: Makefile,v 1.11 2008/04/25 20:39:12 joerg Exp $
#
DISTNAME= xeno-1.2-src-040418
@@ -27,7 +27,7 @@ CONF_FILES+= ${EGDIR}/netbsd ${PKG_SYSCONFDIR}/netbsd
USE_TOOLS+= gmake
MAKE_ENV+= EGDIR=${EGDIR:Q}
MAKE_ENV+= MV=${MV:Q} PYTHON=${PYTHONBIN:Q} SED=${SED:Q}
-PYTHON_VERSIONS_ACCEPTED= 22 23
+PYTHON_VERSIONS_ACCEPTED= 23
PY_PATCHPLIST= yes
PYTHON_PATCH_SCRIPTS= examples/xc_dom_control.py examples/xc_dom_create.py
PYTHON_PATCH_SCRIPTS+= examples/xc_vd_tool.py
diff --git a/sysutils/xentools20/Makefile b/sysutils/xentools20/Makefile
index 589ccb32131..4c553c60308 100644
--- a/sysutils/xentools20/Makefile
+++ b/sysutils/xentools20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2008/01/18 05:09:45 tnn Exp $
+# $NetBSD: Makefile,v 1.33 2008/04/25 20:39:12 joerg Exp $
#
DISTNAME= xen-2.0.7-src
@@ -28,7 +28,6 @@ MESSAGE_SUBST= EGDIR=${EGDIR}
USE_TOOLS+= gmake
MAKE_ENV+= EGDIR=${EGDIR:Q}
MAKE_ENV+= MV=${MV:Q} PYTHON=${PYTHONBIN:Q} SED=${SED:Q}
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
PY_PATCHPLIST= yes
PYTHON_PATCH_SCRIPTS= python/xen/util/console_client.py
PYTHON_PATCH_SCRIPTS+= python/xen/xend/server/SrvServer.py
diff --git a/sysutils/xentools3-hvm/Makefile b/sysutils/xentools3-hvm/Makefile
index 770de3d9013..71be36f17f2 100644
--- a/sysutils/xentools3-hvm/Makefile
+++ b/sysutils/xentools3-hvm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/02/17 16:29:03 bouyer Exp $
+# $NetBSD: Makefile,v 1.6 2008/04/25 20:39:12 joerg Exp $
#
VERSION= 3.1.3
@@ -39,7 +39,6 @@ MAKE_ENV+= XEN_TARGET_ARCH="x86_64" XEN_COMPILE_ARCH="x86_64"
.else
MAKE_ENV+= XEN_TARGET_ARCH="unsupported"
.endif
-PYTHON_VERSIONS_ACCEPTED= 24 23
SUBST_CLASSES+= paths
SUBST_STAGE.paths= pre-configure
diff --git a/sysutils/xentools3/Makefile b/sysutils/xentools3/Makefile
index 63973ba524b..d6b84891f91 100644
--- a/sysutils/xentools3/Makefile
+++ b/sysutils/xentools3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/04/17 08:44:51 abs Exp $
+# $NetBSD: Makefile,v 1.12 2008/04/25 20:39:12 joerg Exp $
#
VERSION= 3.1.3
@@ -44,7 +44,6 @@ MAKE_ENV+= XEN_TARGET_ARCH="x86_64" XEN_COMPILE_ARCH="x86_64"
.else
MAKE_ENV+= XEN_TARGET_ARCH="unsupported"
.endif
-PYTHON_VERSIONS_ACCEPTED= 25 24 23
PY_PATCHPLIST= yes
PYTHON_PATCH_SCRIPTS+= misc/xm
PYTHON_PATCH_SCRIPTS+= misc/netfix
diff --git a/textproc/asciidoc/Makefile b/textproc/asciidoc/Makefile
index 718966f4879..249d77a7af4 100644
--- a/textproc/asciidoc/Makefile
+++ b/textproc/asciidoc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2008/04/11 23:15:48 gdt Exp $
+# $NetBSD: Makefile,v 1.10 2008/04/25 20:39:12 joerg Exp $
#
DISTNAME= asciidoc-8.2.5
@@ -16,7 +16,6 @@ DEPENDS+= getopt-[0-9]*:../../misc/getopt
REPLACE_BASH+= a2x
USE_TOOLS+= bash:run
-PYTHON_VERSIONS_INCOMPATIBLE= 15 20 21 22
PYTHON_PATCH_SCRIPTS= asciidoc.py filters/code-filter.py filters/music2png.py
NO_BUILD= yes
diff --git a/textproc/doclifter/Makefile b/textproc/doclifter/Makefile
index bf2e048d8b5..396a30fea30 100644
--- a/textproc/doclifter/Makefile
+++ b/textproc/doclifter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2007/01/15 23:40:46 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2008/04/25 20:39:12 joerg Exp $
#
DISTNAME= doclifter-2.3
@@ -12,7 +12,6 @@ COMMENT= Translates documents written in troff macros to DocBook
NO_BUILD= yes
PYTHON_PATCH_SCRIPTS= doclifter manlifter
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
SUBST_CLASSES+= bin-path
SUBST_STAGE.bin-path= pre-configure
diff --git a/textproc/py-FourSuite/Makefile b/textproc/py-FourSuite/Makefile
index 1956927a22b..c3af4f3b50d 100644
--- a/textproc/py-FourSuite/Makefile
+++ b/textproc/py-FourSuite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/06/29 12:47:19 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2008/04/25 20:39:12 joerg Exp $
#
DISTNAME= 4Suite-0.12.0a3
@@ -15,7 +15,7 @@ CONFLICTS+= ${PYPKGPREFIX}-4Suite-*
PYDISTUTILSPKG= yes
PY_PATCHPLIST= yes
-PYTHON_VERSIONS_ACCEPTED= 24 23 22 21
+PYTHON_VERSIONS_ACCEPTED= 25 24 23 21
#pyxml is needed at runtime to get pyexpat
#.include "../../textproc/py-xml/buildlink3.mk"
diff --git a/textproc/py-HappyDoc/Makefile b/textproc/py-HappyDoc/Makefile
index 9e7ac7c9a83..3ce3ca638b3 100644
--- a/textproc/py-HappyDoc/Makefile
+++ b/textproc/py-HappyDoc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/09/30 17:45:25 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2008/04/25 20:39:12 joerg Exp $
DISTNAME= HappyDoc_r2_1
PKGNAME= ${PYPKGPREFIX}-HappyDoc-2.1
@@ -12,7 +12,7 @@ COMMENT= Python tool to generate Python API documents
WRKSRC= ${WRKDIR}/HappyDoc-r2_1
PYDISTUTILSPKG= # defined
-PYTHON_VERSIONS_ACCEPTED= 24 23 22 21
+PYTHON_VERSIONS_ACCEPTED= 25 24 23 21
PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
post-extract:
diff --git a/textproc/py-SimpleParse/Makefile b/textproc/py-SimpleParse/Makefile
index 531d11cc853..06081082995 100644
--- a/textproc/py-SimpleParse/Makefile
+++ b/textproc/py-SimpleParse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/02/22 19:27:16 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2008/04/25 20:39:12 joerg Exp $
#
DISTNAME= SimpleParse-2.0.0
@@ -13,7 +13,7 @@ HOMEPAGE= http://simpleparse.sourceforge.net/
COMMENT= Simple parser generator for mxTextTools text-tagging engine
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED= 23 22
+PYTHON_VERSIONS_ACCEPTED= 23
.include "../../lang/python/extension.mk"
.include "../../time/py-mxDateTime/buildlink3.mk"
diff --git a/textproc/py-X/Makefile b/textproc/py-X/Makefile
index 814689cdac6..358e87154b6 100644
--- a/textproc/py-X/Makefile
+++ b/textproc/py-X/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2007/11/08 23:47:03 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2008/04/25 20:39:12 joerg Exp $
#
DISTNAME= PyX-0.9
@@ -9,7 +9,6 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pyx/}
DEPENDS+= teTeX-bin-[0-9]*:../../print/teTeX3-bin
-PYTHON_VERSIONS_ACCEPTED= 24 23
PYBINMODULE= yes
PYDISTUTILSPKG= yes
diff --git a/textproc/py-csv/Makefile b/textproc/py-csv/Makefile
index 6da6b096808..06a80cb4931 100644
--- a/textproc/py-csv/Makefile
+++ b/textproc/py-csv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:47:41 tv Exp $
+# $NetBSD: Makefile,v 1.8 2008/04/25 20:39:12 joerg Exp $
#
DISTNAME= csv-1.0
@@ -14,7 +14,7 @@ COMMENT= CSV reading module for Python
PYDISTUTILSPKG= yes
PYBINMODULE= yes
-PYTHON_VERSIONS_ACCEPTED= 22 21 20
+PYTHON_VERSIONS_ACCEPTED= 21
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-elementtree/Makefile b/textproc/py-elementtree/Makefile
index c7b3d3d646c..daf7226f0d3 100644
--- a/textproc/py-elementtree/Makefile
+++ b/textproc/py-elementtree/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/04/30 11:12:35 heinz Exp $
+# $NetBSD: Makefile,v 1.8 2008/04/25 20:39:12 joerg Exp $
#
DISTNAME= elementtree-1.2.6-20050316
@@ -17,7 +17,7 @@ DEPENDS+= ${PYPKGPREFIX}-xml-[0-9]*:../../textproc/py-xml
PY_PATCHPLIST= yes
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED= 24 23 22 21
+PYTHON_VERSIONS_ACCEPTED= 25 24 23 21
USE_LANGUAGES= # empty
diff --git a/textproc/py-feedparser/Makefile b/textproc/py-feedparser/Makefile
index d3f6f52556e..81afe348380 100644
--- a/textproc/py-feedparser/Makefile
+++ b/textproc/py-feedparser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/02/05 23:11:06 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2008/04/25 20:39:12 joerg Exp $
#
DISTNAME= feedparser-4.1
@@ -15,7 +15,6 @@ COMMENT= Parse RSS and Atom feeds in Python
WRKSRC= ${WRKDIR}
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED?= 24 23 22 21
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-gdick/Makefile b/textproc/py-gdick/Makefile
index 1898f534f1a..92fb28c6615 100644
--- a/textproc/py-gdick/Makefile
+++ b/textproc/py-gdick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/09/21 13:04:23 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2008/04/25 20:39:12 joerg Exp $
DISTNAME= gdick-0.9.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -11,7 +11,7 @@ MAINTAINER= minskim@NetBSD.org
HOMEPAGE= http://gdick.sourceforge.net/
COMMENT= English-Korean Dictionary Client for GNOME2
-PYTHON_VERSIONS_ACCEPTED= 24
+PYTHON_VERSIONS_ACCEPTED= 25 24
PYDISTUTILSPKG= yes
NO_CONFIGURE= yes
diff --git a/textproc/py-gnosis-utils/Makefile b/textproc/py-gnosis-utils/Makefile
index 0c83ff765eb..465802e5994 100644
--- a/textproc/py-gnosis-utils/Makefile
+++ b/textproc/py-gnosis-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/06/07 12:46:31 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2008/04/25 20:39:13 joerg Exp $
#
DISTNAME= Gnosis_Utils-1.1.1
@@ -13,7 +13,6 @@ COMMENT= Classes for working with XML
PYDISTUTILSPKG= yes
PY_PATCHPLIST= yes
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
.include "../../lang/python/extension.mk"
.include "../../textproc/py-xml/buildlink3.mk"
diff --git a/textproc/py-html2text/Makefile b/textproc/py-html2text/Makefile
index 03bed8428fa..5b0ab110532 100644
--- a/textproc/py-html2text/Makefile
+++ b/textproc/py-html2text/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/02/19 10:31:53 schmonz Exp $
+# $NetBSD: Makefile,v 1.8 2008/04/25 20:39:13 joerg Exp $
#
DISTNAME= html2text-2.29
@@ -15,7 +15,7 @@ WRKSRC= ${WRKDIR}
USE_TOOLS+= tr
NO_BUILD= yes
-PYTHON_VERSIONS_ACCEPTED?= 24 23 22 21
+PYTHON_VERSIONS_ACCEPTED?= 25 24 23 21
INSTALLATION_DIRS= share/html2text
diff --git a/textproc/py-libxslt/Makefile b/textproc/py-libxslt/Makefile
index 37d9e5a70c7..6fe74235229 100644
--- a/textproc/py-libxslt/Makefile
+++ b/textproc/py-libxslt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2008/04/21 19:44:14 drochner Exp $
+# $NetBSD: Makefile,v 1.31 2008/04/25 20:39:13 joerg Exp $
DISTNAME= libxslt-1.1.23
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
DEPENDS+= ${PYPKGPREFIX}-libxml2>=2.6.8:../../textproc/py-libxml2
WRKSRC= ${WRKDIR}/${DISTNAME}/python
-PYTHON_VERSIONS_ACCEPTED= 25 24 23
PYDISTUTILSPKG= YES
PYBINMODULE= YES
NO_CONFIGURE= YES
diff --git a/textproc/py-textile/Makefile b/textproc/py-textile/Makefile
index f8e5f11291d..f17c70942d5 100644
--- a/textproc/py-textile/Makefile
+++ b/textproc/py-textile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/08/09 13:29:33 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2008/04/25 20:39:13 joerg Exp $
#
DISTNAME= textile-2
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
PYDISTUTILSPKG= yes
NO_CONFIGURE= yes
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-yaml/Makefile b/textproc/py-yaml/Makefile
index 4bfc55db754..f8c6efa9e8a 100644
--- a/textproc/py-yaml/Makefile
+++ b/textproc/py-yaml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/07/01 00:06:46 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2008/04/25 20:39:13 joerg Exp $
#
DISTNAME= PyYAML-3.05
@@ -11,7 +11,6 @@ HOMEPAGE= http://www.pyyaml.org/
COMMENT= Collection of libraries to process YAML with Python
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED= 24 23
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/rubber/Makefile b/textproc/rubber/Makefile
index c120d04c0d1..428476d1920 100644
--- a/textproc/rubber/Makefile
+++ b/textproc/rubber/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/08/10 03:21:40 minskim Exp $
+# $NetBSD: Makefile,v 1.19 2008/04/25 20:39:13 joerg Exp $
#
DISTNAME= rubber-1.1
@@ -15,7 +15,6 @@ USE_PKGLOCALEDIR= yes
HAS_CONFIGURE= yes
INFO_FILES= # PLIST
TEXINFO_REQD= 4.6
-PYTHON_VERSIONS_ACCEPTED= 24 23
TEX_ACCEPTED= teTeX3
CONFIGURE_ARGS+= --python=${PYTHONBIN:Q}
diff --git a/time/gdeskcal/Makefile b/time/gdeskcal/Makefile
index 1d95a3dc6cc..67c55e96e22 100644
--- a/time/gdeskcal/Makefile
+++ b/time/gdeskcal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2007/09/21 13:04:24 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2008/04/25 20:39:13 joerg Exp $
#
DISTNAME= gDeskCal-0_57_1
@@ -14,7 +14,6 @@ COMMENT= Desktop calendar
WRKSRC= ${WRKDIR}/gDeskCal-0.57.1
NO_BUILD= yes
-PYTHON_VERSIONS_ACCEPTED= 24 23
PYTHON_PATCH_SCRIPTS= gdeskcal
INSTALLATION_DIRS= bin
diff --git a/time/py-dateutil/Makefile b/time/py-dateutil/Makefile
index 6120d75ee0b..c57a08189a7 100644
--- a/time/py-dateutil/Makefile
+++ b/time/py-dateutil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/07/02 18:05:24 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2008/04/25 20:39:13 joerg Exp $
#
DISTNAME= python-dateutil-1.2
@@ -14,7 +14,5 @@ COMMENT= Extensions to the standard datetime module
PYDISTUTILSPKG= yes
PY_PATCHPLIST= yes
-PYTHON_VERSIONS_ACCEPTED= 24 23
-
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/time/py-mxDateTime/Makefile b/time/py-mxDateTime/Makefile
index 6e19c892e93..7e12bedaa5e 100644
--- a/time/py-mxDateTime/Makefile
+++ b/time/py-mxDateTime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2008/04/15 16:00:58 abs Exp $
+# $NetBSD: Makefile,v 1.25 2008/04/25 20:39:13 joerg Exp $
#
DISTNAME= egenix-mx-base-2.0.6
@@ -13,7 +13,7 @@ COMMENT= Python extension that provides types and conversions for dates
PYDISTUTILSPKG= yes
PYBINMODULE= yes
-PYTHON_VERSIONS_ACCEPTED= 25 24 23 22 21
+PYTHON_VERSIONS_ACCEPTED= 25 24 23 21
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/time/wxRemind/Makefile b/time/wxRemind/Makefile
index df21e9bd1d5..27972ec92ac 100644
--- a/time/wxRemind/Makefile
+++ b/time/wxRemind/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/11/14 13:38:16 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/04/25 20:39:13 joerg Exp $
#
DISTNAME= wxRemind-0.6.18
@@ -12,7 +12,7 @@ COMMENT= Graphical front-end to Remind
DEPENDS+= ${PYPKGPREFIX}-wxWidgets>=2.6.1:../../x11/py-wxWidgets
DEPENDS+= ${PYPKGPREFIX}-setuptools>=0.6b1:../../devel/py-setuptools
-PYTHON_VERSIONS_ACCEPTED= 24
+PYTHON_VERSIONS_ACCEPTED= 25 24
PYDISTUTILSPKG= YES
.include "../../lang/python/extension.mk"
diff --git a/www/ap-python/Makefile b/www/ap-python/Makefile
index d74224fe488..51d34deb36d 100644
--- a/www/ap-python/Makefile
+++ b/www/ap-python/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/06/02 18:27:59 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2008/04/25 20:39:13 joerg Exp $
#
DISTNAME= mod_python-2.7.10
@@ -18,7 +18,7 @@ PLIST_SRC= ${WRKDIR}/.PLIST_SRC
GNU_CONFIGURE= yes
CONFIGURE_ENV+= PYTHON_BIN=${PYTHONBIN:Q}
MAKE_ENV+= PYTHONBIN=${PYTHONBIN:Q}
-PYTHON_VERSIONS_ACCEPTED= 23 22 21 20
+PYTHON_VERSIONS_ACCEPTED= 23 21
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/ap-mod_python
diff --git a/www/ap2-python/Makefile b/www/ap2-python/Makefile
index 20362c11ac1..717a93343ce 100644
--- a/www/ap2-python/Makefile
+++ b/www/ap2-python/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2008/04/16 13:42:40 abs Exp $
+# $NetBSD: Makefile,v 1.24 2008/04/25 20:39:13 joerg Exp $
DISTNAME= mod_python-${VERSION}
PKGNAME= ${APACHE_PKG_PREFIX}-${PYPKGPREFIX}-python-${VERSION}
@@ -20,7 +20,6 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-apxs=${APXS:Q}
CONFIGURE_ARGS+=--with-python=${PYTHONBIN:Q}
-PYTHON_VERSIONS_ACCEPTED= 25 24 23
PY_PATCHPLIST= YES
PKG_APACHE_ACCEPTED= apache2 apache22
diff --git a/www/ap2-wsgi/Makefile b/www/ap2-wsgi/Makefile
index f1d0b5f7dc2..5d371a0b519 100644
--- a/www/ap2-wsgi/Makefile
+++ b/www/ap2-wsgi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2007/12/18 01:00:13 gdt Exp $
+# $NetBSD: Makefile,v 1.5 2008/04/25 20:39:13 joerg Exp $
#
DISTNAME= mod_wsgi-${VERSION}
@@ -18,8 +18,6 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-apxs=${APXS:Q}
CONFIGURE_ARGS+=--with-python=${PYTHONBIN:Q}
-PYTHON_VERSIONS_ACCEPTED= 24 23
-
PKG_APACHE_ACCEPTED= apache2 apache22
.include "../../lang/python/extension.mk"
diff --git a/www/ja-trac/Makefile b/www/ja-trac/Makefile
index 0bac540f471..775bb033b58 100644
--- a/www/ja-trac/Makefile
+++ b/www/ja-trac/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/12/21 03:38:06 taca Exp $
+# $NetBSD: Makefile,v 1.15 2008/04/25 20:39:13 joerg Exp $
#
DISTNAME= trac-0.10.4-ja-1
@@ -40,7 +40,6 @@ DEPENDS+= ${PYPKGPREFIX}-psycopg>=1.1.14:../../databases/py-psycopg2
PYDISTUTILSPKG= YES
PY_PATCHPLIST= YES
PYTHON_PATCH_SCRIPTS= contrib/*.py contrib/*-hook
-PYTHON_VERSIONS_ACCEPTED= 24 23
OWN_DIRS+= ${PREFIX}/share/trac
OWN_DIRS+= ${PREFIX}/share/trac/conf
diff --git a/www/py-clearsilver/Makefile b/www/py-clearsilver/Makefile
index b4624ad0d0e..52a114ccb1b 100644
--- a/www/py-clearsilver/Makefile
+++ b/www/py-clearsilver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/04/11 15:27:22 abs Exp $
+# $NetBSD: Makefile,v 1.11 2008/04/25 20:39:13 joerg Exp $
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
PKGREVISION= 1
@@ -15,7 +15,6 @@ INSTALL_DIRS= ${WRKSRC}/python
PY_PATCHPLIST= YES
PYBINMODULE= YES
-PYTHON_VERSIONS_INCOMPATIBLE= 15 20
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/py-curl/Makefile b/www/py-curl/Makefile
index a12060b3ac2..ae090a0c4d5 100644
--- a/www/py-curl/Makefile
+++ b/www/py-curl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2008/01/18 05:09:53 tnn Exp $
+# $NetBSD: Makefile,v 1.36 2008/04/25 20:39:13 joerg Exp $
DISTNAME= pycurl-7.16.4
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -14,7 +14,6 @@ BROKEN_IN= pkgsrc-2006Q4
PYDISTUTILSPKG= # defined
PYBINMODULE= # defined
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
BUILDLINK_API_DEPENDS.curl+= curl>=7.16.1
diff --git a/www/py-django/Makefile b/www/py-django/Makefile
index 2277ff21a10..83c879a253e 100644
--- a/www/py-django/Makefile
+++ b/www/py-django/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/11/01 21:24:02 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2008/04/25 20:39:13 joerg Exp $
DISTNAME= Django-0.96.1
PKGNAME= ${PYPKGPREFIX}-django-0.96.1
@@ -11,7 +11,7 @@ COMMENT= Django, a high-level Python Web framework
PYDISTUTILSPKG= # yes
PYBINMODULE= # yes
-PYTHON_VERSIONS_ACCEPTED= 24
+PYTHON_VERSIONS_ACCEPTED= 25 24
PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/www/py-jonpy/Makefile b/www/py-jonpy/Makefile
index b8d10e08c40..12e6abdadf5 100644
--- a/www/py-jonpy/Makefile
+++ b/www/py-jonpy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/04/10 13:35:53 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/04/25 20:39:13 joerg Exp $
#
DISTNAME= jonpy-0.06
@@ -14,7 +14,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
PYDISTUTILSPKG= yes
PY_PATCHPLIST= yes
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/py-moin/Makefile b/www/py-moin/Makefile
index 2c264b9f741..55c6cd02acf 100644
--- a/www/py-moin/Makefile
+++ b/www/py-moin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/03/15 18:16:51 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2008/04/25 20:39:13 joerg Exp $
#
DISTNAME= moin-1.6.1
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
PYDISTUTILSPKG= # empty
-PYTHON_VERSIONS_ACCEPTED= 24 23
REPLACE_INTERPRETER+= env_python
REPLACE.env_python.old= /usr/bin/env python
diff --git a/www/py-nevow/Makefile b/www/py-nevow/Makefile
index 326b8199dc1..1cc8f8e91b0 100644
--- a/www/py-nevow/Makefile
+++ b/www/py-nevow/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/10/04 22:04:10 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2008/04/25 20:39:13 joerg Exp $
#
DISTNAME= nevow-0.3
@@ -14,8 +14,6 @@ COMMENT= Next-generation web application templating system
DEPENDS+= ${PYPKGPREFIX}-twisted>=1.3.0:../../net/py-twisted
DEPENDS+= ${PYPKGPREFIX}-xml>=0.8.3:../../textproc/py-xml
-PYTHON_VERSIONS_ACCEPTED= 24 23
-
WRKSRC= ${WRKDIR}/${DISTNAME}
PY_PATCHPLIST= yes
PYDISTUTILSPKG= yes
diff --git a/www/py-webpy/Makefile b/www/py-webpy/Makefile
index 9492da0fde9..ef7e3529d04 100644
--- a/www/py-webpy/Makefile
+++ b/www/py-webpy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/01/11 11:30:00 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/04/25 20:39:13 joerg Exp $
#
DISTNAME= web.py-0.2
@@ -11,7 +11,7 @@ MAINTAINER= darcy@NetBSD.org
HOMEPAGE= http://webpy.org/
COMMENT= Simple, public domain web publishing system
-PYTHON_VERSIONS_ACCEPTED= 24
+PYTHON_VERSIONS_ACCEPTED= 25 24
WRKSRC= ${WRKDIR}/${DISTNAME}
#PY_PATCHPLIST= yes
diff --git a/www/trac/Makefile b/www/trac/Makefile
index 2b5dbc9eaf9..afd2b9b91ee 100644
--- a/www/trac/Makefile
+++ b/www/trac/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2008/04/11 15:27:22 abs Exp $
+# $NetBSD: Makefile,v 1.31 2008/04/25 20:39:14 joerg Exp $
#
DISTNAME= trac-0.10.4
@@ -35,7 +35,6 @@ DEPENDS+= ${PYPKGPREFIX}-psycopg2>=2:../../databases/py-psycopg2
PYDISTUTILSPKG= YES
PY_PATCHPLIST= YES
PYTHON_PATCH_SCRIPTS= contrib/*.py contrib/*-hook
-PYTHON_VERSIONS_INCOMPATIBLE= 15 20 21 22
EGDIR= ${PREFIX}/share/examples/trac
diff --git a/www/zopeedit/Makefile b/www/zopeedit/Makefile
index 653235b1ace..d3af1abc0ff 100644
--- a/www/zopeedit/Makefile
+++ b/www/zopeedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/01/31 13:43:34 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2008/04/25 20:39:14 joerg Exp $
#
DISTNAME= zopeedit-0.7-src
@@ -12,7 +12,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.zope.org/Members/Caseman/ExternalEditor
COMMENT= Helper client application for Zope's ExternalEditor
-PYTHON_VERSIONS_INCOMPATIBLE= 15 20 21
+PYTHON_VERSIONS_ACCEPTED= 25 24 23
PYDISTUTILSPKG= yes
post-install:
diff --git a/x11/modular-xorg-server/buildlink3.mk b/x11/modular-xorg-server/buildlink3.mk
index 2acfd360671..ce96905e195 100644
--- a/x11/modular-xorg-server/buildlink3.mk
+++ b/x11/modular-xorg-server/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2007/08/05 23:30:19 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2008/04/25 20:39:14 joerg Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MODULAR_XORG_SERVER_BUILDLINK3_MK:= ${MODULAR_XORG_SERVER_BUILDLINK3_MK}+
@@ -12,13 +12,14 @@ BUILDLINK_PACKAGES+= modular-xorg-server
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}modular-xorg-server
.if ${MODULAR_XORG_SERVER_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.modular-xorg-server+= modular-xorg-server>=1.2.99
-BUILDLINK_PKGSRCDIR.modular-xorg-server?= ../../x11/modular-xorg-server
+BUILDLINK_API_DEPENDS.modular-xorg-server+= modular-xorg-server>=1.4
+BUILDLINK_PKGSRCDIR.modular-xorg-server?= ../../x11/modular-xorg-server14
.endif # MODULAR_XORG_SERVER_BUILDLINK3_MK
.include "../../x11/compositeproto/buildlink3.mk"
.include "../../x11/fontsproto/buildlink3.mk"
.include "../../x11/inputproto/buildlink3.mk"
+.include "../../x11/pixman/buildlink3.mk"
.include "../../x11/randrproto/buildlink3.mk"
.include "../../x11/renderproto/buildlink3.mk"
.include "../../x11/videoproto/buildlink3.mk"
diff --git a/x11/py-gnome2-desktop/Makefile b/x11/py-gnome2-desktop/Makefile
index 30f9585e0fd..f393df444f4 100644
--- a/x11/py-gnome2-desktop/Makefile
+++ b/x11/py-gnome2-desktop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2008/04/15 18:02:48 drochner Exp $
+# $NetBSD: Makefile,v 1.19 2008/04/25 20:39:14 joerg Exp $
#
DISTNAME= gnome-python-desktop-2.22.0
@@ -20,7 +20,7 @@ DEPENDS+= bug-buddy>=2.16:../../net/bug-buddy
PKGCONFIG_OVERRIDE+= gnome-python-desktop-2.0.pc.in
-PYTHON_VERSIONS_ACCEPTED= 24
+PYTHON_VERSIONS_ACCEPTED= 25 24
# XXX not yet, needs hal
PLIST_VARS+= nautilusburn
diff --git a/x11/py-qt3-base/Makefile.common b/x11/py-qt3-base/Makefile.common
index 53fcf7ae01f..a31f4849321 100644
--- a/x11/py-qt3-base/Makefile.common
+++ b/x11/py-qt3-base/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2006/05/28 22:59:59 joerg Exp $
+# $NetBSD: Makefile.common,v 1.8 2008/04/25 20:39:14 joerg Exp $
#
# XXX: when updating version, be sure to update distinfo for both
@@ -28,7 +28,6 @@ CONFIGURE_ARGS+= -b ${PREFIX}/bin
CONFIGURE_ARGS+= -d ${PREFIX}/${PYSITELIB}
CONFIGURE_ARGS+= -v ${PREFIX}/share/sip${PYVERSSUFFIX}
-PYTHON_VERSIONS_ACCEPTED= 24 23
PY_PATCHPLIST= yes
PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
diff --git a/x11/py-qt3-sip/Makefile b/x11/py-qt3-sip/Makefile
index b7cdebca1dd..194cc585b34 100644
--- a/x11/py-qt3-sip/Makefile
+++ b/x11/py-qt3-sip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2007/02/22 19:27:27 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2008/04/25 20:39:14 joerg Exp $
#
DISTNAME= sip-4.3.2
@@ -25,7 +25,6 @@ CONFIGURE_ARGS+= -d ${PREFIX}/${PYSITELIB}
CONFIGURE_ARGS+= -e ${PREFIX}/${PYINC}
CONFIGURE_ARGS+= -v ${PREFIX}/share/sip${PYVERSSUFFIX}
-PYTHON_VERSIONS_ACCEPTED= 24 23
PY_PATCHPLIST= yes
PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
diff --git a/x11/py-wxWidgets/Makefile b/x11/py-wxWidgets/Makefile
index 33944c1857b..e60490cfa74 100644
--- a/x11/py-wxWidgets/Makefile
+++ b/x11/py-wxWidgets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2007/01/13 11:59:33 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2008/04/25 20:39:14 joerg Exp $
#
DISTNAME= wxPython-src-2.6.3.3
@@ -18,8 +18,6 @@ USE_TOOLS+= gmake pkg-config
# previous name of the package
CONFLICTS+= ${PYPKGPREFIX}-wxWindows-[0-9]*
-PYTHON_VERSIONS_ACCEPTED= 24 23
-
WXARG= WXPORT=gtk2 \
WX_CONFIG=${BUILDLINK_PREFIX.wxGTK}/bin/wx-config \
CONTRIBS_INC="../contrib/include" \
diff --git a/x11/rox-session/Makefile b/x11/rox-session/Makefile
index e5504420dea..80aa23af7cd 100644
--- a/x11/rox-session/Makefile
+++ b/x11/rox-session/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/09/21 13:04:44 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2008/04/25 20:39:14 joerg Exp $
#
DISTNAME= rox-session-0.28
@@ -18,7 +18,7 @@ DIST_SUBDIR= rox
NO_BUILD= yes
-PYTHON_VERSIONS_ACCEPTED= 24
+PYTHON_VERSIONS_ACCEPTED= 25 24
PYTHON_PATCH_SCRIPTS= AppRun tests/testutils.py
INSTALLATION_DIRS= share/rox/ROX-Session