diff options
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/avant-window-navigator/Makefile | 5 | ||||
| -rw-r--r-- | x11/py-gnome2-desktop/Makefile | 5 | ||||
| -rw-r--r-- | x11/py-gtk2/Makefile | 6 |
3 files changed, 7 insertions, 9 deletions
diff --git a/x11/avant-window-navigator/Makefile b/x11/avant-window-navigator/Makefile index a3a9f9ada51..02d348215dd 100644 --- a/x11/avant-window-navigator/Makefile +++ b/x11/avant-window-navigator/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2017/10/03 12:36:54 wiz Exp $ +# $NetBSD: Makefile,v 1.37 2017/11/24 22:15:59 wiz Exp $ DISTNAME= avant-window-navigator-0.4.0 PKGREVISION= 26 @@ -12,6 +12,7 @@ LICENSE= gnu-lgpl-v2 DEPENDS+= ${PYPKGPREFIX}-xdg-[0-9]*:../../devel/py-xdg DEPENDS+= bzr>=2.4.2:../../devel/bzr +DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo GNU_CONFIGURE= yes USE_LIBTOOL= yes @@ -44,7 +45,6 @@ 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 -PYTHON_VERSIONED_DEPENDENCIES= cairo:link PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-gtk2 .include "../../devel/GConf/schemas.mk" @@ -53,7 +53,6 @@ PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-gtk2 .include "../../sysutils/dbus-glib/buildlink3.mk" .include "../../sysutils/py-dbus/buildlink3.mk" .include "../../x11/py-gtk2/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/py-gnome2-desktop/Makefile b/x11/py-gnome2-desktop/Makefile index 9cdccdd02a7..2c4043724b1 100644 --- a/x11/py-gnome2-desktop/Makefile +++ b/x11/py-gnome2-desktop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.110 2017/11/23 17:19:46 wiz Exp $ +# $NetBSD: Makefile,v 1.111 2017/11/24 22:15:59 wiz Exp $ DISTNAME= gnome-python-desktop-2.32.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/-python/2/} @@ -17,11 +17,11 @@ USE_LIBTOOL= yes USE_TOOLS+= pkg-config gmake #DEPENDS+= bug-buddy>=2.16:../../net/bug-buddy +DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo PKGCONFIG_OVERRIDE+= gnome-python-desktop-2.0.pc.in PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-ORBit via py-gnome2, py-gtk2 -PYTHON_VERSIONED_DEPENDENCIES= cairo:link .include "../../lang/python/pyversion.mk" @@ -36,7 +36,6 @@ PYTHON_VERSIONS_ACCEPTED= ${PYTHON_VERSION_DEFAULT:M27} .include "../../lang/python/extension.mk" .include "../../devel/libwnck/buildlink3.mk" .include "../../graphics/librsvg/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-gtk2/Makefile b/x11/py-gtk2/Makefile index 977dfde9936..082d40cb766 100644 --- a/x11/py-gtk2/Makefile +++ b/x11/py-gtk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.108 2017/02/12 06:24:57 ryoon Exp $ +# $NetBSD: Makefile,v 1.109 2017/11/24 22:15:59 wiz Exp $ DISTNAME= pygtk-2.24.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/pygtk/gtk2/} @@ -12,6 +12,8 @@ HOMEPAGE= http://www.pygtk.org/ COMMENT= Python bindings for GTK+2 LICENSE= gnu-lgpl-v2.1 +DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo + CONFLICTS= ${PYPKGPREFIX}-gtk<0.6.10 # IOError: [Errno 2] No such file or directory: 'gtk-types.defs' @@ -24,7 +26,6 @@ CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} USE_TOOLS+= gmake pkg-config PY_PATCHPLIST= YES -PYTHON_VERSIONED_DEPENDENCIES= cairo:link PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # not yet ported as of 2.24.0 REPLACE_PYTHON+= examples/atk/atk-demo.py @@ -78,7 +79,6 @@ REPLACE_PYTHON+= tests/runtests.py .include "../../lang/python/application.mk" .include "../../lang/python/extension.mk" -.include "../../lang/python/versioned_dependencies.mk" .include "../../devel/libglade/buildlink3.mk" BUILDLINK_API_DEPENDS.pygobject+= ${PYPKGPREFIX}-gobject>=2.15.3 |