[pkgsrc/trunk]: pkgsrc *: use py-cairo's bl3.mk file where previously it used...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f6c5d14cabb9
branches:  trunk
changeset: 371966:f6c5d14cabb9
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Nov 25 08:58:55 2017 +0000

description:
*: use py-cairo's bl3.mk file where previously it used cairo:link

Needed when e.g. pkg-config is used to detect py-cairo.

diffstat:

 devel/py-gobject3/Makefile          |  5 ++---
 games/gcompris/Makefile             |  4 ++--
 graphics/py-goocanvas/Makefile      |  5 ++---
 print/py-poppler/Makefile           |  5 ++---
 x11/avant-window-navigator/Makefile |  4 ++--
 x11/py-gnome2-desktop/Makefile      |  4 ++--
 x11/py-gtk2/Makefile                |  5 ++---
 7 files changed, 14 insertions(+), 18 deletions(-)

diffs (167 lines):

diff -r 387d3c9467ef -r f6c5d14cabb9 devel/py-gobject3/Makefile
--- a/devel/py-gobject3/Makefile        Fri Nov 24 22:18:22 2017 +0000
+++ b/devel/py-gobject3/Makefile        Sat Nov 25 08:58:55 2017 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2017/11/24 22:15:58 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2017/11/25 08:58:55 wiz Exp $
 
 # https://bugzilla.gnome.org/show_bug.cgi?id=685094
 # https://bugzilla.gnome.org/show_bug.cgi?id=707196
-DEPENDS+=      ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
-.include "../../lang/python/versioned_dependencies.mk"
+.include "../../graphics/py-cairo/buildlink3.mk"
 .include "../../graphics/cairo-gobject/buildlink3.mk"
 TEST_TARGET=   check
 
diff -r 387d3c9467ef -r f6c5d14cabb9 games/gcompris/Makefile
--- a/games/gcompris/Makefile   Fri Nov 24 22:18:22 2017 +0000
+++ b/games/gcompris/Makefile   Sat Nov 25 08:58:55 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2017/11/24 22:15:58 wiz Exp $
+# $NetBSD: Makefile,v 1.76 2017/11/25 08:58:55 wiz Exp $
 
 DISTNAME=      gcompris-12.11
 PKGREVISION=   28
@@ -12,7 +12,6 @@
 LICENSE=       gnu-gpl-v3
 
 DEPENDS+=      gnuchess-[0-9]*:../../games/gnuchess
-DEPENDS+=      ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
 
 USE_TOOLS+=            gmake intltool gtar pkg-config msgfmt texi2html
 GNU_CONFIGURE=         YES
@@ -50,6 +49,7 @@
 .include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/py-sqlite2/buildlink3.mk"
+.include "../../graphics/py-cairo/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
diff -r 387d3c9467ef -r f6c5d14cabb9 graphics/py-goocanvas/Makefile
--- a/graphics/py-goocanvas/Makefile    Fri Nov 24 22:18:22 2017 +0000
+++ b/graphics/py-goocanvas/Makefile    Sat Nov 25 08:58:55 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2017/11/24 22:15:59 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2017/11/25 08:58:55 wiz Exp $
 
 DISTNAME=      pygoocanvas-0.14.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/^py//}
@@ -11,8 +11,6 @@
 COMMENT=       Python bindings for GooCanvas
 LICENSE=       gnu-lgpl-v2
 
-DEPENDS+=      ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
-
 GNU_CONFIGURE= yes
 USE_LIBTOOL=   yes
 USE_TOOLS+=    pkg-config
@@ -26,6 +24,7 @@
 
 .include "../../lang/python/pyversion.mk"
 
+.include "../../graphics/py-cairo/buildlink3.mk"
 BUILDLINK_API_DEPENDS.pygtk2+= ${PYPKGPREFIX}-gtk2>=2.10.0
 .include "../../x11/py-gtk2/buildlink3.mk"
 .include "../../devel/py-gobject/buildlink3.mk"
diff -r 387d3c9467ef -r f6c5d14cabb9 print/py-poppler/Makefile
--- a/print/py-poppler/Makefile Fri Nov 24 22:18:22 2017 +0000
+++ b/print/py-poppler/Makefile Sat Nov 25 08:58:55 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2017/11/24 22:15:59 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2017/11/25 08:58:55 wiz Exp $
 
 DISTNAME=      pypoppler-0.12.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -11,14 +11,13 @@
 COMMENT=       Python bindings for the Poppler PDF rendering library
 LICENSE=       gnu-gpl-v2
 
-DEPENDS+=      ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
-
 GNU_CONFIGURE= yes
 USE_LIBTOOL=   yes
 USE_TOOLS+=    pkg-config
 PY_PATCHPLIST= yes
 PYTHON_VERSIONS_INCOMPATIBLE=  34 35 36 # py-gtk2
 
+.include "../../graphics/py-cairo/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../devel/atk/buildlink3.mk"
 BUILDLINK_API_DEPENDS.poppler-glib+=   poppler-glib>=0.12.1
diff -r 387d3c9467ef -r f6c5d14cabb9 x11/avant-window-navigator/Makefile
--- a/x11/avant-window-navigator/Makefile       Fri Nov 24 22:18:22 2017 +0000
+++ b/x11/avant-window-navigator/Makefile       Sat Nov 25 08:58:55 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2017/11/24 22:15:59 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2017/11/25 08:58:55 wiz Exp $
 
 DISTNAME=      avant-window-navigator-0.4.0
 PKGREVISION=   26
@@ -12,7 +12,6 @@
 
 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
@@ -52,6 +51,7 @@
 .include "../../devel/libwnck/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/py-dbus/buildlink3.mk"
+.include "../../graphics/py-cairo/buildlink3.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"
 .include "../../x11/libdesktop-agnostic/buildlink3.mk"
 .include "../../sysutils/libgtop/buildlink3.mk"
diff -r 387d3c9467ef -r f6c5d14cabb9 x11/py-gnome2-desktop/Makefile
--- a/x11/py-gnome2-desktop/Makefile    Fri Nov 24 22:18:22 2017 +0000
+++ b/x11/py-gnome2-desktop/Makefile    Sat Nov 25 08:58:55 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.111 2017/11/24 22:15:59 wiz Exp $
+# $NetBSD: Makefile,v 1.112 2017/11/25 08:58:56 wiz Exp $
 
 DISTNAME=      gnome-python-desktop-2.32.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/-python/2/}
@@ -17,7 +17,6 @@
 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
 
@@ -36,6 +35,7 @@
 .include "../../lang/python/extension.mk"
 .include "../../devel/libwnck/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
+.include "../../graphics/py-cairo/buildlink3.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 -r 387d3c9467ef -r f6c5d14cabb9 x11/py-gtk2/Makefile
--- a/x11/py-gtk2/Makefile      Fri Nov 24 22:18:22 2017 +0000
+++ b/x11/py-gtk2/Makefile      Sat Nov 25 08:58:55 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.109 2017/11/24 22:15:59 wiz Exp $
+# $NetBSD: Makefile,v 1.110 2017/11/25 08:58:56 wiz Exp $
 
 DISTNAME=      pygtk-2.24.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/pygtk/gtk2/}
@@ -12,8 +12,6 @@
 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'
@@ -81,6 +79,7 @@
 .include "../../lang/python/extension.mk"
 
 .include "../../devel/libglade/buildlink3.mk"
+.include "../../graphics/py-cairo/buildlink3.mk"
 BUILDLINK_API_DEPENDS.pygobject+=      ${PYPKGPREFIX}-gobject>=2.15.3
 .include "../../devel/py-gobject/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gtk2+=           gtk2+>=2.16.0