diff options
532 files changed, 1402 insertions, 1207 deletions
diff --git a/audio/aubio/Makefile b/audio/aubio/Makefile index acda5a09d14..d91d2421b9f 100644 --- a/audio/aubio/Makefile +++ b/audio/aubio/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2013/02/09 22:11:31 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.5 2014/01/25 10:29:56 wiz Exp $ DISTNAME= aubio-0.3.2 PKGREVISION= 2 @@ -20,6 +19,7 @@ PKGCONFIG_OVERRIDE+= aubio.pc.in # Python related variables: PY_PATCHPLIST= yes PYTHON_PATCH_SCRIPTS= python/aubiocut python/aubiopitch +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.3.2 .include "options.mk" diff --git a/audio/csound5/Makefile b/audio/csound5/Makefile index 5c8f0bc730c..cb3ed3fc002 100644 --- a/audio/csound5/Makefile +++ b/audio/csound5/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2014/01/09 16:55:16 jperkin Exp $ -# +# $NetBSD: Makefile,v 1.29 2014/01/25 10:29:56 wiz Exp $ DISTNAME= Csound${CSOUND_VERSION}_src PKGNAME= csound5-${CSOUND_VERSION} @@ -26,6 +25,8 @@ SCONS_ARGS+= useALSA=0 useJack=0 useOSC=0 usePortMIDI=0 SCONS_ARGS+= usePortAudio=0 SCONS_ARGS+= buildInterfaces=0 +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 5.01 + INSTALLATION_DIRS= bin .include "../../mk/bsd.prefs.mk" diff --git a/audio/exaile/Makefile b/audio/exaile/Makefile index 692f46bc5ad..74c42b1ab7a 100644 --- a/audio/exaile/Makefile +++ b/audio/exaile/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2013/10/10 14:41:58 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.44 2014/01/25 10:29:56 wiz Exp $ DISTNAME= exaile_0.2.14 PKGNAME= ${DISTNAME:S/_/-/1} @@ -18,6 +17,8 @@ USE_PKGLOCALEDIR= yes USE_TOOLS+= pkg-config gmake intltool msgfmt PYTHON_PATCH_SCRIPTS= exaile.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-mutagen, py-sqlite2, py-gtk2, py-gstreamer0.10 + MAKE_ENV+= PYTHONBIN=${PYTHONBIN} MAKE_FLAGS+= PKGLOCALEDIR=${PKGLOCALEDIR} diff --git a/audio/moss/Makefile b/audio/moss/Makefile index a620901a6f7..111ec626675 100644 --- a/audio/moss/Makefile +++ b/audio/moss/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2012/10/02 23:47:58 asau Exp $ +# $NetBSD: Makefile,v 1.22 2014/01/25 10:29:56 wiz Exp $ DISTNAME= moss-0.1.13 PKGREVISION= 6 @@ -12,6 +12,8 @@ COMMENT= MP3/OGG Streaming Server DEPENDS+= ${PYPKGPREFIX}-ogg>=1.3:../../audio/py-ogg DEPENDS+= ${PYPKGPREFIX}-vorbis>=1.3:../../audio/py-vorbis +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-ogg, py-vorbis + PYTHON_PATCH_SCRIPTS= ${WRKSRC}/*.py RCD_SCRIPTS= moss diff --git a/audio/mutagen-tools/Makefile b/audio/mutagen-tools/Makefile index a79ef1f6e25..1d69c0e7617 100644 --- a/audio/mutagen-tools/Makefile +++ b/audio/mutagen-tools/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2013/12/04 16:48:21 drochner Exp $ -# +# $NetBSD: Makefile,v 1.3 2014/01/25 10:29:56 wiz Exp $ DISTNAME= mutagen-1.22 PKGNAME= mutagen-tools-1.22 @@ -11,10 +10,11 @@ HOMEPAGE= http://code.google.com/p/mutagen/ COMMENT= Audio metadata handling for Python LICENSE= gnu-gpl-v2 +DEPENDS+= ${PYPKGPREFIX}-mutagen-[0-9]*:../../audio/py-mutagen + USE_LANGUAGES= # none PY_NO_EGG= yes - -DEPENDS+= ${PYPKGPREFIX}-mutagen-[0-9]*:../../audio/py-mutagen +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.22 .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/picard/Makefile b/audio/picard/Makefile index d14139730cc..2ca34f8d08d 100644 --- a/audio/picard/Makefile +++ b/audio/picard/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2013/08/21 15:39:43 drochner Exp $ -# +# $NetBSD: Makefile,v 1.19 2014/01/25 10:29:56 wiz Exp $ DISTNAME= picard-1.2 CATEGORIES= audio @@ -16,6 +15,8 @@ DEPENDS+= ${PYPKGPREFIX}-mutagen>=1.20:../../audio/py-mutagen USE_LANGUAGES= c c++ USE_TOOLS+= msgfmt pkg-config +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-mutagen + HAS_CONFIGURE= yes CONFIG_SHELL= ${PYTHONBIN} CONFIGURE_SCRIPT= setup.py diff --git a/audio/py-acoustid/Makefile b/audio/py-acoustid/Makefile index b38c272b216..e4788fd9c93 100644 --- a/audio/py-acoustid/Makefile +++ b/audio/py-acoustid/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2013/04/02 10:44:41 drochner Exp $ -# +# $NetBSD: Makefile,v 1.2 2014/01/25 10:29:56 wiz Exp $ DISTNAME= v1.0.0 PKGNAME= ${PYPKGPREFIX}-acoustid-1.0.0 @@ -12,12 +11,13 @@ HOMEPAGE= https://github.com/sampsyo/pyacoustid COMMENT= Audio fingerprinting LICENSE= mit +DEPENDS+= ${PYPKGPREFIX}-audioread-[0-9]*:../../audio/py-audioread +DEPENDS+= chromaprint-[0-9]*:../../audio/chromaprint + WRKSRC= ${WRKDIR}/pyacoustid-1.0.0 USE_LANGUAGES= # none EGG_NAME= pyacoustid-1.0.0 - -DEPENDS+= ${PYPKGPREFIX}-audioread-[0-9]*:../../audio/py-audioread -DEPENDS+= chromaprint-[0-9]*:../../audio/chromaprint +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.0.0 .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/py-beets/Makefile b/audio/py-beets/Makefile index 567a6dd8e43..57a8cec2519 100644 --- a/audio/py-beets/Makefile +++ b/audio/py-beets/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2014/01/15 16:17:23 drochner Exp $ -# +# $NetBSD: Makefile,v 1.9 2014/01/25 10:29:56 wiz Exp $ DISTNAME= v1.3.2 PKGNAME= beets-${DISTNAME:S/v//} @@ -20,6 +19,8 @@ DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml DEPENDS+= ${PYPKGPREFIX}-Unidecode-[0-9]*:../../textproc/py-Unidecode DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-mutagen + .include "../../lang/python/pyversion.mk" .if empty(PYPKGPREFIX:Mpy27) DEPENDS+= ${PYPKGPREFIX}-ordereddict-[0-9]*:../../devel/py-ordereddict diff --git a/audio/py-cddb/Makefile b/audio/py-cddb/Makefile index 76dbadf0169..0b1e53bd917 100644 --- a/audio/py-cddb/Makefile +++ b/audio/py-cddb/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2012/10/02 23:48:05 asau Exp $ -# +# $NetBSD: Makefile,v 1.17 2014/01/25 10:29:56 wiz Exp $ DISTNAME= CDDB-1.4 PKGNAME= ${PYPKGPREFIX}-cddb-1.4 @@ -12,5 +11,7 @@ HOMEPAGE= http://cddb-py.sourceforge.net/ COMMENT= Python module to access the CDDB online database LICENSE= gnu-gpl-v2 +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.4 + .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/py-discogs_client/Makefile b/audio/py-discogs_client/Makefile index 03cf38d793e..0c01dae297b 100644 --- a/audio/py-discogs_client/Makefile +++ b/audio/py-discogs_client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2013/08/21 15:26:56 drochner Exp $ +# $NetBSD: Makefile,v 1.2 2014/01/25 10:29:56 wiz Exp $ DISTNAME= v1.1.1 PKGNAME= ${PYPKGPREFIX}-discogs_client-1.1.1 @@ -11,11 +11,13 @@ HOMEPAGE= https://github.com/discogs/discogs_client/ COMMENT= Python Client for the Discogs API LICENSE= modified-bsd +DEPENDS+= ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests + WRKSRC= ${WRKDIR}/discogs_client-1.1.1 USE_LANGUAGES= # none EGG_NAME= discogs_client-1.1.1 -DEPENDS+= ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests +PYTHON_VERSIONS_INCOMPATIBLE= 33 .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/py-id3/Makefile b/audio/py-id3/Makefile index 259ae9764a5..30ce4687fad 100644 --- a/audio/py-id3/Makefile +++ b/audio/py-id3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2012/10/02 23:48:05 asau Exp $ +# $NetBSD: Makefile,v 1.4 2014/01/25 10:29:56 wiz Exp $ DISTNAME= id3-py_1.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py_//} @@ -16,5 +16,7 @@ USE_LANGUAGES= # empty WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/} EGG_NAME= ${DISTNAME:S/py_//:tu} +PYTHON_VERSIONS_INCOMPATIBLE= 33 + .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/py-id3lib/Makefile b/audio/py-id3lib/Makefile index 6171adbdfef..6631580778a 100644 --- a/audio/py-id3lib/Makefile +++ b/audio/py-id3lib/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2012/10/02 23:48:05 asau Exp $ -# +# $NetBSD: Makefile,v 1.6 2014/01/25 10:29:56 wiz Exp $ DISTNAME= pyid3lib-0.5.1 PKGNAME= ${PYPKGPREFIX}-id3lib-0.5.1 @@ -15,6 +14,8 @@ LICENSE= gnu-lgpl-v2.1 USE_LANGUAGES= c c++ +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.5.1 + .include "../../lang/python/distutils.mk" .include "../../audio/id3lib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/py-karaoke/Makefile b/audio/py-karaoke/Makefile index 6be7f5ae9e1..defd4a3145b 100644 --- a/audio/py-karaoke/Makefile +++ b/audio/py-karaoke/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2013/10/24 12:32:38 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.27 2014/01/25 10:29:57 wiz Exp $ DISTNAME= pykaraoke-0.7.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -19,6 +18,8 @@ DEPENDS+= ${PYPKGPREFIX}-wxWidgets>=2.6:../../x11/py-wxWidgets DEPENDS+= ${PYPKGPREFIX}-mutagen-[0-9]*:../../audio/py-mutagen DEPENDS+= ${PYPKGPREFIX}-Numeric-[0-9]*:../../math/py-Numeric +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-Numeric, py-wxWidgets, py-mutagen + REPLACE_PYTHON+= performer_prompt.py REPLACE_PYTHON+= pycdg.py REPLACE_PYTHON+= pykar.py diff --git a/audio/py-last/Makefile b/audio/py-last/Makefile index 0ac25f461c6..828bf91661b 100644 --- a/audio/py-last/Makefile +++ b/audio/py-last/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2012/10/03 22:14:00 wiz Exp $ -# +# $NetBSD: Makefile,v 1.5 2014/01/25 10:29:57 wiz Exp $ DISTNAME= pylast-0.5.11 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -12,7 +11,6 @@ COMMENT= Python interface to Last.fm LICENSE= apache-2.0 USE_LANGUAGES= # none -PYTHON_VERSIONS_INCLUDE_3X= yes .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/py-mad/Makefile b/audio/py-mad/Makefile index daad1b18b74..2c0ba3d35d2 100644 --- a/audio/py-mad/Makefile +++ b/audio/py-mad/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2012/10/02 23:48:06 asau Exp $ -# +# $NetBSD: Makefile,v 1.15 2014/01/25 10:29:57 wiz Exp $ DISTNAME= pymad-0.6 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -17,6 +16,8 @@ CONFIG_SHELL= ${PYTHONBIN} CONFIGURE_SCRIPT= config_unix.py CONFIGURE_ARGS+= --prefix ${PREFIX} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.6 + .include "../../audio/libmad/buildlink3.mk" .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/py-musicbrainz-ngs/Makefile b/audio/py-musicbrainz-ngs/Makefile index 9f1a9633aa5..29ec8df7943 100644 --- a/audio/py-musicbrainz-ngs/Makefile +++ b/audio/py-musicbrainz-ngs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2013/06/12 20:25:18 drochner Exp $ +# $NetBSD: Makefile,v 1.3 2014/01/25 10:29:57 wiz Exp $ DISTNAME= v0.4 PKGNAME= ${PYPKGPREFIX}-musicbrainz-ngs-0.4 @@ -15,7 +15,6 @@ DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat WRKSRC= ${WRKDIR}/python-musicbrainz-ngs-0.4 DIST_SUBDIR= py-musicbrainz-ngs -PYTHON_VERSIONS_INCLUDE_3X= yes EGG_NAME= musicbrainzngs-0.4 do-test: diff --git a/audio/py-musicbrainz/Makefile b/audio/py-musicbrainz/Makefile index eefc0f21bd6..be8fb53b3a5 100644 --- a/audio/py-musicbrainz/Makefile +++ b/audio/py-musicbrainz/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2012/10/04 00:22:00 cheusov Exp $ +# $NetBSD: Makefile,v 1.12 2014/01/25 10:29:57 wiz Exp $ DISTNAME= python-musicbrainz2-0.4.1 PKGNAME= ${DISTNAME:S/python/${PYPKGPREFIX}/} @@ -11,12 +11,11 @@ HOMEPAGE= http://musicbrainz.org/doc/PythonMusicBrainz2 COMMENT= Python interface to the MusicBrainz XML web service LICENSE= modified-bsd -PYTHON_SELF_CONFLICT= yes - -.include "../../lang/python/pyversion.mk" - DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat +PYTHON_SELF_CONFLICT= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 + EGG_NAME= ${DISTNAME:S/-/_/} .include "../../audio/libdiscid/buildlink3.mk" diff --git a/audio/py-musique/Makefile b/audio/py-musique/Makefile index d2b4373d0a2..76f8799b9f9 100644 --- a/audio/py-musique/Makefile +++ b/audio/py-musique/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2013/10/10 14:42:00 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.44 2014/01/25 10:29:57 wiz Exp $ DISTNAME= pymusique-0.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -24,6 +23,7 @@ DEPENDS+= ${PYPKGPREFIX}-libxml2-[0-9]*:../../textproc/py-libxml2 DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat PYDISTUTILSPKG= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-twisted, py-mcrypt, py-gtk2 .include "../../lang/python/application.mk" .include "../../lang/python/extension.mk" diff --git a/audio/py-mutagen/Makefile b/audio/py-mutagen/Makefile index 5b8091385c3..31329421dee 100644 --- a/audio/py-mutagen/Makefile +++ b/audio/py-mutagen/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2013/12/04 16:47:32 drochner Exp $ -# +# $NetBSD: Makefile,v 1.13 2014/01/25 10:29:57 wiz Exp $ DISTNAME= mutagen-1.22 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,6 +11,7 @@ COMMENT= Audio metadata handling for Python LICENSE= gnu-gpl-v2 USE_LANGUAGES= # none +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.22 .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/py-ogg/Makefile b/audio/py-ogg/Makefile index 662b0e503de..f44c9a15f98 100644 --- a/audio/py-ogg/Makefile +++ b/audio/py-ogg/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2012/10/02 23:48:06 asau Exp $ -# +# $NetBSD: Makefile,v 1.13 2014/01/25 10:29:57 wiz Exp $ DISTNAME= pyogg-1.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -17,6 +16,8 @@ CONFIG_SHELL= ${PYTHONBIN} CONFIGURE_SCRIPT= config_unix.py CONFIGURE_ARGS+= --prefix ${PREFIX} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.3 + .include "../../lang/python/distutils.mk" .include "../../multimedia/libogg/buildlink3.mk" diff --git a/audio/py-vorbis/Makefile b/audio/py-vorbis/Makefile index 4c07a0a4feb..1b93f5d4d74 100644 --- a/audio/py-vorbis/Makefile +++ b/audio/py-vorbis/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2012/10/02 23:48:06 asau Exp $ -# +# $NetBSD: Makefile,v 1.13 2014/01/25 10:29:57 wiz Exp $ DISTNAME= pyvorbis-1.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} -PKGREVISION= 2 +PKGREVISION= 2 CATEGORIES= audio python MASTER_SITES= http://vorbis.com/files/1.0.1/unix/py/ @@ -13,6 +12,7 @@ COMMENT= Python bindings for Vorbis library PY_PATCHPLIST= yes PYDISTUTILSPKG= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-ogg, and itself not ported as of 1.3 HAS_CONFIGURE= yes CONFIG_SHELL= ${PYTHONBIN} diff --git a/audio/quodlibet2/Makefile b/audio/quodlibet2/Makefile index e9b1ab52afb..723be196b6a 100644 --- a/audio/quodlibet2/Makefile +++ b/audio/quodlibet2/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2013/11/23 13:58:13 drochner Exp $ -# +# $NetBSD: Makefile,v 1.2 2014/01/25 10:29:57 wiz Exp $ DISTNAME= quodlibet-2.6.3 CATEGORIES= audio @@ -20,6 +19,7 @@ USE_PKGLOCALEDIR= yes #BUILD_TARGET= _trayicon.so _mmkeys.so PYDISTUTILSPKG= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-mutagen, py-gtk2, py-gstreamer0.10 PYTHON_PATCH_SCRIPTS= exfalso.py quodlibet.py operon.py .include "../../devel/py-gobject/buildlink3.mk" diff --git a/audio/rhythmbox-gtk3/Makefile b/audio/rhythmbox-gtk3/Makefile index 7a57ba9a521..a24d638e182 100644 --- a/audio/rhythmbox-gtk3/Makefile +++ b/audio/rhythmbox-gtk3/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2014/01/01 11:52:09 wiz Exp $ -# +# $NetBSD: Makefile,v 1.17 2014/01/25 10:29:57 wiz Exp $ DISTNAME= rhythmbox-2.99.1 PKGREVISION= 9 @@ -22,6 +21,8 @@ CONFIGURE_ARGS+= --disable-browser-plugin CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc CONFIGURE_ARGS+= --disable-fm-radio +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gstreamer0.10 + # option? .include "../../net/grilo/buildlink3.mk" diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile index dd235977ca5..f2738f878cc 100644 --- a/audio/rhythmbox/Makefile +++ b/audio/rhythmbox/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.116 2014/01/01 11:52:09 wiz Exp $ -# +# $NetBSD: Makefile,v 1.117 2014/01/25 10:29:57 wiz Exp $ DISTNAME= rhythmbox-0.12.8 PKGREVISION= 35 @@ -24,6 +23,8 @@ CONFIGURE_ARGS+= --disable-fm-radio GCONF_SCHEMAS= rhythmbox.schemas +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2, py-gstreamer0.10 + .include "../../lang/python/application.mk" .include "../../x11/py-gtk2/buildlink3.mk" .include "../../multimedia/py-gstreamer0.10/buildlink3.mk" diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile index 80c6071ab81..16808c3cc77 100644 --- a/audio/solfege/Makefile +++ b/audio/solfege/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2013/10/10 14:42:00 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.48 2014/01/25 10:29:57 wiz Exp $ DISTNAME= solfege-3.14.1 PKGREVISION= 22 @@ -27,6 +26,7 @@ USE_TOOLS+= gmake gm4 makeinfo pkg-config msgfmt bash:run REPLACE_BASH= lesson-files/bin/csound-play-harmonic-interval.sh PYTHON_PATCH_SCRIPTS= *.py *.py.in */*.py */*.py.in +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 SUBST_CLASSES+= sound SUBST_STAGE.sound= do-configure diff --git a/audio/sonata/Makefile b/audio/sonata/Makefile index 1118c3bca7a..c5ebeba015b 100644 --- a/audio/sonata/Makefile +++ b/audio/sonata/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2013/10/10 14:42:00 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.39 2014/01/25 10:29:57 wiz Exp $ EGG_NAME= Sonata-1.6.2.1 DISTNAME= ${EGG_NAME:tl} @@ -16,6 +15,8 @@ LICENSE= gnu-gpl-v3 DEPENDS+= ${PYPKGPREFIX}-SOAPpy-[0-9]*:../../net/py-soappy DEPENDS+= ${PYPKGPREFIX}-mpd-[0-9]*:../../audio/py-mpd +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-xml via py-soappy, py-gtk2 + USE_TOOLS+= pkg-config msgfmt SUBST_CLASSES+= mandir diff --git a/audio/streamtuner/options.mk b/audio/streamtuner/options.mk index 5e47d362531..2ba0af1bb8a 100644 --- a/audio/streamtuner/options.mk +++ b/audio/streamtuner/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2008/04/12 22:42:58 jlam Exp $ +# $NetBSD: options.mk,v 1.3 2014/01/25 10:29:57 wiz Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.streamtuner @@ -28,6 +28,7 @@ CONFIGURE_ARGS+= --disable-xiph .if !empty(PKG_OPTIONS:Mpython) PLIST.python= yes CONFIGURE_ARGS+= --enable-python +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 . include "../../x11/py-gtk2/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-python diff --git a/audio/tunapie/Makefile b/audio/tunapie/Makefile index f803808df21..057463463ff 100644 --- a/audio/tunapie/Makefile +++ b/audio/tunapie/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2012/10/02 23:48:12 asau Exp $ -# +# $NetBSD: Makefile,v 1.17 2014/01/25 10:29:57 wiz Exp $ DISTNAME= tunapie-2.1.18 PKGREVISION= 1 @@ -13,6 +12,8 @@ LICENSE= gnu-gpl-v2 DEPENDS+= ${PYPKGPREFIX}-wxWidgets>=2.6:../../x11/py-wxWidgets +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-wxWidgets + USE_LANGUAGES= # none SUBST_CLASSES+= fixpaths diff --git a/chat/gajim/Makefile b/chat/gajim/Makefile index a3e6c13c3ec..71574cee484 100644 --- a/chat/gajim/Makefile +++ b/chat/gajim/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2013/10/10 14:42:02 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.24 2014/01/25 10:29:57 wiz Exp $ DISTNAME= gajim-0.15 PKGREVISION= 11 @@ -16,6 +15,8 @@ DEPENDS= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat DEPENDS= ${PYPKGPREFIX}-dbus>=0.81:../../sysutils/py-dbus DEPENDS= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 + .include "options.mk" USE_TOOLS+= gmake intltool pkg-config msgfmt diff --git a/chat/gajim/options.mk b/chat/gajim/options.mk index e849e3851fa..8c7381280ba 100644 --- a/chat/gajim/options.mk +++ b/chat/gajim/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2012/04/17 20:57:09 gls Exp $ +# $NetBSD: options.mk,v 1.4 2014/01/25 10:29:57 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gajim PKG_SUPPORTED_OPTIONS= avahi gnome gnome-keyring ssl @@ -20,6 +20,7 @@ DEPENDS+= avahi-[0-9]*:../../net/avahi # gnome .if !empty(PKG_OPTIONS:Mgnome) DEPENDS+= ${PYPKGPREFIX}-gnome2-[0-9]*:../../x11/py-gnome2 +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-ORBit via py-gnome2 .endif # gnome-keyring diff --git a/chat/libpurple/options.mk b/chat/libpurple/options.mk index 1a8b242accc..cbe6cf4ef20 100644 --- a/chat/libpurple/options.mk +++ b/chat/libpurple/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.21 2012/08/01 15:23:46 drochner Exp $ +# $NetBSD: options.mk,v 1.22 2014/01/25 10:29:58 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.libpurple PKG_SUPPORTED_OPTIONS+= avahi dbus debug farsight gnome gnutls @@ -62,6 +62,7 @@ REPLACE_SH+= libpurple/purple-send REPLACE_SH+= libpurple/purple-send-async REPLACE_PYTHON+= libpurple/purple-remote REPLACE_PYTHON+= libpurple/purple-url-handler +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.10.7 . include "../../sysutils/py-dbus/buildlink3.mk" . include "../../sysutils/dbus/buildlink3.mk" . include "../../sysutils/dbus-glib/buildlink3.mk" diff --git a/chat/libtelepathy/Makefile b/chat/libtelepathy/Makefile index 70feeffb2b0..428162c7aa1 100644 --- a/chat/libtelepathy/Makefile +++ b/chat/libtelepathy/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2014/01/01 11:52:10 wiz Exp $ -# +# $NetBSD: Makefile,v 1.16 2014/01/25 10:29:58 wiz Exp $ DISTNAME= libtelepathy-0.3.3 PKGREVISION= 9 @@ -19,6 +18,8 @@ USE_TOOLS+= gmake pkg-config PKGCONFIG_OVERRIDE+= libtelepathy.pc.in +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.3.3 + .include "../../lang/python/pyversion.mk" CONFIGURE_ENV+= ac_cv_prog_PYTHON=${PYTHONBIN} diff --git a/chat/py-xmpppy/Makefile b/chat/py-xmpppy/Makefile index 052b12de57b..7a78fe2e561 100644 --- a/chat/py-xmpppy/Makefile +++ b/chat/py-xmpppy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2014/01/17 23:11:27 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2014/01/25 10:29:58 wiz Exp $ DISTNAME= xmpppy-0.5.0rc1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -17,6 +17,7 @@ USE_LANGUAGES= # none PYDISTUTILSPKG= yes PYTHON_VERSIONED_DEPENDENCIES= dns +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.5.0rc1 DOCDIR= ${PREFIX}/share/doc/py-xmpppy EXDIR= ${PREFIX}/share/examples/py-xmpppy diff --git a/chat/spectrum/Makefile b/chat/spectrum/Makefile index 0c74d10697a..4788de25d72 100644 --- a/chat/spectrum/Makefile +++ b/chat/spectrum/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2013/10/19 09:07:00 adam Exp $ +# $NetBSD: Makefile,v 1.38 2014/01/25 10:29:58 wiz Exp $ DISTNAME= spectrum-1.4.8 PKGREVISION= 23 @@ -20,6 +20,7 @@ USE_LANGUAGES= c++ c REPLACE_PYTHON+= spectrumctl/spectrumctl.py PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-xmpppy BUILD_DEFS+= JABBER_USER JABBER_GROUP BUILD_DEFS+= SPECTRUM_RUN SPECTRUM_DB SPECTRUM_LOG diff --git a/chat/telepathy-farsight/Makefile b/chat/telepathy-farsight/Makefile index 9738129db70..5d81dd6856f 100644 --- a/chat/telepathy-farsight/Makefile +++ b/chat/telepathy-farsight/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2013/10/10 14:42:02 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.37 2014/01/25 10:29:58 wiz Exp $ DISTNAME= telepathy-farsight-0.0.16 PKGREVISION= 20 @@ -20,6 +19,8 @@ CFLAGS.SunOS+= -std=c99 -D_XOPEN_SOURCE=600 PKGCONFIG_OVERRIDE+= telepathy-farsight/telepathy-farsight.pc.in PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2, py-gstreamer0.10 + .include "../../lang/python/extension.mk" .include "../../chat/telepathy-glib/buildlink3.mk" diff --git a/chat/telepathy-gabble/Makefile b/chat/telepathy-gabble/Makefile index fcfdddb1520..014c05dc074 100644 --- a/chat/telepathy-gabble/Makefile +++ b/chat/telepathy-gabble/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2014/01/01 11:52:10 wiz Exp $ -# +# $NetBSD: Makefile,v 1.36 2014/01/25 10:29:58 wiz Exp $ DISTNAME= telepathy-gabble-0.11.10 PKGREVISION= 17 @@ -18,6 +17,8 @@ USE_LIBTOOL= yes USE_TOOLS+= gmake pkg-config CONFIGURE_ENV+= UUID_CFLAGS=" " UUID_LIBS=" " +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.11.10 + .include "../../mk/compiler.mk" .if !empty(PKGSRC_COMPILER:Mclang) CFLAGS+= -Wno-error=deprecated-declarations \ diff --git a/chat/telepathy-glib/Makefile b/chat/telepathy-glib/Makefile index fff9dd216aa..8c2842c24d7 100644 --- a/chat/telepathy-glib/Makefile +++ b/chat/telepathy-glib/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2014/01/01 11:52:10 wiz Exp $ -# +# $NetBSD: Makefile,v 1.36 2014/01/25 10:29:58 wiz Exp $ DISTNAME= telepathy-glib-0.20.2 PKGREVISION= 1 @@ -23,6 +22,7 @@ PKGCONFIG_OVERRIDE+= telepathy-glib/telepathy-glib.pc.in PYTHON_FOR_BUILD_ONLY= yes CONFIGURE_ENV+= ac_cv_prog_PYTHON=${PYTHONBIN} REPLACE_PYTHON+= tests/all-errors-documented.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.20.2 TEST_TARGET= check BUILDLINK_API_DEPENDS.glib2+= glib2>=2.32.0 diff --git a/chat/telepathy-idle/Makefile b/chat/telepathy-idle/Makefile index 29d1a1dced0..28bab1bfd64 100644 --- a/chat/telepathy-idle/Makefile +++ b/chat/telepathy-idle/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2014/01/01 11:52:10 wiz Exp $ -# +# $NetBSD: Makefile,v 1.27 2014/01/25 10:29:58 wiz Exp $ DISTNAME= telepathy-idle-0.1.8 PKGREVISION= 8 @@ -13,6 +12,8 @@ LICENSE= gnu-lgpl-v2.1 BUILD_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.1.8 + GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= gmake pkg-config diff --git a/chat/telepathy-logger/Makefile b/chat/telepathy-logger/Makefile index fb525e5b93d..3f6141a1ee4 100644 --- a/chat/telepathy-logger/Makefile +++ b/chat/telepathy-logger/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2013/10/19 09:06:56 adam Exp $ -# +# $NetBSD: Makefile,v 1.24 2014/01/25 10:29:58 wiz Exp $ DISTNAME= telepathy-logger-0.2.7 PKGREVISION= 12 @@ -24,6 +23,7 @@ PKGCONFIG_OVERRIDE+= telepathy-logger/telepathy-logger-0.1.pc.in BUILD_DEPENDS= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat PYTHON_FOR_BUILD_ONLY= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.2.7 .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/schemas.mk" diff --git a/chat/telepathy-mission-control5/Makefile b/chat/telepathy-mission-control5/Makefile index cb0c3a1e200..f5e5297715f 100644 --- a/chat/telepathy-mission-control5/Makefile +++ b/chat/telepathy-mission-control5/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2014/01/01 11:52:10 wiz Exp $ -# +# $NetBSD: Makefile,v 1.14 2014/01/25 10:29:58 wiz Exp $ DISTNAME= telepathy-mission-control-5.7.9 PKGNAME= telepathy-mission-control5-5.7.9 @@ -20,6 +19,8 @@ PKGCONFIG_OVERRIDE+= mission-control-plugins.pc.in #PKGCONFIG_OVERRIDE+= libmcclient.pc.in #PKGCONFIG_OVERRIDE+= mission-control.pc.in +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 5.7.9 + #.include "../../lang/python/pyversion.mk" CONFIGURE_ENV+= ac_cv_prog_PYTHON=${PYTHONBIN} diff --git a/chat/xchat-python/Makefile b/chat/xchat-python/Makefile index 2ae41813fb5..10951a5c456 100644 --- a/chat/xchat-python/Makefile +++ b/chat/xchat-python/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2013/05/31 12:39:42 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2014/01/25 10:29:58 wiz Exp $ .include "../../chat/xchat/Makefile.common" @@ -28,6 +28,8 @@ SUBST_FILES.libutil= configure SUBST_SED.libutil= -e 's/ -lutil//g' .endif +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.8.8 + .include "../../lang/python/application.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/comms/multisync-gui/Makefile b/comms/multisync-gui/Makefile index 10160c0e930..94d63bc5279 100644 --- a/comms/multisync-gui/Makefile +++ b/comms/multisync-gui/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2013/10/19 09:07:01 adam Exp $ -# +# $NetBSD: Makefile,v 1.34 2014/01/25 10:29:58 wiz Exp $ DISTNAME= multisync-gui-0.91.0 PKGREVISION= 27 @@ -14,6 +13,7 @@ USE_TOOLS+= pkg-config HAS_CONFIGURE= yes REPLACE_PYTHON= waf +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.91.0 LDFLAGS.DragonFly= -lgthread-2.0 diff --git a/comms/py-gammu/Makefile b/comms/py-gammu/Makefile index 09852314a83..c1cb3131547 100644 --- a/comms/py-gammu/Makefile +++ b/comms/py-gammu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2012/10/03 11:24:44 asau Exp $ +# $NetBSD: Makefile,v 1.4 2014/01/25 10:29:58 wiz Exp $ # .include "../../comms/gammu/Makefile.common" @@ -18,6 +18,8 @@ PYSETUPBUILDTARGET= build_ext PYSETUPBUILDARGS= --gammu-incs=${BUILDLINK_PREFIX.gammu}/include/gammu PYSETUPBUILDARGS+= --gammu-libs=${BUILDLINK_PREFIX.gammu}/lib +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.26.1 + EGG_NAME= python_${DISTNAME} .include "../../lang/python/distutils.mk" diff --git a/converters/py-chardet/Makefile b/converters/py-chardet/Makefile index e4b9715cd96..306a387aea3 100644 --- a/converters/py-chardet/Makefile +++ b/converters/py-chardet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2014/01/02 17:55:40 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2014/01/25 10:29:58 wiz Exp $ DISTNAME= chardet-2.2.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,7 +11,6 @@ COMMENT= Character encoding auto-detection in Python LICENSE= gnu-lgpl-v2.1 REPLACE_PYTHON= chardet/chardetect.py -PYTHON_VERSIONS_INCLUDE_3X= yes .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" diff --git a/converters/py-jpCodecs/Makefile b/converters/py-jpCodecs/Makefile index f396cd8a1e6..9048c62ef2b 100644 --- a/converters/py-jpCodecs/Makefile +++ b/converters/py-jpCodecs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2012/10/03 00:20:16 asau Exp $ +# $NetBSD: Makefile,v 1.17 2014/01/25 10:29:58 wiz Exp $ DISTNAME= JapaneseCodecs-1.4.11 PKGNAME= ${PYPKGPREFIX}-jpCodecs-1.4.11 @@ -11,5 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.asahi-net.or.jp/~rd6t-kjym/python/ COMMENT= Python Unicode codecs for Japanese charsets +PYTHON_VERSIONS_INCOMPATIBLE= 33 + .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/converters/py-simplejson/Makefile b/converters/py-simplejson/Makefile index 0fbf9022b31..e36963894e9 100644 --- a/converters/py-simplejson/Makefile +++ b/converters/py-simplejson/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2014/01/16 02:24:02 rodent Exp $ -# +# $NetBSD: Makefile,v 1.20 2014/01/25 10:29:58 wiz Exp $ DISTNAME= simplejson-3.3.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -14,9 +13,6 @@ LICENSE= mit USE_LANGUAGES= c -PYTHON_VERSIONS_ACCEPTED= 33 27 26 -PYTHON_VERSIONS_INCLUDE_3X= yes - do-test: cd ${WRKSRC} && ${PYTHONBIN} setup.py test -q diff --git a/converters/py-zfec/Makefile b/converters/py-zfec/Makefile index d53c61c9d96..749f49a8fe4 100644 --- a/converters/py-zfec/Makefile +++ b/converters/py-zfec/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2012/10/03 00:20:16 asau Exp $ -# +# $NetBSD: Makefile,v 1.10 2014/01/25 10:29:59 wiz Exp $ DISTNAME= zfec-1.4.22 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -23,5 +22,7 @@ REPLACE.python.old= /usr/bin/env python REPLACE.python.new= ${PYTHONBIN} REPLACE_FILES.python= zfec/cmdline_zfec.py zfec/cmdline_zunfec.py zfec/test/test_zfec.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-twisted via py-setuptools_trial + .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/converters/py-zhCodecs/Makefile b/converters/py-zhCodecs/Makefile index 809b3cb0903..9c904517062 100644 --- a/converters/py-zhCodecs/Makefile +++ b/converters/py-zhCodecs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2012/10/03 00:20:16 asau Exp $ +# $NetBSD: Makefile,v 1.17 2014/01/25 10:29:59 wiz Exp $ DISTNAME= ChineseCodecs1.2.0 PKGNAME= ${PYPKGPREFIX}-zhCodecs-1.2.0 @@ -14,6 +14,8 @@ COMMENT= Python Unicode codecs for Chinese charsets WRKSRC= ${WRKDIR}/${DISTNAME}/Python PYDISTUTILSPKG= # defined +PYTHON_VERSIONS_INCOMPATIBLE= 33 + post-extract: @${CHMOD} 711 ${WRKSRC}/chinesetw diff --git a/databases/gramps3/Makefile b/databases/gramps3/Makefile index 7158ab38e74..94acb66a7b5 100644 --- a/databases/gramps3/Makefile +++ b/databases/gramps3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2014/01/02 19:01:54 wiz Exp $ +# $NetBSD: Makefile,v 1.49 2014/01/25 10:29:59 wiz Exp $ DISTNAME= gramps-3.4.4 CATEGORIES= databases @@ -15,6 +15,8 @@ USE_TOOLS+= msgfmt pkg-config intltool msgconv USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-ORBit via py-gnome2, py-gtk2 + REPLACE_PYTHON= src/DateHandler/_Date_fr.py REPLACE_PYTHON+= src/plugins/quickview/Reporef.py REPLACE_PYTHON+= src/plugins/rel/rel_fr.py diff --git a/databases/gramps3/options.mk b/databases/gramps3/options.mk index 46a65a36e58..365fa646279 100644 --- a/databases/gramps3/options.mk +++ b/databases/gramps3/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2009/09/14 10:35:18 drochner Exp $ +# $NetBSD: options.mk,v 1.3 2014/01/25 10:29:59 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gramps3 PKG_SUPPORTED_OPTIONS= graphviz enchant freefont @@ -7,6 +7,7 @@ PKG_SUPPORTED_OPTIONS= graphviz enchant freefont .if !empty(PKG_OPTIONS:Menchant) DEPENDS+= ${PYPKGPREFIX}-enchant-[0-9]*:../../textproc/py-enchant +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-ORBit via py-gnome2 .include "../../x11/py-gnome2-extras/buildlink3.mk" .endif diff --git a/databases/luma/Makefile b/databases/luma/Makefile index 31cc58e5c82..2dec155d752 100644 --- a/databases/luma/Makefile +++ b/databases/luma/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2013/10/09 17:39:06 wiz Exp $ +# $NetBSD: Makefile,v 1.31 2014/01/25 10:29:59 wiz Exp $ DISTNAME= luma-2.3 PKGREVISION= 14 @@ -17,6 +17,7 @@ SUBST_STAGE.luma= pre-configure SUBST_FILES.luma= bin/luma SUBST_SED.luma= -e "s|@PREFIX@|${PREFIX}|" PYTHON_PATCH_SCRIPTS= bin/luma lib/luma/luma.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-qt3-base, py-ldap post-extract: cd ${WRKSRC} && mv share/man man diff --git a/databases/py-bdb-xml/Makefile b/databases/py-bdb-xml/Makefile index e444402798d..3fd09cde15e 100644 --- a/databases/py-bdb-xml/Makefile +++ b/databases/py-bdb-xml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2012/10/02 21:25:48 asau Exp $ +# $NetBSD: Makefile,v 1.21 2014/01/25 10:29:59 wiz Exp $ DISTNAME= dbxml-2.5.16 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/db/bdb-/} @@ -17,6 +17,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/dbxml/src/python USE_LANGUAGES= c c++ NO_CONFIGURE= yes PYDISTUTILSPKG= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.5.16 SUBST_CLASSES+= fix-path SUBST_STAGE.fix-path= pre-build diff --git a/databases/py-bsddb3/Makefile b/databases/py-bsddb3/Makefile index b453835bb32..425205e3d08 100644 --- a/databases/py-bsddb3/Makefile +++ b/databases/py-bsddb3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2013/12/18 13:37:25 joerg Exp $ +# $NetBSD: Makefile,v 1.49 2014/01/25 10:29:59 wiz Exp $ DISTNAME= bsddb3-6.0.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -17,8 +17,6 @@ PYSETUPINSTALLARGS= --berkeley-db=${BDBBASE} PYSETUPBUILDARGS+= --berkeley-db-incdir=${BDBBASE}/include/${BDB_TYPE} PYSETUPINSTALLARGS+= --berkeley-db-incdir=${BDBBASE}/include/${BDB_TYPE} -PYTHON_VERSIONS_INCLUDE_3X= yes - REPLACE_PYTHON= Lib/bsddb/dbshelve.py REPLACE_PYTHON+= Lib3/bsddb/dbshelve.py REPLACE_PYTHON+= Lib/bsddb/test/test_dbtables.py diff --git a/databases/py-datapkg/Makefile b/databases/py-datapkg/Makefile index 31febd46aa8..c1775b2f8ad 100644 --- a/databases/py-datapkg/Makefile +++ b/databases/py-datapkg/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2013/02/22 19:59:05 shattered Exp $ -# +# $NetBSD: Makefile,v 1.9 2014/01/25 10:29:59 wiz Exp $ DISTNAME= datapkg-0.8 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -14,6 +13,7 @@ LICENSE= mit DEPENDS+= ${PYPKGPREFIX}-ckanclient-[0-9]*:../../databases/py-ckanclient CONFLICTS= datapkg-[0-9]* +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-ckanclient .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/py-elixir/Makefile b/databases/py-elixir/Makefile index 4170e5d65d1..30dedd591ed 100644 --- a/databases/py-elixir/Makefile +++ b/databases/py-elixir/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2013/12/14 08:59:54 obache Exp $ -# +# $NetBSD: Makefile,v 1.6 2014/01/25 10:29:59 wiz Exp $ DISTNAME= Elixir-0.7.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,11 +10,13 @@ HOMEPAGE= http://elixir.ematia.de/trac/wiki COMMENT= Elixir is a declarative layer on top of the SQLAlchemy library LICENSE= mit -USE_LANGUAGES= # none - DEPENDS+= ${PYPKGPREFIX}-sqlalchemy>=0.4.0:../../databases/py-sqlalchemy/ DEPENDS+= ${PYPKGPREFIX}-sqlite2-[0-9]*:../../databases/py-sqlite2/ DEPENDS+= ${PYPKGPREFIX}-crypto-[0-9]*:../../security/py-crypto +USE_LANGUAGES= # none + +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-sqlite2 + .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/py-gdbm/Makefile b/databases/py-gdbm/Makefile index 46e8d3d5e32..b2d3d316d00 100644 --- a/databases/py-gdbm/Makefile +++ b/databases/py-gdbm/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2012/10/02 21:25:49 asau Exp $ -# +# $NetBSD: Makefile,v 1.33 2014/01/25 10:29:59 wiz Exp $ PKGNAME= ${PYPKGPREFIX}-gdbm-0 PKGREVISION= 5 @@ -9,8 +8,6 @@ MAINTAINER= dolecek@ics.muni.cz HOMEPAGE= http://www.python.org/doc/lib/module-gdbm.html COMMENT= Python interface to gdbm - GNU database manager -PYTHON_VERSIONS_INCLUDE_3X= yes - EVAL_PREFIX+= GDBMDIR=gdbm USE_TOOLS+= patch diff --git a/databases/py-ldap/Makefile b/databases/py-ldap/Makefile index 889bf12800c..dc47c52bc6e 100644 --- a/databases/py-ldap/Makefile +++ b/databases/py-ldap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2013/08/20 15:27:07 adam Exp $ +# $NetBSD: Makefile,v 1.52 2014/01/25 10:29:59 wiz Exp $ DISTNAME= python-ldap-2.4.13 PKGNAME= ${DISTNAME:S/python/${PYPKGPREFIX}/} @@ -14,6 +14,7 @@ EGG_NAME= ${DISTNAME:S/python-ldap/python_ldap/} PY_LDAP_LIBRARY_DIRS= ${BUILDLINK_PREFIX.openldap-client}/lib PY_LDAP_INCLUDE_DIRS= ${BUILDLINK_PREFIX.openldap-client}/include PY_LDAP_LIBS= ldap_r lber ssl crypto +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.4.13 .include "options.mk" diff --git a/databases/py-metakit/Makefile b/databases/py-metakit/Makefile index 32f002c0fef..63deeb9fa38 100644 --- a/databases/py-metakit/Makefile +++ b/databases/py-metakit/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2013/04/08 11:17:11 rodent Exp $ -# +# $NetBSD: Makefile,v 1.27 2014/01/25 10:29:59 wiz Exp $ DISTNAME= metakit-2.4.9.7 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -23,6 +22,7 @@ BUILD_TARGET= python INSTALL_TARGET= install-python MAKE_ENV+= PYINC=${LOCALBASE}/${PYINC} PYSITELIB=${LOCALBASE}/${PYSITELIB} PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.4.9.7 INSTALLATION_DIRS+= ${PYSITELIB} diff --git a/databases/py-mssql/Makefile b/databases/py-mssql/Makefile index 49fa1163764..1293e4c6d76 100644 --- a/databases/py-mssql/Makefile +++ b/databases/py-mssql/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2013/02/06 23:22:02 jperkin Exp $ -# +# $NetBSD: Makefile,v 1.16 2014/01/25 10:29:59 wiz Exp $ DISTNAME= pymssql-1.0.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -20,6 +19,8 @@ SUBST_FILTER_CMD.crlf= ${TR} -d '\r' BUILDLINK_API_DEPENDS.freetds+= freetds>=0.63 +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.0.2; v2 might be better. + .include "../../databases/freetds/buildlink3.mk" .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/py-mysqldb/Makefile b/databases/py-mysqldb/Makefile index 189709e0afd..e90dca0c01d 100644 --- a/databases/py-mysqldb/Makefile +++ b/databases/py-mysqldb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2013/03/02 20:33:24 wiz Exp $ +# $NetBSD: Makefile,v 1.38 2014/01/25 10:29:59 wiz Exp $ DISTNAME= MySQL-python-${DIST_VERSION} PKGNAME= ${PYPKGPREFIX}-mysqldb-${DIST_VERSION:S/c/rc/} @@ -13,6 +13,7 @@ COMMENT= MySQL interface for Python LICENSE= gnu-gpl-v2 EGG_NAME= ${DISTNAME:S/MySQL-/MySQL_/} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.2.3 .include "../../mk/mysql.buildlink3.mk" .include "../../lang/python/egg.mk" diff --git a/databases/py-pgnotify/Makefile b/databases/py-pgnotify/Makefile index b36dd49331e..3ec20ac07c4 100644 --- a/databases/py-pgnotify/Makefile +++ b/databases/py-pgnotify/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2012/10/02 21:25:49 asau Exp $ -# +# $NetBSD: Makefile,v 1.16 2014/01/25 10:29:59 wiz Exp $ DISTNAME= pgnotify-0.1 PKGNAME= ${PYPKGPREFIX}-pgnotify-0.1 @@ -20,6 +19,7 @@ USE_TOOLS+= gmake PYDISTUTILSPKG= yes PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-postgresql .include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/py-postgresql/Makefile b/databases/py-postgresql/Makefile index 2f51d649840..a4e548d9fcc 100644 --- a/databases/py-postgresql/Makefile +++ b/databases/py-postgresql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.68 2013/01/08 15:09:59 darcy Exp $ +# $NetBSD: Makefile,v 1.69 2014/01/25 10:29:59 wiz Exp $ DISTNAME= PyGreSQL-4.1.1 PKGNAME= ${PYPKGPREFIX}-postgresql-4.1.1 @@ -9,11 +9,11 @@ EXTRACT_SUFX= .tgz OWNER= darcy@NetBSD.org HOMEPAGE= http://www.PyGreSQL.org/ COMMENT= Python interface to PostgreSQL +LICENSE= postgresql-license MAKE_ENV+= MANDIR=${PREFIX}/${PKGMANDIR} MAKE_ENV+= BINDIR=${PREFIX}/bin USE_TOOLS+= gmake -LICENSE= postgresql-license MAKE_FILE= GNUmakefile MAKE_ENV+= INSTALLED_LIBPQ=1 @@ -21,8 +21,8 @@ MAKE_ENV+= INSTALLED_LIBPQ=1 PY_PATCHPLIST= yes PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX:Q} REPLACE_PYTHON= pg.py pgdb.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 4.1.1 -PYDISTUTILSPKG= yes DOCDIR= ${PREFIX}/share/doc/${PYPKGPREFIX}-postgresql INSTALLATION_DIRS= ${DOCDIR}/tutorial ${DOCDIR}/docs diff --git a/databases/py-psycopg2/Makefile b/databases/py-psycopg2/Makefile index 6b99eaf2fd9..3f8ef238563 100644 --- a/databases/py-psycopg2/Makefile +++ b/databases/py-psycopg2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2013/07/04 13:01:36 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2014/01/25 10:29:59 wiz Exp $ DISTNAME= psycopg2-2.5.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -10,7 +10,6 @@ HOMEPAGE= http://initd.org/psycopg/ COMMENT= PostgreSQL database adapter for Python LICENSE= gnu-lgpl-v3 -PYTHON_VERSIONS_INCLUDE_3X= yes REPLACE_PYTHON+= tests/*.py .include "../../lang/python/application.mk" diff --git a/databases/py-sqlalchemy-migrate/Makefile b/databases/py-sqlalchemy-migrate/Makefile index 15550b0b124..c035b14a5d1 100644 --- a/databases/py-sqlalchemy-migrate/Makefile +++ b/databases/py-sqlalchemy-migrate/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2013/10/15 14:40:48 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2014/01/25 10:30:00 wiz Exp $ DISTNAME= sqlalchemy-migrate-0.7.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -15,5 +15,7 @@ DEPENDS+= ${PYPKGPREFIX}-Tempita>=0.4:../../textproc/py-Tempita DEPENDS+= ${PYPKGPREFIX}-decorator-[0-9]*:../../devel/py-decorator DEPENDS+= ${PYPKGPREFIX}-sqlalchemy>=0.7:../../databases/py-sqlalchemy +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.7.2 + .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/py-sqlalchemy/options.mk b/databases/py-sqlalchemy/options.mk index adec3db1740..c07da04ceea 100644 --- a/databases/py-sqlalchemy/options.mk +++ b/databases/py-sqlalchemy/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2010/05/02 14:13:09 tonnerre Exp $ +# $NetBSD: options.mk,v 1.3 2014/01/25 10:29:59 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.py-sqlalchemy PKG_SUPPORTED_OPTIONS= mysql sqlite pgsql mssql @@ -7,10 +7,12 @@ PKG_SUPPORTED_OPTIONS= mysql sqlite pgsql mssql .if !empty(PKG_OPTIONS:Mmysql) DEPENDS+= ${PYPKGPREFIX}-mysqldb-[0-9]*:../../databases/py-mysqldb +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-mysqldb .endif .if !empty(PKG_OPTIONS:Msqlite) DEPENDS+= ${PYPKGPREFIX}-sqlite2-[0-9]*:../../databases/py-sqlite2 +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-sqlite2 .endif .if !empty(PKG_OPTIONS:Mpgsql) @@ -19,4 +21,5 @@ DEPENDS+= ${PYPKGPREFIX}-psycopg2-[0-9]*:../../databases/py-psycopg2 .if !empty(PKG_OPTIONS:Mmssql) DEPENDS+= ${PYPKGPREFIX}-mssql-[0-9]*:../../databases/py-mssql +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-mssql .endif diff --git a/databases/py-sqlite3/Makefile b/databases/py-sqlite3/Makefile index c274d664b6e..309c95fff32 100644 --- a/databases/py-sqlite3/Makefile +++ b/databases/py-sqlite3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2013/10/19 09:07:01 adam Exp $ +# $NetBSD: Makefile,v 1.19 2014/01/25 10:30:00 wiz Exp $ PKGNAME= ${PYPKGPREFIX}-sqlite3-${PY_DISTVERSION} PKGREVISION= 2 @@ -12,8 +12,8 @@ USE_TOOLS+= patch EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/_sqlite +# part of python itself; using distutils.mk will install a useless egg PYDISTUTILSPKG= yes -PYTHON_VERSIONS_INCLUDE_3X= yes PY_SETUP_SUBST+= SQLITE_PREFIX=${BUILDLINK_PREFIX.sqlite3} PYSETUPINSTALLARGS+= --install-lib ${PREFIX}/${PYLIB}/lib-dynload diff --git a/databases/py-sybase/Makefile b/databases/py-sybase/Makefile index d11cf1bec1e..ca9d67b9e98 100644 --- a/databases/py-sybase/Makefile +++ b/databases/py-sybase/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2013/02/06 23:22:02 jperkin Exp $ -# +# $NetBSD: Makefile,v 1.25 2014/01/25 10:30:00 wiz Exp $ DISTNAME= sybase-0.36 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -23,6 +22,8 @@ SUBST_MESSAGE.sybase= Fixing runtime_library_dirs. SUBST_FILES.sybase= setup.py SUBST_SED.sybase= -e "s|\\(runtime_library_dirs = \\)None|\\1['${SYBASE}/lib']|" +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.36 + .include "../../databases/freetds/buildlink3.mk" .include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/py-table/Makefile b/databases/py-table/Makefile index e68883074a6..7920abe49f0 100644 --- a/databases/py-table/Makefile +++ b/databases/py-table/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2012/10/02 21:25:50 asau Exp $ -# +# $NetBSD: Makefile,v 1.16 2014/01/25 10:30:00 wiz Exp $ DISTNAME= pytable-0.8.3a PKGNAME= ${PYPKGPREFIX}-table-0.8.3a @@ -13,6 +12,9 @@ COMMENT= Python RDBMS wrapper for various databases DEPENDS+= ${PYPKGPREFIX}-basicproperty-[0-9]*:../../lang/py-basicproperty +# py-basicproperty isn't compatible to 3.x +PYTHON_VERSIONS_INCOMPATIBLE= 33 + USE_LANGUAGES= # none .include "../../lang/python/distutils.mk" diff --git a/databases/py-tokyocabinet/Makefile b/databases/py-tokyocabinet/Makefile index 47b72312474..99017937651 100644 --- a/databases/py-tokyocabinet/Makefile +++ b/databases/py-tokyocabinet/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2012/10/02 21:25:50 asau Exp $ -# +# $NetBSD: Makefile,v 1.5 2014/01/25 10:30:00 wiz Exp $ VERSION= 0.5 DISTNAME= tokyocabinet-${VERSION} @@ -12,6 +11,8 @@ HOMEPAGE= http://code.google.com/p/python-tokyocabinet/ COMMENT= Python wrapper to tokyocabinet database LICENSE= mit +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.5 + .include "../../databases/tokyocabinet/buildlink3.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/tdb/Makefile b/databases/tdb/Makefile index 34a72f49cfe..4d44b0ceeda 100644 --- a/databases/tdb/Makefile +++ b/databases/tdb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2013/06/14 21:18:22 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2014/01/25 10:30:00 wiz Exp $ DISTNAME= tdb-1.2.12 CATEGORIES= databases @@ -23,6 +23,7 @@ PKGCONFIG_OVERRIDE= tdb.pc.in PYTHON_FOR_BUILD_ONLY= yes REPLACE_PYTHON+= buildtools/bin/waf +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.2.12 .include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ExmanIDE/Makefile b/devel/ExmanIDE/Makefile index 489a1ddba3b..c3c04250b64 100644 --- a/devel/ExmanIDE/Makefile +++ b/devel/ExmanIDE/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2013/04/06 21:07:32 rodent Exp $ +# $NetBSD: Makefile,v 1.20 2014/01/25 10:30:00 wiz Exp $ DISTNAME= ExmanIDE-0.9.4 PKGREVISION= 7 @@ -17,6 +17,8 @@ WRKSRC= ${WRKDIR}/${PKGBASE} NO_CONFIGURE= yes NO_BUILD= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-wxWidgets + SUBST_CLASSES+= mod SUBST_MESSAGE.mod= Fixing deprecated module names. SUBST_STAGE.mod= post-patch diff --git a/devel/RBTools/Makefile b/devel/RBTools/Makefile index efa29d8ca37..04b094e211d 100644 --- a/devel/RBTools/Makefile +++ b/devel/RBTools/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2012/10/31 11:16:31 asau Exp $ -# +# $NetBSD: Makefile,v 1.4 2014/01/25 10:30:00 wiz Exp $ DISTNAME= RBTools-0.2 PKGREVISION= 1 @@ -15,6 +14,7 @@ USE_LANGUAGES= # none REPLACE_PYTHON= ez_setup.py setup.py rbtools/postreview.py REPLACE_PYTHON+= contrib/internal/release.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.2 .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/accerciser/Makefile b/devel/accerciser/Makefile index e25a372326c..af5b74df3cc 100644 --- a/devel/accerciser/Makefile +++ b/devel/accerciser/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2012/10/31 11:16:33 asau Exp $ -# +# $NetBSD: Makefile,v 1.21 2014/01/25 10:30:00 wiz Exp $ DISTNAME= accerciser-1.12.1 PKGREVISION= 2 @@ -17,6 +16,8 @@ DEPENDS+= ${PYPKGPREFIX}-gtk2>=2.8:../../x11/py-gtk2 DEPENDS+= ${PYPKGPREFIX}-at-spi>=1.23.4:../../devel/py-at-spi DEPENDS+= ${PYPKGPREFIX}-ipython-[0-9]*:../../devel/py-ipython +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-ORBit via py-gnome2, py-ipython, py-gtk2 + USE_TOOLS+= gmake intltool msgfmt pkg-config USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes diff --git a/devel/boa-constructor/Makefile b/devel/boa-constructor/Makefile index c1e05b1fc96..8fa7ee69921 100644 --- a/devel/boa-constructor/Makefile +++ b/devel/boa-constructor/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2013/10/10 14:42:04 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.28 2014/01/25 10:30:00 wiz Exp $ VERSION= 0.6.1 DISTNAME= boa-constructor-${VERSION}.src @@ -25,6 +24,8 @@ SEDSUBSTS= -e "s|@PYTHONBIN@|${PYTHONBIN}|" SEDSUBSTS+= -e "s|@PREFIX@|${PREFIX}|" SEDSUBSTS+= -e "s|@VERSION@|${VERSION}|" +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-wxWidgets + REPLACE_PYTHON+= Boa.py REPLACE_PYTHON+= Examples/advanced/FramePanels/wxApp1.py REPLACE_PYTHON+= Examples/frames/wxApp1.py diff --git a/devel/bpython/Makefile b/devel/bpython/Makefile index a82bfd76ff0..cc2cb65f323 100644 --- a/devel/bpython/Makefile +++ b/devel/bpython/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2013/10/10 14:42:04 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.10 2014/01/25 10:30:00 wiz Exp $ DISTNAME= bpython-0.12 PKGREVISION= 6 @@ -27,6 +26,7 @@ PKG_SUGGESTED_OPTIONS= # empty .if !empty(PKG_OPTIONS:Mgtk) .include "../../devel/py-gobject/buildlink3.mk" .include "../../x11/py-gtk2/buildlink3.mk" +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 .endif .include "../../lang/python/distutils.mk" diff --git a/devel/bzr-explorer/Makefile b/devel/bzr-explorer/Makefile index a5255d4298e..0dad1c7fa35 100644 --- a/devel/bzr-explorer/Makefile +++ b/devel/bzr-explorer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2012/10/31 11:16:43 asau Exp $ +# $NetBSD: Makefile,v 1.13 2014/01/25 10:30:00 wiz Exp $ DISTNAME= bzr-explorer-${VER} PKGREVISION= 2 @@ -11,16 +11,13 @@ HOMEPAGE= https://launchpad.net/bzr-explorer COMMENT= GUI frontend to bzr LICENSE= gnu-gpl-v2 -# Needed for launchpad -FETCH_USING= curl - -USE_TOOLS+= msgfmt - DEPENDS+= qbzr>=0.11:../../devel/qbzr DEPENDS+= ${PYPKGPREFIX}-qt4>=4.4:../../x11/py-qt4 -PYDISTUTILSPKG= yes +USE_TOOLS+= msgfmt + +PYTHON_VERSIONS_INCOMPATIBLE= 33 # qbzr .include "../../devel/bzr/plugin.mk" -.include "../../lang/python/extension.mk" +.include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/bzr-gtk/Makefile b/devel/bzr-gtk/Makefile index f934a4dc7f1..13af1826632 100644 --- a/devel/bzr-gtk/Makefile +++ b/devel/bzr-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2012/10/31 11:16:43 asau Exp $ +# $NetBSD: Makefile,v 1.18 2014/01/25 10:30:00 wiz Exp $ DISTNAME= bzr-gtk-${VER} PKGREVISION= 1 @@ -11,10 +11,11 @@ HOMEPAGE= http://bazaar-vcs.org/bzr-gtk COMMENT= Various GTK+ frontends to Bazaar commands LICENSE= gnu-gpl-v2 -DEPENDS+= ${PYPKGPREFIX}-cairo>=1.0:../../graphics/py-cairo DEPENDS+= ${PYPKGPREFIX}-gtk2>=2.8:../../x11/py-gtk2 PYDISTUTILSPKG= yes +PYTHON_VERSIONED_DEPENDENCIES= cairo +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 REPLACE_PYTHON= create-credits.py info.py USE_TOOLS+= msgfmt @@ -25,6 +26,7 @@ BZR_PLUGIN_TEST=no .include "../../devel/bzr/plugin.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../lang/python/application.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../lang/python/extension.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/bzr-svn/Makefile b/devel/bzr-svn/Makefile index 46cdb613b03..65ba78b5b81 100644 --- a/devel/bzr-svn/Makefile +++ b/devel/bzr-svn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2012/10/31 11:16:44 asau Exp $ +# $NetBSD: Makefile,v 1.26 2014/01/25 10:30:00 wiz Exp $ DISTNAME= bzr-svn-${VER} CATEGORIES= devel scm @@ -26,6 +26,7 @@ USE_LANGUAGES= #none #TEST_TARGET= check-verbose EGG_NAME= ${DISTNAME:S/-/_/} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-subvertpy, py-paramiko .include "../../devel/bzr/plugin.mk" .include "../../lang/python/application.mk" diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile index 42a26fb8dd7..3263268e6a0 100644 --- a/devel/bzr/Makefile +++ b/devel/bzr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.60 2012/10/31 11:16:43 asau Exp $ +# $NetBSD: Makefile,v 1.61 2014/01/25 10:30:00 wiz Exp $ DISTNAME= bzr-2.5.1 CATEGORIES= devel scm @@ -18,6 +18,7 @@ USE_TOOLS+= gmake msgfmt PY_PATCHPLIST= yes PYDISTUTILSPKG= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-pyrex, py-paramiko PYTHON_PATCH_SCRIPTS= bzr bzrlib/weave.py PYTHON_PATCH_SCRIPTS+= bzrlib/patiencediff.py bzrlib/_patiencediff_py.py diff --git a/devel/bzrtools/Makefile b/devel/bzrtools/Makefile index e511369e424..5b67e5080ab 100644 --- a/devel/bzrtools/Makefile +++ b/devel/bzrtools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2012/10/31 11:16:44 asau Exp $ +# $NetBSD: Makefile,v 1.21 2014/01/25 10:30:00 wiz Exp $ PKGNAME= bzrtools-${VER} DISTNAME= bzrtools-${VER:R} @@ -12,6 +12,7 @@ COMMENT= Collection of plugins for Bazaar LICENSE= gnu-gpl-v2 PYTHON_PATCH_SCRIPTS= check-release.py test.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.5.0 WRKSRC= ${WRKDIR}/bzrtools diff --git a/devel/codeville/Makefile b/devel/codeville/Makefile index afba089ac12..56e9fe761c8 100644 --- a/devel/codeville/Makefile +++ b/devel/codeville/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2012/10/31 11:16:47 asau Exp $ +# $NetBSD: Makefile,v 1.26 2014/01/25 10:30:01 wiz Exp $ DISTNAME= Codeville-0.8.0 PKGNAME= codeville-0.8.0 @@ -13,6 +13,7 @@ LICENSE= modified-bsd REPLACE_PYTHON= *.py REPLACE_PYTHON+= */*.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.8.0 BUILD_DEFS+= VARBASE BUILD_DEFS_EFFECTS+= CODEVILLE_DATADIR diff --git a/devel/cvs2svn/Makefile b/devel/cvs2svn/Makefile index e0152a19dac..af70d8a58c9 100644 --- a/devel/cvs2svn/Makefile +++ b/devel/cvs2svn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2012/10/31 11:16:49 asau Exp $ +# $NetBSD: Makefile,v 1.29 2014/01/25 10:30:01 wiz Exp $ DISTNAME= cvs2svn-2.3.0 PKGREVISION= 2 @@ -16,6 +16,7 @@ CONFLICTS+= py*-subversion<1.0.1 PYDISTUTILSPKG= yes PYTHON_PATCH_SCRIPTS= run-tests.py cvs2svn_rcsparse/run-tests.py \ cvs2svn_rcsparse/parse_rcs_file.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.3.0 #USE_TOOLS+= gtar #EXTRACT_USING= gtar diff --git a/devel/diffuse/Makefile b/devel/diffuse/Makefile index 0ce161d6407..f894b99b587 100644 --- a/devel/diffuse/Makefile +++ b/devel/diffuse/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2013/05/14 19:44:22 wiz Exp $ +# $NetBSD: Makefile,v 1.34 2014/01/25 10:30:01 wiz Exp $ DISTNAME= diffuse-0.4.7 CATEGORIES= devel @@ -11,6 +11,7 @@ COMMENT= Graphical tool for merging and comparing text files LICENSE= gnu-gpl-v2 DEPENDS+= ${PYPKGPREFIX}-gtk2>=2.10:../../x11/py-gtk2 +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 USE_TOOLS+= msgfmt USE_LANGUAGES= # none diff --git a/devel/distcc-pump/Makefile b/devel/distcc-pump/Makefile index b1120e2fba5..1e7b49d304a 100644 --- a/devel/distcc-pump/Makefile +++ b/devel/distcc-pump/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2012/03/15 11:53:23 obache Exp $ +# $NetBSD: Makefile,v 1.6 2014/01/25 10:30:01 wiz Exp $ PKGNAME= ${DISTNAME:S/-/-pump-/} PKGREVISION= 4 @@ -7,6 +7,7 @@ COMMENT= Accelerated remote compilation with distcc .include "../../devel/distcc/Makefile.common" PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 3.1 # check patch-ae for build and install targets BUILD_TARGET= pump include-server diff --git a/devel/epydoc/Makefile b/devel/epydoc/Makefile index 8d43a64c150..c4ba179eaba 100644 --- a/devel/epydoc/Makefile +++ b/devel/epydoc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2012/10/31 11:16:55 asau Exp $ +# $NetBSD: Makefile,v 1.18 2014/01/25 10:30:01 wiz Exp $ DISTNAME= epydoc-2.1 PKGREVISION= 7 @@ -15,6 +15,8 @@ DEPENDS+= ${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk USE_LANGUAGES= #none USE_TOOLS+= pax +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.1 + INSTALLATION_DIRS= ${PKGMANDIR}/man1 share/doc/epydoc post-install: diff --git a/devel/eric3/Makefile b/devel/eric3/Makefile index b3358b53526..964a9987193 100644 --- a/devel/eric3/Makefile +++ b/devel/eric3/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2012/10/31 11:16:56 asau Exp $ -# +# $NetBSD: Makefile,v 1.26 2014/01/25 10:30:01 wiz Exp $ DISTNAME= eric-3.8.1 PKGREVISION= 3 @@ -19,6 +18,8 @@ USE_LANGUAGES= PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-xml, py-qt3-modules + .include "../../mk/bsd.prefs.mk" CONFIGURE_ARGS+= -b ${PREFIX:Q}/bin diff --git a/devel/eric4/Makefile b/devel/eric4/Makefile index 83405fb1fb5..6562dca75b4 100644 --- a/devel/eric4/Makefile +++ b/devel/eric4/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2014/01/15 16:26:25 drochner Exp $ -# +# $NetBSD: Makefile,v 1.39 2014/01/25 10:30:01 wiz Exp $ VERS= 4.5.18 DISTNAME= eric4-${VERS} @@ -15,6 +14,7 @@ LICENSE= gnu-gpl-v3 NO_BUILD= yes PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 4.5.18 CONFIGURE_ARGS+= -b ${PREFIX}/bin CONFIGURE_ARGS+= -d ${PREFIX}/${PYSITELIB} diff --git a/devel/gnatpython/Makefile b/devel/gnatpython/Makefile index 6b45b2f3971..64c1662d8dd 100644 --- a/devel/gnatpython/Makefile +++ b/devel/gnatpython/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2012/10/31 11:17:01 asau Exp $ -# +# $NetBSD: Makefile,v 1.8 2014/01/25 10:30:01 wiz Exp $ DISTNAME= gnatpython-${SNAPSHOT} PKGREVISION= 2 @@ -16,6 +15,8 @@ SNAPSHOT= 20110912 EGG_NAME= gnatpython-1.2 +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 20110912 + .include "../../lang/python/application.mk" .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile index 9b77c6306f2..b3b9a82e121 100644 --- a/devel/gobject-introspection/Makefile +++ b/devel/gobject-introspection/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2014/01/02 12:32:19 obache Exp $ -# +# $NetBSD: Makefile,v 1.37 2014/01/25 10:30:01 wiz Exp $ DISTNAME= gobject-introspection-1.38.0 PKGREVISION= 1 @@ -14,6 +13,8 @@ LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2 DEPENDS+= ${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.38.0 + GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= pkg-config flex bison gmake diff --git a/devel/googletest/Makefile b/devel/googletest/Makefile index 6e596028445..893cf7e5af8 100644 --- a/devel/googletest/Makefile +++ b/devel/googletest/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2013/05/09 13:49:10 joerg Exp $ -# +# $NetBSD: Makefile,v 1.8 2014/01/25 10:30:01 wiz Exp $ DISTNAME= gtest-1.6.0 PKGNAME= ${DISTNAME:S/gtest/googletest/} @@ -25,11 +24,9 @@ SUBST_MESSAGE.rpathfix= Adding rpath to gtest-config SUBST_SED.rpathfix= -e 's/-L$${libdir}/${COMPILER_RPATH_FLAG}$${libdir} -L$${libdir}/g' SUBST_STAGE.rpathfix= pre-configure -SUBST_CLASSES+= fix-python -SUBST_STAGE.fix-python= pre-configure -SUBST_MESSAGE.fix-python= Fixing dynamic python -SUBST_FILES.fix-python+= scripts/*py -SUBST_SED.fix-python+= -e 's,/usr/bin/env python,${PYTHONBIN},' +REPLACE_PYTHON+= scripts/*py + +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.6.0 .include "../../mk/compiler.mk" .if !empty(PKGSRC_COMPILER:Mclang) @@ -40,4 +37,5 @@ post-install: ${INSTALL_SCRIPT} ${WRKSRC}/scripts/gtest-config ${DESTDIR}${PREFIX}/bin .include "../../lang/python/extension.mk" +.include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/gps/options.mk b/devel/gps/options.mk index a29cc92da98..dcc8da64a84 100644 --- a/devel/gps/options.mk +++ b/devel/gps/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.6 2013/07/15 02:02:20 ryoon Exp $ +# $NetBSD: options.mk,v 1.7 2014/01/25 10:30:01 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gps PKG_SUPPORTED_OPTIONS= syslog sqlite readline python pgsql @@ -60,6 +60,7 @@ CONFIGURE_ARGS+= --without-python --disable-pygtk --disable-pygobject .else MY_CONFIGURE_ENV+= PYTHON=${PYTHONBIN} CONFIGURE_ARGS+= --with-python=${PREFIX} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 .include "../../lang/python/pyversion.mk" .include "../../x11/py-gtk2/buildlink3.mk" .endif diff --git a/devel/gyp/Makefile b/devel/gyp/Makefile index f914c39f438..7947c0c5afd 100644 --- a/devel/gyp/Makefile +++ b/devel/gyp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2014/01/24 13:28:30 fhajny Exp $ +# $NetBSD: Makefile,v 1.4 2014/01/25 10:30:01 wiz Exp $ SVN_REVISION= 1718 DIST_VERSION= 0.1 @@ -13,11 +13,13 @@ HOMEPAGE= http://code.google.com/p/gyp/ COMMENT= GYP can Generate Your Projects LICENSE= modified-bsd +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.1pre1718 EGG_NAME= gyp-${DIST_VERSION} # for test USE_TOOLS+= gmake USE_LANGUAGES= c c++ + do-test: ${RUN}cd ${WRKSRC}; LANG=C ${SETENV} ${TEST_ENV} ${PYTHONBIN} gyptest.py -a -f make --passed diff --git a/devel/hg-git/Makefile b/devel/hg-git/Makefile index 66fa50283d1..d8cac261713 100644 --- a/devel/hg-git/Makefile +++ b/devel/hg-git/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2013/05/20 08:18:55 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.16 2014/01/25 10:30:01 wiz Exp $ DISTNAME= hg-git-0.4.0 EGG_NAME= ${DISTNAME:S/hg-/hg_/} @@ -14,6 +13,7 @@ DEPENDS+= ${PYPKGPREFIX}-dulwich>=0.8.6:../../devel/py-dulwich DEPENDS+= mercurial>=1.9.4:../../devel/mercurial USE_LANGUAGES= #none +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-dulwich .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile index c4e4d1cb10e..b45d077aa5b 100644 --- a/devel/kdesdk3/Makefile +++ b/devel/kdesdk3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.113 2014/01/01 11:52:05 wiz Exp $ +# $NetBSD: Makefile,v 1.114 2014/01/25 10:30:01 wiz Exp $ DISTNAME= kdesdk-${_KDE_VERSION} PKGREVISION= 47 @@ -80,6 +80,7 @@ REPLACE_PYTHON+= \ kcachegrind/converters/hotshot2calltree \ scripts/kdelnk2desktop.py \ scripts/zonetab2pot.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 3.5.10 # REPLACE_PHP+= kcachegrind/converters/pprof2calltree SUBST_CLASSES+= php diff --git a/devel/ko-po-check/Makefile b/devel/ko-po-check/Makefile index dc5d08131d7..981a28ddae6 100644 --- a/devel/ko-po-check/Makefile +++ b/devel/ko-po-check/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2012/10/31 11:17:09 asau Exp $ +# $NetBSD: Makefile,v 1.12 2014/01/25 10:30:01 wiz Exp $ DISTNAME= ko-po-check-0.8 PKGREVISION= 3 @@ -13,7 +13,8 @@ GNU_CONFIGURE= yes CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} -PYTHON_PATCH_SCRIPTS= ${WRKSRC}/scripts/ko-po-check.in +REPLACE_PYTHON= scripts/ko-po-check.in +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.8 .include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/lettuce/Makefile b/devel/lettuce/Makefile index 9498e360073..4ba4bd8d883 100644 --- a/devel/lettuce/Makefile +++ b/devel/lettuce/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2013/06/30 22:33:58 rodent Exp $ -# +# $NetBSD: Makefile,v 1.5 2014/01/25 10:30:01 wiz Exp $ DISTNAME= lettuce-0.2.18 CATEGORIES= devel @@ -11,6 +10,7 @@ COMMENT= Behaviour-driven development test tool LICENSE= gnu-gpl-v3 REPLACE_PYTHON= lettuce/bin.py lettuce/plugins/autopdb.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.2.18 .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" diff --git a/devel/libftdi1/Makefile b/devel/libftdi1/Makefile index 5d36b17c583..b3c970185d6 100644 --- a/devel/libftdi1/Makefile +++ b/devel/libftdi1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2013/12/03 01:40:14 mef Exp $ +# $NetBSD: Makefile,v 1.2 2014/01/25 10:30:01 wiz Exp $ DISTNAME= libftdi1-1.0 CATEGORIES= devel @@ -16,6 +16,8 @@ USE_CMAKE= yes USE_TOOLS+= pkg-config cmake USE_LANGUAGES= c c++ +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.0 + BUILD_DEPENDS+=libusb1-[0-9]*:../../devel/libusb1 # It is better off to have doxygen, but # clang segfaults while packaging print/luatex @@ -27,7 +29,7 @@ CONFIGURE_ARGS+= --without-docs PKGCONFIG_OVERRIDE+= libftdi1.pc.in PKGCONFIG_OVERRIDE+= libftdipp1.pc.in -PLIST_SUBST+= PYSITELIB=${PYSITELIB} +PLIST_SUBST+= PYSITELIB=${PYSITELIB} do-configure: (cd $(WRKSRC) ; \ @@ -38,7 +40,7 @@ do-configure: -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=FALSE \ -DLIBUSB_INCLUDE_DIR=${PREFIX}/include/libusb-1.0 \ .) -# -DCMAKE_INSTALL_PREFIX=${PREFIX} converts /usr/local to ${PREFIX} +# -DCMAKE_INSTALL_PREFIX=${PREFIX} converts /usr/local to ${PREFIX} .include "../../devel/boost-headers/buildlink3.mk" .include "../../devel/boost-libs/buildlink3.mk" diff --git a/devel/libhid/Makefile b/devel/libhid/Makefile index 0343e31590a..e4df83caf03 100644 --- a/devel/libhid/Makefile +++ b/devel/libhid/Makefile @@ -1,25 +1,24 @@ -# $NetBSD: Makefile,v 1.2 2014/01/01 11:52:13 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2014/01/25 10:30:02 wiz Exp $ DISTNAME= libhid-0.2.16 - PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= http://sourceforge.net/projects/salix-sbo/files/13.37/libhid/ LICENSE= gnu-gpl-v2 -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://libhid.alioth.debian.org/ -COMMENT= Abstract'n layer for HID-class devices over USB/serial -#' # to close above apostrophe -USE_TOOLS+= gmake -USE_LIBTOOL= yes +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://libhid.alioth.debian.org/ +COMMENT= Abstraction layer for HID-class devices over USB/serial BUILD_DEPENDS+= docbook-[0-9]*:../../textproc/docbook #BUILD_DEPENDS+= swig-[0-9]*:../../devel/swig -PLIST_SUBST+= PYSITELIB=${PYSITELIB} +GNU_CONFIGURE= yes +USE_TOOLS+= gmake +USE_LIBTOOL= yes -GNU_CONFIGURE= yes +PLIST_SUBST+= PYSITELIB=${PYSITELIB} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.2.16 .include "../../lang/python/pyversion.mk" .include "../../lang/${PYPACKAGE}/buildlink3.mk" diff --git a/devel/meld/Makefile b/devel/meld/Makefile index d6d93077a54..6810844ed34 100644 --- a/devel/meld/Makefile +++ b/devel/meld/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2013/12/31 18:03:51 wiz Exp $ +# $NetBSD: Makefile,v 1.46 2014/01/25 10:30:02 wiz Exp $ DISTNAME= meld-1.8.3 CATEGORIES= devel @@ -18,6 +18,7 @@ MAKE_FLAGS+= prefix=${PREFIX} MAKE_FLAGS+= localedir=${PREFIX}/${PKGLOCALEDIR}/locale MAKE_FLAGS+= PYTHON=${PYTHONBIN} PYTHON_PATCH_SCRIPTS= bin/meld +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 # remove unnecessarily created empty dirs post-install: diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile index 404c23f492c..08b419b0447 100644 --- a/devel/mercurial/Makefile +++ b/devel/mercurial/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.97 2014/01/02 23:51:45 wiz Exp $ +# $NetBSD: Makefile,v 1.98 2014/01/25 10:30:02 wiz Exp $ DISTNAME= mercurial-2.8.2 CATEGORIES= devel scm @@ -17,6 +17,15 @@ USE_TOOLS+= gmake msgfmt INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 INSTALLATION_DIRS+= share/doc/mercurial +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.8.2 +# the following setup argument was requested by 2.8.2 when compiling +# for python-3.x +#.include "../../lang/python/pyversion.mk" +# +#.if ("${PYPKGPREFIX}" != "py26") && ("${PYPKGPREFIX}" != "py27") +#PYSETUPARGS+= --c2to3 +#.endif + post-install: ${INSTALL_DATA} ${WRKSRC}/doc/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_DATA} ${WRKSRC}/doc/*.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5 diff --git a/devel/py-InlineEgg/Makefile b/devel/py-InlineEgg/Makefile index 049ff938c58..e24a4e35254 100644 --- a/devel/py-InlineEgg/Makefile +++ b/devel/py-InlineEgg/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2012/10/31 11:19:27 asau Exp $ -# +# $NetBSD: Makefile,v 1.16 2014/01/25 10:30:02 wiz Exp $ DISTNAME= InlineEgg-1.08 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -18,6 +17,7 @@ PYTHON_PATCH_SCRIPTS= examples/example1.py examples/example2.py \ xored_shell_client.py PYTHON_SELF_CONFLICT= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.08 INSTALLATION_DIRS= share/doc/InlineEgg share/examples/InlineEgg diff --git a/devel/py-Optik/Makefile b/devel/py-Optik/Makefile index c073429a522..900d2a6c280 100644 --- a/devel/py-Optik/Makefile +++ b/devel/py-Optik/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2012/10/31 11:19:27 asau Exp $ +# $NetBSD: Makefile,v 1.17 2014/01/25 10:30:02 wiz Exp $ DISTNAME= optik-1.5.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/optik/Optik/} @@ -13,6 +13,8 @@ LICENSE= modified-bsd USE_LANGUAGES= #none +PYTHON_VERSIONS_INCOMPATIBLE= 33 + do-test: cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHONBIN} test/test_optik.py diff --git a/devel/py-Pyro/Makefile b/devel/py-Pyro/Makefile index 53304dc2a18..e9ccc5cc1df 100644 --- a/devel/py-Pyro/Makefile +++ b/devel/py-Pyro/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2013/12/04 16:41:01 drochner Exp $ -# +# $NetBSD: Makefile,v 1.17 2014/01/25 10:30:02 wiz Exp $ DISTNAME= Pyro4-4.22 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,7 +10,6 @@ HOMEPAGE= http://pyro.sourceforge.net/ COMMENT= Distributed Object Technology system in Python LICENSE= mit -PYTHON_VERSIONS_INCLUDE_3X= yes DEPENDS+= ${PYPKGPREFIX}-serpent-[0-9]*:../../devel/py-serpent # only needed for test diff --git a/devel/py-ZopeInterface/Makefile b/devel/py-ZopeInterface/Makefile index cae71efcd5f..1dae4c5c4f8 100644 --- a/devel/py-ZopeInterface/Makefile +++ b/devel/py-ZopeInterface/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2013/08/13 17:42:28 adam Exp $ +# $NetBSD: Makefile,v 1.17 2014/01/25 10:30:02 wiz Exp $ DISTNAME= zope.interface-4.0.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/zope.i/ZopeI/} @@ -11,7 +11,5 @@ HOMEPAGE= http://pypi.python.org/pypi/zope.interface COMMENT= The zope.interface package used in Zope 3 and Twisted LICENSE= zpl -PYTHON_VERSIONS_INCLUDE_3X= yes - .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-argparse/Makefile b/devel/py-argparse/Makefile index bd880394289..00ae6cd9c67 100644 --- a/devel/py-argparse/Makefile +++ b/devel/py-argparse/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2012/10/31 11:19:28 asau Exp $ -# +# $NetBSD: Makefile,v 1.7 2014/01/25 10:30:02 wiz Exp $ VERSION= 1.2.1 DISTNAME= argparse-${VERSION} @@ -13,8 +12,6 @@ HOMEPAGE= http://code.google.com/p/argparse/ COMMENT= Easy, declarative interface for creating command line tools LICENSE= apache-2.0 -#PYTHON_VERSIONS_INCLUDE_3X= yes - USE_LANGUAGES= # none .include "../../lang/python/egg.mk" diff --git a/devel/py-at-spi/Makefile b/devel/py-at-spi/Makefile index 8fdcb00c551..8eab2397ae7 100644 --- a/devel/py-at-spi/Makefile +++ b/devel/py-at-spi/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2012/10/31 11:19:28 asau Exp $ -# +# $NetBSD: Makefile,v 1.26 2014/01/25 10:30:02 wiz Exp $ DISTNAME= at-spi-1.32.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -21,6 +20,8 @@ USE_LANGUAGES= #none NO_BUILD= yes PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-ORBit, py-gnome2 + PYATSPIDIR= ${PREFIX}/${PYSITELIB}/pyatspi INSTALLATION_DIRS= ${PYATSPIDIR} diff --git a/devel/py-babel/Makefile b/devel/py-babel/Makefile index d07b288d09a..2afe7e3d80d 100644 --- a/devel/py-babel/Makefile +++ b/devel/py-babel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2014/01/12 09:45:24 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2014/01/25 10:30:02 wiz Exp $ DISTNAME= Babel-1.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -14,7 +14,5 @@ USE_LANGUAGES= # none DEPENDS+= ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz -PYTHON_VERSIONS_INCLUDE_3X= yes - .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-blinker/Makefile b/devel/py-blinker/Makefile index 25d2e325725..790e29ce0c9 100644 --- a/devel/py-blinker/Makefile +++ b/devel/py-blinker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2013/07/09 16:55:41 kleink Exp $ +# $NetBSD: Makefile,v 1.5 2014/01/25 10:30:02 wiz Exp $ DISTNAME= blinker-1.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,7 +12,5 @@ LICENSE= mit USE_LANGUAGES= # empty -PYTHON_VERSIONS_INCLUDE_3X= yes - .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-buildbot-slave/Makefile b/devel/py-buildbot-slave/Makefile index dfac4d9578e..c6a9cb6ef69 100644 --- a/devel/py-buildbot-slave/Makefile +++ b/devel/py-buildbot-slave/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2013/11/08 15:33:32 riz Exp $ -# +# $NetBSD: Makefile,v 1.5 2014/01/25 10:30:03 wiz Exp $ DISTNAME= buildbot-slave-0.8.8 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -14,5 +13,7 @@ LICENSE= gnu-gpl-v2 DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-twisted + .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-buildbot/Makefile b/devel/py-buildbot/Makefile index c1bb5ccba23..ed3463f0507 100644 --- a/devel/py-buildbot/Makefile +++ b/devel/py-buildbot/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2013/11/08 15:32:10 riz Exp $ -# +# $NetBSD: Makefile,v 1.5 2014/01/25 10:30:02 wiz Exp $ DISTNAME= buildbot-0.8.8 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -18,5 +17,7 @@ DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted DEPENDS+= ${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2 DEPENDS+= ${PYPKGPREFIX}-sqlite2-[0-9]*:../../databases/py-sqlite2 +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-twisted, py-sqlite2, py-sqlalchemy-migrate + .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-checker/Makefile b/devel/py-checker/Makefile index d9ac739ff92..d34f139f1c1 100644 --- a/devel/py-checker/Makefile +++ b/devel/py-checker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2012/10/31 11:19:28 asau Exp $ +# $NetBSD: Makefile,v 1.18 2014/01/25 10:30:03 wiz Exp $ DISTNAME= pychecker-0.8.19 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -13,6 +13,8 @@ LICENSE= modified-bsd PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX:Q} PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.8.19 + post-install: ${MV} ${DESTDIR}${PREFIX}/bin/pychecker ${DESTDIR}${PREFIX}/bin/pychecker${PYVERSSUFFIX} diff --git a/devel/py-compizconfig/Makefile b/devel/py-compizconfig/Makefile index b922f0b0870..a517c18f6f3 100644 --- a/devel/py-compizconfig/Makefile +++ b/devel/py-compizconfig/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2014/01/01 11:52:13 wiz Exp $ -# +# $NetBSD: Makefile,v 1.34 2014/01/25 10:30:03 wiz Exp $ PKGVER= 0.8.4 DISTNAME= compizconfig-python-${PKGVER} @@ -13,13 +12,14 @@ HOMEPAGE= http://compiz.org/ COMMENT= Python bindings for libcompizconfig LICENSE= gnu-gpl-v2 +BUILD_DEPENDS+= ${PYPKGPREFIX}-pyrex>=0.9.3:../../lang/py-pyrex + GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= pkg-config gmake PY_PATCHPLIST= yes - -BUILD_DEPENDS+= ${PYPKGPREFIX}-pyrex>=0.9.3:../../lang/py-pyrex +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-pyrex .include "../../wm/compiz/buildlink3.mk" .include "../../devel/libcompizconfig/buildlink3.mk" diff --git a/devel/py-curses/Makefile b/devel/py-curses/Makefile index a2502336518..4c1cbbadbf7 100644 --- a/devel/py-curses/Makefile +++ b/devel/py-curses/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2013/04/20 09:38:04 obache Exp $ -# +# $NetBSD: Makefile,v 1.40 2014/01/25 10:30:03 wiz Exp $ PKGNAME= ${PYPKGPREFIX}-curses-${PY_DISTVERSION} CATEGORIES= devel python @@ -8,8 +7,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.python.org/doc/current/lib/module-curses.html COMMENT= Curses module for Python -PYTHON_VERSIONS_INCLUDE_3X= yes - USE_NCURSES= yes # needs: filter getsyx getwin has_key immedok mvwinsnstr mvwinsstr ... # noqiflush pechochar putp putwin qiflush redrawwin setsyx syncok termattrs diff --git a/devel/py-cursespanel/Makefile b/devel/py-cursespanel/Makefile index b9b311c5c1f..6b75134feb4 100644 --- a/devel/py-cursespanel/Makefile +++ b/devel/py-cursespanel/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2013/04/20 09:38:04 obache Exp $ -# +# $NetBSD: Makefile,v 1.25 2014/01/25 10:30:03 wiz Exp $ PKGNAME= ${PYPKGPREFIX}-cursespanel-${PY_DISTVERSION} CATEGORIES= devel python @@ -10,8 +9,6 @@ COMMENT= Curses panel module for Python DEPENDS+= ${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses -PYTHON_VERSIONS_INCLUDE_3X= yes - USE_NCURSES= yes # filter getsyx getwin has_key immedok mvwinsnstr mvwinsstr ... # noqiflush pechochar putp putwin qiflush redrawwin setsyx syncok termattrs diff --git a/devel/py-cython/Makefile b/devel/py-cython/Makefile index 8972f3ac30c..aa5e285d858 100644 --- a/devel/py-cython/Makefile +++ b/devel/py-cython/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2013/10/20 22:04:31 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2014/01/25 10:30:03 wiz Exp $ DISTNAME= Cython-0.19.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/Cy/cy/} @@ -12,7 +12,6 @@ LICENSE= apache-1.1 USE_LANGUAGES= c PYDISTUTILSPKG= yes -PYTHON_VERSIONS_INCLUDE_3X= yes PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} PLIST_VARS= cygdb diff --git a/devel/py-distribute/Makefile b/devel/py-distribute/Makefile index de83f7a67ba..b1188a527fb 100644 --- a/devel/py-distribute/Makefile +++ b/devel/py-distribute/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2013/07/08 08:50:09 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2014/01/25 10:30:03 wiz Exp $ DISTNAME= distribute-0.6.49 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,7 +11,6 @@ COMMENT= Replacement for setuptools LICENSE= python-software-foundation # or ZPL CONFLICTS+= ${PYPKGPREFIX}-setuptools-[0-9]* -PYTHON_VERSIONS_INCLUDE_3X= yes PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} REPLACE_PYTHON= setuptools/command/easy_install.py diff --git a/devel/py-doctor/Makefile b/devel/py-doctor/Makefile index 945306ebb78..f1f955ee842 100644 --- a/devel/py-doctor/Makefile +++ b/devel/py-doctor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2013/09/30 17:23:04 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2014/01/25 10:30:03 wiz Exp $ DISTNAME= pydoctor-0.4 PKGNAME= ${DISTNAME:S/py/${PYPKGPREFIX}-/} @@ -14,5 +14,7 @@ DEPENDS+= ${PYPKGPREFIX}-nevow>=0.9.18:../../www/py-nevow USE_LANGUAGES= # none +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-twisted, py-xml via py-nevow + .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-expect/Makefile b/devel/py-expect/Makefile index 19c657d73f3..d16373b8ab3 100644 --- a/devel/py-expect/Makefile +++ b/devel/py-expect/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2014/01/11 14:42:02 adam Exp $ -# +# $NetBSD: Makefile,v 1.20 2014/01/25 10:30:03 wiz Exp $ DISTNAME= ExpectPy-1.9b1 PKGNAME= ${PYPKGPREFIX}-expect-1.9b1 @@ -21,6 +20,7 @@ CONFIGURE_ENV+= PYTH_CONFIGDIR=${BUILDLINK_PREFIX.${PYPACKAGE}}/${PYLIB}/config INSTALL_TARGET= installshared PY_PATCHPLIST= yes PLIST_SUBST+= PYLIB=${PYLIB:Q} PYPKGPREFIX=${PYPKGPREFIX:Q} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.9b1 EXAMPLESDIR= ${PREFIX}/share/examples/${PYPKGPREFIX}-expect EXAMPLESFILES= ask.py glob.py ping.py telnet.py xping.py diff --git a/devel/py-fann/Makefile b/devel/py-fann/Makefile index 590e209c044..641aa4192d3 100644 --- a/devel/py-fann/Makefile +++ b/devel/py-fann/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2014/01/22 01:44:10 gdt Exp $ +# $NetBSD: Makefile,v 1.10 2014/01/25 10:30:03 wiz Exp $ .include "../../devel/fann/Makefile.common" PKGNAME= ${PYPKGPREFIX}-fann-${FANNVERSION} @@ -8,6 +8,7 @@ COMMENT= Fast Artificial Neural Network python interface USE_LANGUAGES= c c++ PYSETUPSUBDIR= python +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.1.0.20061012 EGG_NAME= pyfann-${FANNVERSION} diff --git a/devel/py-filechunkio/Makefile b/devel/py-filechunkio/Makefile index 09555ce0e69..c98c203cf24 100644 --- a/devel/py-filechunkio/Makefile +++ b/devel/py-filechunkio/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2012/11/18 02:25:37 asau Exp $ -# +# $NetBSD: Makefile,v 1.3 2014/01/25 10:30:03 wiz Exp $ DISTNAME= filechunkio-1.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,6 +11,7 @@ COMMENT= Chunck files for input/output LICENSE= mit USE_LANGUAGES= # none +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.5 .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-funcparserlib/Makefile b/devel/py-funcparserlib/Makefile index 1bbb6b8679b..56181793a4c 100644 --- a/devel/py-funcparserlib/Makefile +++ b/devel/py-funcparserlib/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2013/10/12 13:38:38 obache Exp $ -# +# $NetBSD: Makefile,v 1.4 2014/01/25 10:30:03 wiz Exp $ DISTNAME= funcparserlib-0.3.6 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -13,7 +12,5 @@ LICENSE= mit USE_LANGUAGES= # none -PYTHON_VERSIONS_INCLUDE_3X= yes - .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-generate/Makefile b/devel/py-generate/Makefile index 1aaeb132381..6967e1a37c9 100644 --- a/devel/py-generate/Makefile +++ b/devel/py-generate/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2013/10/06 12:47:13 darcy Exp $ -# +# $NetBSD: Makefile,v 1.21 2014/01/25 10:30:03 wiz Exp $ DISTNAME= generate-2.8 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,8 +10,6 @@ OWNER= darcy@NetBSD.org HOMEPAGE= http://www.druid.net/darcy/readme-generate.html COMMENT= Python interface to Generate -PYTHON_VERSIONS_INCLUDE_3X= yes - MAKE_ENV+= MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR} MAKE_ENV+= BINDIR=${DESTDIR}${PREFIX}/bin USE_TOOLS+= gmake diff --git a/devel/py-gobject3/Makefile b/devel/py-gobject3/Makefile index 4e3e4da5a0e..0b2a55bad23 100644 --- a/devel/py-gobject3/Makefile +++ b/devel/py-gobject3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2013/12/09 23:12:31 prlw1 Exp $ +# $NetBSD: Makefile,v 1.23 2014/01/25 10:30:03 wiz Exp $ DISTNAME= pygobject-3.10.2 PKGNAME= ${PYPKGPREFIX}-gobject3-3.10.2 @@ -18,7 +18,6 @@ USE_TOOLS+= pkg-config gmake GNU_CONFIGURE= yes CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} -#PYTHON_VERSIONS_INCLUDE_3X= yes PYTHON_VERSIONS_INCOMPATIBLE= 26 PYTHON_SELF_CONFLICT= yes @@ -30,7 +29,8 @@ CONFLICTS+= ${PYPKGPREFIX}-gobject<2.28.6nb4 # needed for tests only # https://bugzilla.gnome.org/show_bug.cgi?id=685094 -.include "../../graphics/cairo/buildlink3.mk" +PYTHON_VERSIONED_DEPENDENCIES= cairo:link +.include "../../lang/python/versioned_dependencies.mk" .include "../../graphics/cairo-gobject/buildlink3.mk" TEST_TARGET= check @@ -48,5 +48,4 @@ BUILDLINK_API_DEPENDS.glib2= glib2>=2.35.9 BUILDLINK_API_DEPENDS.gobject-introspection= gobject-introspection>=1.35.9 .include "../../devel/gobject-introspection/buildlink3.mk" .include "../../devel/libffi/buildlink3.mk" -.include "../../graphics/py-cairo/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-idle/Makefile b/devel/py-idle/Makefile index 225232f477e..2003dc0a49c 100644 --- a/devel/py-idle/Makefile +++ b/devel/py-idle/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2012/10/31 11:19:31 asau Exp $ -# +# $NetBSD: Makefile,v 1.33 2014/01/25 10:30:03 wiz Exp $ PKGNAME= ${PYPKGPREFIX}-idle-0 PKGREVISION= 2 @@ -11,8 +10,6 @@ COMMENT= IDLE - The Integrated DeveLopment Environment for Python DEPENDS+= ${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk -PYTHON_VERSIONS_INCLUDE_3X= yes - PY_PATCHPLIST= yes PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} diff --git a/devel/py-ipython/Makefile b/devel/py-ipython/Makefile index 9f946f09d44..dc410d4a86d 100644 --- a/devel/py-ipython/Makefile +++ b/devel/py-ipython/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2013/10/26 12:15:59 obache Exp $ -# +# $NetBSD: Makefile,v 1.6 2014/01/25 10:30:03 wiz Exp $ DISTNAME= ipython-0.10.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -16,6 +15,7 @@ DEPENDS+= ${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline DEPENDS+= ${PYPKGPREFIX}-pexpect-[0-9]*:../../devel/py-pexpect PYTHON_SELF_CONFLICT= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.10.2 (1.0 is out) USE_LANGUAGES= # none USE_TOOLS+= gunzip diff --git a/devel/py-ipython013/Makefile b/devel/py-ipython013/Makefile index dd68fce66d5..7bac5827809 100644 --- a/devel/py-ipython013/Makefile +++ b/devel/py-ipython013/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2013/10/29 18:18:46 drochner Exp $ -# +# $NetBSD: Makefile,v 1.7 2014/01/25 10:30:04 wiz Exp $ DISTNAME= ipython-0.13.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -13,7 +12,7 @@ LICENSE= modified-bsd DEPENDS+= ${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline -#PYTHON_VERSIONS_INCLUDE_3X= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.13.2 (see py-ipython1 package for a compatible version) USE_LANGUAGES= # none USE_TOOLS+= gunzip diff --git a/devel/py-jersey/Makefile b/devel/py-jersey/Makefile index 53a76c654b6..70245f4bd07 100644 --- a/devel/py-jersey/Makefile +++ b/devel/py-jersey/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2012/10/31 11:19:31 asau Exp $ +# $NetBSD: Makefile,v 1.7 2014/01/25 10:30:04 wiz Exp $ DISTNAME= jersey-0.1.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -13,5 +13,7 @@ LICENSE= modified-bsd #BUILD_DEPENDS+= ${PYPKGPREFIX}-twisted>=10.0.0:../../net/py-twisted DEPENDS+= ${PYPKGPREFIX}-twisted>=10.0.0:../../net/py-twisted +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-twisted + .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-kqueue/Makefile b/devel/py-kqueue/Makefile index 086a821938b..1961ed4458b 100644 --- a/devel/py-kqueue/Makefile +++ b/devel/py-kqueue/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.12 2012/10/31 11:19:32 asau Exp $ +# $NetBSD: Makefile,v 1.13 2014/01/25 10:30:04 wiz Exp $ DISTNAME= py-kqueue-2.0 -PKGNAME= ${PYPKGPREFIX}-kqueue-2.0 +PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py-//} PKGREVISION= 2 CATEGORIES= devel python MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/jdolecek/ @@ -18,6 +18,7 @@ PKG_FAIL_REASON+= "${PKGNAME} is not available for ${MACHINE_PLATFORM}, needs OS .endif EGG_NAME= ${DISTNAME:S/py-//} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.0 .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-logilab-astng/Makefile b/devel/py-logilab-astng/Makefile index 30495319313..a5bcb7a69c8 100644 --- a/devel/py-logilab-astng/Makefile +++ b/devel/py-logilab-astng/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2012/10/31 11:19:32 asau Exp $ -# +# $NetBSD: Makefile,v 1.6 2014/01/25 10:30:04 wiz Exp $ VERSION= 0.21.0 DISTNAME= logilab-astng-${VERSION} @@ -14,6 +13,7 @@ COMMENT= Extend Python abstract syntax tree LICENSE= gnu-gpl-v2 USE_LANGUAGES= # none +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-mxDateTime via py-logilab-common do-test: cd ${WRKSRC} && ${SH} test/fulltest.sh ${PYVERSSUFFIX} diff --git a/devel/py-logilab-common/Makefile b/devel/py-logilab-common/Makefile index 55d0d05f0cb..5eacd6c2b3f 100644 --- a/devel/py-logilab-common/Makefile +++ b/devel/py-logilab-common/Makefile @@ -1,20 +1,20 @@ -# $NetBSD: Makefile,v 1.5 2013/06/04 07:35:14 wiz Exp $ -# +# $NetBSD: Makefile,v 1.6 2014/01/25 10:30:04 wiz Exp $ -VERS= 0.53.0 -DISTNAME= logilab-common-${VERS} -PKGNAME= ${PYPKGPREFIX}-${DISTNAME} -EGG_NAME= logilab_common-${VERS} -CATEGORIES= devel python +VERS= 0.53.0 +DISTNAME= logilab-common-${VERS} +PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +EGG_NAME= logilab_common-${VERS} +CATEGORIES= devel python MASTER_SITES= http://ftp.logilab.org/pub/common/ -MAINTAINER= kamel.derouiche@gmail.com -HOMEPAGE= http://www.logilab.org/project/logilab-common -COMMENT= Useful miscellaneous modules used by Logilab projects -LICENSE= gnu-lgpl-v2.1 +MAINTAINER= kamel.derouiche@gmail.com +HOMEPAGE= http://www.logilab.org/project/logilab-common +COMMENT= Useful miscellaneous modules used by Logilab projects +LICENSE= gnu-lgpl-v2.1 #comment this out to avoid problems to find the binary by other programs PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-mxDateTime INSTALLATION_DIRS= ${PKGMANDIR}/man1 diff --git a/devel/py-memcached/Makefile b/devel/py-memcached/Makefile index bc359ec0896..bbde7b625ff 100644 --- a/devel/py-memcached/Makefile +++ b/devel/py-memcached/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2014/01/03 04:06:20 rodent Exp $ -# +# $NetBSD: Makefile,v 1.2 2014/01/25 10:30:04 wiz Exp $ DISTNAME= python-memcached-1.53 PKGNAME= ${DISTNAME:S/python/${PYPKGPREFIX}/1} @@ -17,6 +16,7 @@ DOCDIR= ${PREFIX}/share/doc/py-memcached INSTALLATION_DIRS= ${DOCDIR} REPLACE_PYTHON+= memcache.py EGG_NAME= ${DISTNAME:S/-/_/1} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.53 post-install: ${INSTALL_DATA} ${WRKSRC}/memcache.html ${DESTDIR}${DOCDIR} diff --git a/devel/py-msgpack/Makefile b/devel/py-msgpack/Makefile index adbd71a0e58..efc53ce61c7 100644 --- a/devel/py-msgpack/Makefile +++ b/devel/py-msgpack/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2014/01/23 09:40:29 obache Exp $ -# +# $NetBSD: Makefile,v 1.9 2014/01/25 10:30:04 wiz Exp $ DISTNAME= msgpack-python-0.4.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/-python-/-/} @@ -13,8 +12,6 @@ LICENSE= apache-2.0 USE_LANGUAGES= c c++ -PYTHON_VERSIONS_INCLUDE_3X= yes - EGG_NAME= ${DISTNAME:S/-/_/} .include "../../devel/msgpack/buildlink3.mk" diff --git a/devel/py-newt/Makefile b/devel/py-newt/Makefile index 8f967157fb4..f937cdf941b 100644 --- a/devel/py-newt/Makefile +++ b/devel/py-newt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2014/01/11 14:42:03 adam Exp $ +# $NetBSD: Makefile,v 1.8 2014/01/25 10:30:04 wiz Exp $ DISTNAME= newt-0.52.16 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -19,6 +19,7 @@ USE_LIBTOOL= yes PKGCONFIG_OVERRIDE+= libnewt.pc.in PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 pre-configure: cd ${WRKSRC}; \ diff --git a/devel/py-nose/Makefile b/devel/py-nose/Makefile index 82c4b4ea5a5..5c6fac144d5 100644 --- a/devel/py-nose/Makefile +++ b/devel/py-nose/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2013/09/11 09:38:53 prlw1 Exp $ -# +# $NetBSD: Makefile,v 1.9 2014/01/25 10:30:04 wiz Exp $ DISTNAME= nose-1.3.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -18,7 +17,6 @@ LICENSE= gnu-lgpl-v2.1 #DEPENDS+= ${PYPKGPREFIX}-coverage>=3.0:../../devel/py-coverage USE_LANGUAGES= # none -PYTHON_VERSIONS_INCLUDE_3X= yes PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} post-extract: diff --git a/devel/py-open-vcdiff/Makefile b/devel/py-open-vcdiff/Makefile index b9f9ad66b2f..68c936795f3 100644 --- a/devel/py-open-vcdiff/Makefile +++ b/devel/py-open-vcdiff/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2013/08/15 17:14:06 joerg Exp $ -# +# $NetBSD: Makefile,v 1.2 2014/01/25 10:30:04 wiz Exp $ DISTNAME= 06d46e3de6f7 PKGNAME= ${PYPKGPREFIX}-open-vcdiff-0.1pre${DISTNAME} @@ -8,8 +7,6 @@ CATEGORIES= devel python MASTER_SITES= https://bitbucket.org/bluehorn/openvcdiff-python/get/ EXTRACT_SUFX= .zip -FETCH_USING= curl - MAINTAINER= joerg@NetBSD.org HOMEPAGE= https://bitbucket.org/bluehorn/openvcdiff-python COMMENT= Python binding for open-vcdiff @@ -19,6 +16,8 @@ WRKSRC= ${WRKDIR}/bluehorn-openvcdiff-python-${DISTNAME} USE_LANGUAGES= c c++ +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 06d46e3de6f7 + .include "../../devel/open-vcdiff/buildlink3.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-polib/Makefile b/devel/py-polib/Makefile index 0b9b38c9566..63adc7cbccf 100644 --- a/devel/py-polib/Makefile +++ b/devel/py-polib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2013/04/24 13:34:28 obache Exp $ +# $NetBSD: Makefile,v 1.2 2014/01/25 10:30:04 wiz Exp $ DISTNAME= polib-1.0.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -12,7 +12,5 @@ LICENSE= mit USE_LANGUAGES= # empty -PYTHON_VERSIONS_INCLUDE_3X= yes - .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-pqueue/Makefile b/devel/py-pqueue/Makefile index 3a78f9a14ed..d1321ab5dd0 100644 --- a/devel/py-pqueue/Makefile +++ b/devel/py-pqueue/Makefile @@ -1,25 +1,25 @@ -# $NetBSD: Makefile,v 1.13 2012/10/31 11:19:33 asau Exp $ -# +# $NetBSD: Makefile,v 1.14 2014/01/25 10:30:04 wiz Exp $ DISTNAME= PQueue-0.2 PKGNAME= ${PYPKGPREFIX}-pqueue-0.2 PKGREVISION= 1 CATEGORIES= devel python -MASTER_SITES= http://www.csse.monash.edu.au/hons/projects/1999/Andrew.Snare/ +MASTER_SITES= http://www.csse.monash.edu.au/hons/projects/1999/Andrew.Snare/ EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.csse.monash.edu.au/hons/projects/1999/Andrew.Snare/ +HOMEPAGE= http://www.csse.monash.edu.au/hons/projects/1999/Andrew.Snare/ COMMENT= Priority-queues using fibonacci heaps LICENSE= gnu-lgpl-v2 -WRKSRC= ${WRKDIR}/PQueue +WRKSRC= ${WRKDIR}/PQueue GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-python=${PYTHONBIN:Q} BUILD_TARGET= default PY_PATCHPLIST= yes PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX:Q} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.2 PYQ_DOCDIR= ${PREFIX}/share/doc/${PYPKGPREFIX}-PQueue diff --git a/devel/py-pyutil/Makefile b/devel/py-pyutil/Makefile index bfec5ed0ddd..3744d33424e 100644 --- a/devel/py-pyutil/Makefile +++ b/devel/py-pyutil/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2012/10/31 11:19:34 asau Exp $ -# +# $NetBSD: Makefile,v 1.10 2014/01/25 10:30:04 wiz Exp $ DISTNAME= pyutil-1.9.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -17,6 +16,8 @@ DEPENDS+= ${PYPKGPREFIX}-zbase32-[0-9]*:../../converters/py-zbase32 USE_LANGUAGES= # none +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-twisted via py-setuptools_trial, py-zbase32 + REPLACE_INTERPRETER+= python REPLACE.python.old= /usr/bin/env python REPLACE.python.new= ${PYTHONBIN} diff --git a/devel/py-readline/Makefile b/devel/py-readline/Makefile index 627f47dd201..825cdfc03c4 100644 --- a/devel/py-readline/Makefile +++ b/devel/py-readline/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2013/07/15 02:02:21 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.29 2014/01/25 10:30:04 wiz Exp $ PKGNAME= ${PYPKGPREFIX}-readline-${PY_DISTVERSION} CATEGORIES= devel misc python @@ -8,8 +7,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.python.org/doc/current/tut/node15.html COMMENT= Line editing support for Python -PYTHON_VERSIONS_INCLUDE_3X= yes - EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/readline.c PYDISTUTILSPKG= yes diff --git a/devel/py-rope/Makefile b/devel/py-rope/Makefile index ff117c6edf4..65075ea76bf 100644 --- a/devel/py-rope/Makefile +++ b/devel/py-rope/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2012/10/31 11:19:34 asau Exp $ -# +# $NetBSD: Makefile,v 1.6 2014/01/25 10:30:04 wiz Exp $ VERS= 0.9.3 DISTNAME= rope-${VERS} @@ -12,6 +11,8 @@ HOMEPAGE= http://rope.sourceforge.net/ COMMENT= Rope is a python refactoring library LICENSE= gnu-gpl-v2 +PYTHON_VERSIONS_INCOMPATIBLE= 33 + # XXX tests in contrib.codeassisttest fail do-test: cd ${WRKSRC} && ${PYTHONBIN} setup.py test diff --git a/devel/py-serpent/Makefile b/devel/py-serpent/Makefile index 70bef74fc84..c5674828c8a 100644 --- a/devel/py-serpent/Makefile +++ b/devel/py-serpent/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2013/12/04 16:34:31 drochner Exp $ +# $NetBSD: Makefile,v 1.2 2014/01/25 10:30:04 wiz Exp $ DISTNAME= serpent-1.4 PKGNAME= ${PYPKGPREFIX}-serpent-1.4 @@ -11,7 +11,6 @@ COMMENT= Simple serialization library LICENSE= mit USE_LANGUAGES= # none -PYTHON_VERSIONS_INCLUDE_3X= yes .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-setuptools/Makefile b/devel/py-setuptools/Makefile index 1fa0d6baecb..62d783ae041 100644 --- a/devel/py-setuptools/Makefile +++ b/devel/py-setuptools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2014/01/06 14:42:34 wiz Exp $ +# $NetBSD: Makefile,v 1.38 2014/01/25 10:30:05 wiz Exp $ EGG_VERSION= 2.0.2 DISTNAME= setuptools-${EGG_VERSION} @@ -13,7 +13,6 @@ COMMENT= New Python packaging system LICENSE= python-software-foundation OR zpl PYDISTUTILSPKG= yes -PYTHON_VERSIONS_INCLUDE_3X= yes PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} PYPKGPREFIX=${PYPKGPREFIX} PLIST_SUBST+= EGG_NAME=${EGGNAME} diff --git a/devel/py-setuptools_trial/Makefile b/devel/py-setuptools_trial/Makefile index f5386838beb..19b9f09cf6f 100644 --- a/devel/py-setuptools_trial/Makefile +++ b/devel/py-setuptools_trial/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2012/10/31 11:19:34 asau Exp $ -# +# $NetBSD: Makefile,v 1.6 2014/01/25 10:30:05 wiz Exp $ DISTNAME= setuptools_trial-0.5.12 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -15,5 +14,7 @@ USE_LANGUAGES= # none DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-twisted + .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-stompclient/Makefile b/devel/py-stompclient/Makefile index 4c9218ac393..25c635b0e25 100644 --- a/devel/py-stompclient/Makefile +++ b/devel/py-stompclient/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2012/10/31 11:19:34 asau Exp $ -# +# $NetBSD: Makefile,v 1.5 2014/01/25 10:30:05 wiz Exp $ DISTNAME= stompclient-0.3.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,6 +11,7 @@ COMMENT= Lightweight and extensible STOMP messaging client LICENSE= apache-2.0 USE_LANGUAGES= # none +PYTHON_VERSIONS_INCOMPATIBLE= 33 .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-subvertpy/Makefile b/devel/py-subvertpy/Makefile index f795fefb6e0..9e253a26c1d 100644 --- a/devel/py-subvertpy/Makefile +++ b/devel/py-subvertpy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2013/12/01 10:18:03 ryoon Exp $ +# $NetBSD: Makefile,v 1.24 2014/01/25 10:30:05 wiz Exp $ DISTNAME= subvertpy-0.8.10 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -15,6 +15,7 @@ LICENSE= gnu-lgpl-v2.1 MAKE_ENV+= SVN_PREFIX=${BUILDLINK_PREFIX.subversion-base} PYTHON_SELF_CONFLICT= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.8.10 .include "../../devel/subversion-base/buildlink3.mk" .include "../../lang/python/distutils.mk" diff --git a/devel/py-tabular/Makefile b/devel/py-tabular/Makefile index 834e81e381d..f1a0a813950 100644 --- a/devel/py-tabular/Makefile +++ b/devel/py-tabular/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2013/06/02 01:47:54 dholland Exp $ +# $NetBSD: Makefile,v 1.2 2014/01/25 10:30:05 wiz Exp $ DISTNAME= tabular-0.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,6 +12,8 @@ LICENSE= mit PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.1 + .include "../../graphics/py-matplotlib/buildlink3.mk" .include "../../math/py-numpy/buildlink3.mk" BUILDLINK_API_DEPENDS.pynumpy+= ${PYPKGPREFIX}-numpy>=1.6 diff --git a/devel/py-testtools/Makefile b/devel/py-testtools/Makefile index 007eb7b98ee..53af22ad82d 100644 --- a/devel/py-testtools/Makefile +++ b/devel/py-testtools/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2014/01/24 13:22:22 obache Exp $ -# +# $NetBSD: Makefile,v 1.10 2014/01/25 10:30:05 wiz Exp $ DISTNAME= testtools-0.9.34 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -13,7 +12,5 @@ LICENSE= mit AND python-software-foundation USE_LANGUAGES= # none -PYTHON_VERSIONS_INCLUDE_3X= yes - .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-unit/Makefile b/devel/py-unit/Makefile index b4b5fa4d8eb..d89d4969744 100644 --- a/devel/py-unit/Makefile +++ b/devel/py-unit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2012/10/31 11:19:35 asau Exp $ +# $NetBSD: Makefile,v 1.16 2014/01/25 10:30:05 wiz Exp $ DISTNAME= pyunit-1.4.1 PKGNAME= ${PYPKGPREFIX}-unit-1.4.1 @@ -13,6 +13,7 @@ COMMENT= Unit testing framework for python EGG_NAME= PyUnit-${PKGVERSION_NOREV} PYTHON_SELF_CONFLICT= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-unitgui/Makefile b/devel/py-unitgui/Makefile index 8cf058045a1..33817b7c5fc 100644 --- a/devel/py-unitgui/Makefile +++ b/devel/py-unitgui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2012/10/31 11:19:35 asau Exp $ +# $NetBSD: Makefile,v 1.16 2014/01/25 10:30:05 wiz Exp $ DISTNAME= pyunit-1.4.1 PKGNAME= ${PYPKGPREFIX}-unitgui-1.4.1 @@ -14,5 +14,7 @@ DEPENDS+= ${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk EGG_NAME= PyUnit-${PKGVERSION_NOREV} +PYTHON_VERSIONS_INCOMPATIBLE= 33 + .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-unittest2/Makefile b/devel/py-unittest2/Makefile index c3aaac0c02e..da7b2fe4aee 100644 --- a/devel/py-unittest2/Makefile +++ b/devel/py-unittest2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2013/07/08 16:17:20 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2014/01/25 10:30:05 wiz Exp $ DISTNAME= unittest2-0.5.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -10,12 +10,11 @@ HOMEPAGE= http://pypi.python.org/pypi/unittest2 COMMENT= Unittest features for Python 2.7 backported to Python 2.3+ LICENSE= original-bsd -PYTHON_VERSIONS_INCLUDE_3X = no - DOCDIR= share/doc/${PKGBASE} INSTALLATION_DIRS+= ${DOCDIR} PLIST_SUBST+= DOCDIR=${DOCDIR} PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # separate package exists: unittest2py3k and could be packaged post-install: ${INSTALL_DATA} ${WRKSRC}/README.txt ${DESTDIR}${PREFIX}/${DOCDIR} diff --git a/devel/py-usb/Makefile b/devel/py-usb/Makefile index 50d9ed0802b..fa65148816f 100644 --- a/devel/py-usb/Makefile +++ b/devel/py-usb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2013/12/10 11:55:41 jperkin Exp $ +# $NetBSD: Makefile,v 1.7 2014/01/25 10:30:05 wiz Exp $ VERSION= 0.4.2 DISTNAME= pyusb-${VERSION} @@ -13,6 +13,8 @@ COMMENT= Python interface to USB via libusb CFLAGS.SunOS+= -Du_int8_t=uint8_t -Du_int16_t=uint16_t -Du_int32_t=uint32_t +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.4.2 + .include "../../devel/libusb/buildlink3.mk" .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-windbg/Makefile b/devel/py-windbg/Makefile index 0ab18fae036..b9fdc170991 100644 --- a/devel/py-windbg/Makefile +++ b/devel/py-windbg/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2013/04/06 12:08:39 rodent Exp $ -# +# $NetBSD: Makefile,v 1.12 2014/01/25 10:30:05 wiz Exp $ DISTNAME= winpdb-1.4.6 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -14,6 +13,8 @@ LICENSE= gnu-gpl-v2 # or later DEPENDS+= ${PYPKGPREFIX}-wxWidgets>=2.6:../../x11/py-wxWidgets +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-wxWidgets + USE_LANGUAGES= #none .include "../../lang/python/distutils.mk" diff --git a/devel/py-xdg/Makefile b/devel/py-xdg/Makefile index aa7bb20e078..fd861031295 100644 --- a/devel/py-xdg/Makefile +++ b/devel/py-xdg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2012/10/31 11:19:36 asau Exp $ +# $NetBSD: Makefile,v 1.4 2014/01/25 10:30:05 wiz Exp $ DISTNAME= pyxdg-0.19 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -10,5 +10,7 @@ HOMEPAGE= http://freedesktop.org/wiki/Software/pyxdg COMMENT= Python library for XDG LICENSE= gnu-lgpl-v2 +PYTHON_VERSIONS_INCOMPATIBLE= 33 + .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-zconfig/Makefile b/devel/py-zconfig/Makefile index 786c42794ab..28842d531a7 100644 --- a/devel/py-zconfig/Makefile +++ b/devel/py-zconfig/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2012/10/31 11:19:36 asau Exp $ -# +# $NetBSD: Makefile,v 1.10 2014/01/25 10:30:05 wiz Exp $ DISTNAME= ZConfig-2.6.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -15,6 +14,8 @@ USE_LANGUAGES= # empty INSTALLATION_DIRS+= share/doc/py-zconfig +PYTHON_VERSIONS_INCOMPATIBLE= 33 + post-install: ${INSTALL_DATA} ${WRKSRC}/doc/zconfig.pdf \ ${DESTDIR}${PREFIX}/share/doc/py-zconfig diff --git a/devel/roundup/Makefile b/devel/roundup/Makefile index 33a8d0c45c1..47b70618c99 100644 --- a/devel/roundup/Makefile +++ b/devel/roundup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2012/10/31 11:19:39 asau Exp $ +# $NetBSD: Makefile,v 1.44 2014/01/25 10:30:05 wiz Exp $ DISTNAME= roundup-1.4.19 PKGREVISION= 2 @@ -10,9 +10,10 @@ HOMEPAGE= http://roundup.sourceforge.net/ COMMENT= Issue tracking system with command-line, web and email clients LICENSE= mit AND zpl -USE_LANGUAGES= +USE_LANGUAGES= # empty USE_TOOLS+= pax +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.4.19 PYTHON_PATCH_SCRIPTS+= cgi-bin/roundup.cgi demo.py roundup/admin.py PYTHON_PATCH_SCRIPTS+= frontends/roundup.cgi PYTHON_PATCH_SCRIPTS+= roundup/backends/locking.py diff --git a/devel/rox-lib/Makefile b/devel/rox-lib/Makefile index 4250fb81d89..8ef89c910b0 100644 --- a/devel/rox-lib/Makefile +++ b/devel/rox-lib/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2012/10/31 11:19:39 asau Exp $ -# +# $NetBSD: Makefile,v 1.19 2014/01/25 10:30:06 wiz Exp $ DISTNAME= rox-lib-2.0.2 PKGREVISION= 14 @@ -25,6 +24,7 @@ USE_TOOLS+= pax PYTHON_PATCH_SCRIPTS= AppRun MakeDist PYTHON_PATCH_SCRIPTS+= python/make_docs.py PYTHON_PATCH_SCRIPTS+= tests/python/*.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 INSTALLATION_DIRS= share/rox/ROX-Lib2 diff --git a/devel/scons/Makefile b/devel/scons/Makefile index 36d75457158..b20f9c7305d 100644 --- a/devel/scons/Makefile +++ b/devel/scons/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2013/09/19 11:07:04 jperkin Exp $ +# $NetBSD: Makefile,v 1.22 2014/01/25 10:30:06 wiz Exp $ DISTNAME= scons-2.3.0 PKGREVISION= 1 @@ -12,6 +12,9 @@ LICENSE= mit REPLACE_PYTHON+= script/scons script/scons-time script/sconsign +# not yet ported as of 2.3.0, but progress promised +PYTHON_VERSIONS_INCOMPATIBLE= 33 + .include "../../lang/python/application.mk" .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/stgit/Makefile b/devel/stgit/Makefile index a97a27e5a76..89cdd58246a 100644 --- a/devel/stgit/Makefile +++ b/devel/stgit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2013/09/09 14:07:59 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2014/01/25 10:30:06 wiz Exp $ DISTNAME= stgit-0.14.3 PKGREVISION= 7 @@ -23,6 +23,7 @@ REPLACE_BASH= contrib/stg-* PYTHON_PATCH_SCRIPTS= *.py stgit/*.py stg PYSETUPINSTALLARGS= --prefix=${PREFIX} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.14.3 MAKE_ENV+= ASCIIDOC=${PREFIX}/bin/asciidoc MAKE_ENV+= ASCIIDOC_EXTRA=${ASCIIDOC_EXTRA:M*:Q} diff --git a/devel/tailor/Makefile b/devel/tailor/Makefile index 2bb24ad8da2..f4039015b91 100644 --- a/devel/tailor/Makefile +++ b/devel/tailor/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2012/10/31 11:19:49 asau Exp $ -# +# $NetBSD: Makefile,v 1.23 2014/01/25 10:30:06 wiz Exp $ DISTNAME= tailor-0.9.35 PKGREVISION= 5 @@ -13,7 +12,8 @@ LICENSE= gnu-gpl-v3 USE_LANGUAGES= #none -PYTHON_PATCH_SCRIPTS= tailor +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.9.35 +REPLACE_PYTHON= tailor AUTO_MKDIRS= yes diff --git a/devel/talloc/Makefile b/devel/talloc/Makefile index a8f16a19036..bb3c7f90770 100644 --- a/devel/talloc/Makefile +++ b/devel/talloc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2014/01/09 11:57:04 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2014/01/25 10:30:06 wiz Exp $ DISTNAME= talloc-2.1.0 CATEGORIES= devel @@ -17,6 +17,7 @@ USE_TOOLS+= pkg-config PKGCONFIG_OVERRIDE+= talloc.pc.in PKGCONFIG_OVERRIDE+= pytalloc-util.pc.in PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.1.0 # include/talloc.h CONFLICTS+= samba-[0-9]* diff --git a/devel/transifex-client/Makefile b/devel/transifex-client/Makefile index d1f89b27774..86b12b79dad 100644 --- a/devel/transifex-client/Makefile +++ b/devel/transifex-client/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2013/12/24 03:26:19 taca Exp $ -# +# $NetBSD: Makefile,v 1.5 2014/01/25 10:30:06 wiz Exp $ DISTNAME= ${VERS} PKGNAME= transifex-client-${VERS} @@ -12,9 +11,10 @@ HOMEPAGE= https://github.com/transifex/transifex-client COMMENT= Transifex Command-line Client LICENSE= gnu-gpl-v2 -FETCH_USING= wget VERS= 0.10 WRKSRC= ${WRKDIR}/transifex-client-${VERS} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.10 + .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/umbrello/Makefile b/devel/umbrello/Makefile index afa1716e91a..cb5742d2311 100644 --- a/devel/umbrello/Makefile +++ b/devel/umbrello/Makefile @@ -1,10 +1,12 @@ -# $NetBSD: Makefile,v 1.16 2014/01/01 11:52:13 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2014/01/25 10:30:06 wiz Exp $ DISTNAME= umbrello-${_KDE_VERSION} PKGREVISION= 4 CATEGORIES= devel COMMENT= UML Modeller +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 4.11.3 + .include "../../meta-pkgs/kde4/Makefile.kde4" REPLACE_PERL+= \ diff --git a/devel/valide/Makefile b/devel/valide/Makefile index 289d21c4a39..d7f2486b637 100644 --- a/devel/valide/Makefile +++ b/devel/valide/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2014/01/01 11:52:13 wiz Exp $ -# +# $NetBSD: Makefile,v 1.30 2014/01/25 10:30:06 wiz Exp $ DISTNAME= valide-0.4.0 PKGREVISION= 23 @@ -16,6 +15,7 @@ PYTHON_FOR_BUILD_ONLY= yes REPLACE_PYTHON+= wscript waf \ */wscript_build \ */*/wscript_build +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.4.0 WAF_ENV= PATH=${PATH} CC=${CC:Q} CXX=${CXX:Q} PREFIX=${PREFIX:Q} \ CFLAGS=${CFLAGS:Q} CXXFLAGS=${CXXFLAGS:Q} \ diff --git a/devel/xulrunner10/mozilla-common.mk b/devel/xulrunner10/mozilla-common.mk index 7e8045bfa7d..4536fc925ff 100644 --- a/devel/xulrunner10/mozilla-common.mk +++ b/devel/xulrunner10/mozilla-common.mk @@ -1,4 +1,4 @@ -# $NetBSD: mozilla-common.mk,v 1.3 2012/12/18 22:27:10 marino Exp $ +# $NetBSD: mozilla-common.mk,v 1.4 2014/01/25 10:30:06 wiz Exp $ # # common Makefile fragment for mozilla packages based on gecko 2.0. # @@ -55,6 +55,7 @@ CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.sub CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.sub PYTHON_FOR_BUILD_ONLY= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 10.0.12 .include "../../lang/python/application.mk" CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} diff --git a/devel/xulrunner17/mozilla-common.mk b/devel/xulrunner17/mozilla-common.mk index faccd47db56..a40bef5cccd 100644 --- a/devel/xulrunner17/mozilla-common.mk +++ b/devel/xulrunner17/mozilla-common.mk @@ -1,4 +1,4 @@ -# $NetBSD: mozilla-common.mk,v 1.2 2013/02/10 14:23:20 ryoon Exp $ +# $NetBSD: mozilla-common.mk,v 1.3 2014/01/25 10:30:06 wiz Exp $ # # common Makefile fragment for mozilla packages based on gecko 2.0. # @@ -54,6 +54,7 @@ CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.sub CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.sub PYTHON_FOR_BUILD_ONLY= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-sqlite2 .include "../../lang/python/application.mk" CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} diff --git a/devel/xulrunner192/mozilla-common.mk b/devel/xulrunner192/mozilla-common.mk index 8cc6bbf6a9b..3b315e23ac7 100644 --- a/devel/xulrunner192/mozilla-common.mk +++ b/devel/xulrunner192/mozilla-common.mk @@ -1,4 +1,4 @@ -# $NetBSD: mozilla-common.mk,v 1.4 2013/04/08 11:17:12 rodent Exp $ +# $NetBSD: mozilla-common.mk,v 1.5 2014/01/25 10:30:06 wiz Exp $ # # common Makefile fragment for mozilla packages based on gecko 2.0. # @@ -49,6 +49,7 @@ CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.sub CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.sub PYTHON_FOR_BUILD_ONLY= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.9.2.28 .include "../../lang/python/application.mk" CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} diff --git a/editors/gedit-python/Makefile b/editors/gedit-python/Makefile index 277ae6dbed9..675bf78284d 100644 --- a/editors/gedit-python/Makefile +++ b/editors/gedit-python/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2013/10/10 14:42:06 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.23 2014/01/25 10:30:06 wiz Exp $ DISTNAME= gedit-2.30.4 PKGNAME= gedit-python-2.30.4 @@ -26,6 +25,8 @@ BUILD_DIRS= plugin-loaders/python BUILD_DIRS+= plugins/pythonconsole plugins/quickopen plugins/snippets INSTALL_DIRS= ${BUILD_DIRS} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 + .include "../../lang/python/application.mk" .include "../../devel/py-gobject/buildlink3.mk" .include "../../x11/py-gtk2/buildlink3.mk" diff --git a/editors/kdissert/Makefile b/editors/kdissert/Makefile index 7d36bfc8ce4..e45294613fe 100644 --- a/editors/kdissert/Makefile +++ b/editors/kdissert/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2014/01/01 11:52:14 wiz Exp $ -# +# $NetBSD: Makefile,v 1.50 2014/01/25 10:30:06 wiz Exp $ DISTNAME= kdissert-1.0.7 PKGREVISION= 26 @@ -17,6 +16,7 @@ USE_LANGUAGES= c c++ USE_LIBTOOL= yes USE_TOOLS+= msgfmt PYTHON_FOR_BUILD_ONLY= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.0.7 do-configure: ${RUN} ${_ULIMIT_CMD} \ diff --git a/editors/lyx/Makefile b/editors/lyx/Makefile index 2be4844d89a..6fc122b61d7 100644 --- a/editors/lyx/Makefile +++ b/editors/lyx/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2014/01/19 14:04:39 rumko Exp $ -# +# $NetBSD: Makefile,v 1.38 2014/01/25 10:30:06 wiz Exp $ DISTNAME= lyx-2.0.6 CATEGORIES= editors @@ -65,6 +64,7 @@ GNU_CONFIGURE= YES USE_TOOLS+= gmake perl:run pkg-config USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.6.10 CXXFLAGS.Linux+= -fpermissive diff --git a/editors/medit/Makefile b/editors/medit/Makefile index 3c36998135d..9bbac89c6c2 100644 --- a/editors/medit/Makefile +++ b/editors/medit/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2013/10/10 14:42:07 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.15 2014/01/25 10:30:07 wiz Exp $ DISTNAME= medit-1.1.1 PKGREVISION= 10 @@ -20,6 +19,7 @@ USE_LANGUAGES= c c++ USE_TOOLS+= gmake pkg-config msgfmt intltool PYTHON_FOR_BUILD_ONLY= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.1.1 CONFIGURE_ARGS+= --with-python=no .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/editors/nts/Makefile b/editors/nts/Makefile index 455bfd79262..a19abb8d043 100644 --- a/editors/nts/Makefile +++ b/editors/nts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2014/01/16 10:41:53 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2014/01/25 10:30:07 wiz Exp $ DISTNAME= nts-78 PKGREVISION= 1 @@ -13,6 +13,7 @@ LICENSE= gnu-gpl-v2 DEPENDS+= ${PYPKGPREFIX}-wxWidgets>=2.8.7:../../x11/py-wxWidgets PYTHON_VERSIONED_DEPENDENCIES= dateutil +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-wxWidgets USE_LANGUAGES= # none diff --git a/editors/zim/Makefile b/editors/zim/Makefile index ef4a424957b..6a857341a7e 100644 --- a/editors/zim/Makefile +++ b/editors/zim/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2013/10/10 14:42:08 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.19 2014/01/25 10:30:07 wiz Exp $ DISTNAME= zim-0.59 PKGREVISION= 7 @@ -12,16 +11,16 @@ HOMEPAGE= http://zim-wiki.org/ COMMENT= Zim brings the concept of a wiki to your desktop LICENSE= gnu-gpl-v2 -USE_LANGUAGES= # none - -REPLACE_PYTHON= ${WRKSRC}/zim.py -PYDISTUTILSPKG= YES - DEPENDS+= ${PYPKGPREFIX}-xdg-[0-9]*:../../devel/py-xdg DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 DEPENDS+= ${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils +USE_LANGUAGES= # none + +REPLACE_PYTHON= ${WRKSRC}/zim.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 + SUBST_CLASSES+= data-path SUBST_STAGE.data-path= pre-configure SUBST_FILES.data-path= zim/config.py diff --git a/emulators/hatari/Makefile b/emulators/hatari/Makefile index c83765d513e..e8cba5691eb 100644 --- a/emulators/hatari/Makefile +++ b/emulators/hatari/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2013/09/12 14:31:58 ryoon Exp $ +# $NetBSD: Makefile,v 1.38 2014/01/25 10:30:07 wiz Exp $ DISTNAME= hatari-${HATARI_VER} HATARI_VER= 1.7.0 @@ -14,6 +14,7 @@ LICENSE= gnu-gpl-v2 USE_CMAKE= yes USE_LANGUAGES= c +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.7.0 REPLACE_PYTHON+= python-ui/config.py REPLACE_PYTHON+= python-ui/debugui.py REPLACE_PYTHON+= python-ui/dialogs.py diff --git a/emulators/mame/Makefile.common b/emulators/mame/Makefile.common index 3847f06a2c1..6f289852659 100644 --- a/emulators/mame/Makefile.common +++ b/emulators/mame/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.12 2013/10/10 00:06:19 joerg Exp $ +# $NetBSD: Makefile.common,v 1.13 2014/01/25 10:30:07 wiz Exp $ # # used by emulators/mame/Makefile # used by emulators/mess/Makefile @@ -59,6 +59,7 @@ SUBST_STAGE.exe= post-patch SUBST_MESSAGE.exe= Fixing executable name. PYTHON_FOR_BUILD_ONLY= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.151 .include "../../lang/python/application.mk" .include "../../devel/GConf/buildlink3.mk" diff --git a/emulators/openmsx/Makefile b/emulators/openmsx/Makefile index 3df3d350011..a5449ed1acc 100644 --- a/emulators/openmsx/Makefile +++ b/emulators/openmsx/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2014/01/11 14:42:03 adam Exp $ -# +# $NetBSD: Makefile,v 1.40 2014/01/25 10:30:07 wiz Exp $ DISTNAME= openmsx-0.9.0 PKGREVISION= 4 @@ -24,6 +23,8 @@ INSTALL_MAKE_FLAGS+= SYMLINK_FOR_BINARY=false INSTALL_MAKE_FLAGS+= INSTALL_BASE=${PREFIX}/openmsx MAKE_ENV+= OPENMSX_INSTALL=${PREFIX}/openmsx +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.9.0 + .include "../../mk/bsd.prefs.mk" .if "${PKGSRC_COMPILER}" == "clang" diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile index b903eb1c30f..7319507b96c 100644 --- a/emulators/qemu/Makefile +++ b/emulators/qemu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.121 2014/01/15 18:26:20 wiz Exp $ +# $NetBSD: Makefile,v 1.122 2014/01/25 10:30:07 wiz Exp $ DISTNAME= qemu-1.7.0 CATEGORIES= emulators @@ -45,6 +45,8 @@ PKG_SYSCONFSUBDIR= qemu REPLACE_PERL+= scripts/texi2pod.pl +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported yet as of 1.7.0 + BUILDLINK_PASSTHRU_DIRS+= /usr/lib BUILDLINK_PASSTHRU_RPATHDIRS+= /usr/lib diff --git a/emulators/qemu0/Makefile b/emulators/qemu0/Makefile index 843132ff487..6ca9090f398 100644 --- a/emulators/qemu0/Makefile +++ b/emulators/qemu0/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2013/05/31 12:41:01 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2014/01/25 10:30:07 wiz Exp $ DISTNAME= qemu-0.15.1 PKGREVISION= 10 @@ -35,6 +35,8 @@ EGDIR= ${PREFIX}/share/examples/qemu INSTALL_MAKE_FLAGS= egdir=${EGDIR} PKG_SYSCONFSUBDIR= qemu +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.15.1 + # Avoid clash with system include file: pre-patch: mv ${WRKSRC}/audio/audio.h ${WRKSRC}/audio/qaudio.h diff --git a/filesystems/fuse-gmailfs/Makefile b/filesystems/fuse-gmailfs/Makefile index 5bbb387804f..d650b5153de 100644 --- a/filesystems/fuse-gmailfs/Makefile +++ b/filesystems/fuse-gmailfs/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2012/10/03 16:08:31 asau Exp $ -# +# $NetBSD: Makefile,v 1.8 2014/01/25 10:30:07 wiz Exp $ DISTNAME= gmailfs-0.7.2 PKGREVISION= 3 @@ -13,6 +12,7 @@ COMMENT= FUSE filesystem which uses Google mail for free space NO_BUILD= yes PYTHON_PATCH_SCRIPTS= gmailfs.py mount.gmailfs +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-fuse-bindings CONF_FILES= ${PREFIX}/share/examples/gmailfs/gmailfs.conf \ ${PKG_SYSCONFDIR}/gmailfs.conf diff --git a/filesystems/py-filesystem/Makefile b/filesystems/py-filesystem/Makefile index cfe9683e5b3..6fddc7ed28b 100644 --- a/filesystems/py-filesystem/Makefile +++ b/filesystems/py-filesystem/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2012/10/04 00:22:00 cheusov Exp $ -# +# $NetBSD: Makefile,v 1.8 2014/01/25 10:30:07 wiz Exp $ VERSION= 0.4.0 DISTNAME= fs-${VERSION} @@ -16,6 +15,7 @@ LICENSE= modified-bsd USE_LANGUAGES= # none PYTHON_SELF_CONFLICT= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.4.0 .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/filesystems/py-fuse-bindings/Makefile b/filesystems/py-fuse-bindings/Makefile index 97c87c8c836..d737f15659e 100644 --- a/filesystems/py-fuse-bindings/Makefile +++ b/filesystems/py-fuse-bindings/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2012/10/03 16:08:33 asau Exp $ -# +# $NetBSD: Makefile,v 1.9 2014/01/25 10:30:07 wiz Exp $ VERSION= 0.2.1 DISTNAME= fuse-python-${VERSION} @@ -17,6 +16,8 @@ PYDISTUTILSPKG= yes PY_PATCHLIST= yes USE_TOOLS+= pkg-config +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.2.1 + INSTALLATION_DIRS= share/examples/fuse-python post-install: diff --git a/filesystems/tahoe-lafs/Makefile b/filesystems/tahoe-lafs/Makefile index 303dfdf02bb..c8fe3850a50 100644 --- a/filesystems/tahoe-lafs/Makefile +++ b/filesystems/tahoe-lafs/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2013/10/31 16:04:05 jperkin Exp $ -# +# $NetBSD: Makefile,v 1.20 2014/01/25 10:30:07 wiz Exp $ VERSION= 1.10.0 PKGREVISION= 2 @@ -46,6 +45,8 @@ DEPENDS+= ${PYPKGPREFIX}-cryptopp-[0-9]*:../../security/py-cryptopp DEPENDS+= ${PYPKGPREFIX}-OpenSSL-[0-9]*:../../security/py-OpenSSL DEPENDS+= ${PYPKGPREFIX}-nevow-[0-9]*:../../www/py-nevow +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-twisted, py-xml via py-nevow, py-zbase32, py-cryptopp + # Note that there is an upstream (inherited from setuptools) bug # https://tahoe-lafs.org/trac/tahoe-lafs/ticket/1258#comment:29 that # will cause a build to fail if there is a package with bad modes diff --git a/finance/moneyguru/Makefile b/finance/moneyguru/Makefile index 74e3e802f0c..6803ebf212f 100644 --- a/finance/moneyguru/Makefile +++ b/finance/moneyguru/Makefile @@ -1,6 +1,5 @@ -# $NetBSD: Makefile,v 1.2 2014/01/12 09:41:07 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2014/01/25 10:30:07 wiz Exp $ # - # any of ~* is fine, they are the same and just there for Ubuntu # so moneyguru's built for all releases DISTNAME= moneyguru_2.6.1~quantal @@ -24,7 +23,6 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/} USE_LANGUAGES= c USE_TOOLS= pax -PYTHON_VERSIONS_INCLUDE_3X= yes PY_PATCHPLIST= yes REPLACE_PYTHON= src/run.py diff --git a/finance/py-vatnumber/Makefile b/finance/py-vatnumber/Makefile index 5fcb343fa14..96e412ba182 100644 --- a/finance/py-vatnumber/Makefile +++ b/finance/py-vatnumber/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.1 2013/07/20 16:48:46 richard Exp $ +# $NetBSD: Makefile,v 1.2 2014/01/25 10:30:07 wiz Exp $ + DISTNAME= vatnumber-1.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} CATEGORIES= finance python -MASTER_SITES= http://vatnumber.googlecode.com/files/ +MASTER_SITES= http://vatnumber.googlecode.com/files/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://code.google.com/p/vatnumber/ @@ -17,6 +18,7 @@ PKG_SUGGESTED_OPTIONS= vatnumber-suds .if !empty(PKG_OPTIONS:Mvatnumber-suds) DEPENDS+= ${PYPKGPREFIX}-suds-[0-9]*:../../net/py-suds +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-suds .endif .include "../../lang/python/egg.mk" diff --git a/fonts/mftrace/Makefile b/fonts/mftrace/Makefile index d060a14ccdf..2243d2473bf 100644 --- a/fonts/mftrace/Makefile +++ b/fonts/mftrace/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2012/10/03 18:28:27 asau Exp $ +# $NetBSD: Makefile,v 1.25 2014/01/25 10:30:08 wiz Exp $ DISTNAME= mftrace-1.2.15 PKGREVISION= 2 @@ -21,6 +21,7 @@ CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} MAKE_FILE= GNUmakefile PLIST_SUBST+= PYSITELIB=${PYSITELIB:Q} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.2.15 INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PYSITELIB} diff --git a/fonts/py-TTFQuery/Makefile b/fonts/py-TTFQuery/Makefile index e7c8bf5df44..8c40f2c9784 100644 --- a/fonts/py-TTFQuery/Makefile +++ b/fonts/py-TTFQuery/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2012/10/03 18:28:30 asau Exp $ -# +# $NetBSD: Makefile,v 1.14 2014/01/25 10:30:08 wiz Exp $ DISTNAME= TTFQuery-1.0.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -15,6 +14,7 @@ DEPENDS+= ${PYPKGPREFIX}-fonttools>=2.0b1:../../fonts/py-fonttools PYDISTUTILSPKG= yes PLIST_SUBST= PYVERSSUFFIX=${PYVERSSUFFIX} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-fonttools post-install: cd ${DESTDIR}${PREFIX}/bin && for f in ttffamily ttffiles ttfgroups ttfmetadata; do \ diff --git a/games/4stAttack/Makefile b/games/4stAttack/Makefile index 14ca9a1c59a..5d3b1bcffaf 100644 --- a/games/4stAttack/Makefile +++ b/games/4stAttack/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2013/10/24 12:32:38 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.24 2014/01/25 10:30:08 wiz Exp $ DISTNAME= 4stAttack-2.1.4 PKGREVISION= 17 @@ -15,6 +14,7 @@ INSTALLATION_DIRS= bin share/${PKGBASE} USE_TOOLS+= pax PYTHON_PATCH_SCRIPTS= 4stattack.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.1.4 FIND_EXCLUDE= \( -name \*.orig -or -name \*.txt -or -name \*.pre -or -name GPL -or -name \*~ -or -name 4stattack \) diff --git a/games/blindmine/Makefile b/games/blindmine/Makefile index 732b16f8f92..38eb3c6b646 100644 --- a/games/blindmine/Makefile +++ b/games/blindmine/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2013/10/24 12:32:38 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.22 2014/01/25 10:30:08 wiz Exp $ DISTNAME= blindmine-0.3-src PKGNAME= ${DISTNAME:S/-src//} @@ -23,6 +22,7 @@ SUBST_FILES.path= blindmine.py sdl_ui.py SUBST_SED.path= -e 's,/usr/bin/env python,${PYTHONBIN},g' PYCOMPILEALL= ${BUILDLINK_PREFIX.${PYPACKAGE}}/${PYLIB}/compileall.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.3 INSTALLATION_DIRS= bin share/doc/blindmine share/blindmine/data diff --git a/games/freeciv-share/Makefile.common b/games/freeciv-share/Makefile.common index 7e9ba12969c..fbda937a970 100644 --- a/games/freeciv-share/Makefile.common +++ b/games/freeciv-share/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.39 2012/07/31 15:49:37 prlw1 Exp $ +# $NetBSD: Makefile.common,v 1.40 2014/01/25 10:30:08 wiz Exp $ # used by games/freeciv-share/Makefile # used by games/freeciv-client/Makefile @@ -25,6 +25,7 @@ DISTINFO_FILE= ${.CURDIR}/../../games/freeciv-share/distinfo PATCHDIR= ${.CURDIR}/../../games/freeciv-share/patches PYTHON_PATCH_SCRIPTS= ${WRKSRC}/common/generate_packets.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.3.2 SUBST_CLASSES+= data SUBST_STAGE.data= post-patch diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile index 3aefc78ba15..56acbaf437c 100644 --- a/games/gcompris/Makefile +++ b/games/gcompris/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2014/01/01 11:52:15 wiz Exp $ +# $NetBSD: Makefile,v 1.54 2014/01/25 10:30:08 wiz Exp $ DISTNAME= gcompris-12.11 PKGREVISION= 12 @@ -11,6 +11,8 @@ HOMEPAGE= http://gcompris.net/ COMMENT= Educational games for children LICENSE= gnu-gpl-v3 +DEPENDS+= gnuchess-[0-9]*:../../games/gnuchess + USE_TOOLS+= gmake intltool gtar pkg-config msgfmt texi2html GNU_CONFIGURE= YES USE_PKGLOCALEDIR= YES @@ -19,10 +21,11 @@ USE_LIBTOOL= YES CHECK_PORTABILITY_SKIP+= macosx/build-gtk.sh INFO_FILES= yes -DEPENDS+= gnuchess-[0-9]*:../../games/gnuchess - PTHREAD_AUTO_VARS= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-sqlite2, py-gtk2 +PYTHON_VERSIONED_DEPENDENCIES= cairo:link + PKG_SUPPORTED_OPTIONS= gnet PKG_OPTIONS_VAR= PKG_OPTIONS.gcompris .include "../../mk/bsd.options.mk" @@ -50,7 +53,7 @@ post-install: .include "../../databases/sqlite3/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../graphics/librsvg/buildlink3.mk" -.include "../../graphics/py-cairo/buildlink3.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../lang/python/application.mk" .include "../../multimedia/gstreamer0.10/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile index 4471e5546ef..8671b9ddc7b 100644 --- a/games/gnome-games/Makefile +++ b/games/gnome-games/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.139 2014/01/04 13:46:55 obache Exp $ +# $NetBSD: Makefile,v 1.140 2014/01/25 10:30:08 wiz Exp $ DISTNAME= gnome-games-2.32.1 PKGREVISION= 24 @@ -11,6 +11,8 @@ HOMEPAGE= http://www.gnome.org/ COMMENT= GNOME2 games collection #LICENSE= gnu-gpl-v2 AND gnu-fdl-v1.1 +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-ORBit via py-gnome2 + CONFLICTS= xbill-[0-9]* SUPERSEDES= glchess-[0-9]* diff --git a/games/kajongg/Makefile b/games/kajongg/Makefile index 129c1556163..1c8788c30d6 100644 --- a/games/kajongg/Makefile +++ b/games/kajongg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2014/01/01 11:52:16 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2014/01/25 10:30:08 wiz Exp $ DISTNAME= kajongg-${_KDE_VERSION} PKGREVISION= 1 @@ -9,6 +9,8 @@ COMMENT= Maj Jong game DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-twisted + REPLACE_PYTHON+= setup.py REPLACE_PYTHON+= src/deferredutil.py REPLACE_PYTHON+= src/kajongg.py diff --git a/games/kye/Makefile b/games/kye/Makefile index b107ad86fa8..dfb021068c6 100644 --- a/games/kye/Makefile +++ b/games/kye/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2013/10/10 14:42:11 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.47 2014/01/25 10:30:08 wiz Exp $ DISTNAME= kye-1.0 PKGREVISION= 18 @@ -16,6 +15,8 @@ SUBST_STAGE.prefix= pre-configure SUBST_FILES.prefix= kye/common.py SUBST_SED.prefix= 's|@PREFIX@|${PREFIX}|g' +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 + .include "../../lang/python/application.mk" .include "../../lang/python/extension.mk" .include "../../x11/py-gtk2/buildlink3.mk" diff --git a/games/monsterz/Makefile b/games/monsterz/Makefile index 7e4abb0c9bb..0f33edf307d 100644 --- a/games/monsterz/Makefile +++ b/games/monsterz/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2012/10/06 11:54:47 asau Exp $ -# +# $NetBSD: Makefile,v 1.11 2014/01/25 10:30:08 wiz Exp $ DISTNAME= monsterz-0.7.1 PKGREVISION= 4 @@ -14,6 +13,7 @@ DEPENDS+= ${PYPKGPREFIX}-game-[0-9]*:../../devel/py-game DEPENDS+= ${PYPKGPREFIX}-Numeric-[0-9]*:../../math/py-Numeric PYTHON_PATCH_SCRIPTS= monsterz.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-Numeric MAKE_ENV+= GAMEOWN=${GAMEOWN:Q} MAKE_ENV+= GAMEGRP=${GAMEGRP:Q} diff --git a/games/py-ranking/Makefile b/games/py-ranking/Makefile index c8a66354058..06dcd680072 100644 --- a/games/py-ranking/Makefile +++ b/games/py-ranking/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2013/07/06 17:36:39 kleink Exp $ +# $NetBSD: Makefile,v 1.2 2014/01/25 10:30:08 wiz Exp $ DISTNAME= ranking-0.3.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,7 +12,5 @@ LICENSE= modified-bsd USE_LANGUAGES= # empty -PYTHON_VERSIONS_INCLUDE_3X= yes - .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/py-trueskill/Makefile b/games/py-trueskill/Makefile index 068e9573fe8..f4a623d7dc8 100644 --- a/games/py-trueskill/Makefile +++ b/games/py-trueskill/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2013/06/12 20:33:29 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2014/01/25 10:30:08 wiz Exp $ DISTNAME= trueskill-0.4.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,7 +11,6 @@ COMMENT= Python module implementing the TrueSkill rating system LICENSE= 2-clause-bsd USE_LANGUAGES= # none -PYTHON_VERSIONS_INCLUDE_3X= yes .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/pysolfc/Makefile b/games/pysolfc/Makefile index 2cd18b7a36c..bfc5b854508 100644 --- a/games/pysolfc/Makefile +++ b/games/pysolfc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2013/06/04 22:16:10 tron Exp $ +# $NetBSD: Makefile,v 1.18 2014/01/25 10:30:08 wiz Exp $ DISTNAME= PySolFC-2.0 PKGNAME= ${DISTNAME:tl} @@ -13,6 +13,7 @@ COMMENT= Over 1000 solitaire games LICENSE= gnu-gpl-v3 PYDISTUTILSPKG= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-imaging REPLACE_PYTHON+= \ data/themes/clearlooks/create_imgs.py \ diff --git a/games/pytraffic/Makefile b/games/pytraffic/Makefile index 29a16de6a28..cba5f3a2514 100644 --- a/games/pytraffic/Makefile +++ b/games/pytraffic/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2013/10/10 14:42:11 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.39 2014/01/25 10:30:08 wiz Exp $ DISTNAME= pytraffic-2.5.4 PKGREVISION= 26 @@ -14,6 +13,7 @@ COMMENT= Computer version of a popular board game DIST_SUBDIR= pytraffic-2.5.4-070313 PYDISTUTILSPKG= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 .include "../../lang/python/application.mk" .include "../../lang/python/extension.mk" diff --git a/geography/gpsd/Makefile b/geography/gpsd/Makefile index d72a11c661f..b72bfde6ff2 100644 --- a/geography/gpsd/Makefile +++ b/geography/gpsd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2013/12/10 12:22:52 jperkin Exp $ +# $NetBSD: Makefile,v 1.26 2014/01/25 10:30:08 wiz Exp $ DISTNAME= gpsd-2.96 PKGREVISION= 1 @@ -17,6 +17,7 @@ BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto GNU_CONFIGURE= YES CONFIGURE_ENV+= PYTHON=${PYTHONBIN} PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.96 USE_TOOLS+= gmake USE_LIBTOOL= yes diff --git a/geography/proj-swig/Makefile b/geography/proj-swig/Makefile index 3ba39160f4c..256f4fcd44b 100644 --- a/geography/proj-swig/Makefile +++ b/geography/proj-swig/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2013/05/31 12:41:04 wiz Exp $ -# +# $NetBSD: Makefile,v 1.18 2014/01/25 10:30:09 wiz Exp $ DISTNAME= proj-swig-0.02 PKGREVISION= 5 @@ -18,6 +17,7 @@ GNU_CONFIGURE= yes # Defines PYSITELIB, apparently. PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.02 # The perl build is commented out upstream, so this doesn't have any # effect. diff --git a/graphics/Mesa/Makefile.lib b/graphics/Mesa/Makefile.lib index 90070692b27..e3acaaade84 100644 --- a/graphics/Mesa/Makefile.lib +++ b/graphics/Mesa/Makefile.lib @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.lib,v 1.16 2013/12/29 16:28:15 bsiegert Exp $ +# $NetBSD: Makefile.lib,v 1.17 2014/01/25 10:30:09 wiz Exp $ # # This Makefile fragment is included by all packages that build libraries # from the Mesa sources. @@ -21,6 +21,7 @@ USE_LANGUAGES= c99 c++ USE_TOOLS+= automake bison flex gmake pkg-config makedepend PYTHON_FOR_BUILD_ONLY= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 7.11.2 .include "../../lang/python/tool.mk" BUILDLINK_DEPMETHOD.libxml2?= build .include "../../textproc/libxml2/buildlink3.mk" diff --git a/graphics/comix/Makefile b/graphics/comix/Makefile index 9f0463551cf..e64402d5d82 100644 --- a/graphics/comix/Makefile +++ b/graphics/comix/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2013/10/10 14:42:12 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.49 2014/01/25 10:30:09 wiz Exp $ DISTNAME= comix-4.0.4 PKGREVISION= 25 @@ -12,7 +11,6 @@ COMMENT= Image viewer specifically designed to handle comic books LICENSE= gnu-gpl-v2 DEPENDS+= unrar-[0-9]*:../../archivers/unrar -.include "../../lang/python/extension.mk" DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 MANCOMPRESSED= yes @@ -25,7 +23,8 @@ SUBST_MESSAGE.install-path= Fixing man page installation path. SUBST_FILES.install-path= install.py SUBST_SED.install-path= -e "s,share/man/man,${PKGMANDIR}/man,g" -PYTHON_PATCH_SCRIPTS= src/comix.py mime/comicthumb +REPLACE_PYTHON= src/comix.py mime/comicthumb +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-imaging, py-gtk2 do-build: @@ -37,6 +36,7 @@ do-install: BUILDLINK_API_DEPENDS.pyimaging+= ${PYPKGPREFIX}-imaging>=1.1.5 .include "../../graphics/py-imaging/buildlink3.mk" .include "../../lang/python/application.mk" +.include "../../lang/python/extension.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" BUILDLINK_API_DEPENDS.pygtk2+= ${PYPKGPREFIX}-gtk2>=2.12 .include "../../x11/py-gtk2/buildlink3.mk" diff --git a/graphics/dia-python/Makefile b/graphics/dia-python/Makefile index f0f92147738..a46045e7002 100644 --- a/graphics/dia-python/Makefile +++ b/graphics/dia-python/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2014/01/01 11:52:19 wiz Exp $ -# +# $NetBSD: Makefile,v 1.39 2014/01/25 10:30:09 wiz Exp $ DIA_SUBPKG= -python .include "../../graphics/dia/Makefile.common" @@ -14,6 +13,7 @@ CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} PYTHON_PATCH_SCRIPTS= po-checktrans.py PYTHON_PATCH_SCRIPTS+= plug-ins/python/gtkcons.py PYTHON_PATCH_SCRIPTS+= sheets/checktrans.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 BUILD_DIRS+= plug-ins/python INSTALL_DIRS+= plug-ins/python diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile index 2bc2c47b516..e7a4aa62103 100644 --- a/graphics/eog/Makefile +++ b/graphics/eog/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.80 2013/10/10 14:41:52 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.81 2014/01/25 10:30:09 wiz Exp $ DISTNAME= eog-2.32.1 PKGREVISION= 19 @@ -22,6 +21,7 @@ GCONF_SCHEMAS= eog.schemas # XXX Python plugins do more harm than good for now #.include "../../lang/python/application.mk" #.include "../../x11/py-gtk2/buildlink3.mk" +#PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 .include "../../devel/GConf/schemas.mk" BUILDLINK_API_DEPENDS.glib2+= glib2>=2.15.3 .include "../../devel/glib2/buildlink3.mk" diff --git a/graphics/gimp-docs-en/Makefile.common b/graphics/gimp-docs-en/Makefile.common index d8c7936541b..b5f275cbee8 100644 --- a/graphics/gimp-docs-en/Makefile.common +++ b/graphics/gimp-docs-en/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.4 2013/08/15 16:26:07 joerg Exp $ +# $NetBSD: Makefile.common,v 1.5 2014/01/25 10:30:09 wiz Exp $ # # used by graphics/gimp-docs-de/Makefile # used by graphics/gimp-docs-en/Makefile @@ -34,6 +34,7 @@ CONFIGURE_ENV= ALL_LINGUAS=${HELPLANGUAGE} MAKE_FLAGS= VERBOSE=2 REPLACE_PYTHON= tools/xml2po.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.8.0 CONFLICTS= gimp-docs<=2.4.0 SUPERSEDES= gimp-docs<=2.4.0 diff --git a/graphics/libscigraphica/Makefile b/graphics/libscigraphica/Makefile index be6dcd30cfa..cd48fb2200e 100644 --- a/graphics/libscigraphica/Makefile +++ b/graphics/libscigraphica/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2013/10/10 14:41:48 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.35 2014/01/25 10:30:09 wiz Exp $ DISTNAME= libscigraphica-2.1.1 PKGREVISION= 25 @@ -17,6 +16,7 @@ USE_TOOLS+= pkg-config gmake intltool GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE+= libscigraphica-2.0.pc.in +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-numarray pre-configure: ln -s ${PYTHONBIN} ${TOOLS_DIR}/bin/python diff --git a/graphics/mypaint/Makefile b/graphics/mypaint/Makefile index d219501bd3c..eaeb6ce755c 100644 --- a/graphics/mypaint/Makefile +++ b/graphics/mypaint/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2013/02/16 11:22:18 wiz Exp $ -# +# $NetBSD: Makefile,v 1.16 2014/01/25 10:30:09 wiz Exp $ DISTNAME= mypaint-1.0.0 PKGREVISION= 5 @@ -12,13 +11,15 @@ HOMEPAGE= http://mypaint.intilinux.com/ COMMENT= Fast and easy open-source graphics application for digital painters LICENSE= gnu-gpl-v2 +BUILD_DEPENDS+= scons-[0-9]*:../../devel/scons +DEPENDS+= ${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2 + USE_LANGUAGES= c++ USE_TOOLS+= bash:run msgfmt pkg-config -BUILD_DEPENDS+= scons-[0-9]*:../../devel/scons -DEPENDS+= ${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2 -DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo +PYTHON_VERSIONED_DEPENDENCIES= cairo +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 FIND_PREFIX:= SCONSDIR=scons .include "../../mk/find-prefix.mk" @@ -53,6 +54,7 @@ do-install: .include "../../graphics/png/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../math/py-numpy/buildlink3.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../lang/python/pyversion.mk" .include "../../devel/swig/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/py-OpenGL/Makefile b/graphics/py-OpenGL/Makefile index d9846d24bb2..68c404517e6 100644 --- a/graphics/py-OpenGL/Makefile +++ b/graphics/py-OpenGL/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2014/01/11 14:42:03 adam Exp $ +# $NetBSD: Makefile,v 1.17 2014/01/25 10:30:09 wiz Exp $ DISTNAME= PyOpenGL-3.0.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/^Py//} @@ -12,11 +12,9 @@ COMMENT= Python bindings for OpenGL DEPENDS+= ${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk -PYDISTUTILSPKG= yes -#PY_PATCHPLIST= YES +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-Numeric -#.include "../../lang/python/egg.mk" -.include "../../lang/python/extension.mk" +.include "../../lang/python/distutils.mk" .include "../../graphics/Mesa/buildlink3.mk" .include "../../math/py-Numeric/buildlink3.mk" .include "../../lang/tcl/buildlink3.mk" diff --git a/graphics/py-Pillow/Makefile b/graphics/py-Pillow/Makefile index 20f1cb0105a..97927cecf0b 100644 --- a/graphics/py-Pillow/Makefile +++ b/graphics/py-Pillow/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2014/01/23 08:54:59 obache Exp $ -# +# $NetBSD: Makefile,v 1.6 2014/01/25 10:30:09 wiz Exp $ DISTNAME= Pillow-2.3.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -13,8 +12,6 @@ COMMENT= Python Imaging Library (Fork) CONFLICTS+= ${PYPKGPREFIX}-imaging-[0-9]* -PYTHON_VERSIONS_INCLUDE_3X= yes - .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/lcms2/buildlink3.mk" diff --git a/graphics/py-aafigure/Makefile b/graphics/py-aafigure/Makefile index 7ed23024c4d..f81812e2482 100644 --- a/graphics/py-aafigure/Makefile +++ b/graphics/py-aafigure/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2013/12/06 12:11:15 obache Exp $ -# +# $NetBSD: Makefile,v 1.6 2014/01/25 10:30:09 wiz Exp $ DISTNAME= aafigure-0.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -18,6 +17,7 @@ DEPENDS+= ${PYPKGPREFIX}-reportlab-[0-9]*:../../print/py-reportlab USE_LANGUAGES= # none PYTHON_SELF_CONFLICT= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-reportlab, py-imaging .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/py-actdiag/Makefile b/graphics/py-actdiag/Makefile index 06e12889447..e35e68e1c59 100644 --- a/graphics/py-actdiag/Makefile +++ b/graphics/py-actdiag/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2013/12/06 11:33:13 obache Exp $ -# +# $NetBSD: Makefile,v 1.10 2014/01/25 10:30:09 wiz Exp $ DISTNAME= actdiag-0.5.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -14,7 +13,6 @@ LICENSE= apache-2.0 DEPENDS+= ${PYPKGPREFIX}-blockdiag>=1.3.1:../../graphics/py-blockdiag PYTHON_SELF_CONFLICT= yes -PYTHON_VERSIONS_INCLUDE_3X= yes USE_LANGUAGES= # none diff --git a/graphics/py-blockdiag/Makefile b/graphics/py-blockdiag/Makefile index 844c949f8e4..ea64c00142a 100644 --- a/graphics/py-blockdiag/Makefile +++ b/graphics/py-blockdiag/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2013/12/07 12:57:54 obache Exp $ -# +# $NetBSD: Makefile,v 1.15 2014/01/25 10:30:09 wiz Exp $ DISTNAME= blockdiag-1.3.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -16,7 +15,6 @@ DEPENDS+= ${PYPKGPREFIX}-funcparserlib>=0.3.6:../../devel/py-funcparserlib DEPENDS+= ${PYPKGPREFIX}-webcolors-[0-9]*:../../www/py-webcolors PYTHON_SELF_CONFLICT= yes -PYTHON_VERSIONS_INCLUDE_3X= yes USE_LANGUAGES= # none diff --git a/graphics/py-cairo3/Makefile b/graphics/py-cairo3/Makefile index c98acdb9ca8..e0ca8c8800b 100644 --- a/graphics/py-cairo3/Makefile +++ b/graphics/py-cairo3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2014/01/24 15:59:41 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2014/01/25 10:30:09 wiz Exp $ DISTNAME= pycairo-1.10.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -20,7 +20,6 @@ CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} PKGCONFIG_OVERRIDE+= py3cairo.pc.in PYTHON_SELF_CONFLICT= yes PYTHON_VERSIONS_INCOMPATIBLE= 26 27 -PYTHON_VERSIONS_INCLUDE_3X= yes PY_PATCHPLIST= yes # waf is not smart enough for this as of 1.10.0 PY_PEP3147= no diff --git a/graphics/py-gnuplot/Makefile b/graphics/py-gnuplot/Makefile index 69cb33934fa..6520410f03e 100644 --- a/graphics/py-gnuplot/Makefile +++ b/graphics/py-gnuplot/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2012/10/06 14:11:16 asau Exp $ -# +# $NetBSD: Makefile,v 1.16 2014/01/25 10:30:10 wiz Exp $ DISTNAME= gnuplot-py-1.8 PKGNAME= ${PYPKGPREFIX}-gnuplot-1.8 @@ -17,5 +16,7 @@ DEPENDS+= ${PYPKGPREFIX}-numpy-[0-9]*:../../math/py-numpy USE_LANGUAGES= # empty EGG_NAME= ${DISTNAME:S/-/_/} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.8 + .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/py-goocanvas/Makefile b/graphics/py-goocanvas/Makefile index 66d6321f67c..aa47b08a1b0 100644 --- a/graphics/py-goocanvas/Makefile +++ b/graphics/py-goocanvas/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2013/10/10 14:42:15 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.34 2014/01/25 10:30:10 wiz Exp $ DISTNAME= pygoocanvas-0.14.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/^py//} @@ -21,6 +20,8 @@ PKGCONFIG_OVERRIDE+= pygoocanvas.pc.in CONFIGURE_ARGS+= --disable-docs PY_PATCHPLIST= yes +PYTHON_VERSIONED_DEPENDENCIES= cairo:link +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 .include "../../lang/python/pyversion.mk" @@ -29,7 +30,6 @@ BUILDLINK_API_DEPENDS.pygtk2+= ${PYPKGPREFIX}-gtk2>=2.10.0 .include "../../devel/py-gobject/buildlink3.mk" BUILDLINK_API_DEPENDS.goocanvas+= goocanvas>=0.14.0 .include "../../graphics/goocanvas/buildlink3.mk" -BUILDLINK_API_DEPENDS.pycairo+= ${PYPKGPREFIX}-cairo>=1.8.4 -.include "../../graphics/py-cairo/buildlink3.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/py-gtkglext/Makefile b/graphics/py-gtkglext/Makefile index fbe6f3cad19..da0e98a0622 100644 --- a/graphics/py-gtkglext/Makefile +++ b/graphics/py-gtkglext/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2013/10/10 14:42:15 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.35 2014/01/25 10:30:10 wiz Exp $ DISTNAME= pygtkglext-1.1.0 PKGNAME= ${PYPKGPREFIX}-pygtkglext-1.1.0 @@ -17,6 +16,7 @@ CONFIGURE_ENV+= PYTHON=${PYTHONBIN} USE_LIBTOOL= yes USE_TOOLS+= pkg-config PYDISTUTILSPKG= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 PKGCONFIG_OVERRIDE+= pygtkglext.pc.in diff --git a/graphics/py-imaging/Makefile b/graphics/py-imaging/Makefile index ec4aef84906..043629c43a4 100644 --- a/graphics/py-imaging/Makefile +++ b/graphics/py-imaging/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2013/06/04 22:16:25 tron Exp $ +# $NetBSD: Makefile,v 1.47 2014/01/25 10:30:10 wiz Exp $ DISTNAME= Imaging-1.1.7 PKGNAME= ${PYPKGPREFIX}-imaging-1.1.7 @@ -22,6 +22,8 @@ SUBST_SED.fix-path+= -e 's,FREETYPE_ROOT = None,FREETYPE_ROOT = libinclude("${BU INSTALLATION_DIRS= ${PYINC}/PIL +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.1.7, use Pillow instead + post-install: ${INSTALL_DATA} ${WRKSRC}/libImaging/ImPlatform.h ${DESTDIR}${PREFIX}/${PYINC}/PIL ${INSTALL_DATA} ${WRKSRC}/libImaging/Imaging.h ${DESTDIR}${PREFIX}/${PYINC}/PIL diff --git a/graphics/py-matplotlib-gtk2/Makefile b/graphics/py-matplotlib-gtk2/Makefile index f6583b6cb27..ae5bb2c274a 100644 --- a/graphics/py-matplotlib-gtk2/Makefile +++ b/graphics/py-matplotlib-gtk2/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2014/01/21 21:16:02 drochner Exp $ -# +# $NetBSD: Makefile,v 1.46 2014/01/25 10:30:10 wiz Exp $ DISTNAME= matplotlib-1.3.1 PKGNAME= ${PYPKGPREFIX}-matplotlib-gtk-1.3.1 @@ -14,6 +13,7 @@ COMMENT= GTK frontend for matplotlib USE_TOOLS+= pkg-config PY_PATCHPLIST= yes PYDISTUTILSPKG= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 USE_LANGUAGES= c c++ post-patch: diff --git a/graphics/py-piddle/Makefile b/graphics/py-piddle/Makefile index c1ff2b43124..a83cb9c26dc 100644 --- a/graphics/py-piddle/Makefile +++ b/graphics/py-piddle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2012/10/06 14:11:17 asau Exp $ +# $NetBSD: Makefile,v 1.15 2014/01/25 10:30:10 wiz Exp $ DISTNAME= piddle-1.0.15 PKGREVISION= 3 @@ -12,5 +12,7 @@ COMMENT= Python Plug In Drawing, Does Little Else USE_LANGUAGES= # empty +PYTHON_VERSIONS_INCOMPATIBLE= 33 + .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/py-pycha/Makefile b/graphics/py-pycha/Makefile index f9cfb9bfaa9..dfd115ed88b 100644 --- a/graphics/py-pycha/Makefile +++ b/graphics/py-pycha/Makefile @@ -1,24 +1,27 @@ -# $NetBSD: Makefile,v 1.2 2013/08/15 20:57:14 richard Exp $ -DISTNAME= pycha-0.6.0 +# $NetBSD: Makefile,v 1.3 2014/01/25 10:30:10 wiz Exp $ + +DISTNAME= pycha-0.6.0 PKGREVISION= 1 -PKGNAME= ${PYPKGPREFIX}-${DISTNAME} -CATEGORIES= graphics python +PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +CATEGORIES= graphics python MASTER_SITES= https://pypi.python.org/packages/source/p/pycha/ -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://bitbucket.org/lgs/pycha/ -COMMENT= Library for making charts with Python +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://bitbucket.org/lgs/pycha/ +COMMENT= Library for making charts with Python LICENSE= gnu-lgpl-v3 -DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo -DEPENDS+= ${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2 +DEPENDS+= ${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2 USE_LANGUAGES= #none PYTHON_SELF_CONFLICT= yes +PYTHON_VERSIONED_DEPENDENCIES= cairo +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 post-install: ${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/${PYSITELIB}/${EGG_NAME}-py${PYVERSSUFFIX}.egg-info/* .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/py-seqdiag/Makefile b/graphics/py-seqdiag/Makefile index ea0272eb0d9..8b3c92f7512 100644 --- a/graphics/py-seqdiag/Makefile +++ b/graphics/py-seqdiag/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2013/12/06 11:30:53 obache Exp $ -# +# $NetBSD: Makefile,v 1.10 2014/01/25 10:30:10 wiz Exp $ DISTNAME= seqdiag-0.9.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -14,7 +13,6 @@ LICENSE= apache-2.0 DEPENDS+= ${PYPKGPREFIX}-blockdiag>=1.3.0:../../graphics/py-blockdiag PYTHON_SELF_CONFLICT= yes -PYTHON_VERSIONS_INCLUDE_3X= yes USE_LANGUAGES= # none diff --git a/graphics/scigraphica/Makefile b/graphics/scigraphica/Makefile index 7e44f5ef533..f3bacb7ffbe 100644 --- a/graphics/scigraphica/Makefile +++ b/graphics/scigraphica/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.70 2013/10/10 14:42:16 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.71 2014/01/25 10:30:10 wiz Exp $ DISTNAME= scigraphica-2.1.0 PKGREVISION= 24 @@ -23,6 +22,8 @@ CONFIGURE_ENV+= PYTHONBIN=${PYTHONBIN:Q} USE_LIBTOOL= YES PTHREAD_AUTO_VARS= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-numarray via libscigraphica + pre-configure: ln -s ${PYTHONBIN} ${TOOLS_DIR}/bin/python diff --git a/graphics/skencil/Makefile b/graphics/skencil/Makefile index 4e860b06741..069d227f29b 100644 --- a/graphics/skencil/Makefile +++ b/graphics/skencil/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2014/01/20 19:20:08 joerg Exp $ +# $NetBSD: Makefile,v 1.31 2014/01/25 10:30:10 wiz Exp $ DISTNAME= skencil-0.6.17 PKGREVISION= 12 @@ -14,6 +14,8 @@ DEPENDS+= ${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk USE_TOOLS+= pax PYTHON_PATCH_SCRIPTS= sk2ppm.py sk2ps.py skconvert.py skencil.py skshow.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-imaging + SK_CONF_ARGS= --imaging-include=${BUILDLINK_PREFIX.pyimaging}/${PYINC}/PIL SK_TKFLAGS= -L${BUILDLINK_PREFIX.tk}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.tk}/lib -ltk -ltcl SK_TKFLAGS+= ${COMPILER_RPATH_FLAG}${X11BASE}/lib diff --git a/graphics/xdot/Makefile b/graphics/xdot/Makefile index a0102fbce76..5846ebfc85b 100644 --- a/graphics/xdot/Makefile +++ b/graphics/xdot/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2013/01/05 22:12:33 wiz Exp $ -# +# $NetBSD: Makefile,v 1.2 2014/01/25 10:30:10 wiz Exp $ DISTNAME= xdot PKGNAME= xdot-20121124 @@ -18,6 +17,7 @@ WRKSRC= ${WRKDIR} USE_LANGUAGES= # none DIST_SUBDIR= ${PKGNAME_NOREV} REPLACE_PYTHON= xdot.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 INSTALLATION_DIRS= bin do-build: diff --git a/ham/gnuradio-core/Makefile b/ham/gnuradio-core/Makefile index 148b197dc13..4e5916b69e4 100644 --- a/ham/gnuradio-core/Makefile +++ b/ham/gnuradio-core/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2013/11/20 20:04:35 adam Exp $ +# $NetBSD: Makefile,v 1.38 2014/01/25 10:30:10 wiz Exp $ PKGNAME= gnuradio-core-${VERSION} PKGREVISION= 10 @@ -7,6 +7,7 @@ COMMENT= Runtime system and DSP blocks for GNU Radio LDFLAGS.DragonFly+= -lboost_system LDFLAGS.SunOS+= -lboost_system +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 3.3.0 .include "../../meta-pkgs/gnuradio/Makefile.common" CONF_FILES+= ${EGDIR}/gnuradio-core.conf ${PKG_SYSCONFDIR}/gnuradio-core.conf diff --git a/ham/gnuradio-wxgui/Makefile b/ham/gnuradio-wxgui/Makefile index 1a3d608950a..c07f111f2f0 100644 --- a/ham/gnuradio-wxgui/Makefile +++ b/ham/gnuradio-wxgui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2013/11/20 20:04:36 adam Exp $ +# $NetBSD: Makefile,v 1.48 2014/01/25 10:30:10 wiz Exp $ PKGNAME= gnuradio-wxgui-${VERSION} PKGREVISION= 27 @@ -8,6 +8,8 @@ PYTHON_PATCH_SCRIPTS+= gr-wxgui/src/python/form.py PYTHON_PATCH_SCRIPTS+= gr-wxgui/src/python/powermate.py PYTHON_PATCH_SCRIPTS+= gr-wxgui/src/python/slider.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-wxWidgets + SUBST_CLASSES+= py-exec SUBST_STAGE.py-exec= pre-configure SUBST_MESSAGE.py-exec= Fixing python exec name diff --git a/ham/usrp/Makefile b/ham/usrp/Makefile index c5ea7adf808..f72cc03dc19 100644 --- a/ham/usrp/Makefile +++ b/ham/usrp/Makefile @@ -1,9 +1,11 @@ -# $NetBSD: Makefile,v 1.25 2013/12/08 22:32:15 joerg Exp $ +# $NetBSD: Makefile,v 1.26 2014/01/25 10:30:11 wiz Exp $ PKGNAME= usrp-${VERSION} PKGREVISION= 10 COMMENT= Non GNU Radio specific part of the USRP code base +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 3.3.0 + .include "../../meta-pkgs/gnuradio/Makefile.common" CONFIGURE_ARGS+= --enable-usrp diff --git a/inputmethod/ibus-anthy/Makefile b/inputmethod/ibus-anthy/Makefile index e97ec36c785..74e3d65db6f 100644 --- a/inputmethod/ibus-anthy/Makefile +++ b/inputmethod/ibus-anthy/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2013/11/26 11:22:15 obache Exp $ -# +# $NetBSD: Makefile,v 1.15 2014/01/25 10:30:11 wiz Exp $ DISTNAME= ibus-anthy-1.5.4 PKGREVISION= 1 @@ -15,6 +14,8 @@ DEPENDS+= kasumi>=2.1:../../inputmethod/kasumi DEPENDS+= ibus>=1.5.4:../../inputmethod/ibus DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3 +PYTHON_VERSIONS_INCOMPATIBLE= 33 # ibus + GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes diff --git a/inputmethod/ibus-array/Makefile b/inputmethod/ibus-array/Makefile index 3e16c4d0499..164915cab33 100644 --- a/inputmethod/ibus-array/Makefile +++ b/inputmethod/ibus-array/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2013/10/23 12:11:14 obache Exp $ -# +# $NetBSD: Makefile,v 1.10 2014/01/25 10:30:11 wiz Exp $ DISTNAME= ibus-array-0.0.2 PKGREVISION= 7 @@ -22,6 +21,8 @@ SUBST_STAGE.epython= pre-configure SUBST_FILES.epython= setup/ibus-setup-array.in SUBST_SED.epython= -e 's;exec python;exec ${PYTHONBIN};g' +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 via py-ibus-python + .include "../../inputmethod/ibus/buildlink3.mk" .include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/ibus-python/Makefile b/inputmethod/ibus-python/Makefile index b8ec5b1cbb8..7c5a6eae92d 100644 --- a/inputmethod/ibus-python/Makefile +++ b/inputmethod/ibus-python/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2013/12/10 11:15:26 jperkin Exp $ -# +# $NetBSD: Makefile,v 1.3 2014/01/25 10:30:11 wiz Exp $ .include "../../inputmethod/ibus/Makefile.common" @@ -39,7 +38,7 @@ CONFIGURE_ARGS+= --disable-dconf CONFIGURE_ARGS+= --disable-gconf CONFIGURE_ARGS+= --enable-python-library -PYTHON_VERSIONS_INCOMPATIBLE= 26 +PYTHON_VERSIONS_INCOMPATIBLE= 26 33 # py-gtk2 .include "../../devel/py-gobject3/buildlink3.mk" PY_PATCHPLIST= yes diff --git a/inputmethod/ibus-table/Makefile b/inputmethod/ibus-table/Makefile index 2274ce0c3f9..1e1844c30ec 100644 --- a/inputmethod/ibus-table/Makefile +++ b/inputmethod/ibus-table/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2013/12/28 09:02:31 obache Exp $ -# +# $NetBSD: Makefile,v 1.10 2014/01/25 10:30:11 wiz Exp $ DISTNAME= ibus-table-1.5.0 PKGREVISION= 1 @@ -25,6 +24,7 @@ SUBST_FILES.prefix= engine/tabcreatedb.py SUBST_SED.prefix= -e 's|/usr/share|${PREFIX}/share|g' REPLACE_PYTHON+= engine/tabcreatedb.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.5.0 .include "../../lang/python/application.mk" .include "../../inputmethod/ibus/buildlink3.mk" diff --git a/inputmethod/ibus-tegaki/Makefile b/inputmethod/ibus-tegaki/Makefile index b6e7121c55c..9137552d43c 100644 --- a/inputmethod/ibus-tegaki/Makefile +++ b/inputmethod/ibus-tegaki/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2013/10/23 12:45:35 obache Exp $ -# +# $NetBSD: Makefile,v 1.6 2014/01/25 10:30:11 wiz Exp $ DISTNAME= ibus-tegaki-0.3.1 PKGREVISION= 2 @@ -23,6 +22,7 @@ SUBST_FILES.epython= ibus-engine-tegaki.in SUBST_SED.epython= -e 's;exec python;exec ${PYTHONBIN};g' EGG_NAME= ${DISTNAME:S/-/_/} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 via py-ibus-python .include "../../lang/python/distutils.mk" .include "../../lang/python/application.mk" diff --git a/inputmethod/ibus/Makefile b/inputmethod/ibus/Makefile index e1f14cb7e25..063c53af88f 100644 --- a/inputmethod/ibus/Makefile +++ b/inputmethod/ibus/Makefile @@ -1,5 +1,6 @@ -# $NetBSD: Makefile,v 1.34 2014/01/16 11:04:26 obache Exp $ -# +# $NetBSD: Makefile,v 1.35 2014/01/25 10:30:11 wiz Exp $ + +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.5.4 .include "Makefile.common" diff --git a/inputmethod/mozc-server/Makefile.common b/inputmethod/mozc-server/Makefile.common index d8210917afc..f3df1276426 100644 --- a/inputmethod/mozc-server/Makefile.common +++ b/inputmethod/mozc-server/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.5 2014/01/20 10:39:29 ryoon Exp $ +# $NetBSD: Makefile.common,v 1.6 2014/01/25 10:30:11 wiz Exp $ # used by inputmethod/ibus-mozc/Makefile # used by inputmethod/mozc-elisp/Makefile # used by inputmethod/mozc-server/Makefile @@ -21,6 +21,8 @@ PATCHDIR= ${.CURDIR}/../../inputmethod/mozc-server/patches BUILD_DEPENDS+= ${PYPKGPREFIX}-gyp-[0-9]*:../../devel/gyp +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gyp + USE_LANGUAGES= c c++ # nullptr requires -std=c++11, and -std=c++11 requires gcc 4.7 or later GCC_REQD= 4.7 diff --git a/inputmethod/py-input-pad/Makefile b/inputmethod/py-input-pad/Makefile index e20bf47f3a3..8431a22b876 100644 --- a/inputmethod/py-input-pad/Makefile +++ b/inputmethod/py-input-pad/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2013/12/07 11:32:31 obache Exp $ -# +# $NetBSD: Makefile,v 1.31 2014/01/25 10:30:11 wiz Exp $ .include "../../inputmethod/input-pad/Makefile.common" @@ -27,6 +26,7 @@ post-configure: ${LN} -s ${BUILDLINK_DIR}/lib/libinput-pad.la ${WRKSRC}/input-pad PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 BUILDLINK_API_DEPENDS.input-pad+= input-pad>=${PKGVERSION_NOREV} .include "../../inputmethod/input-pad/buildlink3.mk" diff --git a/inputmethod/py-zinnia/Makefile b/inputmethod/py-zinnia/Makefile index 0385b2555dd..1607fd54224 100644 --- a/inputmethod/py-zinnia/Makefile +++ b/inputmethod/py-zinnia/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2012/10/06 14:25:15 asau Exp $ -# +# $NetBSD: Makefile,v 1.4 2014/01/25 10:30:11 wiz Exp $ .include "../../inputmethod/zinnia/Makefile.common" @@ -12,6 +11,7 @@ USE_TOOLS+= pkg-config USE_LANGUAGES= c c++ PYSETUPSUBDIR= python +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.06 EGG_NAME= zinnia_python-0.0.0 diff --git a/inputmethod/scim-python/Makefile b/inputmethod/scim-python/Makefile index 4bfc29ea0a6..54065125099 100644 --- a/inputmethod/scim-python/Makefile +++ b/inputmethod/scim-python/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2013/10/10 14:42:19 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.23 2014/01/25 10:30:11 wiz Exp $ DISTNAME= scim-python-0.1.13rc1 PKGREVISION= 21 @@ -30,7 +29,7 @@ post-extract: ${CP} ${WRKDIR}/py.db ${WRKSRC}/python/engine/PinYin/py.db PY_PATCHPLIST= yes - +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 REPLACE_PYTHON+= python/engine/XingMa/XMCreateDB.py .include "../../inputmethod/scim/buildlink3.mk" diff --git a/inputmethod/tegaki-pygtk/Makefile b/inputmethod/tegaki-pygtk/Makefile index 7b40ea84c10..347ff48efd5 100644 --- a/inputmethod/tegaki-pygtk/Makefile +++ b/inputmethod/tegaki-pygtk/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2012/10/06 14:25:19 asau Exp $ -# +# $NetBSD: Makefile,v 1.4 2014/01/25 10:30:11 wiz Exp $ DISTNAME= tegaki-pygtk-0.3.1 PKGREVISION= 2 @@ -17,6 +16,7 @@ DEPENDS+= ${PYPKGPREFIX}-gtk2>=2.10:../../x11/py-gtk2 USE_LANGUAGES= # none EGG_NAME= ${DISTNAME:S/-/_/} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/tegaki-python/Makefile b/inputmethod/tegaki-python/Makefile index 931b3f72365..695317f8bd1 100644 --- a/inputmethod/tegaki-python/Makefile +++ b/inputmethod/tegaki-python/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2012/10/06 14:25:19 asau Exp $ -# +# $NetBSD: Makefile,v 1.4 2014/01/25 10:30:11 wiz Exp $ DISTNAME= tegaki-python-0.3.1 PKGREVISION= 1 @@ -25,6 +24,7 @@ SUBST_FILES.prefix= tegaki/engine.py SUBST_SED.prefix= -e 's|/usr/local/share|${PREFIX}/share|g' EGG_NAME= ${DISTNAME:S/-/_/} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-zinnia .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/tegaki-recognize/Makefile b/inputmethod/tegaki-recognize/Makefile index e15ec0dad59..abe0ec9b053 100644 --- a/inputmethod/tegaki-recognize/Makefile +++ b/inputmethod/tegaki-recognize/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2012/10/06 14:25:19 asau Exp $ -# +# $NetBSD: Makefile,v 1.5 2014/01/25 10:30:11 wiz Exp $ DISTNAME= tegaki-recognize-0.3.1.2 PKGREVISION= 1 @@ -16,6 +15,7 @@ DEPENDS+= tegaki-pygtk>=0.2:../../inputmethod/tegaki-pygtk USE_LANGUAGES= # none REPLACE_PYTHON= bin/tegaki-recognize +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.3.1.2 EGG_NAME= ${DISTNAME:S/-/_/} diff --git a/inputmethod/tegaki-tools/Makefile b/inputmethod/tegaki-tools/Makefile index 65a88cedb35..305cef7151e 100644 --- a/inputmethod/tegaki-tools/Makefile +++ b/inputmethod/tegaki-tools/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2012/10/06 14:25:19 asau Exp $ -# +# $NetBSD: Makefile,v 1.4 2014/01/25 10:30:12 wiz Exp $ DISTNAME= tegaki-tools-0.3.1 PKGREVISION= 1 @@ -16,6 +15,7 @@ DEPENDS+= tegaki-pygtk>=0.3:../../inputmethod/tegaki-pygtk USE_LANGUAGES= c c++ +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.3.1 EGG_NAME= ${DISTNAME:S/-/_/} .include "../../lang/python/application.mk" diff --git a/inputmethod/tegaki-train/Makefile b/inputmethod/tegaki-train/Makefile index 79f93b16ca7..58093f97974 100644 --- a/inputmethod/tegaki-train/Makefile +++ b/inputmethod/tegaki-train/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2012/10/06 14:25:19 asau Exp $ -# +# $NetBSD: Makefile,v 1.4 2014/01/25 10:30:12 wiz Exp $ DISTNAME= tegaki-train-0.3.1 PKGREVISION= 1 @@ -15,6 +14,7 @@ DEPENDS+= tegaki-pygtk>=0.2:../../inputmethod/tegaki-pygtk USE_LANGUAGES= # none +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.3.1 EGG_NAME= ${DISTNAME:S/-/_/} .include "../../lang/python/application.mk" diff --git a/inputmethod/tegaki-wagomu/Makefile b/inputmethod/tegaki-wagomu/Makefile index e43e522503d..c82f2a338d4 100644 --- a/inputmethod/tegaki-wagomu/Makefile +++ b/inputmethod/tegaki-wagomu/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2013/01/25 12:50:02 obache Exp $ -# +# $NetBSD: Makefile,v 1.11 2014/01/25 10:30:12 wiz Exp $ DISTNAME= tegaki-wagomu-0.3.1 PKGREVISION= 6 @@ -30,6 +29,7 @@ SUBST_FILES.fixver= tegakiwagomu.py SUBST_SED.fixver= -e 's|0\.3|${PKGVERSION_NOREV}|' EGG_NAME= ${DISTNAME:S/-/_/} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.3.1 .include "../../devel/glib2/buildlink3.mk" .include "../../lang/python/distutils.mk" diff --git a/lang/nodejs/Makefile b/lang/nodejs/Makefile index 542e472daba..2039db6ea42 100644 --- a/lang/nodejs/Makefile +++ b/lang/nodejs/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2014/01/13 13:07:51 jperkin Exp $ -# +# $NetBSD: Makefile,v 1.17 2014/01/25 10:30:12 wiz Exp $ DISTNAME= node-v0.10.24 CATEGORIES= devel @@ -16,6 +15,8 @@ USE_TOOLS+= pkg-config USE_TOOLS+= gmake USE_LANGUAGES= c c++ +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.10.24 + .include "../../mk/bsd.prefs.mk" .include "options.mk" diff --git a/lang/py-cxfreeze/Makefile b/lang/py-cxfreeze/Makefile index a83af3c03c2..94725ef43df 100644 --- a/lang/py-cxfreeze/Makefile +++ b/lang/py-cxfreeze/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2012/10/02 20:11:50 asau Exp $ -# +# $NetBSD: Makefile,v 1.6 2014/01/25 10:30:12 wiz Exp $ VERS= 4.2.3 DISTNAME= cx_Freeze-${VERS} @@ -12,8 +11,6 @@ HOMEPAGE= http://cx-freeze.sourceforge.net/ COMMENT= Freezing python scripts into executables LICENSE= python-software-foundation -PYTHON_VERSIONS_INCLUDE_3X= yes - USE_LANGUAGES= c c++ PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} diff --git a/lang/py-pyrex/Makefile b/lang/py-pyrex/Makefile index 66416dcfed9..b21dc42f915 100644 --- a/lang/py-pyrex/Makefile +++ b/lang/py-pyrex/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2012/10/04 00:22:01 cheusov Exp $ +# $NetBSD: Makefile,v 1.24 2014/01/25 10:30:12 wiz Exp $ DISTNAME= Pyrex-0.9.9 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/P/p/} @@ -11,10 +11,10 @@ HOMEPAGE= http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/ COMMENT= Language for Writing Python Extension Modules LICENSE= apache-2.0 -PYDISTUTILSPKG= yes USE_TOOLS+= pax PYTHON_SELF_CONFLICT= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.9.9 -.include "../../lang/python/extension.mk" +.include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/archivemail/Makefile b/mail/archivemail/Makefile index 06564a0caf3..a15abbc0a88 100644 --- a/mail/archivemail/Makefile +++ b/mail/archivemail/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2012/10/08 12:19:02 asau Exp $ -# +# $NetBSD: Makefile,v 1.16 2014/01/25 10:30:12 wiz Exp $ DISTNAME= archivemail-0.9.0 PKGREVISION= 1 @@ -15,6 +14,8 @@ USE_LANGUAGES= # none INSTALLATION_DIRS= share/archivemail +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.9.0 + post-install: cd ${WRKSRC} && ${INSTALL_DATA} \ CHANGELOG FAQ MANIFEST PKG-INFO README TODO \ diff --git a/mail/fetchmailconf/Makefile b/mail/fetchmailconf/Makefile index 1696b91da37..c10da223485 100644 --- a/mail/fetchmailconf/Makefile +++ b/mail/fetchmailconf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.88 2013/06/04 22:16:36 tron Exp $ +# $NetBSD: Makefile,v 1.89 2014/01/25 10:30:12 wiz Exp $ DISTNAME= fetchmail-6.3.22 PKGNAME= ${DISTNAME:S/fetchmail/fetchmailconf/} @@ -31,6 +31,7 @@ INSTALL_TARGET= install-pythonPYTHON PLIST_SUBST+= PYSITELIB=${PYSITELIB} PYTHON_PATCH_SCRIPTS= fetchmailconf.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 6.3.22 post-install: ${INSTALL_SCRIPT} ${WRKSRC}/fetchmailconf.py ${DESTDIR}${PREFIX}/bin/fetchmailconf diff --git a/mail/getmail/Makefile b/mail/getmail/Makefile index 151c8fa2a0e..8868a4bf788 100644 --- a/mail/getmail/Makefile +++ b/mail/getmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.136 2013/08/26 11:17:32 schmonz Exp $ +# $NetBSD: Makefile,v 1.137 2014/01/25 10:30:12 wiz Exp $ DISTNAME= getmail-4.43.0 CATEGORIES= mail @@ -12,6 +12,7 @@ LICENSE= gnu-gpl-v2 USE_LANGUAGES= # none PYTHON_PATCH_SCRIPTS= *.py getmailcore/*.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 4.43.0 .include "../../lang/python/application.mk" .include "../../lang/python/distutils.mk" diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile index 4e876e6ea46..ece9212fdc8 100644 --- a/mail/mailman/Makefile +++ b/mail/mailman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.67 2013/07/12 10:44:57 jperkin Exp $ +# $NetBSD: Makefile,v 1.68 2014/01/25 10:30:12 wiz Exp $ DISTNAME= mailman-2.1.14-1 PKGNAME= mailman-2.1.14.1 @@ -69,6 +69,7 @@ RCD_SCRIPTS= mailman INSTALL_TEMPLATES+= ${FILESDIR}/INSTALL DEINSTALL_TEMPLATES+= ${FILESDIR}/DEINSTALL +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.1.14.1 PYTHON_PATCH_SCRIPTS+= Mailman/Archiver/pipermail.py PYTHON_PATCH_SCRIPTS+= Mailman/Post.py PYTHON_PATCH_SCRIPTS+= bin/msgfmt.py diff --git a/mail/offlineimap/Makefile b/mail/offlineimap/Makefile index 18c5b54d138..978f139c44b 100644 --- a/mail/offlineimap/Makefile +++ b/mail/offlineimap/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2012/10/08 12:19:19 asau Exp $ -# +# $NetBSD: Makefile,v 1.24 2014/01/25 10:30:12 wiz Exp $ DISTNAME= offlineimap-v6.5.2.1 PKGNAME= ${DISTNAME:S/-v/-/} @@ -20,6 +19,7 @@ WRKSRC= ${WRKDIR}/offlineimap INSTALLATION_DIRS= share/examples/offlineimap EGG_NAME= ${PKGNAME_NOREV} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 6.5.2.1 post-install: .for f in offlineimap.conf offlineimap.conf.minimal diff --git a/mail/py-libgmail/Makefile b/mail/py-libgmail/Makefile index 8653010fadf..f6120e2a83c 100644 --- a/mail/py-libgmail/Makefile +++ b/mail/py-libgmail/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2012/10/08 12:19:28 asau Exp $ -# +# $NetBSD: Makefile,v 1.8 2014/01/25 10:30:12 wiz Exp $ DISTNAME= libgmail-0.1.11 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -15,5 +14,7 @@ DEPENDS+= ${PYPKGPREFIX}-mechanize-[0-9]*:../../www/py-mechanize USE_LANGUAGES= # none +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-mechanize + .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/py-sendmail-admin/Makefile b/mail/py-sendmail-admin/Makefile index cbfd469c066..5ff637ec325 100644 --- a/mail/py-sendmail-admin/Makefile +++ b/mail/py-sendmail-admin/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2012/10/08 12:19:28 asau Exp $ -# +# $NetBSD: Makefile,v 1.9 2014/01/25 10:30:12 wiz Exp $ VER= 1.0 DISTNAME= sendmail-admin-${VER} @@ -13,7 +12,6 @@ HOMEPAGE= http://www.clapper.org/software/python/sendmail-admin/ COMMENT= Mailqs and rmmq, two scripts that ease Sendmail administration LICENSE= 2-clause-bsd -PYTHON_VERSIONS_INCLUDE_3X= yes PYTHON_SELF_CONFLICT= yes USE_LANGUAGES= # none diff --git a/mail/rss2email/Makefile b/mail/rss2email/Makefile index c8f4eabdd07..1cdc1063308 100644 --- a/mail/rss2email/Makefile +++ b/mail/rss2email/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2014/01/19 19:54:47 schmonz Exp $ -# +# $NetBSD: Makefile,v 1.36 2014/01/25 10:30:12 wiz Exp $ DISTNAME= v3.8 PKGNAME= rss2email-3.8 @@ -18,7 +17,6 @@ DEPENDS+= ${PYPKGPREFIX}-html2text>=3.0.1:../../textproc/py-html2text WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} -PYTHON_VERSIONS_INCLUDE_3X= yes PYTHON_VERSIONS_INCOMPATIBLE= 26 27 PYDISTUTILSPKG= yes diff --git a/mail/tmda/Makefile b/mail/tmda/Makefile index b3fc2668d80..0c0deb72d50 100644 --- a/mail/tmda/Makefile +++ b/mail/tmda/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2013/07/12 10:44:58 jperkin Exp $ -# +# $NetBSD: Makefile,v 1.50 2014/01/25 10:30:13 wiz Exp $ DISTNAME= tmda-1.1.12 PKGREVISION= 5 @@ -14,6 +13,7 @@ COMMENT= Python-based SPAM reduction system PYTHON_PATCH_SCRIPTS= ${TMDA_PROGRAMS} PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.1.12 PKG_SYSCONFSUBDIR= ${PKGBASE} diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile index 09d5b49efdb..5df67e9ec14 100644 --- a/math/gnumeric/Makefile +++ b/math/gnumeric/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.172 2013/10/10 14:42:22 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.173 2014/01/25 10:30:13 wiz Exp $ DISTNAME= gnumeric-1.8.4 PKGREVISION= 36 @@ -26,6 +25,7 @@ REPLACE_PERL+= plugins/perl-func/perl_func.pl CONFIGURE_ARGS+= --with-python CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.8.4 .include "../../lang/python/application.mk" .include "../../devel/py-gobject/buildlink3.mk" diff --git a/math/gnumeric110/Makefile b/math/gnumeric110/Makefile index bc4243384a8..8203d77813c 100644 --- a/math/gnumeric110/Makefile +++ b/math/gnumeric110/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2013/10/10 14:42:22 ryoon Exp $ +# $NetBSD: Makefile,v 1.51 2014/01/25 10:30:13 wiz Exp $ DISTNAME= gnumeric-1.10.17 PKGREVISION= 19 @@ -29,6 +29,7 @@ PLIST_SUBST+= GOFFICE_VERSION=${GOFFICE_VERSION} CONFIGURE_ARGS+= --with-python CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.10.17 .include "../../lang/python/application.mk" .include "../../devel/py-gobject/buildlink3.mk" diff --git a/math/gnumeric112/Makefile b/math/gnumeric112/Makefile index 08bdf98c089..bbf791720fa 100644 --- a/math/gnumeric112/Makefile +++ b/math/gnumeric112/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2014/01/02 18:50:03 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2014/01/25 10:30:13 wiz Exp $ DISTNAME= gnumeric-1.12.9 CATEGORIES= math gnome @@ -26,6 +26,7 @@ PLIST_SUBST+= GOFFICE_VERSION=${GOFFICE_VERSION} CONFIGURE_ARGS+= --with-python CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.12.9 .include "../../lang/python/application.mk" .include "../../devel/py-gobject3/buildlink3.mk" diff --git a/math/py-Numeric/Makefile b/math/py-Numeric/Makefile index d06c2a1f2a8..584707aa7ab 100644 --- a/math/py-Numeric/Makefile +++ b/math/py-Numeric/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2012/09/11 23:04:30 asau Exp $ +# $NetBSD: Makefile,v 1.51 2014/01/25 10:30:13 wiz Exp $ DISTNAME= Numeric-24.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,6 +11,7 @@ HOMEPAGE= http://numeric.scipy.org/ COMMENT= Adds multidimensional numeric arrays to Python PYSETUP= setup.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 24.2 PLIST_VARS+= blas .if exists(/System/Library/Frameworks/vecLib.framework) diff --git a/math/py-Scientific/Makefile b/math/py-Scientific/Makefile index ff427cad030..c9861032efa 100644 --- a/math/py-Scientific/Makefile +++ b/math/py-Scientific/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2013/09/01 12:14:07 obache Exp $ +# $NetBSD: Makefile,v 1.35 2014/01/25 10:30:13 wiz Exp $ DISTNAME= ScientificPython-2.8 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/Python//} @@ -13,6 +13,7 @@ COMMENT= Python modules for scientific computing CONFLICTS+= py-Scientific-[0-9]* PYDISTUTILSPKG= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.8 MAKE_ENV+= NETCDF_PREFIX=${BUILDLINK_PREFIX.netcdf} diff --git a/math/py-gmpy/Makefile b/math/py-gmpy/Makefile index cd55c294820..e47e07b786f 100644 --- a/math/py-gmpy/Makefile +++ b/math/py-gmpy/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2014/01/24 09:16:18 jperkin Exp $ -# +# $NetBSD: Makefile,v 1.7 2014/01/25 10:30:13 wiz Exp $ DISTNAME= gmpy-1.15 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,8 +11,6 @@ HOMEPAGE= http://code.google.com/p/gmpy COMMENT= Python library for arbitrary precision arithmetic LICENSE= gnu-lgpl-v2.1 -PYTHON_VERSIONS_INCLUDE_3X= yes - USE_LANGUAGES= c BUILD_TARGET= gmpy.so diff --git a/math/py-mpmath/Makefile b/math/py-mpmath/Makefile index f0ed87e8309..61c4346a9b8 100644 --- a/math/py-mpmath/Makefile +++ b/math/py-mpmath/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2012/09/11 23:04:31 asau Exp $ -# +# $NetBSD: Makefile,v 1.7 2014/01/25 10:30:13 wiz Exp $ DISTNAME= mpmath-0.17 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -14,6 +13,8 @@ LICENSE= modified-bsd USE_LANGUAGES= # none PYDISTUTILSPKG= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 + TEST_ENV+= PYTHONPATH=${WRKSRC}/build/lib do-test: ${RUN} cd ${WRKSRC}/build/lib/mpmath/tests; \ diff --git a/math/py-networkx/Makefile b/math/py-networkx/Makefile index a62ca618725..b6f055c5978 100644 --- a/math/py-networkx/Makefile +++ b/math/py-networkx/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2012/10/04 00:21:59 cheusov Exp $ -# +# $NetBSD: Makefile,v 1.12 2014/01/25 10:30:13 wiz Exp $ DISTNAME= networkx-1.7 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -14,6 +13,7 @@ COMMENT= Python package for creating and manipulating graphs and networks LICENSE= modified-bsd PYTHON_SELF_CONFLICT= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile index 9ebced3559e..a1292aeccb2 100644 --- a/math/py-numpy/Makefile +++ b/math/py-numpy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2013/05/20 05:59:58 adam Exp $ +# $NetBSD: Makefile,v 1.26 2014/01/25 10:30:13 wiz Exp $ DISTNAME= numpy-1.7.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,7 +11,6 @@ COMMENT= Array processing for numbers, strings, records, and objects LICENSE= modified-bsd USE_LANGUAGES= c fortran -PYTHON_VERSIONS_INCLUDE_3X= yes PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} MAKE_ENV+= ATLAS=None diff --git a/math/py-roman/Makefile b/math/py-roman/Makefile index 9b712c0ffd3..a21163a35ba 100644 --- a/math/py-roman/Makefile +++ b/math/py-roman/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2012/09/11 23:04:32 asau Exp $ -# +# $NetBSD: Makefile,v 1.4 2014/01/25 10:30:13 wiz Exp $ DISTNAME= roman-1.4.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -14,7 +13,6 @@ LICENSE= python-software-foundation CONFLICTS+= ${PYPKGPREFIX}-docutils<=0.7 USE_LANGUAGES= # none -PYTHON_VERSIONS_INCLUDE_3X= yes .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/py-scipy/Makefile b/math/py-scipy/Makefile index 036e7beac15..1460c71f657 100644 --- a/math/py-scipy/Makefile +++ b/math/py-scipy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2013/10/16 19:35:40 markd Exp $ +# $NetBSD: Makefile,v 1.14 2014/01/25 10:30:13 wiz Exp $ DISTNAME= scipy-0.12.1 PKGNAME= ${PYPKGPREFIX}-scipy-0.12.1 @@ -13,7 +13,6 @@ LICENSE= modified-bsd PYDISTUTILSPKG= yes PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX} USE_LANGUAGES+= c c++ fortran -PYTHON_VERSIONS_INCLUDE_3X= yes MAKE_ENV+= ATLAS=None # XXX Avoid picking up other compilers when installed diff --git a/meta-pkgs/bulk-large/Makefile b/meta-pkgs/bulk-large/Makefile index 7b584598225..f67ca10a25f 100644 --- a/meta-pkgs/bulk-large/Makefile +++ b/meta-pkgs/bulk-large/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2013/12/02 19:14:02 minskim Exp $ +# $NetBSD: Makefile,v 1.10 2014/01/25 10:30:13 wiz Exp $ DISTNAME= bulk-large-20130223 PKGREVISION= 2 @@ -15,6 +15,8 @@ RESTRICTED= Just for test build purpose NO_BIN_ON_CDROM= ${RESTRICTED} NO_BIN_ON_FTP= ${RESTRICTED} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 + # # Note: the primary purpose of this package is to build the most # popular/useful packages out of the set of all packages in pkgsrc. diff --git a/meta-pkgs/bulk-medium/Makefile b/meta-pkgs/bulk-medium/Makefile index a07aa5e04b5..ec12f072141 100644 --- a/meta-pkgs/bulk-medium/Makefile +++ b/meta-pkgs/bulk-medium/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2014/01/21 10:55:15 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2014/01/25 10:30:13 wiz Exp $ DISTNAME= bulk-medium-20140121 CATEGORIES= meta-pkgs @@ -10,6 +10,8 @@ COMMENT= Meta-package for a standard medium-sized limited bulk build META_PACKAGE= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-postgresql, py-matplotlib-gtk2 + RESTRICTED= Just for test build purpose NO_BIN_ON_CDROM= ${RESTRICTED} NO_BIN_ON_FTP= ${RESTRICTED} diff --git a/meta-pkgs/gnome/Makefile b/meta-pkgs/gnome/Makefile index 349309eac63..a1295385868 100644 --- a/meta-pkgs/gnome/Makefile +++ b/meta-pkgs/gnome/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.128 2013/06/26 22:06:17 joerg Exp $ +# $NetBSD: Makefile,v 1.129 2014/01/25 10:30:14 wiz Exp $ DISTNAME= gnome-2.26.2 PKGREVISION= 4 @@ -11,6 +11,8 @@ COMMENT= Meta-package for the GNOME desktop META_PACKAGE= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-ORBit via py-gnome2 + .include "../../lang/python/pyversion.mk" PKG_OPTIONS_VAR= PKG_OPTIONS.gnome diff --git a/meta-pkgs/py-gnome-bindings/Makefile b/meta-pkgs/py-gnome-bindings/Makefile index b082a22d7a3..e08ca2d4ad0 100644 --- a/meta-pkgs/py-gnome-bindings/Makefile +++ b/meta-pkgs/py-gnome-bindings/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2012/04/08 19:09:07 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2014/01/25 10:30:14 wiz Exp $ DISTNAME= ${PYPKGPREFIX}-gnome-bindings-2.26.2 CATEGORIES= meta-pkgs x11 gnome @@ -10,6 +10,8 @@ COMMENT= Meta-package for Python bindings for the GNOME desktop META_PACKAGE= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-ORBit, py-gnome2, py-gtk2 + .include "../../lang/python/pyversion.mk" # see http://ftp.gnome.org/pub/GNOME/bindings/2.26/2.26.2/sources/python/ diff --git a/misc/byobu/Makefile b/misc/byobu/Makefile index 76b30992b12..71f86b8f250 100644 --- a/misc/byobu/Makefile +++ b/misc/byobu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2014/01/01 07:15:58 ryoon Exp $ +# $NetBSD: Makefile,v 1.2 2014/01/25 10:30:14 wiz Exp $ DISTNAME= byobu_5.69.orig PKGNAME= ${DISTNAME:S/_/-/:S/.orig//} @@ -22,6 +22,7 @@ REPLACE_BASH+= usr/share/byobu/tests/* REPLACE_PERL+= usr/lib/byobu/include/* REPLACE_PYTHON+= usr/lib/byobu/include/* +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-newt EGDIR= share/examples/byobu CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/${EGDIR} diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile index d25b0fb513e..6329f7ca2d6 100644 --- a/misc/calibre/Makefile +++ b/misc/calibre/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.64 2014/01/17 23:11:27 wiz Exp $ +# $NetBSD: Makefile,v 1.65 2014/01/25 10:30:14 wiz Exp $ DISTNAME= calibre-0.9.7 PKGREVISION= 15 @@ -32,6 +32,7 @@ PYTHON_VERSIONED_DEPENDENCIES= dateutil dns USE_LANGUAGES= c c++ USE_TOOLS+= pkg-config pax PYTHON_VERSIONS_ACCEPTED= 27 +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-mechanize, py-beautifulsoup, py-imaging, py-netifaces PYDISTUTILSPKG= yes PYSETUPOPTARGS= # empty PYSETUPINSTALLARGS= --prefix=${PREFIX} --root=${DESTDIR:Q}${PREFIX} diff --git a/misc/deskbar-applet/Makefile b/misc/deskbar-applet/Makefile index 89af84aaee8..e4f8d6770da 100644 --- a/misc/deskbar-applet/Makefile +++ b/misc/deskbar-applet/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.81 2014/01/01 11:52:23 wiz Exp $ -# +# $NetBSD: Makefile,v 1.82 2014/01/25 10:30:14 wiz Exp $ DISTNAME= deskbar-applet-2.32.0 PKGREVISION= 31 @@ -21,6 +20,8 @@ PKGCONFIG_OVERRIDE= data/deskbar-applet.pc.in GCONF_SCHEMAS= deskbar-applet.schemas +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-ORBit via py-gnome2, py-gtk2 + PYTHON_PATCH_SCRIPTS= deskbar/deskbar-applet.py PY_PATCHPLIST= yes diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile index 2350dc6a534..38a2b0cb2d8 100644 --- a/misc/kdeutils3/Makefile +++ b/misc/kdeutils3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.101 2014/01/01 11:52:24 wiz Exp $ +# $NetBSD: Makefile,v 1.102 2014/01/25 10:30:14 wiz Exp $ DISTNAME= kdeutils-${_KDE_VERSION} PKGREVISION= 32 @@ -26,7 +26,7 @@ SUBST_SED.tarexe= -e 's:<default>tar</default>:<default>${PREFIX.gtar}/bin/gtar< .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "NetBSD" && exists(/usr/include/machine/apmvar.h) -CPPFLAGS+= -D__NetBSD_APM__ +CPPFLAGS+= -D__NetBSD_APM__ .endif .if ${OPSYS} == "DragonFly" @@ -37,6 +37,8 @@ CONFIGURE_ARGS+= --with-snmp=no CONFIGURE_ARGS+= --with-pythondir=${LOCALBASE} CONFIGURE_ENV+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 3.5.10 + .include "../../meta-pkgs/kde3/kde3.mk" .include "../../devel/gmp/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" diff --git a/misc/kodos/Makefile b/misc/kodos/Makefile index d600af3e012..604a81e57d8 100644 --- a/misc/kodos/Makefile +++ b/misc/kodos/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2013/10/09 17:39:13 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2014/01/25 10:30:14 wiz Exp $ DISTNAME= kodos-2.4.9 PKGREVISION= 6 @@ -10,7 +10,8 @@ HOMEPAGE= http://kodos.sourceforge.net/ COMMENT= GUI for creating, testing and debugging Python REs PYDISTUTILSPKG= yes -USE_LANGUAGES= +USE_LANGUAGES= # empty +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-qt3-modules SUBST_CLASSES+= libpath SUBST_STAGE.libpath= pre-configure diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile index 0a48f595a5d..0d274352a82 100644 --- a/misc/koffice/Makefile +++ b/misc/koffice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.156 2014/01/01 11:52:25 wiz Exp $ +# $NetBSD: Makefile,v 1.157 2014/01/25 10:30:14 wiz Exp $ DISTNAME= koffice-1.6.3 PKGREVISION= 51 @@ -43,6 +43,8 @@ REPLACE_PERL+= tools/scripts/gdb_output_to_text.pl REPLACE_PERL+= tools/thesaurus/extract.pl REPLACE_PERL+= kpresenter/kprconverter.pl +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.6.3 + # Ensure we export symbols in the linked shared object. LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS} diff --git a/misc/mnemosyne/Makefile b/misc/mnemosyne/Makefile index 9f0e33a2bf8..ead8ec3828f 100644 --- a/misc/mnemosyne/Makefile +++ b/misc/mnemosyne/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2013/10/24 12:32:38 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.28 2014/01/25 10:30:14 wiz Exp $ DISTNAME= mnemosyne-1.2.2 PKGREVISION= 16 @@ -15,6 +14,7 @@ LICENSE= gnu-gpl-v2 USE_LANGUAGES= # none EGG_NAME= ${DISTNAME:S/^m/M/} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-qt3-base, py-imaging SUBST_CLASSES+= installpath SUBST_SED.installpath= -e 's,/usr/share,${PREFIX}/share,' diff --git a/misc/openoffice3/Makefile b/misc/openoffice3/Makefile index 88a08e48267..9b6064521e9 100644 --- a/misc/openoffice3/Makefile +++ b/misc/openoffice3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.96 2014/01/01 11:52:26 wiz Exp $ +# $NetBSD: Makefile,v 1.97 2014/01/25 10:30:14 wiz Exp $ OO_VER= 3.1.1 OO_TAG= OOO310_m19 @@ -32,6 +32,8 @@ WRKSRC= ${WRKDIR}/${OO_TAG} GCC_REQD+= 3.4 USE_LANGUAGES+= c c++ +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 3.1.1 + CONFLICTS+= staroffice-[0-9]* CONFLICTS+= openoffice-[0-9]* CONFLICTS+= openoffice2-[0-9]* diff --git a/misc/orca/Makefile b/misc/orca/Makefile index c72e96e5c43..86773b6d68a 100644 --- a/misc/orca/Makefile +++ b/misc/orca/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2012/10/08 09:57:32 asau Exp $ -# +# $NetBSD: Makefile,v 1.36 2014/01/25 10:30:14 wiz Exp $ DISTNAME= orca-2.32.1 PKGREVISION= 1 @@ -16,7 +15,6 @@ LICENSE= gnu-lgpl-v2 DEPENDS+= ${PYPKGPREFIX}-at-spi>=1.32:../../devel/py-at-spi DEPENDS+= ${PYPKGPREFIX}-gobject>=2.26:../../devel/py-gobject DEPENDS+= ${PYPKGPREFIX}-xdg-[0-9]*:../../devel/py-xdg -DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo DEPENDS+= ${PYPKGPREFIX}-ORBit>=2.24:../../net/py-ORBit DEPENDS+= ${PYPKGPREFIX}-dbus-[0-9]*:../../sysutils/py-dbus DEPENDS+= ${PYPKGPREFIX}-gnome2>=2.28:../../x11/py-gnome2 @@ -32,6 +30,9 @@ USE_PKGLOCALEDIR= yes CONFIGURE_ENV+= PYTHON=${PYTHONBIN} PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-ORBit, py-gnome2, py-gtk2 +PYTHON_VERSIONED_DEPENDENCIES= cairo + .include "../../mk/bsd.prefs.mk" .if ${X11_TYPE} == "modular" || !exists(${X11BASE}/bin/xmodmap) DEPENDS+= xmodmap-[0-9]*:../../x11/xmodmap @@ -41,4 +42,5 @@ DEPENDS+= xmodmap-[0-9]*:../../x11/xmodmap .include "../../lang/python/application.mk" .include "../../lang/python/extension.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/py-anita/Makefile b/misc/py-anita/Makefile index 7dd83885c6e..795e45c7353 100644 --- a/misc/py-anita/Makefile +++ b/misc/py-anita/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2014/01/15 19:05:34 martin Exp $ -# +# $NetBSD: Makefile,v 1.28 2014/01/25 10:30:14 wiz Exp $ DISTNAME= anita-1.31 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -16,6 +15,8 @@ DEPENDS+= ${PYPKGPREFIX}-pexpect>=2.1:../../devel/py-pexpect USE_LANGUAGES= #none +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.31 + .include "options.mk" .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/py-anki2/Makefile b/misc/py-anki2/Makefile index b004b6bd6ac..bd9ca5462f9 100644 --- a/misc/py-anki2/Makefile +++ b/misc/py-anki2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2013/12/31 17:47:21 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2014/01/25 10:30:14 wiz Exp $ DISTNAME= anki-2.0.20 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:C/anki/anki2/} @@ -18,6 +18,7 @@ DEPENDS+= portaudio-devel-[0-9]*:../../audio/portaudio-devel # Actually, these hurt more than they help. # anki comes with its own version of the two, and if the pkgsrc versions # are newer, it might break +#PYTHON_VERSIONS_INCOMPATIBLE=33 # py-beautifulsoup #DEPENDS+= ${PYPKGPREFIX}-beautifulsoup>=3.2:../../www/py-beautifulsoup #DEPENDS+= ${PYPKGPREFIX}-httplib2-[0-9]*:../../www/py-httplib2 # XXX: python portaudio diff --git a/misc/py-carddav/Makefile b/misc/py-carddav/Makefile index 418d12e30cf..0df52126d9c 100644 --- a/misc/py-carddav/Makefile +++ b/misc/py-carddav/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2013/11/26 13:46:30 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2014/01/25 10:30:14 wiz Exp $ DISTNAME= pyCardDAV-0.6.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/pyCardDAV/carddav/} @@ -17,6 +17,8 @@ DEPENDS+= ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests USE_LANGUAGES= # none +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-vobject + REPLACE_PYTHON= pycarddav/ui.py REPLACE_PYTHON+= pycarddav/controllers.py REPLACE_PYTHON+= pycarddav/model.py diff --git a/misc/routeplanner-cli/Makefile b/misc/routeplanner-cli/Makefile index f9017dfb274..f1f591dc4c1 100644 --- a/misc/routeplanner-cli/Makefile +++ b/misc/routeplanner-cli/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2012/10/08 09:57:36 asau Exp $ +# $NetBSD: Makefile,v 1.16 2014/01/25 10:30:14 wiz Exp $ # DISTNAME= routeplanner_0.11 @@ -41,6 +41,7 @@ do-install: done # optional speedup +#PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-kjbuckets #.include "../../devel/py-kjbuckets/buildlink3.mk" #.include "../../devel/py-pqueue/buildlink3.mk" diff --git a/misc/superkaramba/Makefile b/misc/superkaramba/Makefile index e862446a94b..246a0312fa4 100644 --- a/misc/superkaramba/Makefile +++ b/misc/superkaramba/Makefile @@ -1,10 +1,12 @@ -# $NetBSD: Makefile,v 1.20 2014/01/01 11:52:26 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2014/01/25 10:30:15 wiz Exp $ DISTNAME= superkaramba-${_KDE_VERSION} PKGREVISION= 1 CATEGORIES= misc COMMENT= KDE desktop widgets +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 4.11.3 + .include "../../meta-pkgs/kde4/Makefile.kde4" #make sure cmake picks up the same Python version as pkgsrc diff --git a/multimedia/farsight2/Makefile b/multimedia/farsight2/Makefile index c8c3cf1edbd..be78b16b5b9 100644 --- a/multimedia/farsight2/Makefile +++ b/multimedia/farsight2/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2014/01/01 11:52:26 wiz Exp $ -# +# $NetBSD: Makefile,v 1.44 2014/01/25 10:30:15 wiz Exp $ DISTNAME= farsight2-0.0.31 PKGREVISION= 10 @@ -21,6 +20,8 @@ PKGCONFIG_OVERRIDE+= farsight2.pc.in # gstreamer-check-0.10 >= 0.10.23 (GStreamer Check unittest Library) PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2, py-gstreamer0.10 + .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.pygobject+= ${PYPKGPREFIX}-gobject>=2.16 diff --git a/multimedia/libkate/options.mk b/multimedia/libkate/options.mk index 7d7107eec34..372a65d7593 100644 --- a/multimedia/libkate/options.mk +++ b/multimedia/libkate/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2013/05/15 00:41:42 rodent Exp $ +# $NetBSD: options.mk,v 1.2 2014/01/25 10:30:15 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.libkate PKG_SUPPORTED_OPTIONS= debug doc oggz python valgrind vorbis @@ -24,6 +24,7 @@ CONFIGURE_ARGS+= --disable-doc .if !empty(PKG_OPTIONS:Mpython) REPLACE_PYTHON= tools/KateDJ/KateDJ PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-wxWidgets .include "../../x11/py-wxWidgets/buildlink3.mk" .include "../../lang/python/application.mk" .include "../../lang/python/extension.mk" diff --git a/multimedia/pitivi/Makefile b/multimedia/pitivi/Makefile index dbae6fa8db2..23985ad5c1b 100644 --- a/multimedia/pitivi/Makefile +++ b/multimedia/pitivi/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2013/10/10 14:42:25 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.29 2014/01/25 10:30:15 wiz Exp $ DISTNAME= pitivi-0.15.2 PKGREVISION= 5 @@ -17,11 +16,13 @@ USE_TOOLS+= pkg-config intltool gmake msgfmt CONFIGURE_ENV+= ac_cv_path_PYTHON=${PYTHONBIN} PYTHON_PATCH_SCRIPTS= bin/pitivi.in +PYTHON_VERSIONED_DEPENDENCIES= cairo +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2, py-gstreamer0.10 .include "../../multimedia/gstreamer0.10/buildlink3.mk" .include "../../lang/python/application.mk" .include "../../x11/py-gtk2/buildlink3.mk" -.include "../../graphics/py-cairo/buildlink3.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../multimedia/py-gstreamer0.10/buildlink3.mk" .include "../../multimedia/gst-plugins0.10-gnonlin/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" diff --git a/multimedia/py-gstreamer0.10/Makefile b/multimedia/py-gstreamer0.10/Makefile index 659ad28f546..8e6161db14f 100644 --- a/multimedia/py-gstreamer0.10/Makefile +++ b/multimedia/py-gstreamer0.10/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2012/10/08 09:21:11 asau Exp $ -# +# $NetBSD: Makefile,v 1.32 2014/01/25 10:30:15 wiz Exp $ DISTNAME= gst-python-0.10.22 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/gst-python/gstreamer0.10/} @@ -21,6 +20,7 @@ USE_TOOLS+= pkg-config gmake GNU_CONFIGURE= yes CONFIGURE_ENV+= PYTHON=${PYTHONBIN} PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.10.22; use py-gobjects PKGCONFIG_OVERRIDE+= pkgconfig/gst-python.pc.in diff --git a/multimedia/totem/Makefile.common b/multimedia/totem/Makefile.common index 099e98243f0..72d52fff077 100644 --- a/multimedia/totem/Makefile.common +++ b/multimedia/totem/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.60 2010/11/25 01:16:39 obache Exp $ +# $NetBSD: Makefile.common,v 1.61 2014/01/25 10:30:15 wiz Exp $ # # used by multimedia/totem-browser-plugin/Makefile # used by multimedia/totem-nautilus/Makefile @@ -28,6 +28,8 @@ GCONF_SCHEMAS+= totem-video-thumbnail.schemas CONFIGURE_ARGS+= --enable-vala=no +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2, py-gdata + .include "../../lang/python/application.mk" .include "../../x11/py-gtk2/buildlink3.mk" .include "../../www/py-gdata/buildlink3.mk" diff --git a/net/Radicale/Makefile b/net/Radicale/Makefile index 08b3dc3f1f8..7a44f2bdd33 100644 --- a/net/Radicale/Makefile +++ b/net/Radicale/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2013/10/11 09:59:54 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2014/01/25 10:30:15 wiz Exp $ DISTNAME= Radicale-0.8 PKGREVISION= 1 @@ -13,7 +13,6 @@ LICENSE= gnu-gpl-v3 PYDISTUTILSPKG= yes EGDIR= share/examples/radicale -PYTHON_VERSIONS_INCLUDE_3X= yes INSTALLATION_DIRS= ${EGDIR} OWN_DIRS= ${PKG_SYSCONFDIR}/radicale CONF_FILES+= ${EGDIR}/config ${PKG_SYSCONFDIR}/radicale/config diff --git a/net/avahi/options.mk b/net/avahi/options.mk index bbf8980891b..bd429b19774 100644 --- a/net/avahi/options.mk +++ b/net/avahi/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2013/06/17 12:44:54 wiz Exp $ +# $NetBSD: options.mk,v 1.5 2014/01/25 10:30:15 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.avahi PKG_SUPPORTED_OPTIONS= avahi-howl gdbm introspection gtk2 gtk3 mono python qt3 @@ -77,8 +77,9 @@ CONFIGURE_ARGS+= --disable-qt4 ### Enable python support ### .if !empty(PKG_OPTIONS:Mpython) -. include "../../lang/python/application.mk" PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 +. include "../../lang/python/application.mk" REPLACE_PYTHON+= avahi-python/avahi-discover/__init__.py . include "../../lang/python/extension.mk" . include "../../sysutils/py-dbus/buildlink3.mk" diff --git a/net/bittornado-gui/Makefile b/net/bittornado-gui/Makefile index a6de769696f..a40a01403ba 100644 --- a/net/bittornado-gui/Makefile +++ b/net/bittornado-gui/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2012/10/23 17:18:12 asau Exp $ -# +# $NetBSD: Makefile,v 1.29 2014/01/25 10:30:15 wiz Exp $ .include "../../net/bittornado/Makefile.common" @@ -17,6 +16,7 @@ NO_BUILD= yes PYTHON_PATCH_SCRIPTS= btcompletedirgui.py btdownloadgui.py PYTHON_PATCH_SCRIPTS+= btmaketorrentgui.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-wxWidgets INSTALLATION_DIRS= bin diff --git a/net/bittornado/Makefile b/net/bittornado/Makefile index f86ea3a644e..63560a04b3f 100644 --- a/net/bittornado/Makefile +++ b/net/bittornado/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2012/10/23 17:18:12 asau Exp $ -# +# $NetBSD: Makefile,v 1.11 2014/01/25 10:30:15 wiz Exp $ .include "Makefile.common" @@ -10,6 +9,8 @@ CONFLICTS= bittorrent-[0-9]* DEPENDS+= ${PYPKGPREFIX}-cursespanel-[0-9]*:../../devel/py-cursespanel DEPENDS+= ${PYPKGPREFIX}-crypto>=2.0:../../security/py-crypto +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.3.18 + EGG_NAME= BitTornado-T_${PKGVERSION_NOREV}._BitTornado_ .include "../../lang/python/application.mk" diff --git a/net/bittorrent-gui/Makefile b/net/bittorrent-gui/Makefile index 4283b98843f..1aedd13a5f6 100644 --- a/net/bittorrent-gui/Makefile +++ b/net/bittorrent-gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2012/10/23 17:18:12 asau Exp $ +# $NetBSD: Makefile,v 1.33 2014/01/25 10:30:15 wiz Exp $ .include "../../net/bittorrent/Makefile.common" @@ -11,6 +11,7 @@ DEPENDS+= bittorrent>=${PKGVERSION_NOREV}:../../net/bittorrent DEPENDS+= ${PYPKGPREFIX}-gtk2>=2.6:../../x11/py-gtk2 PYTHON_PATCH_SCRIPTS= bittorrent maketorrent +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 CONFLICTS+= bittornado-gui-[0-9]* diff --git a/net/bittorrent/Makefile b/net/bittorrent/Makefile index 5f4a9928668..b77830d6b0a 100644 --- a/net/bittorrent/Makefile +++ b/net/bittorrent/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2012/10/23 17:18:12 asau Exp $ +# $NetBSD: Makefile,v 1.46 2014/01/25 10:30:15 wiz Exp $ .include "Makefile.common" @@ -28,6 +28,8 @@ SUBST_FILES.sha+= khashmir/utkhashmir.py SUBST_FILES.sha+= torrentinfo-console.py SUBST_SED.sha= -e "s/^from sha import .*/from hashlib import sha1 as sha/" +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 4.4.0 + .include "../../lang/python/application.mk" .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/calypso/Makefile b/net/calypso/Makefile index d26e985af88..eebc3b207a6 100644 --- a/net/calypso/Makefile +++ b/net/calypso/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2013/11/29 16:58:33 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2014/01/25 10:30:15 wiz Exp $ DISTNAME= calypso-1.3 CATEGORIES= net time @@ -14,6 +14,8 @@ DEPENDS+= git-base-[0-9]*:../../devel/git-base INSTALLATION_DIRS= share/examples/calypso +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-vobject + REPLACE_PYTHON= calypso.py post-install: diff --git a/net/coherence/Makefile b/net/coherence/Makefile index 53ac8dd7ca2..716ed5772c0 100644 --- a/net/coherence/Makefile +++ b/net/coherence/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2012/10/23 17:18:15 asau Exp $ -# +# $NetBSD: Makefile,v 1.8 2014/01/25 10:30:15 wiz Exp $ DISTNAME= Coherence-0.6.6.2 PKGNAME= coherence-0.6.6.2 @@ -15,5 +14,7 @@ USE_LANGUAGES= # none DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-twisted + .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/gitso/Makefile b/net/gitso/Makefile index c40fb0a6b02..92c9033f2a6 100644 --- a/net/gitso/Makefile +++ b/net/gitso/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2013/10/10 14:42:27 ryoon Exp $ +# $NetBSD: Makefile,v 1.16 2014/01/25 10:30:16 wiz Exp $ DISTNAME= gitso-0.6 PKGREVISION= 11 @@ -17,6 +17,8 @@ DEPENDS+= x11vnc-[0-9]*:../../x11/x11vnc WRKSRC= ${WRKDIR}/Gitso PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-wxWidgets + USE_TOOLS+= bash:run REPLACE_BASH+= run-gitso.sh.local diff --git a/net/gtk-vnc/options.mk b/net/gtk-vnc/options.mk index 9ec9cd8c89c..9e65d7e06c4 100644 --- a/net/gtk-vnc/options.mk +++ b/net/gtk-vnc/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.5 2013/06/13 07:02:34 obache Exp $ +# $NetBSD: options.mk,v 1.6 2014/01/25 10:30:16 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gtk-vnc PKG_SUPPORTED_OPTIONS= python vnc-sasl pulseaudio @@ -8,6 +8,7 @@ PKG_SUGGESTED_OPTIONS= python vnc-sasl PLIST_VARS= python .if !empty(PKG_OPTIONS:Mpython) +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 .include "../../lang/python/extension.mk" .include "../../x11/py-gtk2/buildlink3.mk" PLIST.python= yes diff --git a/net/gupnp-igd/Makefile b/net/gupnp-igd/Makefile index 81d2e8c33b6..064c54a71d9 100644 --- a/net/gupnp-igd/Makefile +++ b/net/gupnp-igd/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2014/01/01 11:52:07 wiz Exp $ -# +# $NetBSD: Makefile,v 1.25 2014/01/25 10:30:16 wiz Exp $ DISTNAME= gupnp-igd-0.2.2 PKGREVISION= 5 @@ -18,6 +17,7 @@ USE_TOOLS+= gmake pkg-config PKGCONFIG_OVERRIDE+= gupnp-igd-1.0.pc.in PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.2.2 CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} diff --git a/net/mimms/Makefile b/net/mimms/Makefile index 4911a3c0e9c..f5c455e5135 100644 --- a/net/mimms/Makefile +++ b/net/mimms/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2013/06/16 21:21:15 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2014/01/25 10:30:16 wiz Exp $ DISTNAME= mimms-3.2 CATEGORIES= net multimedia @@ -11,6 +11,7 @@ COMMENT= MMS (e.g. mms://) stream downloader LICENSE= gnu-gpl-v3 USE_LANGUAGES= # none +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 3.2 SUBST_CLASSES+= man SUBST_FILES.man+= setup.py diff --git a/net/mitmproxy/Makefile b/net/mitmproxy/Makefile index 4011ddc5918..73ebf77fa10 100644 --- a/net/mitmproxy/Makefile +++ b/net/mitmproxy/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2013/05/15 22:39:26 wiz Exp $ -# +# $NetBSD: Makefile,v 1.2 2014/01/25 10:30:16 wiz Exp $ DISTNAME= mitmproxy-0.9 CATEGORIES= net @@ -19,6 +18,7 @@ DEPENDS+= ${PYPKGPREFIX}-OpenSSL>=0.13:../../security/py-OpenSSL DEPENDS+= ${PYPKGPREFIX}-urwid>=1.1:../../devel/py-urwid USE_LANGUAGES= # none +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-imaging, py-netlib .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/nagstamon/Makefile b/net/nagstamon/Makefile index 481b7d6207e..43965651d37 100644 --- a/net/nagstamon/Makefile +++ b/net/nagstamon/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2013/10/10 14:42:28 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.31 2014/01/25 10:30:16 wiz Exp $ VERSION= 0.9.9 DISTNAME= nagstamon_${VERSION} @@ -13,6 +12,10 @@ HOMEPAGE= http://nagstamon.ifw-dresden.de/ COMMENT= Nagios status monitor which takes place in systray or on desktop LICENSE= gnu-gpl-v2 +DEPENDS+= ${PYPKGPREFIX}-lxml>=2.2.4:../../textproc/py-lxml +DEPENDS+= ${PYPKGPREFIX}-libxslt>=1.1.24:../../textproc/py-libxslt +DEPENDS+= sox>=14.0.1:../../audio/sox + USE_LANGUAGES= # none PYDISTUTILSPKG= yes @@ -22,9 +25,7 @@ INSTALLATION_DIRS+= ${PKGMANDIR}/man1 REPLACE_PYTHON= ${WRKSRC}/*.py REPLACE_PYTHON+= ${WRKSRC}/Nagstamon/Server/Multisite.py -DEPENDS+= ${PYPKGPREFIX}-lxml>=2.2.4:../../textproc/py-lxml -DEPENDS+= ${PYPKGPREFIX}-libxslt>=1.1.24:../../textproc/py-libxslt -DEPENDS+= sox>=14.0.1:../../audio/sox +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-libxslt, py-ORBit via py-gnome2, py-gtk2 SUBST_CLASSES+= mandir SUBST_STAGE.mandir= pre-configure diff --git a/net/nicotine/Makefile b/net/nicotine/Makefile index c79b7e92f00..8e6a8a26ca6 100644 --- a/net/nicotine/Makefile +++ b/net/nicotine/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2012/10/23 17:18:42 asau Exp $ -# +# $NetBSD: Makefile,v 1.42 2014/01/25 10:30:16 wiz Exp $ DISTNAME= nicotine-1.0.8 PKGREVISION= 16 @@ -16,6 +15,7 @@ DEPENDS+= ${PYPKGPREFIX}-gtk2>=1.99.16:../../x11/py-gtk2 USE_PKGLOCALEDIR= yes USE_LANGUAGES= # empty +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/nmap/options.mk b/net/nmap/options.mk index 0d3c83761a0..23f8dd5410e 100644 --- a/net/nmap/options.mk +++ b/net/nmap/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.10 2013/09/14 14:11:25 drochner Exp $ +# $NetBSD: options.mk,v 1.11 2014/01/25 10:30:16 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.nmap @@ -37,6 +37,7 @@ PY_PATCHPLIST= yes REPLACE_PYTHON+= zenmap/zenmapCore/*.py REPLACE_PYTHON+= zenmap/zenmapGUI/*.py REPLACE_PYTHON+= zenmap/zenmapGUI/higwidgets/*.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-xml, py-sqlite2, py-gtk2 .include "../../lang/python/application.mk" .include "../../lang/python/extension.mk" .include "../../x11/py-gtk2/buildlink3.mk" diff --git a/net/omniORB/Makefile b/net/omniORB/Makefile index b1afc282e60..219a4296848 100644 --- a/net/omniORB/Makefile +++ b/net/omniORB/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2014/01/19 11:28:59 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2014/01/25 10:30:16 wiz Exp $ DISTNAME= omniORB-4.1.7 CATEGORIES= devel @@ -44,6 +44,7 @@ CONFIGURE_ARGS+=--disable-ipv6 PY_PATCHPLIST= yes REPLACE_PYTHON+= src/tool/omniidl/python/scripts/omniidlrun.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 4.1.7 post-install: ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/omniORB/ diff --git a/net/py-IP/Makefile b/net/py-IP/Makefile index 1017be72756..178f4ec4f82 100644 --- a/net/py-IP/Makefile +++ b/net/py-IP/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2012/10/23 17:19:01 asau Exp $ +# $NetBSD: Makefile,v 1.19 2014/01/25 10:30:16 wiz Exp $ DISTNAME= IPy-0.75 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/IPy/IP/} @@ -10,8 +10,6 @@ HOMEPAGE= https://github.com/haypo/python-ipy/ COMMENT= Python module to handle IPv4 and IPv6 address LICENSE= modified-bsd -PYTHON_VERSIONS_INCLUDE_3X= yes - do-test: ${RUN}cd ${WRKSRC}/test; ${SETENV} ${TEST_ENV} ${PYTHONBIN} test_IPy.py diff --git a/net/py-ORBit/Makefile b/net/py-ORBit/Makefile index d16e45b9ff9..96f389771df 100644 --- a/net/py-ORBit/Makefile +++ b/net/py-ORBit/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2013/01/21 11:49:19 wiz Exp $ -# +# $NetBSD: Makefile,v 1.47 2014/01/25 10:30:16 wiz Exp $ DISTNAME= pyorbit-2.24.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/pyorbit/ORBit/} @@ -24,6 +23,8 @@ PYTHON_SELF_CONFLICT= YES BUILDLINK_API_DEPENDS.python26+= python26>=2.6.2nb4 +PYTHON_VERSIONS_INCOMPATIBLE= 33 # dead upstream, no plans to port + .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "SunOS" BUILDLINK_TRANSFORM+= rm:-std=c9x diff --git a/net/py-boto/Makefile b/net/py-boto/Makefile index f94e0f669ec..fac58018860 100644 --- a/net/py-boto/Makefile +++ b/net/py-boto/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2012/11/11 21:31:08 jakllsch Exp $ -# +# $NetBSD: Makefile,v 1.20 2014/01/25 10:30:16 wiz Exp $ DISTNAME= boto-2.6.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -18,6 +17,8 @@ REPLACE_PYTHON+= *.py REPLACE_PYTHON+= boto/*/*.py REPLACE_PYTHON+= bin/* +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-filechunkio + .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/py-dns3/Makefile b/net/py-dns3/Makefile index c8810b76e12..1f471d91d68 100644 --- a/net/py-dns3/Makefile +++ b/net/py-dns3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2014/01/20 11:10:04 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2014/01/25 10:30:16 wiz Exp $ DISTNAME= dnspython3-1.11.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/python3-/-/} @@ -12,7 +12,6 @@ LICENSE= modified-bsd USE_LANGUAGES= # none PYTHON_VERSIONS_INCOMPATIBLE= 26 27 -PYTHON_VERSIONS_INCLUDE_3X= yes .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/py-foolscap/Makefile b/net/py-foolscap/Makefile index a66277d51a2..9a4c867ddce 100644 --- a/net/py-foolscap/Makefile +++ b/net/py-foolscap/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2012/10/23 17:19:02 asau Exp $ -# +# $NetBSD: Makefile,v 1.9 2014/01/25 10:30:16 wiz Exp $ DISTNAME= foolscap-0.6.4 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/.tar//} @@ -16,6 +15,8 @@ DEPENDS+= ${PYPKGPREFIX}-ZopeInterface>=3.6.1:../../devel/py-ZopeInterface DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted DEPENDS+= ${PYPKGPREFIX}-OpenSSL>=0.6:../../security/py-OpenSSL +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-twisted + TEST_TARGET= test USE_LANGUAGES= # none diff --git a/net/py-google/Makefile b/net/py-google/Makefile index 34e3a20c7ea..a0558c731c6 100644 --- a/net/py-google/Makefile +++ b/net/py-google/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2012/10/23 17:19:02 asau Exp $ -# +# $NetBSD: Makefile,v 1.32 2014/01/25 10:30:17 wiz Exp $ DISTNAME= pygoogle-0.6 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -15,5 +14,7 @@ DEPENDS+= ${PYPKGPREFIX}-SOAPpy-[0-9]*:../../net/py-soappy EGG_NAME= pygoogle-0.5 +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-xml via py-soappy + .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/py-kenosis/Makefile b/net/py-kenosis/Makefile index 7b4b3fbd91d..3fd38c7ee64 100644 --- a/net/py-kenosis/Makefile +++ b/net/py-kenosis/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2012/10/23 17:19:02 asau Exp $ -# +# $NetBSD: Makefile,v 1.15 2014/01/25 10:30:17 wiz Exp $ DISTNAME= kenosis-0.96 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -17,6 +16,7 @@ DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat USE_LANGUAGES= # empty PYSETUP= kenosis_setup.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.96 .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/py-libdnet/Makefile b/net/py-libdnet/Makefile index c0b702ee843..d1f2959e9ff 100644 --- a/net/py-libdnet/Makefile +++ b/net/py-libdnet/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2012/10/23 17:19:02 asau Exp $ -# +# $NetBSD: Makefile,v 1.12 2014/01/25 10:30:17 wiz Exp $ DISTNAME= libdnet-1.12 PKGNAME= ${PYPKGPREFIX}-libdnet-1.12 @@ -15,6 +14,7 @@ LICENSE= modified-bsd GNU_CONFIGURE= yes PYSETUPSUBDIR= python +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.12 EGG_NAME= ${DISTNAME:S/^lib//} diff --git a/net/py-libpcap/Makefile b/net/py-libpcap/Makefile index 8e4b1e267e2..c7155bf78be 100644 --- a/net/py-libpcap/Makefile +++ b/net/py-libpcap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2013/06/15 20:18:14 adam Exp $ +# $NetBSD: Makefile,v 1.14 2014/01/25 10:30:17 wiz Exp $ DISTNAME= pylibpcap-0.6.4 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/^py//} @@ -12,6 +12,8 @@ LICENSE= modified-bsd BUILDLINK_API_DEPENDS.libpcap+= libpcap>=0.9.3nb1 +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.6.4 + pre-build: (cd ${WRKSRC} && ${PYTHONBIN} mk-constants.py) diff --git a/net/py-medusa/Makefile b/net/py-medusa/Makefile index 6e5cb708bba..4c47da11096 100644 --- a/net/py-medusa/Makefile +++ b/net/py-medusa/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2012/10/23 17:19:02 asau Exp $ -# +# $NetBSD: Makefile,v 1.5 2014/01/25 10:30:17 wiz Exp $ DISTNAME= medusa-0.5.4 PKGREVISION= 1 @@ -13,5 +12,7 @@ COMMENT= Framework for writing asynchronous socket-based servers USE_LANGUAGES= # none +PYTHON_VERSIONS_INCOMPATIBLE= 33 + .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/py-netifaces/Makefile b/net/py-netifaces/Makefile index 22882f3b094..88c8990a7fc 100644 --- a/net/py-netifaces/Makefile +++ b/net/py-netifaces/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2012/11/26 13:55:00 ryoon Exp $ -# +#y$NetBSD: Makefile,v 1.2 2014/01/25 10:30:17 wiz Exp $ DISTNAME= netifaces-0.8 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,7 +10,7 @@ HOMEPAGE= http://alastairs-place.net/projects/netifaces/ COMMENT= Portable access to network interfaces from Python LICENSE= mit -PYDISTUTILSPKG= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.8 .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/py-omniORBpy/Makefile b/net/py-omniORBpy/Makefile index 6a92a84ac5e..0a846e177dd 100644 --- a/net/py-omniORBpy/Makefile +++ b/net/py-omniORBpy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2012/10/23 17:19:03 asau Exp $ +# $NetBSD: Makefile,v 1.8 2014/01/25 10:30:17 wiz Exp $ DISTNAME= omniORBpy-3.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -18,6 +18,7 @@ USE_LANGUAGES+= c c++ MAKE_FILE= GNUmakefile PYTHON_SELF_CONFLICT= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # omniORB .include "../../lang/python/application.mk" .include "../../net/omniORB/buildlink3.mk" diff --git a/net/py-pcap/Makefile b/net/py-pcap/Makefile index 3ded00fc7eb..3f4baf6cae9 100644 --- a/net/py-pcap/Makefile +++ b/net/py-pcap/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2013/02/06 19:31:00 jperkin Exp $ -# +# $NetBSD: Makefile,v 1.4 2014/01/25 10:30:17 wiz Exp $ DISTNAME= pypcap-1.1 PKGNAME= ${PYPKGPREFIX}-pcap-1.1 @@ -24,6 +23,7 @@ SUBST_SED.prefix= -e "s|@PREFIX@|${PREFIX}|g" SUBST_STAGE.prefix= post-patch PYDISTUTILSPKG= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-pyrex FILES_SUBST+= PYTHONBIN=${PYTHONBIN:Q} diff --git a/net/py-s3cmd/Makefile b/net/py-s3cmd/Makefile index 71fed0f2357..d6c6f2373ed 100644 --- a/net/py-s3cmd/Makefile +++ b/net/py-s3cmd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2012/10/23 17:19:03 asau Exp $ +# $NetBSD: Makefile,v 1.12 2014/01/25 10:30:17 wiz Exp $ DISTNAME= s3cmd-1.0.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -15,6 +15,7 @@ PYDISTUTILSPKG= yes MAKE_ENV+= S3CMD_INSTPATH_MAN=${PKGMANDIR} PYTHON_SELF_CONFLICT= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.0.1 .include "../../lang/python/pyversion.mk" diff --git a/net/py-soaplib/Makefile b/net/py-soaplib/Makefile index cf6efd8231f..60a52e10510 100644 --- a/net/py-soaplib/Makefile +++ b/net/py-soaplib/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2012/10/23 17:19:03 asau Exp $ -# +# $NetBSD: Makefile,v 1.16 2014/01/25 10:30:17 wiz Exp $ DISTNAME= soaplib-0.8-20000621 PKGNAME= ${PYPKGPREFIX}-soaplib-0.8 @@ -12,8 +11,6 @@ MAINTAINER= drochner@NetBSD.org HOMEPAGE= http://www.pythonware.com/products/soap/index.htm COMMENT= Implementation of the SOAP 1.1 protocol -PYTHON_VERSIONS_INCLUDE_3X= yes - WRKSRC= ${WRKDIR} NO_BUILD= yes diff --git a/net/py-soappy/Makefile b/net/py-soappy/Makefile index 424eb3895b1..bd1bdb74e01 100644 --- a/net/py-soappy/Makefile +++ b/net/py-soappy/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2012/10/23 17:19:03 asau Exp $ -# +# $NetBSD: Makefile,v 1.30 2014/01/25 10:30:17 wiz Exp $ DISTNAME= SOAPpy-0.11.6 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -16,5 +15,7 @@ DEPENDS+= ${PYPKGPREFIX}-xml>=0.8.3:../../textproc/py-xml USE_LANGUAGES= # empty +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-xml + .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/py-socketpool/Makefile b/net/py-socketpool/Makefile index 5431c500a6a..75562e540af 100644 --- a/net/py-socketpool/Makefile +++ b/net/py-socketpool/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2013/12/31 20:02:38 rodent Exp $ +# $NetBSD: Makefile,v 1.3 2014/01/25 10:30:17 wiz Exp $ DISTNAME= socketpool-0.5.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} CATEGORIES= net MASTER_SITES= https://pypi.python.org/packages/source/s/socketpool/ -FETCH_USING= curl MAINTAINER= rodent@NetBSD.org HOMEPAGE= https://github.com/benoitc/socketpool @@ -16,6 +15,8 @@ USE_LANGUAGES= # none DOCDIR= share/doc/${PKGBASE:S/${PYPKGPREFIX}/py/1} INSTALLATION_DIRS+= ${DOCDIR} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.5.3 + post-install: ${INSTALL_DATA} ${DESTDIR}${PREFIX}/socketpool/README.rst \ ${DESTDIR}${PREFIX}/${DOCDIR} diff --git a/net/py-spreadmodule/Makefile b/net/py-spreadmodule/Makefile index 6b5e0c5927a..b1f7fab1289 100644 --- a/net/py-spreadmodule/Makefile +++ b/net/py-spreadmodule/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2012/10/23 17:19:03 asau Exp $ -# +# $NetBSD: Makefile,v 1.14 2014/01/25 10:30:17 wiz Exp $ DISTNAME= SpreadModule-1.4 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/SpreadModule/spreadmodule/} @@ -18,6 +17,8 @@ SUBST_STAGE.setup= post-patch SUBST_FILES.setup= setup.py SUBST_SED.setup= -e 's,/usr/local,${BUILDLINK_PREFIX.spread},g' +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.4 + .include "../../net/spread/buildlink3.mk" .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/py-suds/Makefile b/net/py-suds/Makefile index c02e727975f..4520c1cf8a1 100644 --- a/net/py-suds/Makefile +++ b/net/py-suds/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2012/10/23 17:19:03 asau Exp $ +# $NetBSD: Makefile,v 1.3 2014/01/25 10:30:17 wiz Exp $ DISTNAME= suds-0.4 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,6 +12,7 @@ LICENSE= gnu-lgpl-v3 EGG_NAME= ${DISTNAME} USE_LANGUAGES= # empty +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.4 .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/py-twisted/Makefile.common b/net/py-twisted/Makefile.common index 0b47c29e725..15d1241b1fb 100644 --- a/net/py-twisted/Makefile.common +++ b/net/py-twisted/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.13 2013/11/13 07:06:58 adam Exp $ +# $NetBSD: Makefile.common,v 1.14 2014/01/25 10:30:17 wiz Exp $ # used by net/py-twisted/Makefile # used by net/py-twisted-docs/Makefile @@ -13,3 +13,5 @@ LICENSE= mit DISTINFO_FILE?= ${.CURDIR}/../py-twisted/distinfo PATCHDIR?= ${.CURDIR}/../py-twisted/patches + +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 13.2.0 diff --git a/net/py-zmq/Makefile b/net/py-zmq/Makefile index 5bcec971a1e..f690759256a 100644 --- a/net/py-zmq/Makefile +++ b/net/py-zmq/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2013/07/31 12:16:57 drochner Exp $ -# +# $NetBSD: Makefile,v 1.12 2014/01/25 10:30:17 wiz Exp $ DISTNAME= pyzmq-13.1.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -19,8 +18,6 @@ REPLACE_PYTHON+= zmq/eventloop/minitornado/platform/interface.py REPLACE_PYTHON+= zmq/eventloop/minitornado/platform/posix.py REPLACE_PYTHON+= zmq/eventloop/minitornado/stack_context.py -PYTHON_VERSIONS_INCLUDE_3X= yes - .include "../../lang/python/application.mk" .include "../../lang/python/distutils.mk" .include "../../net/zeromq/buildlink3.mk" diff --git a/net/py-zsi/Makefile b/net/py-zsi/Makefile index 07d94d3d118..e95fb5f55cf 100644 --- a/net/py-zsi/Makefile +++ b/net/py-zsi/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2012/10/23 17:19:04 asau Exp $ -# +# $NetBSD: Makefile,v 1.19 2014/01/25 10:30:18 wiz Exp $ DISTNAME= ZSI-2.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -15,6 +14,8 @@ DEPENDS+= ${PYPKGPREFIX}-xml>=0.8.3:../../textproc/py-xml USE_LANGUAGES= # none +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-xml + PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} post-extract: diff --git a/net/pygopherd/Makefile b/net/pygopherd/Makefile index c802d6501e1..fc45c3e7bd6 100644 --- a/net/pygopherd/Makefile +++ b/net/pygopherd/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2013/07/12 10:45:00 jperkin Exp $ -# +# $NetBSD: Makefile,v 1.25 2014/01/25 10:30:18 wiz Exp $ DISTNAME= pygopherd_2.0.16 PKGREVISION= 4 @@ -34,6 +33,7 @@ RCD_SCRIPTS= pygopherd FILES_SUBST+= RUNTIMEDIR=${RUNTIMEDIR:Q} FILES_SUBST+= PYTHONBIN=${PYTHONBIN:Q} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.0.16 PYTHON_PATCH_SCRIPTS= bin/pygopherd PYTHON_PATCH_SCRIPTS+= pygopherd/GopherExceptionsTest.py PYTHON_PATCH_SCRIPTS+= pygopherd/fileextTest.py diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile index b37b2df595e..ca8b252fb07 100644 --- a/net/rabbitmq/Makefile +++ b/net/rabbitmq/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2014/01/13 12:10:23 fhajny Exp $ -# +# $NetBSD: Makefile,v 1.15 2014/01/25 10:30:18 wiz Exp $ PKGNAME= rabbitmq-${RMQ_VERSION} PKGREVISION= 2 @@ -22,6 +21,8 @@ BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto DEPENDS+= coreutils-[0-9]*:../../sysutils/coreutils DEPENDS+= ${PYPKGPREFIX}-simplejson>=2:../../converters/py-simplejson +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 3.2.2 + .include "version.mk" .include "../../lang/python/pyversion.mk" diff --git a/net/scapy/Makefile b/net/scapy/Makefile index 8fba3c7d117..0e7df887531 100644 --- a/net/scapy/Makefile +++ b/net/scapy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2013/06/15 20:24:19 adam Exp $ +# $NetBSD: Makefile,v 1.16 2014/01/25 10:30:18 wiz Exp $ DISTNAME= scapy-2.2.0 CATEGORIES= net @@ -15,6 +15,8 @@ DEPENDS+= ${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline NO_BUILD= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-libpcap, py-libdnet + INSTALLATION_DIRS+= share/examples/scapy .include "options.mk" diff --git a/net/scapy/options.mk b/net/scapy/options.mk index 87eb1052a42..44cfccdea6d 100644 --- a/net/scapy/options.mk +++ b/net/scapy/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2011/10/16 04:16:49 obache Exp $ +# $NetBSD: options.mk,v 1.3 2014/01/25 10:30:18 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.scapy @@ -18,11 +18,13 @@ DEPENDS+= ${PYPKGPREFIX}-amkCrypto-[0-9]*:../../security/py-amkCrypto ### .if !empty(PKG_OPTIONS:Mgnuplot) DEPENDS+= ${PYPKGPREFIX}-gnuplot-[0-9]*:../../graphics/py-gnuplot +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gnuplot .endif ### ### Add in TeX support for psdump() and/or pdfdump() ### .if !empty(PKG_OPTIONS:Mscapy-pyx) -DEPENDS+= ${PYPKGPREFIX}-X-[0-9]*:../../textproc/py-X +PYTHON_VERSIONED_DEPENDENCIES= X +.include "../../lang/python/versioned_dependencies.mk" .endif diff --git a/net/upnpinspector/Makefile b/net/upnpinspector/Makefile index 2069dda9f6d..089280a356a 100644 --- a/net/upnpinspector/Makefile +++ b/net/upnpinspector/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2013/09/01 09:19:16 obache Exp $ -# +# $NetBSD: Makefile,v 1.7 2014/01/25 10:30:18 wiz Exp $ DISTNAME= UPnP-Inspector-0.2.2 PKGREVISION= 3 @@ -17,5 +16,7 @@ DEPENDS+= ${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2 USE_LANGUAGES= # none EGG_NAME= UPnP_Inspector-0.2.2 +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 + .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index fde6ccd4b8e..88ba6078c37 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.114 2014/01/01 11:52:31 wiz Exp $ +# $NetBSD: Makefile,v 1.115 2014/01/25 10:30:18 wiz Exp $ DISTNAME= wireshark-1.10.5 PKGREVISION= 1 @@ -34,6 +34,7 @@ CONFIGURE_ENV+= ac_cv_path_LEXDUMMY=${TOOLS_PATH.lex} PTHREAD_OPTS+= require PYTHON_FOR_BUILD_ONLY= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.10.5 REPLACE_PYTHON+= help/faq.py REPLACE_PYTHON+= tools/asn2deb REPLACE_PYTHON+= tools/asn2wrs.py diff --git a/news/hellanzb/Makefile b/news/hellanzb/Makefile index a80bd01a578..e8a6de74a37 100644 --- a/news/hellanzb/Makefile +++ b/news/hellanzb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2012/10/08 12:27:40 asau Exp $ +# $NetBSD: Makefile,v 1.11 2014/01/25 10:30:18 wiz Exp $ # .include "../../news/hellanzb/Makefile.version" @@ -17,6 +17,8 @@ DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat DEPENDS+= par2>=0.4:../../archivers/par2 DEPENDS+= unrar>=3.5.4:../../archivers/unrar +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-twisted + USE_LANGUAGES= #none EGDIR= ${PREFIX}/share/examples/${PKGBASE} diff --git a/news/lottanzb/Makefile b/news/lottanzb/Makefile index 5b4f2c003ac..df68cab90a6 100644 --- a/news/lottanzb/Makefile +++ b/news/lottanzb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2012/10/08 12:27:41 asau Exp $ +# $NetBSD: Makefile,v 1.21 2014/01/25 10:30:18 wiz Exp $ DISTNAME= lottanzb-0.4.1 PKGREVISION= 1 @@ -18,6 +18,7 @@ USE_PKGLOCALEDIR= yes USE_TOOLS+= intltool msgfmt REPLACE_PYTHON= lottanzb/postprocessor.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 via py-kiwi SUBST_CLASSES+= localedir SUBST_STAGE.localedir= pre-configure diff --git a/pkgtools/gnome-packagekit/Makefile b/pkgtools/gnome-packagekit/Makefile index 3f2787cf911..fc8234a7755 100644 --- a/pkgtools/gnome-packagekit/Makefile +++ b/pkgtools/gnome-packagekit/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2013/10/19 09:07:11 adam Exp $ -# +# $NetBSD: Makefile,v 1.41 2014/01/25 10:30:18 wiz Exp $ DISTNAME= gnome-packagekit-0.4.0 PKGREVISION= 32 @@ -18,6 +17,7 @@ USE_PKGLOCALEDIR= yes GCONF_SCHEMAS+= gnome-packagekit.schemas PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.4.0 # needed for gnome-packagekit-0.4 and gtk2-2.20 -- remove on next update BUILDLINK_TRANSFORM+= rm:-DG_DISABLE_DEPRECATED diff --git a/pkgtools/packagekit/Makefile b/pkgtools/packagekit/Makefile index a209d596a84..baa9933daaa 100644 --- a/pkgtools/packagekit/Makefile +++ b/pkgtools/packagekit/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2013/10/19 09:06:56 adam Exp $ -# +# $NetBSD: Makefile,v 1.39 2014/01/25 10:30:18 wiz Exp $ DISTNAME= PackageKit-0.4.0 PKGREVISION= 30 @@ -48,6 +47,7 @@ PKGCONFIG_OVERRIDE+= data/packagekit-qt.pc.in PKGCONFIG_OVERRIDE+= data/packagekit-glib.pc.in PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.4.0 REPLACE_PYTHON= backends/test/helpers/PackageKitDbusTest.py \ lib/python/packagekit/client.py \ diff --git a/print/hplip/Makefile b/print/hplip/Makefile index f4ce218fc64..8bc6fb248f2 100644 --- a/print/hplip/Makefile +++ b/print/hplip/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2014/01/23 14:58:28 schnoebe Exp $ -# +# $NetBSD: Makefile,v 1.31 2014/01/25 10:30:18 wiz Exp $ DISTNAME= hplip-3.14.1 CATEGORIES= print @@ -18,6 +17,8 @@ FILES_SUBST+= CUPS_GROUP=${CUPS_GROUP} PKG_GROUPS_VARS+= CUPS_GROUP PKG_USERS_VARS+= CUPS_USER +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-xml + BUILD_DEFS+= CUPS_USER CUPS_GROUP VARBASE GNU_CONFIGURE= yes diff --git a/print/hplip/options.mk b/print/hplip/options.mk index aa4c1c16a6b..766c7bd4a94 100644 --- a/print/hplip/options.mk +++ b/print/hplip/options.mk @@ -1,8 +1,7 @@ -# $NetBSD: options.mk,v 1.2 2013/04/12 03:47:30 schnoebe Exp $ +# $NetBSD: options.mk,v 1.3 2014/01/25 10:30:18 wiz Exp $ # # HPLIP dependencies are detailed in the following page: # http://hplipopensource.com/hplip-web/install/manual/distros/other.html -# PKG_OPTIONS_VAR= PKG_OPTIONS.hplip PKG_SUPPORTED_OPTIONS= fax sane qt @@ -19,6 +18,7 @@ CONFIGURE_ARGS+= --enable-dbus-build EGFILES+= cups/pstotiff.convs cups/pstotiff.types MAKE_DIRS+= ${PKG_SYSCONFDIR}/cups DEPENDS+= ${PYPKGPREFIX}-reportlab-[0-9]*:../../print/py-reportlab +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-reportlab .include "../../sysutils/dbus/buildlink3.mk" .include "../../sysutils/py-dbus/buildlink3.mk" .else @@ -32,7 +32,9 @@ CONFIGURE_ARGS+= --enable-scan-build MESSAGE_SRC+= MESSAGE.scan MESSAGE_SUBST+= EGDIR=${EGDIR} .include "../../graphics/sane-backends/buildlink3.mk" +# XXX: a dependency installs py-Pillow, which conflicts .include "../../graphics/py-imaging/buildlink3.mk" +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-imaging .else CONFIGURE_ARGS+= --disable-scan-build .endif @@ -47,6 +49,7 @@ MAKE_DIRS+= ${PKG_SYSCONFDIR}/dbus-1/system.d .include "../../x11/py-qt4/buildlink3.mk" .include "../../security/policykit/buildlink3.mk" DEPENDS+= ${PYPKGPREFIX}-notify-[0-9]*:../../sysutils/py-notify +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-notify .else CONFIGURE_ARGS+= --disable-policykit CONFIGURE_ARGS+= --disable-qt4 diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile index a45f075ef5c..4272118a99e 100644 --- a/print/lilypond/Makefile +++ b/print/lilypond/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.96 2014/01/05 22:29:47 wiz Exp $ +# $NetBSD: Makefile,v 1.97 2014/01/25 10:30:18 wiz Exp $ DISTNAME= lilypond-2.18.0 CATEGORIES= print @@ -52,6 +52,7 @@ CONFIGURE_ARGS+= --with-ncsb-dir=${PREFIX}/share/fonts/urw CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} REPLACE_PYTHON+= scripts/build/yyout2grammar.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.18.0 PLIST_SUBST+= PKGVERSION=${PKGVERSION:S/nb${PKGREVISION}//} # needs FlexLexer.h diff --git a/print/py-pisa/Makefile b/print/py-pisa/Makefile index b76d732def4..56935796cac 100644 --- a/print/py-pisa/Makefile +++ b/print/py-pisa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2012/10/08 13:45:45 asau Exp $ +# $NetBSD: Makefile,v 1.9 2014/01/25 10:30:18 wiz Exp $ DISTNAME= pisa-3.0.33 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -14,6 +14,8 @@ DEPENDS+= ${PYPKGPREFIX}-Pdf-[0-9]*:../../print/py-Pdf DEPENDS+= ${PYPKGPREFIX}-reportlab>=2.2:../../print/py-reportlab DEPENDS+= ${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-reportlab + # remove CRs: fixes patching on Darwin and stops pkglint from complaining pre-patch: .for f in css.py cssDOMElementInterface.py diff --git a/print/py-poppler/Makefile b/print/py-poppler/Makefile index 87275ca6a5e..8cf09f753b2 100644 --- a/print/py-poppler/Makefile +++ b/print/py-poppler/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2013/12/06 13:23:47 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2014/01/25 10:30:18 wiz Exp $ DISTNAME= pypoppler-0.12.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -15,11 +15,12 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= pkg-config PY_PATCHPLIST= yes +PYTHON_VERSIONED_DEPENDENCIES= cairo:link +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 .include "../../lang/python/extension.mk" .include "../../devel/atk/buildlink3.mk" -BUILDLINK_API_DEPENDS.pycairo+= ${PYPKGPREFIX}-cairo>=1.8.4 -.include "../../graphics/py-cairo/buildlink3.mk" +.include "../../lang/python/versioned_dependencies.mk" BUILDLINK_API_DEPENDS.poppler-glib+= poppler-glib>=0.12.1 .include "../../print/poppler-glib/buildlink3.mk" BUILDLINK_API_DEPENDS.pygtk2+= ${PYPKGPREFIX}-gtk2>=2.8.4 diff --git a/print/py-pslib/Makefile b/print/py-pslib/Makefile index 836a0246991..fb5171dcf27 100644 --- a/print/py-pslib/Makefile +++ b/print/py-pslib/Makefile @@ -1,17 +1,15 @@ -# $NetBSD: Makefile,v 1.10 2012/10/08 13:45:46 asau Exp $ -# +# $NetBSD: Makefile,v 1.11 2014/01/25 10:30:18 wiz Exp $ -DISTNAME= python-pslib_0.2.0.orig -PKGNAME= ${PYPKGPREFIX}-pslib-0.2.0 -PKGREVISION= 3 -CATEGORIES= print -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pslib/} +DISTNAME= python-pslib_0.2.0.orig +PKGNAME= ${PYPKGPREFIX}-pslib-0.2.0 +PKGREVISION= 3 +CATEGORIES= print +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pslib/} -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://pslib.sourceforge.net/ -COMMENT= Python bindings for pslib +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://pslib.sourceforge.net/ +COMMENT= Python bindings for pslib -PYTHON_VERSIONS_INCLUDE_3X= yes WRKSRC= ${WRKDIR}/python-pslib-0.2.0 diff --git a/print/py-reportlab/Makefile b/print/py-reportlab/Makefile index 24e61d24e58..8574d747d60 100644 --- a/print/py-reportlab/Makefile +++ b/print/py-reportlab/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2014/01/19 09:59:47 wiz Exp $ +# $NetBSD: Makefile,v 1.50 2014/01/25 10:30:19 wiz Exp $ DISTNAME= reportlab-2.7 DISTFILES= ${DEFAULT_DISTFILES} pfbfer.zip @@ -17,7 +17,7 @@ DEPENDS+= {${PYPKGPREFIX}-imaging-[0-9]*,${PYPKGPREFIX}-Pillow-[0-9]*}:../../gra EXTRACT_DIR.pfbfer.zip= ${WRKSRC}/src/reportlab/fonts -PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.7 +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.7; py-imaging REPLACE_PYTHON+= demos/tests/testdemos.py REPLACE_PYTHON+= docs/genAll.py diff --git a/print/scribus-qt4/Makefile b/print/scribus-qt4/Makefile index c74a9f74ee3..d3177f084f8 100644 --- a/print/scribus-qt4/Makefile +++ b/print/scribus-qt4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2013/12/15 19:44:02 joerg Exp $ +# $NetBSD: Makefile,v 1.29 2014/01/25 10:30:19 wiz Exp $ DISTNAME= scribus-1.4.3 CATEGORIES= print @@ -19,6 +19,8 @@ CMAKE_ARGS+= -DPNG_LIBRARY_RELEASE=${LOCALBASE}/lib # XXX not yet #CMAKE_ARGS+= -DWANT_HUNSPELL:BOOL=ON +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.4.3 + INSTALLATION_DIRS+= share/pixmaps .include "../../mk/compiler.mk" diff --git a/print/scribus/Makefile b/print/scribus/Makefile index 5e73563cffc..a749ec90b82 100644 --- a/print/scribus/Makefile +++ b/print/scribus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.92 2013/10/20 17:56:26 joerg Exp $ +# $NetBSD: Makefile,v 1.93 2014/01/25 10:30:19 wiz Exp $ DISTNAME= scribus-1.3.3.14 PKGREVISION= 18 @@ -21,6 +21,8 @@ USE_CMAKE= yes LDFLAGS.DragonFly= -lX11 +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.3.3.14 + CONFIGURE_ENV+= FREETYPE_DIR=${BUILDLINK_PREFIX.freetype2} CONFIGURE_ARGS+= --enable-cairo CONFIGURE_ARGS+= --with-extra-includes=${PREFIX}/include diff --git a/security/botan/Makefile b/security/botan/Makefile index 98b7a338d70..ddabc3bac28 100644 --- a/security/botan/Makefile +++ b/security/botan/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2013/01/23 16:45:27 riz Exp $ +# $NetBSD: Makefile,v 1.30 2014/01/25 10:30:19 wiz Exp $ DISTNAME= Botan-1.8.14 PKGNAME= ${DISTNAME:tl} @@ -15,6 +15,7 @@ HAS_CONFIGURE= yes USE_LANGUAGES= c++ PYTHON_FOR_BUILD_ONLY= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.8.14; 1.10 is supposedly better CONFIG_SHELL= ${PYTHONBIN} CONFIGURE_SCRIPT= ./configure.py diff --git a/security/libprelude-python/Makefile b/security/libprelude-python/Makefile index 6ea660c0c49..910912d50fb 100644 --- a/security/libprelude-python/Makefile +++ b/security/libprelude-python/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2014/01/01 11:52:32 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2014/01/25 10:30:19 wiz Exp $ PKGNAME= libprelude-python-${VERSION} PKGREVISION= 7 @@ -15,6 +15,8 @@ BUILD_DIRS= bindings/low-level/python bindings/python PKG_OPTIONS_VAR= PKG_OPTIONS.libprelude PKG_SUPPORTED_OPTIONS= debug +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.9.24.1 + .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mdebug) diff --git a/security/libpreludedb-python/Makefile b/security/libpreludedb-python/Makefile index 287bb789d8e..749d1a3c1b7 100644 --- a/security/libpreludedb-python/Makefile +++ b/security/libpreludedb-python/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2014/01/01 11:52:32 wiz Exp $ -# +# $NetBSD: Makefile,v 1.12 2014/01/25 10:30:19 wiz Exp $ PKGNAME= libpreludedb-python-${VERSION} PKGREVISION= 8 @@ -17,6 +16,8 @@ PYBINMODULE= yes PY_PATCHPLIST= yes BUILD_DIRS= bindings +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.9.24.1 + .include "../../lang/python/application.mk" .include "../../lang/python/extension.mk" .include "../../security/libpreludedb/buildlink3.mk" diff --git a/security/prelude-correlator/Makefile b/security/prelude-correlator/Makefile index b06f16035bb..30126522147 100644 --- a/security/prelude-correlator/Makefile +++ b/security/prelude-correlator/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2013/07/12 10:45:02 jperkin Exp $ -# +# $NetBSD: Makefile,v 1.12 2014/01/25 10:30:19 wiz Exp $ DISTNAME= prelude-correlator-0.9.0-beta8 PKGNAME= prelude-correlator-${DISTNAME:S/-beta/beta/:C/.*-//} @@ -41,7 +40,7 @@ SUBST_FILES.code= run-prelude-correlator.c SUBST_FILES.code+= ${WRKSRC}/*.py SUBST_SED.code= -e 's,@PREFIX@,${PREFIX},g' SUBST_SED.code+= -e 's,@PRELUDE_USER@,${PRELUDE_USER},g' -SUBST_SED.code+= -e 's,@PRELUDE_HOME@,${PRELUDE_HOME},g' +SUBST_SED.code+= -e 's,@PRELUDE_HOME@,${PRELUDE_HOME},g' CONF_FILES+= ${EGDIR}/prelude-correlator.conf ${PKG_SYSCONFDIR}/prelude-correlator/prelude-correlator.conf CONF_FILES+= ${EGDIR}/dshield.dat ${PRELUDE_HOME}/dshield.dat @@ -51,7 +50,7 @@ REQD_DIRS+= ${PRELUDE_HOME} REQD_DIRS_PERMS+= ${PRELUDE_HOME} ${PRELUDE_USER} ${PRELUDE_GROUP} 0700 REPLACE_PYTHON= ${WRKSRC}/*.py - +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.9.0beta8 EGG_NAME= prelude_correlator-0.9.0_beta8 pre-patch: diff --git a/security/py-OpenSSL/Makefile b/security/py-OpenSSL/Makefile index 2a62ede9085..a7340de5845 100644 --- a/security/py-OpenSSL/Makefile +++ b/security/py-OpenSSL/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2013/09/09 17:49:08 drochner Exp $ +# $NetBSD: Makefile,v 1.30 2014/01/25 10:30:19 wiz Exp $ DISTNAME= pyOpenSSL-0.13.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -10,8 +10,6 @@ HOMEPAGE= https://launchpad.net/pyopenssl/ COMMENT= Python interface to the OpenSSL library LICENSE= apache-2.0 -PYTHON_VERSIONS_INCLUDE_3X= yes - .include "../../lang/python/distutils.mk" .include "../../security/openssl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/py-crack/Makefile b/security/py-crack/Makefile index ecdefd8cc3d..a899d4796ec 100644 --- a/security/py-crack/Makefile +++ b/security/py-crack/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2012/10/23 18:16:53 asau Exp $ -# +# $NetBSD: Makefile,v 1.12 2014/01/25 10:30:19 wiz Exp $ DISTNAME= pycrack-0.01 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:C/py//} @@ -12,8 +11,6 @@ HOMEPAGE= http://www.digitalevacuation.org/ COMMENT= Python interface to cracklib LICENSE= gnu-gpl-v2 -PYTHON_VERSIONS_INCLUDE_3X= yes - DEPENDS+= crack>=5.0:../../security/crack .include "../../lang/python/distutils.mk" diff --git a/security/py-cryptkit/Makefile b/security/py-cryptkit/Makefile index fed55cfd46b..24e4b5f365f 100644 --- a/security/py-cryptkit/Makefile +++ b/security/py-cryptkit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2012/10/23 18:16:53 asau Exp $ +# $NetBSD: Makefile,v 1.16 2014/01/25 10:30:19 wiz Exp $ DISTNAME= cryptkit-0.9 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -7,8 +7,10 @@ CATEGORIES= security python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cryptkit/} MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://cryptkit.sourceforge.net/ +HOMEPAGE= http://sourceforge.net/projects/cryptkit/ COMMENT= Python Cryptographic Toolkit +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.9 + .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/py-crypto/Makefile b/security/py-crypto/Makefile index 956436aabbd..1ae8b8fb4a6 100644 --- a/security/py-crypto/Makefile +++ b/security/py-crypto/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2013/12/16 01:03:02 gdt Exp $ -# +# $NetBSD: Makefile,v 1.34 2014/01/25 10:30:19 wiz Exp $ DISTNAME= pycrypto-2.6.1 PKGNAME= ${DISTNAME:S/^py/${PYPKGPREFIX}-/} @@ -15,8 +14,6 @@ LICENSE= python-software-foundation CONFLICTS+= ${PYPKGPREFIX}-amkCrypto-[0-9]* SUPERSEDES+= ${PYPKGPREFIX}-amkCrypto-[0-9]* -PYTHON_VERSIONS_INCLUDE_3X= yes - GNU_CONFIGURE= yes do-test: diff --git a/security/py-cryptopp/Makefile b/security/py-cryptopp/Makefile index 938213d204a..956d4cd9a19 100644 --- a/security/py-cryptopp/Makefile +++ b/security/py-cryptopp/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2012/10/23 18:16:53 asau Exp $ -# +# $NetBSD: Makefile,v 1.10 2014/01/25 10:30:19 wiz Exp $ VERSION= 0.6.0 VERSION_EXCESSIVE= 1206569328141510525648634803928199668821045408958 @@ -11,17 +10,14 @@ MASTER_SITES= http://pypi.python.org/packages/source/p/pycryptopp/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://tahoe-lafs.org/trac/pycryptopp COMMENT= Python wrapper for (and copy of parts of) crypto++ - # GPL v2 or later. # or Transitive Grace Period Public Licence, version 1.0 or later. LICENSE= gnu-gpl-v2 USE_LANGUAGES= c c++ -REPLACE_INTERPRETER+= python -REPLACE.python.old= /usr/bin/env python -REPLACE.python.new= ${PYTHONBIN} -REPLACE_FILES.python= pycryptopp/test/*.py +REPLACE_PYTHON= pycryptopp/test/*.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.6.0.120... # It would be nice if egg.mk had support for this. #TEST_TARGET= @python@ setup.py test diff --git a/security/py-denyhosts/Makefile b/security/py-denyhosts/Makefile index 9add3f46cc8..195bb743659 100644 --- a/security/py-denyhosts/Makefile +++ b/security/py-denyhosts/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2013/12/26 23:30:41 pettai Exp $ -# +# $NetBSD: Makefile,v 1.10 2014/01/25 10:30:20 wiz Exp $ VER= 2.6 DISTNAME= DenyHosts-${VER} @@ -30,6 +29,7 @@ REPLACE_PYTHON+= scripts/restricted_from_invalid.py REPLACE_PYTHON+= scripts/restricted_from_passwd.py PYTHON_SELF_CONFLICT= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 RCD_SCRIPTS+= denyhosts diff --git a/security/py-gnupg/Makefile b/security/py-gnupg/Makefile index 5d4e8703cec..ead1e4fece2 100644 --- a/security/py-gnupg/Makefile +++ b/security/py-gnupg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2012/10/23 18:16:53 asau Exp $ +# $NetBSD: Makefile,v 1.18 2014/01/25 10:30:20 wiz Exp $ DISTNAME= GnuPGInterface-0.3.2 PKGNAME= ${PYPKGPREFIX}-gnupg-0.3.2 @@ -15,5 +15,7 @@ DEPENDS+= gnupg>=1.0.0:../../security/gnupg USE_LANGUAGES= # none +PYTHON_VERSIONS_INCOMPATIBLE= 33 + .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/py-itsdangerous/Makefile b/security/py-itsdangerous/Makefile index a02e0cb5419..1276bb188c2 100644 --- a/security/py-itsdangerous/Makefile +++ b/security/py-itsdangerous/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2014/01/12 09:45:24 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2014/01/25 10:30:20 wiz Exp $ DISTNAME= itsdangerous-0.23 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,7 +12,5 @@ LICENSE= modified-bsd USE_LANGUAGES= # empty -PYTHON_VERSIONS_INCLUDE_3X= yes - .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/py-keyring/Makefile b/security/py-keyring/Makefile index 5ab044f8ff7..a1036d982a9 100644 --- a/security/py-keyring/Makefile +++ b/security/py-keyring/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2012/10/23 18:16:53 asau Exp $ -# +# $NetBSD: Makefile,v 1.3 2014/01/25 10:30:20 wiz Exp $ DISTNAME= keyring-0.5.1 PKGNAME= ${PYPKGPREFIX}-keyring-0.5.1 @@ -12,6 +11,7 @@ COMMENT= Store and access your passwords safely LICENSE= python-software-foundation PYDISTUTILSPKG= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 .include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/py-lasso/Makefile b/security/py-lasso/Makefile index 4fb2dd6a67f..4b12c958598 100644 --- a/security/py-lasso/Makefile +++ b/security/py-lasso/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.19 2014/01/20 16:40:25 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2014/01/25 10:30:20 wiz Exp $ PKGNAME= ${PYPKGPREFIX}-${DISTNAME} PKGREVISION= 11 COMMENT= Liberty Alliance Single Sign On binding for Python -.include "../../lang/python/pyversion.mk" - BUILD_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat CONFIGURE_ARGS+= --disable-php4 @@ -15,6 +13,7 @@ INSTALL_DIRS= bindings/python PY_PATCHPLIST= yes PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.3.6 + .include "../../lang/python/extension.mk" .include "../../security/lasso/buildlink3.mk" diff --git a/security/py-m2crypto/Makefile b/security/py-m2crypto/Makefile index 82c1cd5a680..5f183b6b93e 100644 --- a/security/py-m2crypto/Makefile +++ b/security/py-m2crypto/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2013/07/26 09:50:21 fhajny Exp $ -# +# $NetBSD: Makefile,v 1.31 2014/01/25 10:30:20 wiz Exp $ DISTNAME= M2Crypto-0.21.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -20,6 +19,8 @@ BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.7i{,nb*} PYSETUPBUILDARGS= build_ext --openssl=${BUILDLINK_PREFIX.openssl} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.21.1 + .include "../../lang/python/extension.mk" .include "../../lang/python/egg.mk" .include "../../devel/swig/buildlink3.mk" diff --git a/security/py-mcrypt/Makefile b/security/py-mcrypt/Makefile index 537e6791d19..867f765830c 100644 --- a/security/py-mcrypt/Makefile +++ b/security/py-mcrypt/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2012/10/23 18:16:54 asau Exp $ -# +# $NetBSD: Makefile,v 1.11 2014/01/25 10:30:20 wiz Exp $ DISTNAME= python-mcrypt-1.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/python-//} @@ -14,6 +13,8 @@ LICENSE= gnu-lgpl-v2.1 EGG_NAME= ${DISTNAME:S/-/_/} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.1 + .include "../../lang/python/distutils.mk" .include "../../security/libmcrypt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/py-oauth/Makefile b/security/py-oauth/Makefile index 52f4ce3209f..72c8fe13898 100644 --- a/security/py-oauth/Makefile +++ b/security/py-oauth/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2012/10/23 18:16:54 asau Exp $ +# $NetBSD: Makefile,v 1.4 2014/01/25 10:30:20 wiz Exp $ DISTNAME= oauth-1.0.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -10,7 +10,5 @@ HOMEPAGE= http://pypi.python.org/pypi/oauth/ COMMENT= Python OAuth library LICENSE= mit -PYDISTUTILSPKG= yes - .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/py-openid/Makefile b/security/py-openid/Makefile index efd542979be..b6e1ccb6783 100644 --- a/security/py-openid/Makefile +++ b/security/py-openid/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2012/10/23 18:16:54 asau Exp $ +# $NetBSD: Makefile,v 1.7 2014/01/25 10:30:20 wiz Exp $ DISTVERS= 2.2.5 GITREF= b666238 @@ -14,6 +14,7 @@ COMMENT= Python module for OpenID LICENSE= apache-2.0 PYDISTUTILSPKG= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 .include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/py-paramiko/Makefile b/security/py-paramiko/Makefile index 1cd0dd188cf..d0b4abbbb37 100644 --- a/security/py-paramiko/Makefile +++ b/security/py-paramiko/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2013/10/20 17:02:02 gls Exp $ +# $NetBSD: Makefile,v 1.19 2014/01/25 10:30:20 wiz Exp $ DISTNAME= paramiko-1.12.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -17,6 +17,8 @@ DEPENDS+= ${PYPKGPREFIX}-ecdsa>=0.9:../../security/py-ecdsa PYDISTUTILSPKG= yes REPLACE_PYTHON= paramiko/rng*.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 + do-test: (cd ${WRKSRC} && ${PYTHONBIN} test.py) diff --git a/security/py-passlib/Makefile b/security/py-passlib/Makefile index 902645e48e6..a732a3a6f9c 100644 --- a/security/py-passlib/Makefile +++ b/security/py-passlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2014/01/01 17:46:20 kleink Exp $ +# $NetBSD: Makefile,v 1.3 2014/01/25 10:30:20 wiz Exp $ DISTNAME= passlib-1.6.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -13,7 +13,5 @@ LICENSE= modified-bsd USE_LANGUAGES= # empty -PYTHON_VERSIONS_INCLUDE_3X= yes - .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/py-prewikka/Makefile b/security/py-prewikka/Makefile index 1d91536eb43..8f904a76f36 100644 --- a/security/py-prewikka/Makefile +++ b/security/py-prewikka/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2013/07/12 10:45:03 jperkin Exp $ -# +# $NetBSD: Makefile,v 1.38 2014/01/25 10:30:20 wiz Exp $ DISTNAME= prewikka-${VERSION} PKGNAME= ${PYPKGPREFIX}-prewikka-${VERSION} @@ -8,16 +7,16 @@ CATEGORIES= security MASTER_SITES= http://www.prelude-ids.org/download/releases/prewikka/ \ http://www.prelude-ids.org/download/releases/old/ -VERSION= 0.9.17.1 - -CONFLICTS= prewikka-[0-9]* - MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://prelude-ids.org/download/releases/ COMMENT= Prelude-IDS console DEPENDS+= ${PYPKGPREFIX}-cheetah-[0-9]*:../../devel/py-cheetah +VERSION= 0.9.17.1 + +CONFLICTS= prewikka-[0-9]* + USE_TOOLS+= msgfmt .include "../../mk/bsd.prefs.mk" @@ -25,6 +24,8 @@ USE_TOOLS+= msgfmt PYDISTUTILSPKG= yes PYSETUP= setup.py PYTHON_PATCH_SCRIPTS= scripts/prewikka-httpd +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-cheetah + PREWIKKA_USER?= prewikka PREWIKKA_GROUP?= prewikka PREWIKKA_HOME= /nonexistent diff --git a/security/py-tlslite/Makefile b/security/py-tlslite/Makefile index 89901f244db..17fbe31cecf 100644 --- a/security/py-tlslite/Makefile +++ b/security/py-tlslite/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2012/10/23 18:16:55 asau Exp $ -# +# $NetBSD: Makefile,v 1.8 2014/01/25 10:30:20 wiz Exp $ DISTNAME= tlslite-0.3.8 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -13,6 +12,7 @@ COMMENT= SSL 3.0, TLS 1.0, and TLS 1.1 in Python LICENSE= public-domain PYTHON_SELF_CONFLICT= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.3.8 USE_LANGUAGES= # none diff --git a/sysutils/ansible/Makefile b/sysutils/ansible/Makefile index ba9b19901ab..65d458449a4 100644 --- a/sysutils/ansible/Makefile +++ b/sysutils/ansible/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2013/12/02 22:54:46 hubertf Exp $ -# +# $NetBSD: Makefile,v 1.9 2014/01/25 10:30:20 wiz Exp $ DISTNAME= ansible-1.4.1 CATEGORIES= sysutils @@ -35,6 +34,8 @@ SUBST_STAGE.pythonbin= pre-configure SUBST_FILES.pythonbin= Makefile SUBST_FILES.pythonbin= -e "s,@PYTHONBIN@,${PYTHONBIN}," +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-paramiko + MANPAGES= ansible-doc.1 ansible-pull.1 ansible-playbook.1 ansible.1 DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml diff --git a/sysutils/bup/Makefile b/sysutils/bup/Makefile index ba620d8a7ed..6bafee6a1d4 100644 --- a/sysutils/bup/Makefile +++ b/sysutils/bup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2013/12/31 11:03:12 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2014/01/25 10:30:21 wiz Exp $ DISTNAME= bup-0.25 CATEGORIES= sysutils @@ -17,6 +17,8 @@ DEPENDS+= par2-[0-9]*:../../archivers/par2 DEPENDS+= ${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline DEPENDS+= git-base-[0-9]*:../../devel/git-base +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-fuse-bindings + DOCDIR= ${WRKDIR}/bup-man TEST_TARGET= test diff --git a/sysutils/cuisine/Makefile b/sysutils/cuisine/Makefile index 59f7a9e976d..0123d7d4606 100644 --- a/sysutils/cuisine/Makefile +++ b/sysutils/cuisine/Makefile @@ -1,12 +1,10 @@ -# $NetBSD: Makefile,v 1.2 2013/08/06 18:47:23 gls Exp $ -# +# $NetBSD: Makefile,v 1.3 2014/01/25 10:30:21 wiz Exp $ VERSION= b79718f8f69d17a075b7a626e32c1ed1200445f8 DISTNAME= ${VERSION} PKGNAME= cuisine-0.6.4 CATEGORIES= sysutils MASTER_SITES= https://github.com/sebastien/cuisine/archive/ -FETCH_USING= curl MAINTAINER= imil@NetBSD.org HOMEPAGE= https://github.com/sebastien/cuisine @@ -15,6 +13,8 @@ LICENSE= modified-bsd DEPENDS+= fabric>=1.6.0:../../sysutils/fabric +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.6.4 + WRKSRC= ${WRKDIR}/cuisine-${VERSION} DOCDIR= ${PREFIX}/share/doc/cuisine diff --git a/sysutils/dbus-python-common/Makefile b/sysutils/dbus-python-common/Makefile index a24a6537fd9..00cc848bd6d 100644 --- a/sysutils/dbus-python-common/Makefile +++ b/sysutils/dbus-python-common/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2013/05/29 22:59:32 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2014/01/25 10:30:21 wiz Exp $ DISTNAME= dbus-python-1.2.0 PKGNAME= dbus-python-common-1.2.0 @@ -7,6 +7,7 @@ MASTER_SITES= http://dbus.freedesktop.org/releases/dbus-python/ #BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils>=0:../../textproc/py-docutils #DEPENDS+= ${PYPKGPREFIX}-pyrex>=0.9.3:../../lang/py-pyrex +#PYTHON_VERSIONS_INCOMPATIBLE=33 # py-pyrex MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.freedesktop.org/Software/dbus @@ -16,7 +17,6 @@ LICENSE= mit CONFLICTS+= py[0-9]*-dbus<1.1.1 PYTHON_FOR_BUILD_ONLY= yes -PYTHON_VERSIONS_INCLUDE_3X= yes USE_TOOLS+= pkg-config gmake GNU_CONFIGURE= yes diff --git a/sysutils/duplicity/Makefile b/sysutils/duplicity/Makefile index e1c9d06daad..3e09ebcc3d3 100644 --- a/sysutils/duplicity/Makefile +++ b/sysutils/duplicity/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2013/11/26 20:36:22 drochner Exp $ +# $NetBSD: Makefile,v 1.26 2014/01/25 10:30:21 wiz Exp $ DISTNAME= duplicity-0.6.22 CATEGORIES= sysutils net @@ -23,6 +23,7 @@ GPGPATH= ${LOCALBASE}/bin/gpg .endif REPLACE_PYTHON+= bin/* +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.6.22 SUBST_CLASSES+= fix-paths SUBST_STAGE.fix-paths= pre-configure diff --git a/sysutils/euca2ools/Makefile b/sysutils/euca2ools/Makefile index aab675b1a8d..58b7e785b3d 100644 --- a/sysutils/euca2ools/Makefile +++ b/sysutils/euca2ools/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2013/02/26 10:17:55 joerg Exp $ -# +# $NetBSD: Makefile,v 1.3 2014/01/25 10:30:21 wiz Exp $ DISTNAME= euca2ools-2.1.2 CATEGORIES= sysutils @@ -15,6 +14,8 @@ DEPENDS+= ${PYPKGPREFIX}-m2crypto>=0.20.2:../../security/py-m2crypto DEPENDS+= ${PYPKGPREFIX}-xml-[0-9]*:../../textproc/py-xml DEPENDS+= help2man-[0-9]*:../../converters/help2man +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-xml, py-m2crypto + #USE_LANGUAGES= # none post-build: diff --git a/sysutils/fabric/Makefile b/sysutils/fabric/Makefile index 674c49b7b6d..4a186181034 100644 --- a/sysutils/fabric/Makefile +++ b/sysutils/fabric/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2013/10/21 18:09:30 gls Exp $ +# $NetBSD: Makefile,v 1.32 2014/01/25 10:30:21 wiz Exp $ VERSION= 1.8.0 DISTNAME= Fabric-${VERSION} @@ -14,6 +14,8 @@ LICENSE= 2-clause-bsd DEPENDS+= ${PYPKGPREFIX}-paramiko>=1.10.0:../../security/py-paramiko +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-paramiko + USE_TOOLS+= pax INSTALLATION_DIRS+= ${PKGMANDIR}/man1 diff --git a/sysutils/gnome-commander/Makefile b/sysutils/gnome-commander/Makefile index cb4ab3853f5..d407447ef45 100644 --- a/sysutils/gnome-commander/Makefile +++ b/sysutils/gnome-commander/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2014/01/01 11:52:34 wiz Exp $ -# +# $NetBSD: Makefile,v 1.56 2014/01/25 10:30:21 wiz Exp $ DISTNAME= gnome-commander-1.2.8.15 PKGREVISION= 27 @@ -17,6 +16,8 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_TOOLS+= gmake intltool msgfmt pkg-config perl +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.2.8.15 + #Problem with heimdal, on which this package depends via another packages. #Simple solution is delete link to fnmatch.h from work directory of package #after make configure like this: diff --git a/sysutils/libvirt/Makefile b/sysutils/libvirt/Makefile index d7fc2ec89ba..30a495b7191 100644 --- a/sysutils/libvirt/Makefile +++ b/sysutils/libvirt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2014/01/25 02:54:27 agc Exp $ +# $NetBSD: Makefile,v 1.16 2014/01/25 10:30:21 wiz Exp $ DISTNAME= libvirt-1.2.1 CATEGORIES= sysutils @@ -15,6 +15,8 @@ CONFIGURE_ARGS+= --without-macvtap USE_TOOLS+= gmake pkg-config perl USE_LIBTOOL= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-xml + PY_PATCHPLIST= yes PYTHON_PATCH_SCRIPTS+= examples/python/domstart.py PYTHON_PATCH_SCRIPTS+= examples/python/domrestore.py diff --git a/sysutils/monitoring/Makefile b/sysutils/monitoring/Makefile index 696c61376d7..a441fef387d 100644 --- a/sysutils/monitoring/Makefile +++ b/sysutils/monitoring/Makefile @@ -1,12 +1,10 @@ -# $NetBSD: Makefile,v 1.1 2013/04/22 09:39:21 imil Exp $ -# +# $NetBSD: Makefile,v 1.2 2014/01/25 10:30:21 wiz Exp $ VERSION= e518a90eade4ca538468b6640dccb651e6034b9e DISTNAME= ${VERSION} PKGNAME= monitoring-0.9.5 CATEGORIES= sysutils MASTER_SITES= https://github.com/sebastien/monitoring/archive/ -FETCH_USING= curl MAINTAINER= imil@NetBSD.org HOMEPAGE= https://github.com/sebastien/monitoring @@ -16,6 +14,7 @@ LICENSE= modified-bsd WRKSRC= ${WRKDIR}/monitoring-${VERSION} REPLACE_PYTHON+= Sources/monitoring.py Scripts/monitoring +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.9.5 DOCDIR= ${PREFIX}/share/doc/monitoring EXPDIR= ${PREFIX}/share/examples/monitoring diff --git a/sysutils/openxenmanager/Makefile b/sysutils/openxenmanager/Makefile index 65491694060..ea727578261 100644 --- a/sysutils/openxenmanager/Makefile +++ b/sysutils/openxenmanager/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2013/10/10 14:42:33 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.10 2014/01/25 10:30:21 wiz Exp $ DISTNAME= openxenmanager_0.r80+dfsg.orig PKGNAME= openxenmanager-0.0.80 @@ -22,6 +21,7 @@ DEPENDS+= ${PYPKGPREFIX}-httplib2>=0.7.7:../../www/py-httplib2 INSTALLATION_DIRS= bin share REPLACE_PYTHON= openxenmanager/*py openxenmanager/pygtk_chart/*py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 OXMDIR= ${PREFIX} diff --git a/sysutils/py-dbus/Makefile b/sysutils/py-dbus/Makefile index c80513e48e6..3c5876f7537 100644 --- a/sysutils/py-dbus/Makefile +++ b/sysutils/py-dbus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2013/05/26 19:51:25 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2014/01/25 10:30:21 wiz Exp $ DISTNAME= dbus-python-1.2.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/-python//} @@ -10,8 +10,6 @@ HOMEPAGE= http://www.freedesktop.org/Software/dbus COMMENT= Python bindings for the D-BUS message bus system LICENSE= mit -PYTHON_VERSIONS_INCLUDE_3X= yes - USE_TOOLS+= pkg-config gmake GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-html-docs --disable-api-docs diff --git a/sysutils/py-gnome-menus/Makefile b/sysutils/py-gnome-menus/Makefile index 8f360ddbe20..de6829f08fa 100644 --- a/sysutils/py-gnome-menus/Makefile +++ b/sysutils/py-gnome-menus/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2012/10/23 19:51:21 asau Exp $ -# +# $NetBSD: Makefile,v 1.26 2014/01/25 10:30:21 wiz Exp $ DISTNAME= gnome-menus-2.30.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -23,6 +22,7 @@ CONFIGURE_ARGS+= --enable-python BUILD_DIRS= python INSTALL_DIRS= python PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.30.5 BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.0 diff --git a/sysutils/py-notify-python/Makefile b/sysutils/py-notify-python/Makefile index 9b69a079c7f..389c9a02adc 100644 --- a/sysutils/py-notify-python/Makefile +++ b/sysutils/py-notify-python/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2013/10/10 14:41:54 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.9 2014/01/25 10:30:21 wiz Exp $ DISTNAME= notify-python-0.1.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -23,6 +22,7 @@ USE_TOOLS+= gmake pkg-config PKGCONFIG_OVERRIDE+= notify-python.pc.in PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 # Missing function attach_status_icon # http://trac.galago-project.org/ticket/121 diff --git a/sysutils/py-notify/Makefile b/sysutils/py-notify/Makefile index 7a669f7989b..e98178ba908 100644 --- a/sysutils/py-notify/Makefile +++ b/sysutils/py-notify/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2013/08/13 09:18:46 obache Exp $ -# +# $NetBSD: Makefile,v 1.35 2014/01/25 10:30:21 wiz Exp $ DISTNAME= py-notify-0.2.1 PKGNAME= ${DISTNAME:S/py/${PYPKGPREFIX}/1} @@ -14,5 +13,7 @@ LICENSE= gnu-lgpl-v2.1 EGG_NAME= ${DISTNAME:S/-/_/} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.2.1 + .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/py-psutil/Makefile b/sysutils/py-psutil/Makefile index a720bbde8ec..000dc6b824b 100644 --- a/sysutils/py-psutil/Makefile +++ b/sysutils/py-psutil/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2013/12/07 21:25:23 richard Exp $ +# $NetBSD: Makefile,v 1.4 2014/01/25 10:30:22 wiz Exp $ DISTNAME= psutil-1.2.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,6 +11,7 @@ COMMENT= Cross-platform process and system utilities module for Python LICENSE= modified-bsd REPLACE_PYTHON= psutil/*py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.2.1 .include "../../mk/bsd.prefs.mk" diff --git a/sysutils/py-xattr/Makefile b/sysutils/py-xattr/Makefile index 3f4c9819987..4cfc76632e3 100644 --- a/sysutils/py-xattr/Makefile +++ b/sysutils/py-xattr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2013/11/26 20:25:42 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2014/01/25 10:30:22 wiz Exp $ DISTNAME= v0.7.2 PROPERNAME= ${DISTNAME:S/v/xattr-/} @@ -22,6 +22,8 @@ EGG_NAME= ${PROPERNAME} USE_LANGUAGES= c REPLACE_PYTHON= xattr/tool.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 + .include "../../lang/python/pyversion.mk" .if ${PYPKGPREFIX} == "py27" diff --git a/sysutils/salt-docs/Makefile b/sysutils/salt-docs/Makefile index 64e76403f1f..52542b8b440 100644 --- a/sysutils/salt-docs/Makefile +++ b/sysutils/salt-docs/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2013/04/06 03:45:25 rodent Exp $ -# +# $NetBSD: Makefile,v 1.3 2014/01/25 10:30:22 wiz Exp $ DISTNAME= salt-0.10.5 PKGNAME= ${DISTNAME:S/-/-docs-/} @@ -26,6 +25,9 @@ do-install: ( cd ${DESTDIR}${PREFIX} \ && ${FIND} ${HTMLDIR} -type f -print ) >>${PLIST_SRC} +# problem in sphinx config file? +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.10.5 + # The upstream salt project does not say what version of sphinx is required. .include "../../lang/python/pyversion.mk" BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx diff --git a/sysutils/salt/Makefile b/sysutils/salt/Makefile index ba3adee9b19..b80d11ecfe4 100644 --- a/sysutils/salt/Makefile +++ b/sysutils/salt/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2013/08/17 18:30:02 imil Exp $ -# +# $NetBSD: Makefile,v 1.16 2014/01/25 10:30:22 wiz Exp $ DISTNAME= salt-0.16.3 CATEGORIES= sysutils @@ -11,6 +10,16 @@ HOMEPAGE= http://saltstack.org/ COMMENT= Remote execution and configuration management system LICENSE= apache-2.0 +DEPENDS+= zeromq>=2.1.9:../../net/zeromq +DEPENDS+= ${PYPKGPREFIX}-zmq>=2.1.9:../../net/py-zmq +DEPENDS+= ${PYPKGPREFIX}-m2crypto-[0-9]*:../../security/py-m2crypto +DEPENDS+= ${PYPKGPREFIX}-crypto-[0-9]*:../../security/py-crypto +DEPENDS+= ${PYPKGPREFIX}-msgpack-[0-9]*:../../devel/py-msgpack +DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml +DEPENDS+= ${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2 + +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-m2crypto + SUBST_CLASSES+= fix-paths SUBST_STAGE.fix-paths= post-patch SUBST_MESSAGE.fix-paths=Fixing directory paths. @@ -52,12 +61,4 @@ post-install: # .include "../../lang/python/application.mk" .include "../../lang/python/distutils.mk" -DEPENDS+= zeromq>=2.1.9:../../net/zeromq -DEPENDS+= ${PYPKGPREFIX}-zmq>=2.1.9:../../net/py-zmq -DEPENDS+= ${PYPKGPREFIX}-m2crypto-[0-9]*:../../security/py-m2crypto -DEPENDS+= ${PYPKGPREFIX}-crypto-[0-9]*:../../security/py-crypto -DEPENDS+= ${PYPKGPREFIX}-msgpack-[0-9]*:../../devel/py-msgpack -DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml -DEPENDS+= ${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2 - .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/virt-manager/Makefile b/sysutils/virt-manager/Makefile index b10966abd64..dc916e459b4 100644 --- a/sysutils/virt-manager/Makefile +++ b/sysutils/virt-manager/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2013/10/10 14:42:33 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.16 2014/01/25 10:30:22 wiz Exp $ DISTNAME= virt-manager-0.9.4 PKGREVISION= 12 @@ -11,6 +10,14 @@ HOMEPAGE= http://virt-manager.org/ COMMENT= GUI to manage virtual machines LICENSE= gnu-gpl-v2 +DEPENDS= libvirt>=0.9.3:../../sysutils/libvirt +DEPENDS+= ${PYPKGPREFIX}-gtk2>=2.24:../../x11/py-gtk2 +DEPENDS+= virtinst>=0.600.3:../../sysutils/virtinst +DEPENDS+= ${PYPKGPREFIX}-libxml2>=2.8.0:../../textproc/py-libxml2 +DEPENDS+= urlgrabber>=3.1.0:../../www/urlgrabber +DEPENDS+= ${PYPKGPREFIX}-dbus>=1.1.1:../../sysutils/py-dbus +DEPENDS+= gtk-vnc>=0.5.1:../../net/gtk-vnc + GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-libvirt-package-names=libvirt @@ -19,13 +26,7 @@ USE_PKGLOCALEDIR= yes GCONF_SCHEMAS+= virt-manager.schemas -DEPENDS= libvirt>=0.9.3:../../sysutils/libvirt -DEPENDS+= ${PYPKGPREFIX}-gtk2>=2.24:../../x11/py-gtk2 -DEPENDS+= virtinst>=0.600.3:../../sysutils/virtinst -DEPENDS+= ${PYPKGPREFIX}-libxml2>=2.8.0:../../textproc/py-libxml2 -DEPENDS+= urlgrabber>=3.1.0:../../www/urlgrabber -DEPENDS+= ${PYPKGPREFIX}-dbus>=1.1.1:../../sysutils/py-dbus -DEPENDS+= gtk-vnc>=0.5.1:../../net/gtk-vnc +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-ORBit via py-gnome2, py-gtk2 SUBST_CLASSES+= python SUBST_STAGE.python= pre-configure diff --git a/sysutils/xenkernel3/Makefile b/sysutils/xenkernel3/Makefile index faf04dec76a..64006109b31 100644 --- a/sysutils/xenkernel3/Makefile +++ b/sysutils/xenkernel3/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2013/11/07 00:47:39 joerg Exp $ -# +# $NetBSD: Makefile,v 1.28 2014/01/25 10:30:22 wiz Exp $ VERSION= 3.1.4 DISTNAME= xen-${VERSION} @@ -24,6 +23,7 @@ USE_TOOLS+= gmake PYTHON_FOR_BUILD_ONLY= YES PY_PATCHPLIST= NO +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 3.1.4 SUBST_CLASSES+= py SUBST_STAGE.py= pre-build @@ -38,7 +38,7 @@ SUBST_FILES.py2= xen/tools/compat-build-source.py SUBST_FILES.py2+= xen/tools/compat-build-header.py SUBST_SED.py2= -e "s,/usr/bin/python,${PYTHONBIN},g" -.if ${MACHINE_ARCH} == "x86_64" +.if ${MACHINE_ARCH} == "x86_64" USE_TOOLS+= bash SUBST_CLASSES+= bash SUBST_STAGE.bash= pre-build @@ -46,7 +46,7 @@ SUBST_FILES.bash= xen/include/Makefile SUBST_SED.bash= -e "s,/bin/bash,${PREFIX}/bin/bash,g" .endif -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_ARCH} == "i386" PLIST_SRC= PLIST.i386 PLIST .else PLIST_SRC= PLIST diff --git a/sysutils/xenkernel33/Makefile b/sysutils/xenkernel33/Makefile index b9b72c0df4c..c259eff6f83 100644 --- a/sysutils/xenkernel33/Makefile +++ b/sysutils/xenkernel33/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2013/11/07 00:47:39 joerg Exp $ -# +# $NetBSD: Makefile,v 1.26 2014/01/25 10:30:22 wiz Exp $ VERSION= 3.3.2 DISTNAME= xen-${VERSION} @@ -28,6 +27,7 @@ USE_TOOLS+= gmake PYTHON_FOR_BUILD_ONLY= yes PY_PATCHPLIST= NO +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 3.3.2 SUBST_CLASSES+= py SUBST_STAGE.py= pre-build diff --git a/sysutils/xenkernel41/Makefile b/sysutils/xenkernel41/Makefile index 848ea1660b8..783721da9b5 100644 --- a/sysutils/xenkernel41/Makefile +++ b/sysutils/xenkernel41/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2014/01/24 17:07:35 drochner Exp $ -# +# $NetBSD: Makefile,v 1.32 2014/01/25 10:30:22 wiz Exp $ VERSION= 4.1.6.1 DISTNAME= xen-${VERSION} @@ -22,6 +21,7 @@ USE_TOOLS+= gmake PYTHON_FOR_BUILD_ONLY= yes PY_PATCHPLIST= NO +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 4.1.6.1 # XXX Why does this not work? # See work/xen-4.1.2/Config.mk:41 why PYTHON must be set and what for diff --git a/sysutils/xenkernel42/Makefile b/sysutils/xenkernel42/Makefile index 3571374d855..29e4200e815 100644 --- a/sysutils/xenkernel42/Makefile +++ b/sysutils/xenkernel42/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2013/11/07 00:47:39 joerg Exp $ -# +# $NetBSD: Makefile,v 1.5 2014/01/25 10:30:22 wiz Exp $ VERSION= 4.2.3 DISTNAME= xen-${VERSION} @@ -20,6 +19,7 @@ NO_CONFIGURE= yes USE_TOOLS+= gmake PYTHON_FOR_BUILD_ONLY= YES +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 4.2.3 MAKE_ENV+= OCAML_TOOLS=no diff --git a/sysutils/xentools20/Makefile b/sysutils/xentools20/Makefile index fd85b20d4aa..7805297a3d8 100644 --- a/sysutils/xentools20/Makefile +++ b/sysutils/xentools20/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2013/02/06 23:23:54 jperkin Exp $ -# +# $NetBSD: Makefile,v 1.43 2014/01/25 10:30:22 wiz Exp $ DISTNAME= xen-2.0.7-src PKGNAME= xentools20-2.0.7 @@ -16,6 +15,8 @@ LICENSE= gnu-gpl-v2 DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-twisted + PKG_SYSCONFSUBDIR= xen ONLY_FOR_PLATFORM= Linux-2.[46]*-i386 NetBSD-*-i386 diff --git a/sysutils/xentools3-hvm/Makefile b/sysutils/xentools3-hvm/Makefile index 0f35b2aa100..fb1e58b5f69 100644 --- a/sysutils/xentools3-hvm/Makefile +++ b/sysutils/xentools3-hvm/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2013/05/31 12:42:05 wiz Exp $ -# +# $NetBSD: Makefile,v 1.21 2014/01/25 10:30:22 wiz Exp $ VERSION= 3.1.4 DISTNAME= xen-${VERSION} @@ -22,6 +21,8 @@ ONLY_FOR_PLATFORM+= NetBSD-*-i386 NetBSD-*-x86_64 CONFLICTS= xentools30-* xentools33-* CONFLICTS+= xenstoretools-* +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 3.1.4 + WRKSRC= ${WRKDIR}/xen-${VERSION}/tools CHECK_PORTABILITY_SKIP+= examples/* xm-test/ramdisk/make-release.sh diff --git a/sysutils/xentools3/Makefile b/sysutils/xentools3/Makefile index 9fa87417b48..3999aa0a280 100644 --- a/sysutils/xentools3/Makefile +++ b/sysutils/xentools3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2013/09/27 11:35:07 joerg Exp $ +# $NetBSD: Makefile,v 1.37 2014/01/25 10:30:22 wiz Exp $ VERSION= 3.1.4 DISTNAME= xen-${VERSION} @@ -15,6 +15,8 @@ COMMENT= Userland Tools for Xen DEPENDS+= ${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline DEPENDS+= ${PYPKGPREFIX}-curses>=0nb4:../../devel/py-curses +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-xml + MAKE_JOBS_SAFE= no PKG_SYSCONFSUBDIR= xen diff --git a/sysutils/xentools33/Makefile b/sysutils/xentools33/Makefile index f9b938650a2..0ec7f283685 100644 --- a/sysutils/xentools33/Makefile +++ b/sysutils/xentools33/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2013/09/27 11:35:07 joerg Exp $ +# $NetBSD: Makefile,v 1.41 2014/01/25 10:30:22 wiz Exp $ VERSION= 3.3.2 DISTNAME= xen-${VERSION} @@ -20,6 +20,7 @@ DEPENDS+= ${PYPKGPREFIX}-curses>=0nb4:../../devel/py-curses BUILD_DEPENDS+= dev86-[0-9]*:../../devel/dev86 # needed to build firmware PKG_SYSCONFSUBDIR= xen +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-xml ONLY_FOR_PLATFORM= Linux-2.6*-i386 Linux-2.6*-x86_64 ONLY_FOR_PLATFORM+= NetBSD-[5-9].*-x86_64 NetBSD-[5-9].*-i386 diff --git a/sysutils/xentools41/Makefile b/sysutils/xentools41/Makefile index 4ea4ac48eac..3d321fead3a 100644 --- a/sysutils/xentools41/Makefile +++ b/sysutils/xentools41/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2014/01/06 22:15:31 joerg Exp $ +# $NetBSD: Makefile,v 1.42 2014/01/25 10:30:22 wiz Exp $ # # VERSION is set in version.mk as it is shared with other packages .include "version.mk" @@ -28,6 +28,8 @@ BUILD_DEPENDS+= dev86-[0-9]*:../../devel/dev86 # needed to build firmware BUILD_DEPENDS+= acpica-utils-[0-9]*:../../sysutils/acpica-utils .endif +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-xml + PKG_SYSCONFSUBDIR= xen ONLY_FOR_PLATFORM= Linux-2.6*-i386 Linux-2.6*-x86_64 diff --git a/sysutils/xentools42/Makefile b/sysutils/xentools42/Makefile index af4df726e00..f371edeacad 100644 --- a/sysutils/xentools42/Makefile +++ b/sysutils/xentools42/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2014/01/07 12:59:35 prlw1 Exp $ -# +# $NetBSD: Makefile,v 1.14 2014/01/25 10:30:23 wiz Exp $ VERSION= 4.2.3 VERSION_IPXE= 1.0.0 @@ -26,6 +25,8 @@ BUILD_DEPENDS+= acpica-utils-[0-9]*:../../sysutils/acpica-utils .endif DEPENDS+= ${PYPKGPREFIX}-curses>=0nb4:../../devel/py-curses +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-xml + PKG_SYSCONFSUBDIR= xen ONLY_FOR_PLATFORM= Linux-2.6*-i386 Linux-2.6*-x86_64 diff --git a/textproc/asciidoc/Makefile b/textproc/asciidoc/Makefile index 9b0eec5e7ae..a06621faf6d 100644 --- a/textproc/asciidoc/Makefile +++ b/textproc/asciidoc/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2014/01/01 11:52:35 wiz Exp $ -# +# $NetBSD: Makefile,v 1.38 2014/01/25 10:30:23 wiz Exp $ DISTNAME= asciidoc-8.6.9 PKGREVISION= 1 @@ -30,10 +29,8 @@ SUBST_MESSAGE.ad= Fixing hard-coded config file paths. SUBST_FILES.ad= a2x.py asciidoc.py SUBST_SED.ad= -e 's,^\(CONF_DIR\).*=.*,\1="${PREFIX}/share/asciidoc",' -REPLACE_INTERPRETER+= python -REPLACE.python.old= /usr/bin/env python -REPLACE.python.new= ${PYTHONBIN} -REPLACE_FILES.python= a2x.py asciidoc.conf html5.conf xhtml11.conf xhtml11-quirks.conf +REPLACE_PYTHON= a2x.py asciidoc.conf html5.conf xhtml11.conf xhtml11-quirks.conf +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 8.6.9 (as seen e.g. in git-docs) INSTALLATION_DIRS= bin share/asciidoc share/asciidoc/filters \ share/asciidoc/docbook-xsl share/asciidoc/stylesheets \ diff --git a/textproc/coccigrep/Makefile b/textproc/coccigrep/Makefile index 00c5ecd7ea9..2ff9bce4221 100644 --- a/textproc/coccigrep/Makefile +++ b/textproc/coccigrep/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2013/06/11 14:05:24 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.8 2014/01/25 10:30:23 wiz Exp $ DISTNAME= coccigrep-1.12 CATEGORIES= textproc @@ -16,6 +15,8 @@ USE_LANGUAGES= # none INSTALLATION_DIRS= ${PKGMANDIR}/man1 +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.12 + post-install: ${INSTALL_DATA} ${WRKSRC}/coccigrep.1 \ ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 diff --git a/textproc/dblatex/Makefile b/textproc/dblatex/Makefile index 46bbe5cb993..84e4cb06a73 100644 --- a/textproc/dblatex/Makefile +++ b/textproc/dblatex/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2013/04/08 11:17:23 rodent Exp $ -# +# $NetBSD: Makefile,v 1.15 2014/01/25 10:30:23 wiz Exp $ DISTNAME= dblatex-0.3.2 PKGREVISION= 2 @@ -21,6 +20,7 @@ DEPENDS+= tex-ifxetex-[0-9]*:../../print/tex-ifxetex USE_LANGUAGES= # none REPLACE_PYTHON+= scripts/dblatex lib/dbtexmf/dblatex/xetex/*.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.3.2 SUBST_CLASSES+= man SUBST_MESSAGE.man= Fixing man page installation path. diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile index ccf2a9b7a9d..48ef1183f43 100644 --- a/textproc/gnome-doc-utils/Makefile +++ b/textproc/gnome-doc-utils/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.60 2014/01/01 11:52:36 wiz Exp $ -# +# $NetBSD: Makefile,v 1.61 2014/01/25 10:30:23 wiz Exp $ DISTNAME= gnome-doc-utils-0.20.10 PKGREVISION= 2 @@ -17,6 +16,8 @@ DEPENDS+= ${PYPKGPREFIX}-libxslt>=1.1.12:../../textproc/py-libxslt DEPENDS+= docbook-xml>=4.5:../../textproc/docbook-xml DEPENDS+= getopt-[0-9]*:../../misc/getopt +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-libxslt + USE_TOOLS+= intltool pkg-config gmake gawk msgfmt bash:run GNU_CONFIGURE= YES MAKE_JOBS_SAFE= no diff --git a/textproc/ispell-lt/Makefile b/textproc/ispell-lt/Makefile index f8b246762aa..443c0e2e65c 100644 --- a/textproc/ispell-lt/Makefile +++ b/textproc/ispell-lt/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2013/04/24 03:05:33 rodent Exp $ -# +# $NetBSD: Makefile,v 1.2 2014/01/25 10:30:23 wiz Exp $ DISTNAME= ispell-lt-1.3 CATEGORIES= textproc @@ -14,6 +13,7 @@ DEPENDS+= ispell-[0-9]*:../../textproc/ispell USE_TOOLS+= gmake REPLACE_PYTHON+= tools/*.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.3 SUBST_CLASSES+= install SUBST_FILES.install= Makefile diff --git a/textproc/itstool/Makefile b/textproc/itstool/Makefile index 32b4f8488d2..2b4d40c65ea 100644 --- a/textproc/itstool/Makefile +++ b/textproc/itstool/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2013/12/31 17:50:23 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2014/01/25 10:30:23 wiz Exp $ DISTNAME= itstool-2.0.2 CATEGORIES= textproc @@ -16,6 +16,16 @@ REPLACE_PYTHON= ${WRKSRC}/itstool.in DEPENDS+= ${PYPKGPREFIX}-libxml2-[0-9]*:../../textproc/py-libxml2 +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.0.2 +#Traceback (most recent call last): +# File "/usr/pkg/bin/itstool", line 1516, in <module> +# doc.apply_its_rules(not(opts.nobuiltins), params=params) +# File "/usr/pkg/bin/itstool", line 724, in apply_its_rules +# self.apply_its_file(os.path.join(itsdir, dfile), params=params) +# File "/usr/pkg/bin/itstool", line 754, in apply_its_file +# if not nss.has_key(nsdef.name): +#AttributeError: 'dict' object has no attribute 'has_key' + .include "../../lang/python/application.mk" .include "../../lang/python/tool.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/libplist/Makefile b/textproc/libplist/Makefile index ae9c84fc939..f54ecf3bd21 100644 --- a/textproc/libplist/Makefile +++ b/textproc/libplist/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2013/05/29 13:20:22 joerg Exp $ -# +# $NetBSD: Makefile,v 1.12 2014/01/25 10:30:23 wiz Exp $ DISTNAME= libplist-1.8 PKGREVISION= 3 @@ -20,6 +19,7 @@ MAKE_JOBS_SAFE= no PKGCONFIG_OVERRIDE+= libplist++.pc.in PKGCONFIG_OVERRIDE+= libplist.pc.in PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.8 .include "../../textproc/libxml2/buildlink3.mk" .include "../../lang/python/extension.mk" diff --git a/textproc/py-4Suite/Makefile b/textproc/py-4Suite/Makefile index feaebf557b9..4b2e21e7a49 100644 --- a/textproc/py-4Suite/Makefile +++ b/textproc/py-4Suite/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2012/10/25 06:56:47 asau Exp $ -# +# $NetBSD: Makefile,v 1.7 2014/01/25 10:30:23 wiz Exp $ VER= 1.0.2 DISTNAME= 4Suite-XML-${VER} @@ -28,6 +27,7 @@ SUBST_STAGE.python= post-build SUBST_SED.python= -e 's,\#![^ ]* python,\#! ${PYTHONBIN},' #PYTHON_SELF_CONFLICT= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.0.2 do-configure: cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ diff --git a/textproc/py-Excelerator/Makefile b/textproc/py-Excelerator/Makefile index 8797e98a1ed..890022278eb 100644 --- a/textproc/py-Excelerator/Makefile +++ b/textproc/py-Excelerator/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2012/10/25 06:56:47 asau Exp $ -# +# $NetBSD: Makefile,v 1.12 2014/01/25 10:30:23 wiz Exp $ DISTNAME= pyexcelerator-${VERSION} PKGNAME= ${PYPKGPREFIX}-Excelerator-${VERSION} @@ -15,6 +14,8 @@ COMMENT= Python library for generating Excel 97/2000/XP/2003 files USE_LANGUAGES= #none +PYTHON_VERSIONS_INCOMPATIBLE= 33 + EGG_NAME= pyExcelerator-${VERSION} REPLACE_PYTHON+= pyExcelerator/BIFFRecords.py diff --git a/textproc/py-HappyDoc/Makefile b/textproc/py-HappyDoc/Makefile index e5f5d3ed7fa..918e37a633d 100644 --- a/textproc/py-HappyDoc/Makefile +++ b/textproc/py-HappyDoc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2012/10/25 06:56:47 asau Exp $ +# $NetBSD: Makefile,v 1.23 2014/01/25 10:30:23 wiz Exp $ DISTNAME= HappyDoc_r2_1 PKGNAME= ${PYPKGPREFIX}-HappyDoc-2.1 @@ -16,6 +16,8 @@ WRKSRC= ${WRKDIR}/HappyDoc-r2_1 PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} EGG_NAME= ${DISTNAME:S/_r/-/:S/_/./g} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.1 + post-extract: ${MV} ${WRKSRC}/happydoc ${WRKSRC}/happydoc${PYVERSSUFFIX} diff --git a/textproc/py-Whoosh/Makefile b/textproc/py-Whoosh/Makefile index b1b4b3b0ecf..00549893bb2 100644 --- a/textproc/py-Whoosh/Makefile +++ b/textproc/py-Whoosh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2012/10/25 06:56:47 asau Exp $ +# $NetBSD: Makefile,v 1.5 2014/01/25 10:30:23 wiz Exp $ # DISTNAME= Whoosh-0.1.13 @@ -13,5 +13,7 @@ LICENSE= apache-2.0 USE_LANGUAGES= # none +PYTHON_VERSIONS_INCOMPATIBLE= 33 + .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/py-cElementTree/Makefile b/textproc/py-cElementTree/Makefile index 2419631ab45..781b243f9ea 100644 --- a/textproc/py-cElementTree/Makefile +++ b/textproc/py-cElementTree/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2013/04/20 09:38:05 obache Exp $ -# +# $NetBSD: Makefile,v 1.10 2014/01/25 10:30:23 wiz Exp $ PKGNAME= ${PYPKGPREFIX}-cElementTree-${PY_DISTVERSION} CATEGORIES= textproc python @@ -8,8 +7,6 @@ MAINTAINER= obache@NetBSD.org HOMEPAGE= http://www.effbot.org/zone/celementtree.htm COMMENT= C implementation of Python ElementTree API -PYTHON_VERSIONS_INCLUDE_3X= yes - EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/_elementtree.c USE_TOOLS+= patch diff --git a/textproc/py-cabocha/Makefile b/textproc/py-cabocha/Makefile index cf2fa1234d5..d913f44284f 100644 --- a/textproc/py-cabocha/Makefile +++ b/textproc/py-cabocha/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2013/05/22 13:14:30 obache Exp $ -# +# $NetBSD: Makefile,v 1.5 2014/01/25 10:30:23 wiz Exp $ .include "../../textproc/cabocha/Makefile.common" @@ -11,6 +10,7 @@ COMMENT= CaboCha python module USE_LANGUAGES= c c++ PYSETUPSUBDIR= python +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.67 EGG_NAME= ${DISTNAME:S/-/_python-/} diff --git a/textproc/py-cmTemplate/Makefile b/textproc/py-cmTemplate/Makefile index bcc75fe21ca..2587307c9b3 100644 --- a/textproc/py-cmTemplate/Makefile +++ b/textproc/py-cmTemplate/Makefile @@ -1,17 +1,17 @@ -# $NetBSD: Makefile,v 1.5 2012/10/25 06:56:48 asau Exp $ -# +# $NetBSD: Makefile,v 1.6 2014/01/25 10:30:23 wiz Exp $ -DISTNAME= cmTemplate-0.3.2 +DISTNAME= cmTemplate-0.3.2 PKGNAME= ${PYPKGPREFIX}-cmTemplate-0.3.2 -CATEGORIES= textproc python -MASTER_SITES= http://www.bouncingchairs.net/oss/ +CATEGORIES= textproc python +MASTER_SITES= http://www.bouncingchairs.net/oss/ -MAINTAINER= joerg@NetBSD.org -HOMEPAGE= http://www.bouncingchairs.net/oss/ -COMMENT= Simple and fast Python template engine +MAINTAINER= joerg@NetBSD.org +HOMEPAGE= http://www.bouncingchairs.net/oss/ +COMMENT= Simple and fast Python template engine PY_PATCHPLIST= # empty PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.3.2 INSTALLATION_DIRS= ${PYSITELIB} share/doc/${PYPKGPREFIX}-cmTemplate diff --git a/textproc/py-docutils/Makefile b/textproc/py-docutils/Makefile index 95e3e51f214..5dfcd0bc24c 100644 --- a/textproc/py-docutils/Makefile +++ b/textproc/py-docutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2013/07/28 12:47:46 wiz Exp $ +# $NetBSD: Makefile,v 1.42 2014/01/25 10:30:24 wiz Exp $ DISTNAME= docutils-0.11 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -10,7 +10,6 @@ HOMEPAGE= http://docutils.sourceforge.net/ COMMENT= Python tool to generate documents LICENSE= public-domain AND 2-clause-bsd -PYTHON_VERSIONS_INCLUDE_3X= yes DEPENDS+= ${PYPKGPREFIX}-roman>=1.4:../../math/py-roman DEPENDS+= ${PYPKGPREFIX}-expat>=0:../../textproc/py-expat diff --git a/textproc/py-elementtree/Makefile b/textproc/py-elementtree/Makefile index 4e800beb021..4f51a01e564 100644 --- a/textproc/py-elementtree/Makefile +++ b/textproc/py-elementtree/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2012/10/25 06:56:49 asau Exp $ -# +# $NetBSD: Makefile,v 1.13 2014/01/25 10:30:24 wiz Exp $ DISTNAME= elementtree-1.2.6-20050316 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/-20050316//} @@ -17,5 +16,7 @@ USE_LANGUAGES= # empty EGG_NAME= elementtree-1.2.6_20050316 +PYTHON_VERSIONS_INCOMPATIBLE= 33 + .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/py-empy/Makefile b/textproc/py-empy/Makefile index beca8c4584a..c7482c554ff 100644 --- a/textproc/py-empy/Makefile +++ b/textproc/py-empy/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2012/10/25 06:56:49 asau Exp $ -# +# $NetBSD: Makefile,v 1.5 2014/01/25 10:30:24 wiz Exp $ DISTNAME= empy-3.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -20,6 +19,7 @@ PYDISTUTILSPKG= # yes PLIST_SUBST+= PYVERSSUFFIX="${PYVERSSUFFIX}" PYTHON_SELF_CONFLICT= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # Fix html path in documentation SUBST_CLASSES+= doc diff --git a/textproc/py-expat/Makefile b/textproc/py-expat/Makefile index 98c5ff1801b..520d911c764 100644 --- a/textproc/py-expat/Makefile +++ b/textproc/py-expat/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2013/04/20 09:38:04 obache Exp $ -# +# $NetBSD: Makefile,v 1.22 2014/01/25 10:30:24 wiz Exp $ PKGNAME= ${PYPKGPREFIX}-expat-${PY_DISTVERSION} CATEGORIES= textproc python @@ -8,8 +7,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.python.org/ COMMENT= Python interface to expat -PYTHON_VERSIONS_INCLUDE_3X= yes - EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/pyexpat.c PYDISTUTILSPKG= yes diff --git a/textproc/py-feedparser/Makefile b/textproc/py-feedparser/Makefile index 0c603e1fb11..268a33c022e 100644 --- a/textproc/py-feedparser/Makefile +++ b/textproc/py-feedparser/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2013/06/06 01:57:55 schmonz Exp $ -# +# $NetBSD: Makefile,v 1.26 2014/01/25 10:30:24 wiz Exp $ DISTNAME= feedparser-5.1.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -13,8 +12,6 @@ LICENSE= 2-clause-bsd USE_LANGUAGES= #none -PYTHON_VERSIONS_INCLUDE_3X= yes - do-test: cd ${WRKSRC}/feedparser && ${PYTHONBIN} feedparsertest.py diff --git a/textproc/py-html2text/Makefile b/textproc/py-html2text/Makefile index 7260ec6baed..b360bbab827 100644 --- a/textproc/py-html2text/Makefile +++ b/textproc/py-html2text/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2013/06/06 01:52:01 schmonz Exp $ -# +# $NetBSD: Makefile,v 1.27 2014/01/25 10:30:24 wiz Exp $ DISTNAME= html2text-3.200.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,7 +10,6 @@ HOMEPAGE= http://www.aaronsw.com/2002/html2text/ COMMENT= Convert HTML into easy-to-read plain ASCII text LICENSE= gnu-gpl-v2 -PYTHON_VERSIONS_INCLUDE_3X= yes PYTHON_SELF_CONFLICT= yes NO_BUILD= yes diff --git a/textproc/py-iniparse/Makefile b/textproc/py-iniparse/Makefile index 6465cbf1f72..c98b5c7812e 100644 --- a/textproc/py-iniparse/Makefile +++ b/textproc/py-iniparse/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2014/01/03 03:50:26 rodent Exp $ +# $NetBSD: Makefile,v 1.3 2014/01/25 10:30:24 wiz Exp $ DISTNAME= iniparse-0.4 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,6 +12,8 @@ LICENSE= mit AND python-software-foundation USE_LANGUAGES= # none +PYTHON_VERSIONS_INCOMPATIBLE= 33 + post-install: ${CHMOD} -x ${DESTDIR}${PREFIX}/share/doc/iniparse-0.4/index.html diff --git a/textproc/py-jinja2/Makefile b/textproc/py-jinja2/Makefile index f08e49387bd..68edf6f5cb7 100644 --- a/textproc/py-jinja2/Makefile +++ b/textproc/py-jinja2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2014/01/19 08:39:00 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2014/01/25 10:30:24 wiz Exp $ DISTNAME= Jinja2-2.7.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -12,8 +12,6 @@ LICENSE= modified-bsd USE_LANGUAGES= # none -PYTHON_VERSIONS_INCLUDE_3X= yes - DEPENDS+= ${PYPKGPREFIX}-markupsafe-[0-9]*:../../textproc/py-markupsafe SUBST_CLASSES+= unicode diff --git a/textproc/py-jsonlib3/Makefile b/textproc/py-jsonlib3/Makefile index c6e899a4a80..9eaa248526e 100644 --- a/textproc/py-jsonlib3/Makefile +++ b/textproc/py-jsonlib3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2014/01/20 11:10:05 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2014/01/25 10:30:24 wiz Exp $ DISTNAME= jsonlib-python3-1.6.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/-python3//} @@ -15,7 +15,6 @@ USE_LANGUAGES= c EGG_NAME= ${DISTNAME:S/b-p/b_p/} PYTHON_VERSIONS_INCOMPATIBLE= 26 27 -PYTHON_VERSIONS_INCLUDE_3X= yes .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/py-libxml2/Makefile b/textproc/py-libxml2/Makefile index 1c74a2a6363..668e400c655 100644 --- a/textproc/py-libxml2/Makefile +++ b/textproc/py-libxml2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2013/10/03 07:52:32 prlw1 Exp $ +# $NetBSD: Makefile,v 1.48 2014/01/25 10:30:24 wiz Exp $ DISTNAME= libxml2-2.9.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -14,8 +14,6 @@ LICENSE= modified-bsd WRKSRC= ${WRKDIR}/${DISTNAME}/python NO_CONFIGURE= YES -PYTHON_VERSIONS_INCLUDE_3X= yes - SUBST_CLASSES+= setup SUBST_MESSAGE.setup= Fixing hardcoded paths. SUBST_STAGE.setup= pre-build diff --git a/textproc/py-libxslt/Makefile b/textproc/py-libxslt/Makefile index 2415a6fc39c..d9de5a11371 100644 --- a/textproc/py-libxslt/Makefile +++ b/textproc/py-libxslt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2014/01/01 11:52:36 wiz Exp $ +# $NetBSD: Makefile,v 1.43 2014/01/25 10:30:24 wiz Exp $ DISTNAME= libxslt-1.1.28 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -15,6 +15,8 @@ LICENSE= mit # with no-advertising clause DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat DEPENDS+= ${PYPKGPREFIX}-libxml2>=2.6.8:../../textproc/py-libxml2 +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.1.28 + WRKSRC= ${WRKDIR}/${DISTNAME}/python PYDISTUTILSPKG= yes NO_CONFIGURE= yes diff --git a/textproc/py-lxml/Makefile b/textproc/py-lxml/Makefile index 36cec1a8ca0..76986b2bd9b 100644 --- a/textproc/py-lxml/Makefile +++ b/textproc/py-lxml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2014/01/01 11:52:36 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2014/01/25 10:30:24 wiz Exp $ DISTNAME= lxml-3.2.4 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -13,7 +13,6 @@ COMMENT= Python binding for libxml2 and libxslt LICENSE= modified-bsd TEST_TARGET= test_inplace -PYTHON_VERSIONS_INCLUDE_3X= yes .include "../../lang/python/egg.mk" BUILDLINK_API_DEPENDS.libxml2+= libxml2>=2.7.8 diff --git a/textproc/py-markdown2/Makefile b/textproc/py-markdown2/Makefile index 8b264db8699..824f29cdc4c 100644 --- a/textproc/py-markdown2/Makefile +++ b/textproc/py-markdown2/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2014/01/22 13:18:19 obache Exp $ -# +# $NetBSD: Makefile,v 1.7 2014/01/25 10:30:24 wiz Exp $ DISTNAME= markdown2-2.2.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -14,7 +13,6 @@ LICENSE= mit USE_LANGUAGES= # none -PYTHON_VERSIONS_INCLUDE_3X= yes PYTHON_SELF_CONFLICT= yes REPLACE_PYTHON= lib/markdown2.py diff --git a/textproc/py-markupsafe/Makefile b/textproc/py-markupsafe/Makefile index 48fa5127410..115aa4d1c52 100644 --- a/textproc/py-markupsafe/Makefile +++ b/textproc/py-markupsafe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2013/05/22 11:52:43 kleink Exp $ +# $NetBSD: Makefile,v 1.5 2014/01/25 10:30:24 wiz Exp $ DISTNAME= MarkupSafe-0.18 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -10,7 +10,5 @@ HOMEPAGE= http://www.pocoo.org/projects/markupsafe/ COMMENT= Implements a XML/HTML/XHTML Markup safe string for Python LICENSE= modified-bsd -PYTHON_VERSIONS_INCLUDE_3X= yes - .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/py-mecab/Makefile b/textproc/py-mecab/Makefile index d2cf7419b5b..20a2a0effbd 100644 --- a/textproc/py-mecab/Makefile +++ b/textproc/py-mecab/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2012/10/25 06:56:51 asau Exp $ -# +# $NetBSD: Makefile,v 1.8 2014/01/25 10:30:24 wiz Exp $ .include "../../textproc/mecab/Makefile.common" @@ -23,6 +22,8 @@ do-test: BUILDLINK_API_DEPENDS.mecab+= mecab>=${MECAB_VERSION} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.996 + .include "../../textproc/mecab/buildlink3.mk" .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/py-pygments/Makefile b/textproc/py-pygments/Makefile index 43023fb3eac..02a5949f20c 100644 --- a/textproc/py-pygments/Makefile +++ b/textproc/py-pygments/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2013/03/03 07:31:30 obache Exp $ -# +# $NetBSD: Makefile,v 1.14 2014/01/25 10:30:25 wiz Exp $ DISTNAME= Pygments-1.6 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -13,8 +12,6 @@ LICENSE= 2-clause-bsd USE_LANGUAGES= #none -PYTHON_VERSIONS_INCLUDE_3X= yes - .include "../../mk/bsd.prefs.mk" .if !empty(PKGSRC_RUN_TEST:M[yY][eE][sS]) diff --git a/textproc/py-relatorio/Makefile b/textproc/py-relatorio/Makefile index 6629359de80..bb88643b887 100644 --- a/textproc/py-relatorio/Makefile +++ b/textproc/py-relatorio/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2013/07/21 12:15:29 richard Exp $ -# +# $NetBSD: Makefile,v 1.2 2014/01/25 10:30:25 wiz Exp $ DISTNAME= relatorio-0.5.7 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -9,16 +8,17 @@ MASTER_SITES= http://pypi.python.org/packages/source/r/relatorio/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://relatorio.openhex.org/ COMMENT= Templating library able to output odt and pdf files - LICENSE= gnu-gpl-v3 -DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo -DEPENDS+= ${PYPKGPREFIX}-genshi>=0.5:../../www/py-genshi -DEPENDS+= ${PYPKGPREFIX}-lxml>=2.0:../../textproc/py-lxml -DEPENDS+= ${PYPKGPREFIX}-pycha-[0-9]*:../../graphics/py-pycha -DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml +DEPENDS+= ${PYPKGPREFIX}-genshi>=0.5:../../www/py-genshi +DEPENDS+= ${PYPKGPREFIX}-lxml>=2.0:../../textproc/py-lxml +DEPENDS+= ${PYPKGPREFIX}-pycha-[0-9]*:../../graphics/py-pycha +DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml USE_LANGUAGES= #none +PYTHON_VERSIONED_DEPENDENCIES= cairo +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 via py-pycha +.include "../../lang/python/versioned_dependencies.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/py-sphinx-theme-cloud/Makefile b/textproc/py-sphinx-theme-cloud/Makefile index af66d0c1a0f..1a86e8d8277 100644 --- a/textproc/py-sphinx-theme-cloud/Makefile +++ b/textproc/py-sphinx-theme-cloud/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2012/12/08 18:29:31 dholland Exp $ - +# $NetBSD: Makefile,v 1.3 2014/01/25 10:30:25 wiz Exp $ DISTNAME= cloud_sptheme-${VERSION} -PKGNAME= ${PYPKGPREFIX}sphinx-theme-cloud-${VERSION} -VERSION= 1.5 +PKGNAME= ${PYPKGPREFIX}sphinx-theme-cloud-${VERSION} +VERSION= 1.5 CATEGORIES= textproc python MASTER_SITES= http://pypi.python.org/packages/source/c/cloud_sptheme/ @@ -16,8 +15,6 @@ DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx USE_LANGUAGES= #none -PYTHON_VERSIONS_INCLUDE_3X= yes - .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/py-sphinx/Makefile b/textproc/py-sphinx/Makefile index 1d950484d69..dea221fa0ba 100644 --- a/textproc/py-sphinx/Makefile +++ b/textproc/py-sphinx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2014/01/02 17:58:22 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2014/01/25 10:30:25 wiz Exp $ DISTNAME= Sphinx-1.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -15,7 +15,6 @@ DEPENDS+= ${PYPKGPREFIX}-jinja2>=2.2:../../textproc/py-jinja2 DEPENDS+= ${PYPKGPREFIX}-pygments>=0.8:../../textproc/py-pygments USE_LANGUAGES= #none -PYTHON_VERSIONS_INCLUDE_3X= yes REPLACE_PYTHON+= sphinx/pycode/pgen2/token.py diff --git a/textproc/py-vobject/Makefile b/textproc/py-vobject/Makefile index 571558e2cea..d5f3a68643b 100644 --- a/textproc/py-vobject/Makefile +++ b/textproc/py-vobject/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2014/01/16 10:41:53 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2014/01/25 10:30:25 wiz Exp $ DISTNAME= vobject-0.8.1c PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,6 +12,7 @@ COMMENT= Python iCalendar (ics) and vCard library LICENSE= apache-2.0 PYTHON_VERSIONED_DEPENDENCIES= dateutil +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.8.1c PYTHON_SELF_CONFLICT= yes diff --git a/textproc/py-xlwt/Makefile b/textproc/py-xlwt/Makefile index afec1013046..4cca76b09c5 100644 --- a/textproc/py-xlwt/Makefile +++ b/textproc/py-xlwt/Makefile @@ -1,22 +1,22 @@ -# $NetBSD: Makefile,v 1.1 2013/07/20 07:40:11 richard Exp $ +# $NetBSD: Makefile,v 1.2 2014/01/25 10:30:25 wiz Exp $ -DISTNAME= xlwt-0.7.5 -PKGNAME= ${PYPKGPREFIX}-${DISTNAME} -CATEGORIES= textproc python +DISTNAME= xlwt-0.7.5 +PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +CATEGORIES= textproc python MASTER_SITES= http://pypi.python.org/packages/source/x/xlwt/ -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.python-excel.org/ -COMMENT= Writing data and formatting information from Excel files -LICENSE= original-bsd +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://www.python-excel.org/ +COMMENT= Writing data and formatting information from Excel files +LICENSE= original-bsd USE_LANGUAGES= #none -REPLACE_INTERPRETER+= python -REPLACE.python.old= /usr/bin/env python -REPLACE.python.new= ${PYTHONBIN} -REPLACE_FILES.python= xlwt/Formatting.py -REPLACE_FILES.python+= xlwt/examples/*.py +REPLACE_PYTHON+= xlwt/Formatting.py +REPLACE_PYTHON+= xlwt/examples/*.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.7.5 + +.include "../../lang/python/application.mk" .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/py-xml/Makefile b/textproc/py-xml/Makefile index 27fde5bab79..88694c76a13 100644 --- a/textproc/py-xml/Makefile +++ b/textproc/py-xml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2013/06/17 13:33:47 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2014/01/25 10:30:25 wiz Exp $ DISTNAME= PyXML-0.8.4 PKGNAME= ${PYPKGPREFIX}-xml-0.8.4 @@ -18,6 +18,8 @@ PYSETUPBUILDARGS+= --ldflags="${EXPAT_LDFLAGS}" EXPAT_LDFLAGS= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.expat}/lib FIX_RPATH+= EXPAT_LDFLAGS +PYTHON_VERSIONS_INCOMPATIBLE= 33 # dead upstream, no plans of porting + PYXML_SCRIPTS= scripts/xmlproc_parse \ scripts/xmlproc_val diff --git a/textproc/py-yamcha/Makefile b/textproc/py-yamcha/Makefile index 82884676f32..c77f27d51d7 100644 --- a/textproc/py-yamcha/Makefile +++ b/textproc/py-yamcha/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2012/10/25 06:56:52 asau Exp $ +# $NetBSD: Makefile,v 1.4 2014/01/25 10:30:25 wiz Exp $ # .include "../../textproc/yamcha/Makefile.common" @@ -12,6 +12,7 @@ COMMENT= YamCha python module USE_LANGUAGES= c c++ PYSETUPSUBDIR= python +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.33 EGG_NAME= ${DISTNAME:S/-/_python-/} diff --git a/textproc/py-yaml/Makefile b/textproc/py-yaml/Makefile index ab65f8ea603..669a57c0d79 100644 --- a/textproc/py-yaml/Makefile +++ b/textproc/py-yaml/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2012/10/25 06:56:53 asau Exp $ -# +# $NetBSD: Makefile,v 1.12 2014/01/25 10:30:25 wiz Exp $ DISTNAME= PyYAML-3.10 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/PyYAML/yaml/} @@ -12,8 +11,6 @@ HOMEPAGE= http://www.pyyaml.org/ COMMENT= Collection of libraries to process YAML with Python LICENSE= mit -PYTHON_VERSIONS_INCLUDE_3X= yes - .include "../../lang/python/distutils.mk" .include "../../textproc/libyaml/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/queequeg/Makefile b/textproc/queequeg/Makefile index ac805d88999..ac15ed3850e 100644 --- a/textproc/queequeg/Makefile +++ b/textproc/queequeg/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2012/10/25 06:56:53 asau Exp $ -# +# $NetBSD: Makefile,v 1.4 2014/01/25 10:30:25 wiz Exp $ DISTNAME= queequeg-0.91 PKGREVISION= 1 @@ -16,6 +15,7 @@ BUILD_DEPENDS+= WordNet-[0-9]*:../../textproc/WordNet USE_LANGUAGES= # none PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-cdb SUBST_CLASSES+= fix-python SUBST_STAGE.fix-python= pre-configure diff --git a/textproc/rubber/Makefile b/textproc/rubber/Makefile index 8f3a29f8691..4a33ba818b3 100644 --- a/textproc/rubber/Makefile +++ b/textproc/rubber/Makefile @@ -1,14 +1,13 @@ -# $NetBSD: Makefile,v 1.26 2012/10/25 06:56:55 asau Exp $ -# +# $NetBSD: Makefile,v 1.27 2014/01/25 10:30:25 wiz Exp $ -DISTNAME= rubber-1.1 -PKGREVISION= 5 -CATEGORIES= textproc -MASTER_SITES= http://ebeffara.free.fr/pub/ +DISTNAME= rubber-1.1 +PKGREVISION= 5 +CATEGORIES= textproc +MASTER_SITES= http://ebeffara.free.fr/pub/ -MAINTAINER= tonio@NetBSD.org -HOMEPAGE= https://launchpad.net/rubber -COMMENT= Automated system for building LaTeX documents +MAINTAINER= tonio@NetBSD.org +HOMEPAGE= https://launchpad.net/rubber +COMMENT= Automated system for building LaTeX documents DEPENDS+= tex-latex-bin-[0-9]*:../../print/tex-latex-bin @@ -27,5 +26,7 @@ CONFIGURE_ARGS+= --infodir=${PREFIX:Q}/${PKGINFODIR:Q} PLIST_SUBST+= RUBBERVERSUFFIX=${PKGVERSION_NOREV} PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.1 + .include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/xmlada/Makefile b/textproc/xmlada/Makefile index da7e7713486..6ef2d4227ad 100644 --- a/textproc/xmlada/Makefile +++ b/textproc/xmlada/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2013/07/02 22:13:56 marino Exp $ -# +# $NetBSD: Makefile,v 1.7 2014/01/25 10:30:25 wiz Exp $ DISTNAME= xmlada-${XMLADA_VERS} CATEGORIES= textproc @@ -39,6 +38,7 @@ SUBST_SED.docs= -e 's/^all: \(.*\)/all: \1 docs/g' DESTSTATIC= ${DESTDIR}${PREFIX}/lib/xmlada/static DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 4.4.0.0 post-install: # There is no reason to install sphinx source files diff --git a/time/etm/Makefile b/time/etm/Makefile index 603d1722deb..730ad1f5382 100644 --- a/time/etm/Makefile +++ b/time/etm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2014/01/16 10:41:53 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2014/01/25 10:30:25 wiz Exp $ DISTNAME= etm-877 PKGREVISION= 1 @@ -14,6 +14,7 @@ DEPENDS+= ${PYPKGPREFIX}-wxWidgets>=2.8.7:../../x11/py-wxWidgets DEPENDS+= ${PYPKGPREFIX}-icalendar>=2.0.1:../../time/py-icalendar PYTHON_VERSIONED_DEPENDENCIES= dateutil +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-wxWidgets USE_LANGUAGES= # none diff --git a/time/gdeskcal/Makefile b/time/gdeskcal/Makefile index 5cf452ce4fd..ffcb1bffcfd 100644 --- a/time/gdeskcal/Makefile +++ b/time/gdeskcal/Makefile @@ -1,20 +1,22 @@ -# $NetBSD: Makefile,v 1.52 2013/10/10 14:42:34 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.53 2014/01/25 10:30:25 wiz Exp $ -DISTNAME= gDeskCal-0_57_1 -PKGNAME= gdeskcal-0.57.1 -PKGREVISION= 26 -CATEGORIES= time -MASTER_SITES= http://www.pycage.de/download/ +DISTNAME= gDeskCal-0_57_1 +PKGNAME= gdeskcal-0.57.1 +PKGREVISION= 26 +CATEGORIES= time +MASTER_SITES= http://www.pycage.de/download/ -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.pycage.de/\#gdeskcal -COMMENT= Desktop calendar +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://www.pycage.de/\#gdeskcal +COMMENT= Desktop calendar WRKSRC= ${WRKDIR}/gDeskCal-0.57.1 NO_BUILD= yes PYTHON_PATCH_SCRIPTS= gdeskcal + +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-xml, py-gtk2 + INSTALLATION_DIRS= bin lib/gdeskcal post-extract: diff --git a/time/hamster-applet/Makefile b/time/hamster-applet/Makefile index ee8f41bafdb..d2cb8608f2d 100644 --- a/time/hamster-applet/Makefile +++ b/time/hamster-applet/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2013/10/10 14:42:34 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.40 2014/01/25 10:30:26 wiz Exp $ DISTNAME= hamster-applet-2.28.1 PKGREVISION= 25 @@ -18,6 +17,8 @@ USE_TOOLS+= gmake intltool pkg-config msgfmt GCONF_SCHEMAS+= hamster-applet.schemas PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-ORBit via py-gnome2, py-gtk2 + SUBST_CLASSES+= python SUBST_MESSAGE.python= Fixing path to Python interpreter. SUBST_STAGE.python= post-patch diff --git a/time/py-dateutil/Makefile b/time/py-dateutil/Makefile index 237bfadc95b..50e0e0e3cd8 100644 --- a/time/py-dateutil/Makefile +++ b/time/py-dateutil/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2014/01/16 10:25:03 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2014/01/25 10:30:26 wiz Exp $ DISTNAME= python-dateutil-1.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/python-//} @@ -10,6 +10,7 @@ HOMEPAGE= http://labix.org/python-dateutil COMMENT= Extensions to the standard datetime module (Python-2.x version) EGG_NAME= ${DISTNAME:S/-/_/} +PYTHON_VERSIONS_INCOMPATIBLE= 33 .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/py-dateutil2/Makefile b/time/py-dateutil2/Makefile index 8757bf600ae..f333f8865bf 100644 --- a/time/py-dateutil2/Makefile +++ b/time/py-dateutil2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2014/01/16 10:26:00 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2014/01/25 10:30:26 wiz Exp $ DISTNAME= python-dateutil-2.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/python-//} @@ -12,7 +12,6 @@ LICENSE= modified-bsd EGG_NAME= ${DISTNAME:S/-/_/} -PYTHON_VERSIONS_INCLUDE_3X= yes PYTHON_VERSIONS_INCOMPATIBLE= 26 27 .include "../../lang/python/egg.mk" diff --git a/time/py-pytz/Makefile b/time/py-pytz/Makefile index 2f4d13edc9e..f600968c6e2 100644 --- a/time/py-pytz/Makefile +++ b/time/py-pytz/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2014/01/06 14:36:57 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2014/01/25 10:30:26 wiz Exp $ DISTNAME= pytz-2013.9 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -13,8 +13,6 @@ LICENSE= mit USE_LANGUAGES= # none -PYTHON_VERSIONS_INCLUDE_3X= yes - REPLACE_PYTHON= pytz/tzfile.py .include "../../lang/python/application.mk" diff --git a/time/wxRemind/Makefile b/time/wxRemind/Makefile index f5a39d86a8b..1ba63cf3990 100644 --- a/time/wxRemind/Makefile +++ b/time/wxRemind/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2012/10/08 13:04:30 asau Exp $ -# +# $NetBSD: Makefile,v 1.9 2014/01/25 10:30:26 wiz Exp $ DISTNAME= wxRemind-0.6.18 PKGREVISION= 4 @@ -12,5 +11,7 @@ COMMENT= Graphical front-end to Remind DEPENDS+= ${PYPKGPREFIX}-wxWidgets>=2.6.1:../../x11/py-wxWidgets +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-wxWidgets + .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/bmpanel2/Makefile b/wm/bmpanel2/Makefile index c4842dae5e8..c47f47faa6a 100644 --- a/wm/bmpanel2/Makefile +++ b/wm/bmpanel2/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2013/10/10 14:42:34 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.19 2014/01/25 10:30:26 wiz Exp $ DISTNAME= bmpanel2-2.1pre1 PKGREVISION= 15 @@ -11,12 +10,15 @@ HOMEPAGE= http://code.google.com/p/bmpanel2/ COMMENT= NETWM-compatible panel for X11 LICENSE= mit +BUILD_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc + USE_CMAKE= yes USE_LANGUAGES= c c++ USE_TOOLS+= pkg-config gzip PY_PATCHPLIST= yes REPLACE_PYTHON= extra/py/bmpanel2.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.1pre1 SUBST_CLASSES+= prefix SUBST_SED.prefix= -e "s,/usr/local,${PREFIX},g" @@ -24,8 +26,6 @@ SUBST_FILES.prefix= xdg.c SUBST_STAGE.prefix= post-extract SUBST_MESSAGE.prefix= Fixing path to themes. -BUILD_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc - .include "../../devel/glib2/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" .include "../../lang/python/application.mk" diff --git a/wm/ccsm/Makefile b/wm/ccsm/Makefile index e0287e6658f..4c3fd3355e1 100644 --- a/wm/ccsm/Makefile +++ b/wm/ccsm/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2012/10/08 12:42:18 asau Exp $ -# +# $NetBSD: Makefile,v 1.16 2014/01/25 10:30:26 wiz Exp $ PKGVER= 0.8.4 DISTNAME= ccsm-${PKGVER} @@ -12,17 +11,18 @@ HOMEPAGE= http://compiz.org/ COMMENT= CompizConfig Settings Manager LICENSE= gnu-gpl-v2 +DEPENDS+= compizconfig-backend-gconf>=0.6.0:../../devel/compizconfig-backend-gconf +DEPENDS+= ${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2 + USE_TOOLS+= pkg-config gmake msgfmt intltool PY_PATCHPLIST= yes PYDISTUTILSPKG= yes REPLACE_PYTHON= ${WRKSRC}/setup.py ${WRKSRC}/ccm/*.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 MAKE_ENV+= PYTHONBIN=${PYTHONBIN:Q} -DEPENDS+= compizconfig-backend-gconf>=0.6.0:../../devel/compizconfig-backend-gconf -DEPENDS+= ${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2 - .include "../../devel/py-compizconfig/buildlink3.mk" .include "../../lang/python/application.mk" .include "../../lang/python/extension.mk" diff --git a/wm/icecc/Makefile b/wm/icecc/Makefile index f193df4a30a..433c1ed1c79 100644 --- a/wm/icecc/Makefile +++ b/wm/icecc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2013/10/09 17:39:18 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2014/01/25 10:30:26 wiz Exp $ # Package version reflects icecc version, with PKGREVISION incremented # for any tool updates, according to the authors scheme. @@ -39,6 +39,8 @@ PYTHON_PATCH_SCRIPTS= icecursorscfg-0.6/icecurcfg.py iceiconcvt-1.0/iceiconcvt.p PYTHON_PATCH_SCRIPTS+= icemergeprefs-0.5/icemergeprefs.py icerrun-0.5/icerrrun.py PYTHON_PATCH_SCRIPTS+= icerrun-0.5/icerrun.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-qt3-base + SUBST_CLASSES+= path SUBST_STAGE.path= post-patch SUBST_FILES.path= icebgset-1.3/icebgset.pro icecc-2.9/icecc.pro iceked-1.5/iceked.pro diff --git a/www/ap-python/Makefile b/www/ap-python/Makefile index 713ceb2b2ba..8947ccf0a95 100644 --- a/www/ap-python/Makefile +++ b/www/ap-python/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2012/10/28 06:30:05 asau Exp $ -# +# $NetBSD: Makefile,v 1.26 2014/01/25 10:30:26 wiz Exp $ DISTNAME= mod_python-2.7.11 PKGNAME= ap13-${PYPKGPREFIX}-python-2.7.11 @@ -22,6 +21,7 @@ CONFIGURE_ENV+= PYTHON_BIN=${PYTHONBIN:Q} ac_cv_path_MKDEP= INSTALLATION_DIRS= lib/httpd share/doc/ap-mod_python PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.7.11; 3.5.0 is supposed to work post-install: cd ${WRKSRC}/doc-html && pax -rwpe . ${DESTDIR}${PREFIX}/share/doc/ap-mod_python diff --git a/www/ap-scgi/Makefile b/www/ap-scgi/Makefile index 0aee0a03c2f..bc7500cca03 100644 --- a/www/ap-scgi/Makefile +++ b/www/ap-scgi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2012/10/28 06:30:05 asau Exp $ +# $NetBSD: Makefile,v 1.11 2014/01/25 10:30:26 wiz Exp $ # PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME} @@ -13,6 +13,8 @@ APACHE_MODULE= yes # does not compile with apache24 PKG_APACHE_ACCEPTED= apache13 apache2 apache22 +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-quixote via py-scgi + .include "../../mk/apache.mk" .include "../../www/apache/module.mk" diff --git a/www/ap2-python/Makefile b/www/ap2-python/Makefile index 16fdbee4aba..566c143fed8 100644 --- a/www/ap2-python/Makefile +++ b/www/ap2-python/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2013/08/09 13:02:02 prlw1 Exp $ +# $NetBSD: Makefile,v 1.30 2014/01/25 10:30:26 wiz Exp $ DISTNAME= mod_python-${VERSION} PKGNAME= ${APACHE_PKG_PREFIX}-${PYPKGPREFIX}-python-${VERSION} @@ -25,6 +25,8 @@ PY_PATCHPLIST= YES PKG_APACHE_ACCEPTED= apache2 apache22 +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 3.3.1; 3.5.0 is supposed to work + .include "../../lang/python/extension.mk" .include "../../mk/apache.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/ap2-wsgi/Makefile b/www/ap2-wsgi/Makefile index 2ea6dc37c3d..ca8890c776f 100644 --- a/www/ap2-wsgi/Makefile +++ b/www/ap2-wsgi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2013/08/19 10:09:51 obache Exp $ +# $NetBSD: Makefile,v 1.16 2014/01/25 10:30:26 wiz Exp $ DISTNAME= mod_wsgi-${VERSION} PKGNAME= ${APACHE_PKG_PREFIX}-${PYPKGPREFIX}-wsgi-${VERSION} @@ -10,8 +10,6 @@ HOMEPAGE= http://modwsgi.googlecode.com/ COMMENT= WSGI module for apache LICENSE= apache-2.0 -PYTHON_VERSIONS_INCLUDE_3X= yes - APACHE_MODULE= yes VERSION= 3.4 diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile index d1af7d7828f..21eb75b83f2 100644 --- a/www/bluefish/Makefile +++ b/www/bluefish/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.112 2013/10/10 14:42:35 ryoon Exp $ +# $NetBSD: Makefile,v 1.113 2014/01/25 10:30:26 wiz Exp $ DISTNAME= bluefish-2.2.4 PKGREVISION= 6 @@ -28,6 +28,8 @@ REPLACE_PYTHON+= data/cssmin.py data/jsmin.py CHECK_INTERPRETER_SKIP+= share/bluefish/plugins/*/*.py CHECK_INTERPRETER_SKIP+= share/bluefish/plugins/*/*/*.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.2.4 + # XXX this doesn't work #XML_CATALOGS= ${PREFIX}/share/xml/bluefish/catalog.xml #XML_ENTRIES= delegateURI http://bluefish.openoffice.nl/ns/bflang/2.0/ \ diff --git a/www/browser-bookmarks-menu/Makefile b/www/browser-bookmarks-menu/Makefile index eb431534ed6..7dbd79176df 100644 --- a/www/browser-bookmarks-menu/Makefile +++ b/www/browser-bookmarks-menu/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2013/10/10 14:42:35 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.44 2014/01/25 10:30:26 wiz Exp $ DISTNAME= browser-bookmarks-menu-0.6 PKGREVISION= 28 @@ -12,6 +11,7 @@ COMMENT= Easy access to web bookmarks through a GNOME Panel Applet NO_BUILD= yes PYTHON_PATCH_SCRIPTS= browser-bookmarks-menu.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-ORBit via py-gnome2 SUBST_CLASSES+= paths SUBST_STAGE.paths= pre-configure diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile index 046a8ed3bb3..057219ca48f 100644 --- a/www/cherokee/Makefile +++ b/www/cherokee/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2013/03/02 20:33:34 wiz Exp $ -# +# $NetBSD: Makefile,v 1.25 2014/01/25 10:30:26 wiz Exp $ DISTNAME= cherokee-1.2.101 PKGREVISION= 4 @@ -34,6 +33,8 @@ RCD_SCRIPTS= cherokee INSTALLATION_DIRS+= ${EGDIR}/pam.d +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.2.101 + .include "options.mk" BUILD_DEFS+= VARBASE diff --git a/www/clearsilver/Makefile b/www/clearsilver/Makefile index b6b1d2d53f4..09304a7e7c8 100644 --- a/www/clearsilver/Makefile +++ b/www/clearsilver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2013/05/31 12:42:31 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2014/01/25 10:30:27 wiz Exp $ META_PACKAGE= yes @@ -10,6 +10,8 @@ DEPENDS+=${CLEARSILVER_BASE}{,nb[0-9]*}:../../www/clearsilver-base DEPENDS+=${PYPKGPREFIX}-${DISTNAME}{,nb[0-9]*}:../../www/py-clearsilver DEPENDS+=${RUBY_PKGPREFIX}-${DISTNAME}{,nb[0-9]*}:../../www/ruby-clearsilver +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-clearsilver + .include "../../lang/python/pyversion.mk" .include "../../lang/ruby/rubyversion.mk" diff --git a/www/firefox/mozilla-common.mk b/www/firefox/mozilla-common.mk index 29e9a8c3688..c41232a8862 100644 --- a/www/firefox/mozilla-common.mk +++ b/www/firefox/mozilla-common.mk @@ -1,4 +1,4 @@ -# $NetBSD: mozilla-common.mk,v 1.23 2013/12/26 13:12:05 ryoon Exp $ +# $NetBSD: mozilla-common.mk,v 1.24 2014/01/25 10:30:27 wiz Exp $ # # common Makefile fragment for mozilla packages based on gecko 2.0. # @@ -91,6 +91,7 @@ CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.sub PYTHON_VERSIONS_ACCEPTED= 27 PYTHON_FOR_BUILD_ONLY= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-sqlite2 .include "../../lang/python/application.mk" CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} diff --git a/www/firefox24/mozilla-common.mk b/www/firefox24/mozilla-common.mk index fde72fd8375..2b46a2adf88 100644 --- a/www/firefox24/mozilla-common.mk +++ b/www/firefox24/mozilla-common.mk @@ -1,4 +1,4 @@ -# $NetBSD: mozilla-common.mk,v 1.5 2013/12/01 10:54:40 richard Exp $ +# $NetBSD: mozilla-common.mk,v 1.6 2014/01/25 10:30:27 wiz Exp $ # # common Makefile fragment for mozilla packages based on gecko 2.0. # @@ -92,6 +92,7 @@ CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.sub PYTHON_VERSIONS_ACCEPTED= 27 PYTHON_FOR_BUILD_ONLY= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-sqlite2 .include "../../lang/python/application.mk" CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} diff --git a/www/ies4linux/Makefile b/www/ies4linux/Makefile index 3c46ffbd0b0..e65f052cc02 100644 --- a/www/ies4linux/Makefile +++ b/www/ies4linux/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2013/10/18 11:41:18 bsiegert Exp $ -# +# $NetBSD: Makefile,v 1.12 2014/01/25 10:30:27 wiz Exp $ DISTNAME= ies4linux-2.99.0.1 PKGREVISION= 5 @@ -18,6 +17,7 @@ BUILD_DEPENDS+= cabextract-[0-9]*:../../archivers/cabextract NO_BUILD= yes USE_LANGUAGES= # none USE_TOOLS+= bash:run pax unzip:run +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 SHAREDIR= share/ies4linux diff --git a/www/ja-trac/options.mk b/www/ja-trac/options.mk index 4905cc840df..5090cb9d156 100644 --- a/www/ja-trac/options.mk +++ b/www/ja-trac/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2013/02/14 14:53:31 gdt Exp $ +# $NetBSD: options.mk,v 1.5 2014/01/25 10:30:27 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.trac PKG_OPTIONS_REQUIRED_GROUPS= db @@ -14,10 +14,12 @@ PKG_OPTIONS_LEGACY_OPTS= psycopg2:pgsql # preferred over "py-sqlite3", the bundled version of sqlite3 support, # because it is more up to date. DEPENDS+= ${PYPKGPREFIX}-sqlite2>=2.5.5:../../databases/py-sqlite2 +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-sqlite2 .endif .if !empty(PKG_OPTIONS:Mpgsql) DEPENDS+= ${PYPKGPREFIX}-psycopg2>=2:../../databases/py-psycopg2 .endif .if !empty(PKG_OPTIONS:Mmysql) DEPENDS+= ${PYPKGPREFIX}-mysqldb>=1.2.2:../../databases/py-mysqldb +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-mysqldb .endif diff --git a/www/loggerhead/Makefile b/www/loggerhead/Makefile index bccd97977ee..009cf2c8953 100644 --- a/www/loggerhead/Makefile +++ b/www/loggerhead/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2014/01/18 19:07:57 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2014/01/25 10:30:27 wiz Exp $ DISTNAME= loggerhead-${VER} PKGREVISION= 1 @@ -19,6 +19,7 @@ DEPENDS+= ${PYPKGPREFIX}-PasteDeploy>=1.3:../../www/py-PasteDeploy DEPENDS+= ${PYPKGPREFIX}-SimpleTAL>=4.1:../../www/py-simpletal PYTHON_VERSIONED_DEPENDENCIES= flup +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-PasteDeploy, py-paste, py-simpletal .include "../../lang/python/application.mk" .include "../../lang/python/distutils.mk" diff --git a/www/midori/Makefile b/www/midori/Makefile index 8d3f9f28e6c..f091ca556a2 100644 --- a/www/midori/Makefile +++ b/www/midori/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.66 2014/01/01 11:52:38 wiz Exp $ +# $NetBSD: Makefile,v 1.67 2014/01/25 10:30:27 wiz Exp $ DISTNAME= midori-0.4.9 PKGREVISION= 11 @@ -21,6 +21,7 @@ CHECK_PORTABILITY_SKIP+= win32/x86-mingw32-opensuse/install.sh CHECK_PORTABILITY_SKIP+= win32/makedist/makedist.midori PYTHON_FOR_BUILD_ONLY= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.4.9 REPLACE_PYTHON= waf wscript docs/api/wscript_build REPLACE_PYTHON+= tests/wscript_build extensions/wscript_build diff --git a/www/py-ClientForm/Makefile b/www/py-ClientForm/Makefile index 981fde10bc4..1f9cb250a7c 100644 --- a/www/py-ClientForm/Makefile +++ b/www/py-ClientForm/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2012/10/28 06:30:58 asau Exp $ -# +# $NetBSD: Makefile,v 1.5 2014/01/25 10:30:27 wiz Exp $ DISTNAME= ClientForm-0.2.10 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,6 +11,7 @@ COMMENT= Python module for handling HTML forms on the client side LICENSE= modified-bsd OR zpl USE_LANGUAGES= # none +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.2.10 .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/py-HTMLgen/Makefile b/www/py-HTMLgen/Makefile index 778019af1e8..e914ba64f22 100644 --- a/www/py-HTMLgen/Makefile +++ b/www/py-HTMLgen/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2012/10/28 06:30:58 asau Exp $ -# +# $NetBSD: Makefile,v 1.13 2014/01/25 10:30:27 wiz Exp $ DISTNAME= HTMLgen PKGNAME= ${PYPKGPREFIX}-HTMLgen-2.2.2 @@ -19,6 +18,8 @@ PY_PATCHPLIST= yes REPLACE_PYTHON+= *.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 + INSTALLATION_DIRS+= ${PYSITELIB} .include "../../lang/python/application.mk" diff --git a/www/py-PasteDeploy/Makefile b/www/py-PasteDeploy/Makefile index ca52c99cbe1..4fc1d787245 100644 --- a/www/py-PasteDeploy/Makefile +++ b/www/py-PasteDeploy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2012/10/28 06:30:59 asau Exp $ +# $NetBSD: Makefile,v 1.4 2014/01/25 10:30:27 wiz Exp $ DISTNAME= PasteDeploy-1.3.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -10,5 +10,7 @@ HOMEPAGE= http://pythonpaste.org/ COMMENT= Load, configure, and compose WSGI applications and servers LICENSE= mit +PYTHON_VERSIONS_INCOMPATIBLE= 33 + .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/py-blosxom/Makefile b/www/py-blosxom/Makefile index 575cc8fc429..3f77625592b 100644 --- a/www/py-blosxom/Makefile +++ b/www/py-blosxom/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2013/07/31 10:20:27 hauke Exp $ -# +# $NetBSD: Makefile,v 1.14 2014/01/25 10:30:27 wiz Exp $ PYBLOXSOMVERS= 1.5.3 DISTNAME= pyblosxom-${PYBLOXSOMVERS} @@ -27,6 +26,8 @@ INSTALLATION_DIRS= ${DOC_SUBDIR} REPLACE_PYTHON= Pyblosxom/data/pyblosxom.cgi EGG_NAME= ${DISTNAME} +PYTHON_VERSIONS_INCOMPATIBLE= 33 + # There is a set of manual files in docs/source that could be # converted to HTML or PDF, and installed post-install: diff --git a/www/py-clearsilver/Makefile b/www/py-clearsilver/Makefile index 968d4cd583f..4d38d1872fe 100644 --- a/www/py-clearsilver/Makefile +++ b/www/py-clearsilver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2013/04/06 15:46:40 rodent Exp $ +# $NetBSD: Makefile,v 1.18 2014/01/25 10:30:27 wiz Exp $ PKGNAME= ${PYPKGPREFIX}-${DISTNAME} PKGREVISION= 1 @@ -14,6 +14,7 @@ CFLAGS+= -fPIC INSTALL_DIRS= python PY_PATCHPLIST= YES +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.10.5 .include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/py-django-appmedia/Makefile b/www/py-django-appmedia/Makefile index fd6bf7f0c4d..e02083a5b6e 100644 --- a/www/py-django-appmedia/Makefile +++ b/www/py-django-appmedia/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2012/10/28 06:31:00 asau Exp $ +# $NetBSD: Makefile,v 1.4 2014/01/25 10:30:27 wiz Exp $ DISTNAME= django-appmedia-1.0.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,6 +12,7 @@ LICENSE= modified-bsd EGG_NAME= ${DISTNAME:S/-/_/} USE_LANGUAGES= # empty +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.0.1 DEPENDS+= ${PYPKGPREFIX}-django-[0-9]*:../../www/py-django diff --git a/www/py-django-cms/Makefile b/www/py-django-cms/Makefile index bada9fc0ecc..bab0b3cb4c1 100644 --- a/www/py-django-cms/Makefile +++ b/www/py-django-cms/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2013/11/01 11:18:00 adam Exp $ +# $NetBSD: Makefile,v 1.18 2014/01/25 10:30:28 wiz Exp $ DISTNAME= django-cms-2.4.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -10,9 +10,6 @@ HOMEPAGE= http://www.django-cms.org/ COMMENT= Django content management system LICENSE= modified-bsd -EGG_NAME= ${DISTNAME:S/-/_/} -USE_LANGUAGES= # empty - DEPENDS+= ${PYPKGPREFIX}-django-[0-9]*:../../www/py-django DEPENDS+= ${PYPKGPREFIX}-imaging-[0-9]*:../../graphics/py-imaging DEPENDS+= ${PYPKGPREFIX}-django-south-[0-9]*:../../www/py-django-south @@ -23,5 +20,9 @@ DEPENDS+= ${PYPKGPREFIX}-django-sekizai-[0-9]*:../../www/py-django-sekizai DEPENDS+= ${PYPKGPREFIX}-django-reversion-[0-9]*:../../www/py-django-reversion DEPENDS+= ${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib +EGG_NAME= ${DISTNAME:S/-/_/} +USE_LANGUAGES= # empty +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-django-appmedia, py-imaging + .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/py-django-cmsplugin_gallery/Makefile b/www/py-django-cmsplugin_gallery/Makefile index 98edb0ad631..2eac355a710 100644 --- a/www/py-django-cmsplugin_gallery/Makefile +++ b/www/py-django-cmsplugin_gallery/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2013/01/28 21:16:26 adam Exp $ +# $NetBSD: Makefile,v 1.2 2014/01/25 10:30:28 wiz Exp $ DISTNAME= cmsplugin_gallery-0.5.3 PKGNAME= ${PYPKGPREFIX}-django-${DISTNAME} @@ -16,5 +16,7 @@ DEPENDS+= ${PYPKGPREFIX}-django-inline-ordering-[0-9]*:../../www/py-django-inlin USE_LANGUAGES= # none +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-django-appmedia via py-django-cms, py-django-easy-thumbnails + .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/py-django-photologue/Makefile b/www/py-django-photologue/Makefile index e5ec9a93a0e..d0809688374 100644 --- a/www/py-django-photologue/Makefile +++ b/www/py-django-photologue/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2013/01/27 17:41:40 adam Exp $ +# $NetBSD: Makefile,v 1.4 2014/01/25 10:30:28 wiz Exp $ DISTNAME= django-photologue-2.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -17,6 +17,7 @@ DEPENDS+= ${PYPKGPREFIX}-django-tagging-[0-9]*:../../www/py-django-tagging EGG_NAME= ${DISTNAME:S/-/_/} USE_LANGUAGES= # none +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-django-tagging, py-imaging .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/py-django-registration/Makefile b/www/py-django-registration/Makefile index 8d196a3d172..5652422be90 100644 --- a/www/py-django-registration/Makefile +++ b/www/py-django-registration/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2012/10/28 06:31:00 asau Exp $ -# +# $NetBSD: Makefile,v 1.4 2014/01/25 10:30:28 wiz Exp $ DISTNAME= django-registration-0.8-alpha-1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S:-alpha-:a:} @@ -19,5 +18,7 @@ USE_LANGUAGES= # none EGG_NAME= ${DISTNAME:S/-/_/g:S/registration_/registration-/} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.8a1 + .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/py-django/options.mk b/www/py-django/options.mk index 4fdda3eb09d..affe4ae3cd1 100644 --- a/www/py-django/options.mk +++ b/www/py-django/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.9 2010/09/16 11:12:18 adam Exp $ +# $NetBSD: options.mk,v 1.10 2014/01/25 10:30:27 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.django PKG_SUPPORTED_OPTIONS= mysql oracle pgsql sqlite @@ -10,6 +10,7 @@ PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} .if !empty(PKG_OPTIONS:Mmysql) DEPENDS+= ${PYPKGPREFIX}-mysqldb-[0-9]*:../../databases/py-mysqldb +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-mysqldb PLIST.mysql= yes .endif @@ -25,5 +26,6 @@ PLIST.pgsql= yes .if !empty(PKG_OPTIONS:Msqlite) DEPENDS+= ${PYPKGPREFIX}-sqlite2-[0-9]*:../../databases/py-sqlite2 +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-sqlite2 PLIST.sqlite= yes .endif diff --git a/www/py-django14/Makefile b/www/py-django14/Makefile index 64cc9cf1990..dfc3515e9b7 100644 --- a/www/py-django14/Makefile +++ b/www/py-django14/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2014/01/18 19:07:57 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2014/01/25 10:30:28 wiz Exp $ DISTNAME= Django-1.4.10 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -20,6 +20,7 @@ REPLACE_PYTHON+= ${WRKSRC}/django/contrib/admin/static/admin/js/*.py REPLACE_PYTHON+= ${WRKSRC}/django/conf/project_template/*.py PYTHON_VERSIONED_DEPENDENCIES= flup +PYTHON_VERSIONS_INCOMPATIBLE= 33 # use py-django if you want python-3.x support .include "options.mk" diff --git a/www/py-django14/options.mk b/www/py-django14/options.mk index c61177b1336..8cc5e4e5086 100644 --- a/www/py-django14/options.mk +++ b/www/py-django14/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2013/11/14 21:27:01 joerg Exp $ +# $NetBSD: options.mk,v 1.2 2014/01/25 10:30:28 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.django PKG_SUPPORTED_OPTIONS= mysql oracle pgsql sqlite @@ -10,6 +10,7 @@ PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} .if !empty(PKG_OPTIONS:Mmysql) DEPENDS+= ${PYPKGPREFIX}-mysqldb-[0-9]*:../../databases/py-mysqldb +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-mysqldb PLIST.mysql= yes .endif @@ -25,5 +26,6 @@ PLIST.pgsql= yes .if !empty(PKG_OPTIONS:Msqlite) DEPENDS+= ${PYPKGPREFIX}-sqlite2-[0-9]*:../../databases/py-sqlite2 +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-sqlite2 PLIST.sqlite= yes .endif diff --git a/www/py-djangorestframework/Makefile b/www/py-djangorestframework/Makefile index cb8523730e8..0c47c6a001c 100644 --- a/www/py-djangorestframework/Makefile +++ b/www/py-djangorestframework/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2012/10/28 06:31:00 asau Exp $ +# $NetBSD: Makefile,v 1.4 2014/01/25 10:30:28 wiz Exp $ DISTNAME= djangorestframework-0.2.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -10,10 +10,11 @@ HOMEPAGE= http://django-rest-framework.org/ COMMENT= Lightweight REST framework for Django LICENSE= modified-bsd +DEPENDS+= ${PYPKGPREFIX}-django-[0-9]*:../../www/py-django + EGG_NAME= ${DISTNAME} USE_LANGUAGES= # empty - -DEPENDS+= ${PYPKGPREFIX}-django-[0-9]*:../../www/py-django +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.2.3 .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/py-flask-cache/Makefile b/www/py-flask-cache/Makefile index ea0bd35712b..72c595af6b0 100644 --- a/www/py-flask-cache/Makefile +++ b/www/py-flask-cache/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2013/07/20 13:45:45 kleink Exp $ +# $NetBSD: Makefile,v 1.2 2014/01/25 10:30:28 wiz Exp $ DISTNAME= Flask-Cache-0.12 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -10,11 +10,13 @@ HOMEPAGE= http://packages.python.org/Flask-Cache/ COMMENT= Cache extension for Flask LICENSE= modified-bsd +DEPENDS+= ${PYPKGPREFIX}-flask-[0-9]*:../../www/py-flask + USE_LANGUAGES= # empty EGG_NAME= ${DISTNAME:S/-/_/} -DEPENDS+= ${PYPKGPREFIX}-flask-[0-9]*:../../www/py-flask +PYTHON_VERSIONS_INCOMPATIBLE= 33 .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/py-flask-frozen/Makefile b/www/py-flask-frozen/Makefile index 2c3cdd16cd2..4886de50919 100644 --- a/www/py-flask-frozen/Makefile +++ b/www/py-flask-frozen/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2014/01/12 09:45:24 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2014/01/25 10:30:28 wiz Exp $ DISTNAME= Frozen-Flask-0.11 PKGNAME= ${PYPKGPREFIX}-flask-frozen-0.11 @@ -12,8 +12,6 @@ LICENSE= modified-bsd EGG_NAME= ${DISTNAME:S/-/_/} -PYTHON_VERSIONS_INCLUDE_3X= yes - USE_LANGUAGES= # empty DEPENDS+= ${PYPKGPREFIX}-flask>=0.7:../../www/py-flask diff --git a/www/py-flask-login/Makefile b/www/py-flask-login/Makefile index 19b650885af..02f6b57a30d 100644 --- a/www/py-flask-login/Makefile +++ b/www/py-flask-login/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2014/01/12 09:45:24 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2014/01/25 10:30:28 wiz Exp $ DISTNAME= Flask-Login-0.2.9 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -12,8 +12,6 @@ LICENSE= mit USE_LANGUAGES= # empty -PYTHON_VERSIONS_INCLUDE_3X= yes - EGG_NAME= ${DISTNAME:S/-/_/} DEPENDS+= ${PYPKGPREFIX}-flask-[0-9]*:../../www/py-flask diff --git a/www/py-flask-mail/Makefile b/www/py-flask-mail/Makefile index 22b3042ebf0..fd5174eab14 100644 --- a/www/py-flask-mail/Makefile +++ b/www/py-flask-mail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2014/01/12 09:45:24 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2014/01/25 10:30:28 wiz Exp $ DISTNAME= Flask-Mail-0.9.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -12,8 +12,6 @@ LICENSE= modified-bsd USE_LANGUAGES= # empty -PYTHON_VERSIONS_INCLUDE_3X= yes - EGG_NAME= ${DISTNAME:S/-/_/} DEPENDS+= ${PYPKGPREFIX}-blinker-[0-9]*:../../devel/py-blinker diff --git a/www/py-flask-principal/Makefile b/www/py-flask-principal/Makefile index 6af8b919356..3543b88d63e 100644 --- a/www/py-flask-principal/Makefile +++ b/www/py-flask-principal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2014/01/12 09:45:25 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2014/01/25 10:30:28 wiz Exp $ DISTNAME= Flask-Principal-0.4.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -12,8 +12,6 @@ LICENSE= mit USE_LANGUAGES= # empty -PYTHON_VERSIONS_INCLUDE_3X= yes - EGG_NAME= ${DISTNAME:S/-/_/} DEPENDS+= ${PYPKGPREFIX}-blinker-[0-9]*:../../devel/py-blinker diff --git a/www/py-flask-script/Makefile b/www/py-flask-script/Makefile index 8cd4a235587..9f931f76224 100644 --- a/www/py-flask-script/Makefile +++ b/www/py-flask-script/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2014/01/12 09:45:25 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2014/01/25 10:30:28 wiz Exp $ DISTNAME= Flask-Script-0.6.6 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -12,8 +12,6 @@ LICENSE= modified-bsd USE_LANGUAGES= # empty -PYTHON_VERSIONS_INCLUDE_3X= yes - EGG_NAME= ${DISTNAME:S/-/_/} DEPENDS+= ${PYPKGPREFIX}-flask-[0-9]*:../../www/py-flask diff --git a/www/py-flask-security/Makefile b/www/py-flask-security/Makefile index c605a8a6051..d355d4a572d 100644 --- a/www/py-flask-security/Makefile +++ b/www/py-flask-security/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2014/01/15 09:20:15 kleink Exp $ +# $NetBSD: Makefile,v 1.4 2014/01/25 10:30:28 wiz Exp $ DISTNAME= Flask-Security-1.7.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -10,12 +10,6 @@ HOMEPAGE= http://pythonhosted.org/Flask-Security/ COMMENT= Simple security for Flask apps LICENSE= mit -USE_LANGUAGES= # empty - -PYTHON_VERSIONS_INCLUDE_3X= yes - -EGG_NAME= ${DISTNAME:S/-/_/} - DEPENDS+= ${PYPKGPREFIX}-flask>=0.9:../../www/py-flask DEPENDS+= ${PYPKGPREFIX}-flask-login>=0.2.3:../../www/py-flask-login DEPENDS+= ${PYPKGPREFIX}-flask-mail>=0.7.3:../../www/py-flask-mail @@ -24,6 +18,10 @@ DEPENDS+= ${PYPKGPREFIX}-flask-wtf>=0.8:../../www/py-flask-wtf DEPENDS+= ${PYPKGPREFIX}-itsdangerous>=0.17:../../security/py-itsdangerous DEPENDS+= ${PYPKGPREFIX}-passlib>=1.6.1:../../security/py-passlib +USE_LANGUAGES= # empty + +EGG_NAME= ${DISTNAME:S/-/_/} + post-extract: ${FIND} ${WRKSRC} -type f -name .DS_Store -exec ${RM} {} \; diff --git a/www/py-flask-wtf/Makefile b/www/py-flask-wtf/Makefile index a38958193d5..f06fdf3c2ae 100644 --- a/www/py-flask-wtf/Makefile +++ b/www/py-flask-wtf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2014/01/12 09:45:25 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2014/01/25 10:30:29 wiz Exp $ DISTNAME= Flask-WTF-0.9.4 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -13,8 +13,6 @@ LICENSE= modified-bsd USE_LANGUAGES= # empty -PYTHON_VERSIONS_INCLUDE_3X= yes - EGG_NAME= ${DISTNAME:S/-/_/1} .include "options.mk" diff --git a/www/py-flask/Makefile b/www/py-flask/Makefile index c04bbe468f1..0aeb97763a4 100644 --- a/www/py-flask/Makefile +++ b/www/py-flask/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2014/01/12 09:45:25 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2014/01/25 10:30:28 wiz Exp $ DISTNAME= Flask-0.10.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -12,8 +12,6 @@ LICENSE= modified-bsd USE_LANGUAGES= # empty -PYTHON_VERSIONS_INCLUDE_3X= yes - DEPENDS+= ${PYPKGPREFIX}-itsdangerous-[0-9]*:../../security/py-itsdangerous DEPENDS+= ${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2 DEPENDS+= ${PYPKGPREFIX}-werkzeug-[0-9]*:../../www/py-werkzeug diff --git a/www/py-flup3/Makefile b/www/py-flup3/Makefile index 3452d6e3617..1c54ef339a2 100644 --- a/www/py-flup3/Makefile +++ b/www/py-flup3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2014/01/20 11:10:04 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2014/01/25 10:30:29 wiz Exp $ DISTNAME= cc23b715b120 PKGNAME= ${PYPKGPREFIX}-flup-1.0.3pre1 @@ -16,7 +16,6 @@ WRKSRC= ${WRKDIR}/flup-py3-0-${DISTNAME} USE_LANGUAGES= # empty PYTHON_VERSIONS_INCOMPATIBLE= 26 27 -PYTHON_VERSIONS_INCLUDE_3X= yes .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/py-gdata/Makefile b/www/py-gdata/Makefile index 7fef0f8d9c9..5bb8aaeecfc 100644 --- a/www/py-gdata/Makefile +++ b/www/py-gdata/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2013/07/03 08:37:43 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2014/01/25 10:30:29 wiz Exp $ DISTNAME= gdata-2.0.18 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,6 +12,8 @@ LICENSE= apache-2.0 DEPENDS+= ${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.0.18 + REPLACE_PYTHON= src/atom/__init__.py REPLACE_PYTHON+= src/atom/auth.py REPLACE_PYTHON+= src/atom/client.py diff --git a/www/py-jonpy/Makefile b/www/py-jonpy/Makefile index a514730832d..2d4fae0365d 100644 --- a/www/py-jonpy/Makefile +++ b/www/py-jonpy/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2013/04/06 12:08:40 rodent Exp $ -# +# $NetBSD: Makefile,v 1.7 2014/01/25 10:30:29 wiz Exp $ DISTNAME= jonpy-0.06 -PKGNAME= ${PYPKGPREFIX}-jonpy-0.06 +PKGNAME= ${PYPKGPREFIX}-${DISTNAME} PKGREVISION= 1 CATEGORIES= www python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=jonpy/} @@ -12,5 +11,7 @@ HOMEPAGE= http://jonpy.sourceforge.net/ COMMENT= Tools for FastCGI/CGI Python programs LICENSE= mit +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.06 + .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/py-mechanize/Makefile b/www/py-mechanize/Makefile index 2b55d7b6ef7..8251f57d962 100644 --- a/www/py-mechanize/Makefile +++ b/www/py-mechanize/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2012/10/28 06:31:01 asau Exp $ -# +# $NetBSD: Makefile,v 1.11 2014/01/25 10:30:29 wiz Exp $ DISTNAME= mechanize-0.2.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -13,6 +12,8 @@ COMMENT= Stateful programmatic web browsing in Python USE_LANGUAGES= # none +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.2.5 + do-test: ${RUN}cd ${WRKSRC}; ${PYTHONBIN} test.py diff --git a/www/py-mezzanine/Makefile b/www/py-mezzanine/Makefile index b40c899de16..4ffb5d7988e 100644 --- a/www/py-mezzanine/Makefile +++ b/www/py-mezzanine/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2013/01/03 15:31:08 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.3 2014/01/25 10:30:29 wiz Exp $ DISTNAME= Mezzanine-1.2.4 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -11,8 +10,6 @@ HOMEPAGE= http://mezzanine.jupo.org/ COMMENT= Open source content management platform on Django LICENSE= 2-clause-bsd -PYTHON_VERSIONS_ACCEPTED= 27 26 - DEPENDS+= ${PYPKGPREFIX}-flakes-[0-9]*:../../devel/py-flakes DEPENDS+= ${PYPKGPREFIX}-postgresql-[0-9]*:../../databases/py-postgresql DEPENDS+= ${PYPKGPREFIX}-pep8-[0-9]*:../../devel/py-pep8 @@ -23,13 +20,14 @@ DEPENDS+= ${PYPKGPREFIX}-django-[0-9]*:../../www/py-django DEPENDS+= ${PYPKGPREFIX}-django-appconf-[0-9]*:../../www/py-django-appconf DEPENDS+= ${PYPKGPREFIX}-django-south-[0-9]*:../../www/py-django-south DEPENDS+= ${PYPKGPREFIX}-bleach-[0-9]*:../../www/py-bleach - DEPENDS+= ${PYPKGPREFIX}-django-mezzanine-filebrowser-[0-9]*:../../www/py-django-mezzanine-filebrowser DEPENDS+= ${PYPKGPREFIX}-django-mezzanine-grappelli-[0-9]*:../../www/py-django-mezzanine-grappelli USE_PKGLOCALEDIR= yes USE_LANGUAGES= # none +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-postgresql, py-django-mezzanine-filebrowser, py-django-mezzanine-grappelli, py-imaging + MESSAGE_SUBST+= PYTHONBIN=${PYTHONBIN} .include "../../lang/python/application.mk" diff --git a/www/py-nevow/Makefile b/www/py-nevow/Makefile index e152fcd6926..9116ca59b12 100644 --- a/www/py-nevow/Makefile +++ b/www/py-nevow/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2013/09/20 22:01:56 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2014/01/25 10:30:29 wiz Exp $ VERSION= 0.10.0 DISTNAME= Nevow-${VERSION} @@ -21,6 +21,8 @@ DEPENDS+= ${PYPKGPREFIX}-xml>=0.8.3:../../textproc/py-xml REPLACE_PYTHON= nevow/test/segfault.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-twisted py-xml + .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/py-paste/Makefile b/www/py-paste/Makefile index 4b2e1dff5a4..b41859e49fb 100644 --- a/www/py-paste/Makefile +++ b/www/py-paste/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2013/01/28 20:17:43 adam Exp $ +# $NetBSD: Makefile,v 1.11 2014/01/25 10:30:29 wiz Exp $ DISTNAME= Paste-1.7.5.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,5 +12,7 @@ LICENSE= mit USE_LANGUAGES= # none +PYTHON_VERSIONS_INCOMPATIBLE= 33 + .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/py-pendrell/Makefile b/www/py-pendrell/Makefile index f2642832237..e47fd82f9f1 100644 --- a/www/py-pendrell/Makefile +++ b/www/py-pendrell/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2012/10/28 06:31:01 asau Exp $ -# +# $NetBSD: Makefile,v 1.6 2014/01/25 10:30:29 wiz Exp $ DISTNAME= pendrell-0.2.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,8 +10,9 @@ HOMEPAGE= http://pendrell.olix0r.net/ COMMENT= HTTP/1.1 User Agent for the Programmable Web LICENSE= mit -BUILD_DEPENDS+= ${PYPKGPREFIX}-twisted>=10.0.0:../../net/py-twisted DEPENDS+= ${PYPKGPREFIX}-twisted>=10.0.0:../../net/py-twisted +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-twisted + .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/py-pywebdav/Makefile b/www/py-pywebdav/Makefile index d2c217dc33c..ca3b2f44967 100644 --- a/www/py-pywebdav/Makefile +++ b/www/py-pywebdav/Makefile @@ -1,14 +1,15 @@ -# $NetBSD: Makefile,v 1.1 2013/07/08 05:44:21 richard Exp $ -VERSION= 0.9.8 -DISTNAME= PyWebDAV-${VERSION} -PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} -CATEGORIES= www python +# $NetBSD: Makefile,v 1.2 2014/01/25 10:30:29 wiz Exp $ + +VERSION= 0.9.8 +DISTNAME= PyWebDAV-${VERSION} +PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} +CATEGORIES= www python MASTER_SITES= http://pywebdav.googlecode.com/files/ -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://code.google.com/p/pywebdav/ -COMMENT= Standards compliant Python WebDAV server and library -LICENSE= gnu-gpl-v2 +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://code.google.com/p/pywebdav/ +COMMENT= Standards compliant Python WebDAV server and library +LICENSE= gnu-gpl-v2 DOCDIR= share/doc/${PKGBASE} @@ -16,6 +17,8 @@ PLIST_SUBST+= DOCDIR=${DOCDIR:Q} INSTALLATION_DIRS+= ${DOCDIR} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.9.8 + post-install: ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/${DOCDIR} ${INSTALL_DATA} ${WRKSRC}/VERSION ${DESTDIR}${PREFIX}/${DOCDIR} diff --git a/www/py-rss2gen/Makefile b/www/py-rss2gen/Makefile index 432eb60f16a..90bb434d225 100644 --- a/www/py-rss2gen/Makefile +++ b/www/py-rss2gen/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2013/10/17 23:52:53 tonnerre Exp $ +# $NetBSD: Makefile,v 1.9 2014/01/25 10:30:29 wiz Exp $ PYRSS2GENVER= 1.1 DISTNAME= PyRSS2Gen-${PYRSS2GENVER} @@ -13,7 +13,5 @@ LICENSE= modified-bsd USE_LANGUAGES= #none -PYTHON_VERSIONS_INCLUDE_3X= yes - .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/py-scgi/Makefile b/www/py-scgi/Makefile index 301f9e9064f..db4b71d1565 100644 --- a/www/py-scgi/Makefile +++ b/www/py-scgi/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2012/10/28 06:31:02 asau Exp $ -# +# $NetBSD: Makefile,v 1.8 2014/01/25 10:30:29 wiz Exp $ PKGNAME= ${PYPKGPREFIX}-${DISTNAME} PKGREVISION= 1 @@ -8,6 +7,8 @@ COMMENT= Simple Common Gateway Interface DEPENDS+= ${PYPKGPREFIX}-quixote-[0-9]*:../../devel/py-quixote +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-quixote + .include "../../lang/python/distutils.mk" .include "../../www/py-scgi/Makefile.common" diff --git a/www/py-simpletal/Makefile b/www/py-simpletal/Makefile index acd11f012ac..fe0a553c58d 100644 --- a/www/py-simpletal/Makefile +++ b/www/py-simpletal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2012/10/28 06:31:02 asau Exp $ +# $NetBSD: Makefile,v 1.5 2014/01/25 10:30:29 wiz Exp $ DISTNAME= SimpleTAL-4.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -13,6 +13,8 @@ LICENSE= modified-bsd USE_LANGUAGES= #none +PYTHON_VERSIONS_INCOMPATIBLE= 33 + do-test: ${PYTHONBIN} ${WRKSRC}/runtests.py diff --git a/www/py-swish-e/Makefile b/www/py-swish-e/Makefile index 33f3a9df1de..24ed410711b 100644 --- a/www/py-swish-e/Makefile +++ b/www/py-swish-e/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2012/10/28 06:31:02 asau Exp $ -# +# $NetBSD: Makefile,v 1.7 2014/01/25 10:30:29 wiz Exp $ DISTNAME= swish-e-0.5 PKGNAME= ${PYPKGPREFIX}-swish-e-0.5 @@ -16,6 +15,8 @@ LICENSE= 2-clause-bsd EGG_NAME= SwishE-${PKGVERSION_NOREV} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.5 + .include "../../lang/python/distutils.mk" .include "../../www/swish-e/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/py-webassets/Makefile b/www/py-webassets/Makefile index 65d888a4928..41ae8b37c04 100644 --- a/www/py-webassets/Makefile +++ b/www/py-webassets/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2014/01/12 09:45:25 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2014/01/25 10:30:29 wiz Exp $ DISTNAME= webassets-0.9 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,8 +12,6 @@ LICENSE= modified-bsd USE_LANGUAGES= # empty -PYTHON_VERSIONS_INCLUDE_3X= yes - REPLACE_PYTHON+=src/webassets/filter/rjsmin/rjsmin.py .include "../../lang/python/application.mk" diff --git a/www/py-webcolors/Makefile b/www/py-webcolors/Makefile index 40f5abf23be..38d3025e343 100644 --- a/www/py-webcolors/Makefile +++ b/www/py-webcolors/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2012/10/28 06:31:02 asau Exp $ -# +# $NetBSD: Makefile,v 1.5 2014/01/25 10:30:30 wiz Exp $ DISTNAME= webcolors-1.4 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,8 +11,6 @@ HOMEPAGE= http://www.bitbucket.org/ubernostrum/webcolors/overview/ COMMENT= Library for working with color specifications for HTML and CSS LICENSE= modified-bsd -PYTHON_VERSIONS_INCLUDE_3X= yes - USE_LANGUAGES= # none .include "../../lang/python/distutils.mk" diff --git a/www/py-webpy/Makefile b/www/py-webpy/Makefile index 3f5ec19f868..1040a516aff 100644 --- a/www/py-webpy/Makefile +++ b/www/py-webpy/Makefile @@ -1,19 +1,19 @@ -# $NetBSD: Makefile,v 1.12 2013/07/05 23:35:35 rodent Exp $ -# +# $NetBSD: Makefile,v 1.13 2014/01/25 10:30:30 wiz Exp $ -DISTNAME= web.py-0.37 -PKGNAME= ${PYPKGPREFIX}-${DISTNAME} -CATEGORIES= www python +DISTNAME= web.py-0.37 +PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +CATEGORIES= www python MASTER_SITES= http://webpy.org/static/ -MAINTAINER= darcy@NetBSD.org -HOMEPAGE= http://webpy.org/ -COMMENT= Simple, public domain web publishing system -LICENSE= public-domain +MAINTAINER= darcy@NetBSD.org +HOMEPAGE= http://webpy.org/ +COMMENT= Simple, public domain web publishing system +LICENSE= public-domain -USE_LANGUAGES= #none +USE_LANGUAGES= #none REPLACE_PYTHON+= web/__init__.py web/utils.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.37 .include "../../lang/python/application.mk" .include "../../lang/python/distutils.mk" diff --git a/www/py-werkzeug-docs/Makefile b/www/py-werkzeug-docs/Makefile index e574ad8bf81..a01f7719769 100644 --- a/www/py-werkzeug-docs/Makefile +++ b/www/py-werkzeug-docs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2013/08/05 08:40:14 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2014/01/25 10:30:30 wiz Exp $ PKGNAME= ${PYPKGPREFIX}-werkzeug-docs-${DISTNAME:C/[^-]*-//} @@ -23,6 +23,7 @@ do-install: && ${FIND} ${DOCDIR}/html -type f -print > ${WRKDIR}/PLIST PYTHON_FOR_BUILD_ONLY= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # sphinx detection broken as of 0.9.4 .include "../../lang/python/pyversion.mk" BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx diff --git a/www/py-werkzeug/Makefile b/www/py-werkzeug/Makefile index 85fad17b6f9..90180f7401a 100644 --- a/www/py-werkzeug/Makefile +++ b/www/py-werkzeug/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2014/01/12 09:45:25 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2014/01/25 10:30:30 wiz Exp $ PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -7,8 +7,6 @@ COMMENT= Python WSGI Utility Library USE_LANGUAGES= # empty USE_TOOLS+= pax -PYTHON_VERSIONS_INCLUDE_3X= yes - REPLACE_PYTHON= examples/cookieauth.py REPLACE_PYTHON+= examples/manage-coolmagic.py REPLACE_PYTHON+= examples/manage-couchy.py diff --git a/www/py-wtforms/Makefile b/www/py-wtforms/Makefile index 5ec7d41142d..252ee038c4d 100644 --- a/www/py-wtforms/Makefile +++ b/www/py-wtforms/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2014/01/12 09:45:25 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2014/01/25 10:30:30 wiz Exp $ DISTNAME= WTForms-1.0.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -13,8 +13,6 @@ LICENSE= modified-bsd USE_LANGUAGES= # empty -PYTHON_VERSIONS_INCLUDE_3X= yes - post-extract: ${FIND} ${WRKSRC} -type f -exec ${CHMOD} -x {} \; diff --git a/www/trac/Makefile b/www/trac/Makefile index 350719b221a..c5e9100e3b9 100644 --- a/www/trac/Makefile +++ b/www/trac/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.61 2014/01/21 22:29:33 gdt Exp $ -# +# $NetBSD: Makefile,v 1.62 2014/01/25 10:30:30 wiz Exp $ DISTNAME= Trac-1.0.1 PKGNAME= ${DISTNAME:tl} @@ -47,6 +46,7 @@ PYDISTUTILSPKG= YES PY_PATCHPLIST= YES PYTHON_PATCH_SCRIPTS= contrib/cgi-bin/trac.* contrib/*.py contrib/*-hook PYTHON_PATCH_SCRIPTS+= trac/tests/functional/*.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.0 .include "../../lang/python/application.mk" diff --git a/www/urlgrabber/Makefile b/www/urlgrabber/Makefile index c6a580f3fd1..a83e81faf66 100644 --- a/www/urlgrabber/Makefile +++ b/www/urlgrabber/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2012/10/28 06:31:07 asau Exp $ -# +# $NetBSD: Makefile,v 1.11 2014/01/25 10:30:30 wiz Exp $ DISTNAME= urlgrabber-3.1.0 PKGREVISION= 3 @@ -11,6 +10,7 @@ HOMEPAGE= http://urlgrabber.baseurl.org/ COMMENT= Python package that drastically simplifies the fetching of files USE_LANGUAGES= # none +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 3.1.0 .include "../../lang/python/application.mk" .include "../../lang/python/distutils.mk" diff --git a/www/viewvc/Makefile b/www/viewvc/Makefile index 55b873839b1..ee5cf296c55 100644 --- a/www/viewvc/Makefile +++ b/www/viewvc/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2013/05/19 03:33:11 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.20 2014/01/25 10:30:30 wiz Exp $ DISTNAME= viewvc-1.1.20 CATEGORIES= devel www @@ -11,6 +10,7 @@ COMMENT= Viewing the content of CVS/SVN repositories with a Webbrowser LICENSE= 2-clause-bsd PYTHON_PATCH_SCRIPTS= viewvc-install bin/* bin/cgi/*.cgi lib/*.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.1.20 .if !exists(/usr/bin/rlog) DEPENDS+= rcs-[0-9]*:../../devel/rcs diff --git a/www/webkit-gtk/Makefile.common b/www/webkit-gtk/Makefile.common index 5ebe7efdf65..7f46b3a65da 100644 --- a/www/webkit-gtk/Makefile.common +++ b/www/webkit-gtk/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.29 2014/01/22 15:21:23 jperkin Exp $ +# $NetBSD: Makefile.common,v 1.30 2014/01/25 10:30:30 wiz Exp $ # used by www/webkit-gtk/Makefile # used by www/webkit-gtk3/Makefile @@ -43,6 +43,7 @@ BUILD_DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION}:../../lang/${RUBY_BASE} CONFIGURE_ENV+= RUBY=${RUBY} PYTHON_FOR_BUILD_ONLY= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.10.2 .include "../../lang/python/application.mk" CONFIGURE_ENV+= PYTHON=${PYTHONBIN} diff --git a/x11/alacarte/Makefile b/x11/alacarte/Makefile index efc696aa2c3..7e28b78bacc 100644 --- a/x11/alacarte/Makefile +++ b/x11/alacarte/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2013/10/10 14:42:36 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.54 2014/01/25 10:30:30 wiz Exp $ DISTNAME= alacarte-0.13.1 PKGREVISION= 25 @@ -16,6 +15,7 @@ GNU_CONFIGURE= yes USE_TOOLS+= intltool perl pkg-config gmake msgfmt PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-ORBit via py-gnome2, py-gtk2 SUBST_CLASSES+= paths SUBST_STAGE.paths= pre-configure diff --git a/x11/avant-window-navigator/Makefile b/x11/avant-window-navigator/Makefile index ae20dcef4f4..afaf3653144 100644 --- a/x11/avant-window-navigator/Makefile +++ b/x11/avant-window-navigator/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2013/10/10 14:42:36 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.20 2014/01/25 10:30:30 wiz Exp $ DISTNAME= avant-window-navigator-0.4.0 PKGREVISION= 15 @@ -11,8 +10,8 @@ HOMEPAGE= https://launchpad.net/awn COMMENT= Dock-like navigation bar LICENSE= gnu-lgpl-v2 -# Needed for launchpad -FETCH_USING= curl +DEPENDS+= ${PYPKGPREFIX}-xdg-[0-9]*:../../devel/py-xdg +DEPENDS+= bzr>=2.4.2:../../devel/bzr GNU_CONFIGURE= yes USE_LIBTOOL= yes @@ -43,9 +42,8 @@ SUBST_SED.pathfix= -e "s,/usr/share,${PREFIX}/share," PY_PATCHPLIST= yes REPLACE_PYTHON+= awn-settings/awnSettings.py.in REPLACE_PYTHON+= awn-settings/awnSettingsHelper.py - -DEPENDS+= ${PYPKGPREFIX}-xdg-[0-9]*:../../devel/py-xdg -DEPENDS+= bzr>=2.4.2:../../devel/bzr +PYTHON_VERSIONED_DEPENDENCIES= cairo:link +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 .include "../../devel/GConf/schemas.mk" .include "../../lang/vala014/buildlink3.mk" @@ -53,7 +51,7 @@ DEPENDS+= bzr>=2.4.2:../../devel/bzr .include "../../sysutils/dbus-glib/buildlink3.mk" .include "../../sysutils/py-dbus/buildlink3.mk" .include "../../x11/py-gtk2/buildlink3.mk" -.include "../../graphics/py-cairo/buildlink3.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../x11/libdesktop-agnostic/buildlink3.mk" .include "../../sysutils/libgtop/buildlink3.mk" .include "../../lang/python/application.mk" diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index 3a777c37570..8dca5e5f34e 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.123 2014/01/01 11:52:38 wiz Exp $ -# +# $NetBSD: Makefile,v 1.124 2014/01/25 10:30:30 wiz Exp $ DISTNAME= gnome-applets-2.32.1.1 PKGREVISION= 35 @@ -16,6 +15,8 @@ USE_TOOLS+= gmake intltool msgfmt pkg-config USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-ORBit via py-gnome2 + .include "options.mk" CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} diff --git a/x11/gnome-mag/Makefile b/x11/gnome-mag/Makefile index ced695ed81a..a4f94a73ad4 100644 --- a/x11/gnome-mag/Makefile +++ b/x11/gnome-mag/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.83 2013/10/10 14:41:51 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.84 2014/01/25 10:30:30 wiz Exp $ DISTNAME= gnome-mag-0.16.3 PKGREVISION= 17 @@ -29,6 +28,7 @@ SUBST_SED.doxy= -e 's,SUBDIRS = reference,SUBDIRS =,' DEPENDS+= ${PYPKGPREFIX}-gnome2-desktop-[0-9]*:../../x11/py-gnome2-desktop REPLACE_PYTHON= colorblind/colorblind-applet.py PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-ORBit via py-gnome2, py-gtk2 .include "../../misc/colorblind/buildlink3.mk" .include "../../devel/py-gobject/buildlink3.mk" .include "../../x11/py-gtk2/buildlink3.mk" diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index 8d0975134c6..b95559b17f5 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.166 2014/01/01 11:52:08 wiz Exp $ -# +# $NetBSD: Makefile,v 1.167 2014/01/25 10:30:31 wiz Exp $ DISTNAME= gnome-panel-2.32.1 PKGREVISION= 35 @@ -23,6 +22,7 @@ USE_LIBTOOL= YES PKGCONFIG_OVERRIDE+= bonobo/libpanel-applet/libpanelapplet-2.0.pc.in PKGCONFIG_OVERRIDE+= libpanel-applet/libpanelapplet-3.0.pc.in CONFIGURE_ENV+= PYTHON=${PYTHONBIN} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-ORBit via py-gnome2 # XXX this pkg installs a gio module to ${PREFIX}/lib/gnome-panel/modules # but there are two problems with this: diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile index cb3ba3ede7f..604f805c4d1 100644 --- a/x11/gnome-terminal/Makefile +++ b/x11/gnome-terminal/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2013/10/10 14:42:37 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.59 2014/01/25 10:30:31 wiz Exp $ DISTNAME= gnome-terminal-2.32.1 PKGREVISION= 20 @@ -25,6 +24,7 @@ CONFIGURE_ENV+= ac_cv_path_GTK_BUILDER_CONVERT="${PYTHONBIN} ${BUILDLINK_PREFIX GCONF_SCHEMAS= gnome-terminal.schemas PYTHON_FOR_BUILD_ONLY= YES +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.32.1 .include "../../sysutils/desktop-file-utils/desktopdb.mk" BUILDLINK_API_DEPENDS.GConf+= GConf>=2.14.0 diff --git a/x11/kde-workspace4/Makefile b/x11/kde-workspace4/Makefile index c4ae4a74726..83dc71f2156 100644 --- a/x11/kde-workspace4/Makefile +++ b/x11/kde-workspace4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2014/01/01 11:52:04 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2014/01/25 10:30:31 wiz Exp $ DISTNAME= kde-workspace-${_KDE_VERSION} PKGNAME= ${DISTNAME:S/-4/4-4/} @@ -6,6 +6,8 @@ PKGREVISION= 3 CATEGORIES= x11 COMMENT= Base workspace for the KDE 4 integrated X11 desktop +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 4.11.3 + .include "../../meta-pkgs/kde4/Makefile.kde4" DISTFILES= ${DEFAULT_DISTFILES} Daemon.png Daemon.README diff --git a/x11/libdesktop-agnostic/Makefile b/x11/libdesktop-agnostic/Makefile index e3dafb2546a..79b5a15bc99 100644 --- a/x11/libdesktop-agnostic/Makefile +++ b/x11/libdesktop-agnostic/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2013/10/10 14:41:48 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.19 2014/01/25 10:30:31 wiz Exp $ DISTNAME= libdesktop-agnostic-0.3.92 PKGREVISION= 13 @@ -11,9 +10,6 @@ HOMEPAGE= https://launchpad.net/libdesktop-agnostic COMMENT= Desktop-agnostic library, apis and tools LICENSE= gnu-lgpl-v2 -# Needed for launchpad -FETCH_USING= curl - USE_TOOLS+= intltool pkg-config msgfmt PKGCONFIG_OVERRIDE+= data/desktop-agnostic.pc.in @@ -23,6 +19,7 @@ CONFIGURE_ARGS= --config-backends=keyfile,gconf \ --desktop-entry-backends=glib PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.3.92 EGDIR= ${PREFIX}/share/examples/libdesktop-agnostic PKG_SYSCONFSUBDIR= xdg diff --git a/x11/py-Pmw2/Makefile b/x11/py-Pmw2/Makefile index 54d32ddb2fe..1572d063748 100644 --- a/x11/py-Pmw2/Makefile +++ b/x11/py-Pmw2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2014/01/20 11:10:04 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2014/01/25 10:30:31 wiz Exp $ DISTNAME= Pmw_2_0_0-rc1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/_/-/:S/_/./g:S/-rc/rc/} @@ -22,7 +22,6 @@ REPLACE_PYTHON+= Pmw/Pmw_2_0_0/demos/All.py REPLACE_PYTHON+= Pmw/Pmw_2_0_0/tests/All.py PYTHON_VERSIONS_INCOMPATIBLE= 26 27 -PYTHON_VERSIONS_INCLUDE_3X= yes .include "../../lang/python/application.mk" .include "../../lang/python/distutils.mk" diff --git a/x11/py-Tk/Makefile b/x11/py-Tk/Makefile index f41780eb515..fcb1cbf54f4 100644 --- a/x11/py-Tk/Makefile +++ b/x11/py-Tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2014/01/11 14:42:06 adam Exp $ +# $NetBSD: Makefile,v 1.59 2014/01/25 10:30:31 wiz Exp $ PKGNAME= ${PYPKGPREFIX}-Tk-${PY_DISTVERSION} PKGREVISION= 4 @@ -9,8 +9,6 @@ HOMEPAGE= http://wiki.python.org/moin/TkInter COMMENT= Tkinter -- Python interface to Tcl/Tk LICENSE= python-software-foundation -PYTHON_VERSIONS_INCLUDE_3X= yes - EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/_tkinter.c \ ${PYSUBDIR}/Modules/tkappinit.c PYDISTUTILSPKG= yes diff --git a/x11/py-Xlib/Makefile b/x11/py-Xlib/Makefile index 327a52dd107..43e2234495b 100644 --- a/x11/py-Xlib/Makefile +++ b/x11/py-Xlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2012/10/29 05:06:44 asau Exp $ +# $NetBSD: Makefile,v 1.11 2014/01/25 10:30:31 wiz Exp $ DISTNAME= python-xlib-0.14 PKGNAME= ${PYPKGPREFIX}-Xlib-0.14 @@ -10,8 +10,6 @@ HOMEPAGE= http://python-xlib.sourceforge.net/ COMMENT= Functional X client library for Python LICENSE= gnu-gpl-v2 -PYTHON_VERSIONS_INCLUDE_3X= yes - EGG_NAME= python_xlib-0.12 .include "../../lang/python/distutils.mk" diff --git a/x11/py-gnome2-desktop/Makefile b/x11/py-gnome2-desktop/Makefile index ab311446cef..97d98f04dd6 100644 --- a/x11/py-gnome2-desktop/Makefile +++ b/x11/py-gnome2-desktop/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.85 2014/01/01 11:52:43 wiz Exp $ -# +# $NetBSD: Makefile,v 1.86 2014/01/25 10:30:31 wiz Exp $ DISTNAME= gnome-python-desktop-2.32.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/-python/2/} @@ -21,6 +20,9 @@ USE_TOOLS+= pkg-config gmake PKGCONFIG_OVERRIDE+= gnome-python-desktop-2.0.pc.in +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-ORBit via py-gnome2, py-gtk2 +PYTHON_VERSIONED_DEPENDENCIES= cairo:link + .include "../../lang/python/pyversion.mk" # The "real" value here is: 27 26 @@ -35,7 +37,7 @@ PYTHON_VERSIONS_ACCEPTED+= ${PYTHON_VERSION_DEFAULT:M26} .include "../../lang/python/extension.mk" .include "../../devel/libwnck/buildlink3.mk" .include "../../graphics/librsvg/buildlink3.mk" -.include "../../graphics/py-cairo/buildlink3.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../multimedia/gnome-media/buildlink3.mk" .include "../../multimedia/totem-pl-parser/buildlink3.mk" # works, but should better be in its own pkg to limit dependencies diff --git a/x11/py-gnome2-extras/Makefile b/x11/py-gnome2-extras/Makefile index 704176012cd..5d62efa862c 100644 --- a/x11/py-gnome2-extras/Makefile +++ b/x11/py-gnome2-extras/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.69 2014/01/01 11:52:43 wiz Exp $ -# +# $NetBSD: Makefile,v 1.70 2014/01/25 10:30:31 wiz Exp $ DISTNAME= gnome-python-extras-2.25.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/gnome-python/gnome2/} @@ -17,6 +16,7 @@ BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl PY_PATCHPLIST= YES +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-ORBit via py-gnome2 USE_LIBTOOL= YES PKGCONFIG_OVERRIDE+= gnome-python-extras-2.0.pc.in GNU_CONFIGURE= YES diff --git a/x11/py-gnome2/Makefile b/x11/py-gnome2/Makefile index 7c820c9bda5..433ffe670b0 100644 --- a/x11/py-gnome2/Makefile +++ b/x11/py-gnome2/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.98 2014/01/01 11:52:43 wiz Exp $ -# +# $NetBSD: Makefile,v 1.99 2014/01/25 10:30:31 wiz Exp $ DISTNAME= gnome-python-2.28.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/gnome-python/gnome2/} @@ -19,6 +18,8 @@ GNU_CONFIGURE= YES CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} USE_TOOLS+= pkg-config gmake +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-ORBit, py-gtk2 + .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "SunOS" BUILDLINK_TRANSFORM+= rm:-std=c9x diff --git a/x11/py-gtksourceview/Makefile b/x11/py-gtksourceview/Makefile index f0ae9ee123b..ba43e43ca72 100644 --- a/x11/py-gtksourceview/Makefile +++ b/x11/py-gtksourceview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2013/10/10 14:42:38 ryoon Exp $ +# $NetBSD: Makefile,v 1.33 2014/01/25 10:30:31 wiz Exp $ DISTNAME= pygtksourceview-2.10.1 PKGNAME= ${DISTNAME:S/py/${PYPKGPREFIX}-/} @@ -19,6 +19,7 @@ PKGCONFIG_OVERRIDE+= pygtksourceview-2.0.pc.in GNU_CONFIGURE= YES USE_TOOLS+= pkg-config PY_PATCHPLIST= YES +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 .include "../../lang/python/extension.mk" diff --git a/x11/py-kiwi/Makefile b/x11/py-kiwi/Makefile index 445b3f78dc1..ffffca76a13 100644 --- a/x11/py-kiwi/Makefile +++ b/x11/py-kiwi/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2014/01/10 14:43:36 jperkin Exp $ -# +# $NetBSD: Makefile,v 1.33 2014/01/25 10:30:31 wiz Exp $ DISTNAME= kiwi-1.9.29 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -16,6 +15,7 @@ LICENSE= gnu-lgpl-v2.1 # or later USE_LANGUAGES= #none USE_PKGLOCALEDIR= yes USE_TOOLS+= msgfmt +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 SUBST_CLASSES+= localedir SUBST_STAGE.localedir= pre-configure diff --git a/x11/py-qt3-base/Makefile.common b/x11/py-qt3-base/Makefile.common index b7000e49156..0c1b5e9b112 100644 --- a/x11/py-qt3-base/Makefile.common +++ b/x11/py-qt3-base/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.13 2009/07/22 09:19:37 wiz Exp $ +# $NetBSD: Makefile.common,v 1.14 2014/01/25 10:30:31 wiz Exp $ # # used by x11/py-qt3-base/Makefile # used by x11/py-qt3-modules/Makefile @@ -33,6 +33,7 @@ CONFIGURE_ARGS+= -v ${PREFIX}/share/sip${PYVERSSUFFIX} PY_PATCHPLIST= yes PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 3.18.1 do-configure: (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ diff --git a/x11/py-qt4/Makefile b/x11/py-qt4/Makefile index ae7afa71961..af108f8e4cd 100644 --- a/x11/py-qt4/Makefile +++ b/x11/py-qt4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.71 2014/01/09 19:03:08 jperkin Exp $ +# $NetBSD: Makefile,v 1.72 2014/01/25 10:30:31 wiz Exp $ PKGNAME= ${PYPKGPREFIX}-qt4-${PYQT_VERSION} PYQT_VERSION= 4.10.2 @@ -25,7 +25,6 @@ INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} PY_PATCHPLIST= yes PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} -PYTHON_VERSIONS_INCLUDE_3X= yes BUILDLINK_TRANSFORM+= rm:-Wl,-R${WRKSRC}/qpy/QtCore BUILDLINK_TRANSFORM+= rm:-Wl,-R${WRKSRC}/qpy/QtDeclarative diff --git a/x11/py-sip/Makefile b/x11/py-sip/Makefile index f054dbaf127..d169a016349 100644 --- a/x11/py-sip/Makefile +++ b/x11/py-sip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2013/09/05 15:27:42 drochner Exp $ +# $NetBSD: Makefile,v 1.42 2014/01/25 10:30:32 wiz Exp $ DISTNAME= sip-4.14.7 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -10,8 +10,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.riverbankcomputing.com/software/sip/intro COMMENT= Tool to create Python bindings for C++ libraries -PYTHON_VERSIONS_INCLUDE_3X= yes - CONFLICTS+= ${PYPKGPREFIX}-qt2-sip-* ${PYPKGPREFIX}-qt3-sip-* USE_LIBTOOL= yes diff --git a/x11/py-vte/Makefile b/x11/py-vte/Makefile index d0200e4befd..8c9215819d9 100644 --- a/x11/py-vte/Makefile +++ b/x11/py-vte/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2013/10/10 14:41:48 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.20 2014/01/25 10:30:32 wiz Exp $ .include "../../x11/vte/Makefile.common" @@ -21,6 +20,8 @@ CONFIGURE_ARGS+= --enable-python CONFIGURE_ARGS+= --disable-freetype-test CONFIGURE_ARGS+= --enable-Bsymbolic=auto +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 + BUILD_DIRS= python pre-build: diff --git a/x11/py-wxWidgets/Makefile b/x11/py-wxWidgets/Makefile index 72cd37436cf..d8193c83b6a 100644 --- a/x11/py-wxWidgets/Makefile +++ b/x11/py-wxWidgets/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2013/10/10 14:41:54 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.53 2014/01/25 10:30:32 wiz Exp $ VERSION= 2.8.10.1 DISTNAME= wxPython-src-${VERSION} @@ -20,6 +19,7 @@ USE_TOOLS+= gmake pkg-config # previous name of the package CONFLICTS+= ${PYPKGPREFIX}-wxWindows-[0-9]* PYTHON_SELF_CONFLICT= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.8.10.1 WXARG= WXPORT=gtk2 UNICODE=1 diff --git a/x11/rox-session/Makefile b/x11/rox-session/Makefile index 6840a24aeb4..e5dc22db0c4 100644 --- a/x11/rox-session/Makefile +++ b/x11/rox-session/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2013/10/10 14:42:39 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.40 2014/01/25 10:30:32 wiz Exp $ DISTNAME= rox-session-0.28 PKGREVISION= 26 @@ -19,6 +18,7 @@ DIST_SUBDIR= rox NO_BUILD= yes PYTHON_PATCH_SCRIPTS= AppRun tests/testutils.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 INSTALLATION_DIRS= share/rox/ROX-Session diff --git a/x11/tint2/Makefile b/x11/tint2/Makefile index 43831bcd557..7b8455f47e8 100644 --- a/x11/tint2/Makefile +++ b/x11/tint2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2013/10/10 14:42:39 ryoon Exp $ +# $NetBSD: Makefile,v 1.30 2014/01/25 10:30:32 wiz Exp $ DISTNAME= tint2-0.11 PKGREVISION= 21 @@ -18,9 +18,10 @@ USE_TOOLS+= gmake pkg-config INSTALLATION_DIRS= share/examples/tint2 OWN_DIRS= ${PKG_SYSCONFDIR}/xdg/tint2 CONF_FILES= ${PREFIX}/share/examples/tint2/tint2rc \ - ${PKG_SYSCONFDIR}/xdg/tint2/tint2rc + ${PKG_SYSCONFDIR}/xdg/tint2/tint2rc REPLACE_PYTHON+= src/tint2conf/tintwizard.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 CMAKE_OPTS+= -DCMAKE_INSTALL_PREFIX=${PREFIX} CMAKE_OPTS+= -DSYSCONFDIR=${PKG_SYSCONFDIR} |