diff options
author | wiz <wiz@pkgsrc.org> | 2014-01-25 10:29:56 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2014-01-25 10:29:56 +0000 |
commit | 4fc0b0ed6a186ccd83fc93c34cc9ed91862930d8 (patch) | |
tree | 3bbaa4e1a32886abb417eed9e3a6c4c742388c9a /multimedia | |
parent | da96a0b73ccce3895e3b718798083bf1740293d8 (diff) | |
download | pkgsrc-4fc0b0ed6a186ccd83fc93c34cc9ed91862930d8.tar.gz |
Mark packages as not ready for python-3.x where applicable;
either because they themselves are not ready or because a
dependency isn't. This is annotated by
PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of x.y.z
or
PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-foo, py-bar
respectively, please use the same style for other packages,
and check during updates.
Use versioned_dependencies.mk where applicable.
Use REPLACE_PYTHON instead of handcoded alternatives, where applicable.
Reorder Makefile sections into standard order, where applicable.
Remove PYTHON_VERSIONS_INCLUDE_3X lines since that will be default
with the next commit.
Whitespace cleanups and other nits corrected, where necessary.
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/farsight2/Makefile | 5 | ||||
-rw-r--r-- | multimedia/libkate/options.mk | 3 | ||||
-rw-r--r-- | multimedia/pitivi/Makefile | 7 | ||||
-rw-r--r-- | multimedia/py-gstreamer0.10/Makefile | 4 | ||||
-rw-r--r-- | multimedia/totem/Makefile.common | 4 |
5 files changed, 14 insertions, 9 deletions
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" |