Sat Nov 25 08:58:56 2017 UTC ()
*: 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.


(wiz)
diff -r1.31 -r1.32 pkgsrc/devel/py-gobject3/Makefile
diff -r1.75 -r1.76 pkgsrc/games/gcompris/Makefile
diff -r1.45 -r1.46 pkgsrc/graphics/py-goocanvas/Makefile
diff -r1.31 -r1.32 pkgsrc/print/py-poppler/Makefile
diff -r1.37 -r1.38 pkgsrc/x11/avant-window-navigator/Makefile
diff -r1.111 -r1.112 pkgsrc/x11/py-gnome2-desktop/Makefile
diff -r1.109 -r1.110 pkgsrc/x11/py-gtk2/Makefile
cvs diff -r1.31 -r1.32 pkgsrc/devel/py-gobject3/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/py-gobject3/Makefile 2017/11/24 22:15:58 1.31
+++ pkgsrc/devel/py-gobject3/Makefile 2017/11/25 08:58:55 1.32
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.31 2017/11/24 22:15:58 wiz Exp $ 1# $NetBSD: Makefile,v 1.32 2017/11/25 08:58:55 wiz Exp $
2 2
3# https://bugzilla.gnome.org/show_bug.cgi?id=685094 3# https://bugzilla.gnome.org/show_bug.cgi?id=685094
4# https://bugzilla.gnome.org/show_bug.cgi?id=707196 4# https://bugzilla.gnome.org/show_bug.cgi?id=707196
5DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo 5.include "../../graphics/py-cairo/buildlink3.mk"
6.include "../../lang/python/versioned_dependencies.mk" 
7.include "../../graphics/cairo-gobject/buildlink3.mk" 6.include "../../graphics/cairo-gobject/buildlink3.mk"
8TEST_TARGET= check 7TEST_TARGET= check
9 8
10.include "Makefile.common" 9.include "Makefile.common"
11 10
12PKGNAME= ${PYPKGPREFIX}-gobject3-${VER} 11PKGNAME= ${PYPKGPREFIX}-gobject3-${VER}
13 12
14COMMENT= Python bindings for glib2 gobject 13COMMENT= Python bindings for glib2 gobject
15 14
16CONFIGURE_ARGS+= --without-common 15CONFIGURE_ARGS+= --without-common
17 16
18.include "../../devel/py-gobject3-common/buildlink3.mk" 17.include "../../devel/py-gobject3-common/buildlink3.mk"
19.include "../../mk/bsd.pkg.mk" 18.include "../../mk/bsd.pkg.mk"
cvs diff -r1.75 -r1.76 pkgsrc/games/gcompris/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/games/gcompris/Attic/Makefile 2017/11/24 22:15:58 1.75
+++ pkgsrc/games/gcompris/Attic/Makefile 2017/11/25 08:58:55 1.76
@@ -1,28 +1,27 @@ @@ -1,28 +1,27 @@
1# $NetBSD: Makefile,v 1.75 2017/11/24 22:15:58 wiz Exp $ 1# $NetBSD: Makefile,v 1.76 2017/11/25 08:58:55 wiz Exp $
2 2
3DISTNAME= gcompris-12.11 3DISTNAME= gcompris-12.11
4PKGREVISION= 28 4PKGREVISION= 28
5CATEGORIES= games 5CATEGORIES= games
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gcompris/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gcompris/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= reed@reedmedia.net 9MAINTAINER= reed@reedmedia.net
10HOMEPAGE= http://gcompris.net/ 10HOMEPAGE= http://gcompris.net/
11COMMENT= Educational games for children 11COMMENT= Educational games for children
12LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
13 13
14DEPENDS+= gnuchess-[0-9]*:../../games/gnuchess 14DEPENDS+= gnuchess-[0-9]*:../../games/gnuchess
15DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo 
16 15
17USE_TOOLS+= gmake intltool gtar pkg-config msgfmt texi2html 16USE_TOOLS+= gmake intltool gtar pkg-config msgfmt texi2html
18GNU_CONFIGURE= YES 17GNU_CONFIGURE= YES
19USE_PKGLOCALEDIR= YES 18USE_PKGLOCALEDIR= YES
20GNU_CONFIGURE= YES 19GNU_CONFIGURE= YES
21USE_LIBTOOL= YES 20USE_LIBTOOL= YES
22CHECK_PORTABILITY_SKIP+= macosx/build-gtk.sh 21CHECK_PORTABILITY_SKIP+= macosx/build-gtk.sh
23INFO_FILES= yes 22INFO_FILES= yes
24 23
25PTHREAD_AUTO_VARS= yes 24PTHREAD_AUTO_VARS= yes
26 25
27PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-sqlite2, py-gtk2 26PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-sqlite2, py-gtk2
28 27
@@ -40,25 +39,26 @@ CONFIGURE_ARGS+= --enable-sdlmixer @@ -40,25 +39,26 @@ CONFIGURE_ARGS+= --enable-sdlmixer
40post-extract: 39post-extract:
41 ${CHMOD} -R go-w ${WRKSRC} 40 ${CHMOD} -R go-w ${WRKSRC}
42 41
43post-install: 42post-install:
44 rm ${DESTDIR}${PREFIX}/share/gcompris/boards/anim/Makefile 43 rm ${DESTDIR}${PREFIX}/share/gcompris/boards/anim/Makefile
45 rm ${DESTDIR}${PREFIX}/share/gcompris/boards/anim/Makefile.am 44 rm ${DESTDIR}${PREFIX}/share/gcompris/boards/anim/Makefile.am
46 rm ${DESTDIR}${PREFIX}/share/gcompris/boards/anim/Makefile.in 45 rm ${DESTDIR}${PREFIX}/share/gcompris/boards/anim/Makefile.in
47 rm ${DESTDIR}${PREFIX}/share/gcompris/boards/geo_country/usa/Makefile.am 46 rm ${DESTDIR}${PREFIX}/share/gcompris/boards/geo_country/usa/Makefile.am
48 rm ${DESTDIR}${PREFIX}/share/gcompris/boards/gnumch/Makefile.am 47 rm ${DESTDIR}${PREFIX}/share/gcompris/boards/gnumch/Makefile.am
49 48
50.include "../../audio/SDL_mixer/buildlink3.mk" 49.include "../../audio/SDL_mixer/buildlink3.mk"
51.include "../../converters/libiconv/buildlink3.mk" 50.include "../../converters/libiconv/buildlink3.mk"
52.include "../../databases/py-sqlite2/buildlink3.mk" 51.include "../../databases/py-sqlite2/buildlink3.mk"
 52.include "../../graphics/py-cairo/buildlink3.mk"
53.include "../../databases/sqlite3/buildlink3.mk" 53.include "../../databases/sqlite3/buildlink3.mk"
54.include "../../devel/libgnomeui/buildlink3.mk" 54.include "../../devel/libgnomeui/buildlink3.mk"
55.include "../../graphics/librsvg/buildlink3.mk" 55.include "../../graphics/librsvg/buildlink3.mk"
56.include "../../lang/python/application.mk" 56.include "../../lang/python/application.mk"
57.include "../../multimedia/gstreamer0.10/buildlink3.mk" 57.include "../../multimedia/gstreamer0.10/buildlink3.mk"
58.include "../../sysutils/desktop-file-utils/desktopdb.mk" 58.include "../../sysutils/desktop-file-utils/desktopdb.mk"
59.include "../../textproc/libxml2/buildlink3.mk" 59.include "../../textproc/libxml2/buildlink3.mk"
60.include "../../x11/gtk2/buildlink3.mk" 60.include "../../x11/gtk2/buildlink3.mk"
61.include "../../x11/libXxf86vm/buildlink3.mk" 61.include "../../x11/libXxf86vm/buildlink3.mk"
62.include "../../x11/py-gtk2/buildlink3.mk" 62.include "../../x11/py-gtk2/buildlink3.mk"
63.include "../../mk/pthread.buildlink3.mk" 63.include "../../mk/pthread.buildlink3.mk"
64.include "../../mk/bsd.pkg.mk" 64.include "../../mk/bsd.pkg.mk"
cvs diff -r1.45 -r1.46 pkgsrc/graphics/py-goocanvas/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/py-goocanvas/Attic/Makefile 2017/11/24 22:15:59 1.45
+++ pkgsrc/graphics/py-goocanvas/Attic/Makefile 2017/11/25 08:58:55 1.46
@@ -1,35 +1,34 @@ @@ -1,35 +1,34 @@
1# $NetBSD: Makefile,v 1.45 2017/11/24 22:15:59 wiz Exp $ 1# $NetBSD: Makefile,v 1.46 2017/11/25 08:58:55 wiz Exp $
2 2
3DISTNAME= pygoocanvas-0.14.1 3DISTNAME= pygoocanvas-0.14.1
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/^py//} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/^py//}
5PKGREVISION= 27 5PKGREVISION= 27
6CATEGORIES= graphics python 6CATEGORIES= graphics python
7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pygoocanvas/0.14/} 7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pygoocanvas/0.14/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10#HOMEPAGE= http://live.gnome.org/PyGoocanvas 10#HOMEPAGE= http://live.gnome.org/PyGoocanvas
11COMMENT= Python bindings for GooCanvas 11COMMENT= Python bindings for GooCanvas
12LICENSE= gnu-lgpl-v2 12LICENSE= gnu-lgpl-v2
13 13
14DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo 
15 
16GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
17USE_LIBTOOL= yes 15USE_LIBTOOL= yes
18USE_TOOLS+= pkg-config 16USE_TOOLS+= pkg-config
19 17
20PKGCONFIG_OVERRIDE+= pygoocanvas.pc.in 18PKGCONFIG_OVERRIDE+= pygoocanvas.pc.in
21 19
22CONFIGURE_ARGS+= --disable-docs 20CONFIGURE_ARGS+= --disable-docs
23 21
24PY_PATCHPLIST= yes 22PY_PATCHPLIST= yes
25PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-gtk2 23PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-gtk2
26 24
27.include "../../lang/python/pyversion.mk" 25.include "../../lang/python/pyversion.mk"
28 26
 27.include "../../graphics/py-cairo/buildlink3.mk"
29BUILDLINK_API_DEPENDS.pygtk2+= ${PYPKGPREFIX}-gtk2>=2.10.0 28BUILDLINK_API_DEPENDS.pygtk2+= ${PYPKGPREFIX}-gtk2>=2.10.0
30.include "../../x11/py-gtk2/buildlink3.mk" 29.include "../../x11/py-gtk2/buildlink3.mk"
31.include "../../devel/py-gobject/buildlink3.mk" 30.include "../../devel/py-gobject/buildlink3.mk"
32BUILDLINK_API_DEPENDS.goocanvas+= goocanvas>=0.14.0 31BUILDLINK_API_DEPENDS.goocanvas+= goocanvas>=0.14.0
33.include "../../graphics/goocanvas/buildlink3.mk" 32.include "../../graphics/goocanvas/buildlink3.mk"
34.include "../../lang/python/extension.mk" 33.include "../../lang/python/extension.mk"
35.include "../../mk/bsd.pkg.mk" 34.include "../../mk/bsd.pkg.mk"
cvs diff -r1.31 -r1.32 pkgsrc/print/py-poppler/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/print/py-poppler/Attic/Makefile 2017/11/24 22:15:59 1.31
+++ pkgsrc/print/py-poppler/Attic/Makefile 2017/11/25 08:58:55 1.32
@@ -1,28 +1,27 @@ @@ -1,28 +1,27 @@
1# $NetBSD: Makefile,v 1.31 2017/11/24 22:15:59 wiz Exp $ 1# $NetBSD: Makefile,v 1.32 2017/11/25 08:58:55 wiz Exp $
2 2
3DISTNAME= pypoppler-0.12.1 3DISTNAME= pypoppler-0.12.1
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//}
5PKGREVISION= 24 5PKGREVISION= 24
6CATEGORIES= print 6CATEGORIES= print
7MASTER_SITES= https://launchpad.net/poppler-python/trunk/development/+download/ 7MASTER_SITES= https://launchpad.net/poppler-python/trunk/development/+download/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://launchpad.net/poppler-python 10HOMEPAGE= https://launchpad.net/poppler-python
11COMMENT= Python bindings for the Poppler PDF rendering library 11COMMENT= Python bindings for the Poppler PDF rendering library
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo 
15 
16GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
17USE_LIBTOOL= yes 15USE_LIBTOOL= yes
18USE_TOOLS+= pkg-config 16USE_TOOLS+= pkg-config
19PY_PATCHPLIST= yes 17PY_PATCHPLIST= yes
20PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-gtk2 18PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-gtk2
21 19
 20.include "../../graphics/py-cairo/buildlink3.mk"
22.include "../../lang/python/extension.mk" 21.include "../../lang/python/extension.mk"
23.include "../../devel/atk/buildlink3.mk" 22.include "../../devel/atk/buildlink3.mk"
24BUILDLINK_API_DEPENDS.poppler-glib+= poppler-glib>=0.12.1 23BUILDLINK_API_DEPENDS.poppler-glib+= poppler-glib>=0.12.1
25.include "../../print/poppler-glib/buildlink3.mk" 24.include "../../print/poppler-glib/buildlink3.mk"
26BUILDLINK_API_DEPENDS.pygtk2+= ${PYPKGPREFIX}-gtk2>=2.8.4 25BUILDLINK_API_DEPENDS.pygtk2+= ${PYPKGPREFIX}-gtk2>=2.8.4
27.include "../../x11/py-gtk2/buildlink3.mk" 26.include "../../x11/py-gtk2/buildlink3.mk"
28.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"
cvs diff -r1.37 -r1.38 pkgsrc/x11/avant-window-navigator/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/avant-window-navigator/Attic/Makefile 2017/11/24 22:15:59 1.37
+++ pkgsrc/x11/avant-window-navigator/Attic/Makefile 2017/11/25 08:58:55 1.38
@@ -1,28 +1,27 @@ @@ -1,28 +1,27 @@
1# $NetBSD: Makefile,v 1.37 2017/11/24 22:15:59 wiz Exp $ 1# $NetBSD: Makefile,v 1.38 2017/11/25 08:58:55 wiz Exp $
2 2
3DISTNAME= avant-window-navigator-0.4.0 3DISTNAME= avant-window-navigator-0.4.0
4PKGREVISION= 26 4PKGREVISION= 26
5CATEGORIES= x11 5CATEGORIES= x11
6MASTER_SITES= https://launchpad.net/awn/0.4/0.4.0/+download/ 6MASTER_SITES= https://launchpad.net/awn/0.4/0.4.0/+download/
7 7
8MAINTAINER= imil@NetBSD.org 8MAINTAINER= imil@NetBSD.org
9HOMEPAGE= https://launchpad.net/awn 9HOMEPAGE= https://launchpad.net/awn
10COMMENT= Dock-like navigation bar 10COMMENT= Dock-like navigation bar
11LICENSE= gnu-lgpl-v2 11LICENSE= gnu-lgpl-v2
12 12
13DEPENDS+= ${PYPKGPREFIX}-xdg-[0-9]*:../../devel/py-xdg 13DEPENDS+= ${PYPKGPREFIX}-xdg-[0-9]*:../../devel/py-xdg
14DEPENDS+= bzr>=2.4.2:../../devel/bzr 14DEPENDS+= bzr>=2.4.2:../../devel/bzr
15DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo 
16 15
17GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
18USE_LIBTOOL= yes 17USE_LIBTOOL= yes
19USE_TOOLS+= pkg-config msgfmt intltool gmake 18USE_TOOLS+= pkg-config msgfmt intltool gmake
20USE_LIBTOOL= yes 19USE_LIBTOOL= yes
21 20
22CPPFLAGS.SunOS+= -D__EXTENSIONS__ 21CPPFLAGS.SunOS+= -D__EXTENSIONS__
23 22
24PKGCONFIG_OVERRIDE+= awn.pc.in 23PKGCONFIG_OVERRIDE+= awn.pc.in
25 24
26GCONF_SCHEMAS+= avant-window-navigator.schemas 25GCONF_SCHEMAS+= avant-window-navigator.schemas
27GCONF_SCHEMAS+= awn-applet-taskmanager.schemas 26GCONF_SCHEMAS+= awn-applet-taskmanager.schemas
28 27
@@ -42,24 +41,25 @@ SUBST_FILES.pathfix+= tests/test-awn-eff @@ -42,24 +41,25 @@ SUBST_FILES.pathfix+= tests/test-awn-eff
42SUBST_FILES.pathfix+= tests/test-overlays.py 41SUBST_FILES.pathfix+= tests/test-overlays.py
43SUBST_SED.pathfix= -e "s,/usr/share,${PREFIX}/share," 42SUBST_SED.pathfix= -e "s,/usr/share,${PREFIX}/share,"
44 43
45PY_PATCHPLIST= yes 44PY_PATCHPLIST= yes
46REPLACE_PYTHON+= awn-settings/awnSettings.py.in 45REPLACE_PYTHON+= awn-settings/awnSettings.py.in
47REPLACE_PYTHON+= awn-settings/awnSettingsHelper.py 46REPLACE_PYTHON+= awn-settings/awnSettingsHelper.py
48PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-gtk2 47PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-gtk2
49 48
50.include "../../devel/GConf/schemas.mk" 49.include "../../devel/GConf/schemas.mk"
51.include "../../lang/vala/buildlink3.mk" 50.include "../../lang/vala/buildlink3.mk"
52.include "../../devel/libwnck/buildlink3.mk" 51.include "../../devel/libwnck/buildlink3.mk"
53.include "../../sysutils/dbus-glib/buildlink3.mk" 52.include "../../sysutils/dbus-glib/buildlink3.mk"
54.include "../../sysutils/py-dbus/buildlink3.mk" 53.include "../../sysutils/py-dbus/buildlink3.mk"
 54.include "../../graphics/py-cairo/buildlink3.mk"
55.include "../../x11/py-gtk2/buildlink3.mk" 55.include "../../x11/py-gtk2/buildlink3.mk"
56.include "../../x11/libdesktop-agnostic/buildlink3.mk" 56.include "../../x11/libdesktop-agnostic/buildlink3.mk"
57.include "../../sysutils/libgtop/buildlink3.mk" 57.include "../../sysutils/libgtop/buildlink3.mk"
58.include "../../lang/python/application.mk" 58.include "../../lang/python/application.mk"
59.include "../../lang/python/pyversion.mk" 59.include "../../lang/python/pyversion.mk"
60.include "../../lang/python/extension.mk" 60.include "../../lang/python/extension.mk"
61.include "../../lang/python/tool.mk" 61.include "../../lang/python/tool.mk"
62.include "../../sysutils/desktop-file-utils/desktopdb.mk" 62.include "../../sysutils/desktop-file-utils/desktopdb.mk"
63.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 63.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
64.include "../../graphics/gnome-icon-theme/buildlink3.mk" 64.include "../../graphics/gnome-icon-theme/buildlink3.mk"
65.include "../../mk/bsd.pkg.mk" 65.include "../../mk/bsd.pkg.mk"
cvs diff -r1.111 -r1.112 pkgsrc/x11/py-gnome2-desktop/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/py-gnome2-desktop/Attic/Makefile 2017/11/24 22:15:59 1.111
+++ pkgsrc/x11/py-gnome2-desktop/Attic/Makefile 2017/11/25 08:58:56 1.112
@@ -1,51 +1,51 @@ @@ -1,51 +1,51 @@
1# $NetBSD: Makefile,v 1.111 2017/11/24 22:15:59 wiz Exp $ 1# $NetBSD: Makefile,v 1.112 2017/11/25 08:58:56 wiz Exp $
2 2
3DISTNAME= gnome-python-desktop-2.32.0 3DISTNAME= gnome-python-desktop-2.32.0
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/-python/2/} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/-python/2/}
5PKGREVISION= 51 5PKGREVISION= 51
6CATEGORIES= sysutils gnome 6CATEGORIES= sysutils gnome
7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-python-desktop/2.32/} 7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-python-desktop/2.32/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://www.gnome.org/ 11HOMEPAGE= https://www.gnome.org/
12COMMENT= Python modules for the GNOME desktop 12COMMENT= Python modules for the GNOME desktop
13 13
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15PY_PATCHPLIST= yes 15PY_PATCHPLIST= yes
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_TOOLS+= pkg-config gmake 17USE_TOOLS+= pkg-config gmake
18 18
19#DEPENDS+= bug-buddy>=2.16:../../net/bug-buddy 19#DEPENDS+= bug-buddy>=2.16:../../net/bug-buddy
20DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo 
21 20
22PKGCONFIG_OVERRIDE+= gnome-python-desktop-2.0.pc.in 21PKGCONFIG_OVERRIDE+= gnome-python-desktop-2.0.pc.in
23 22
24PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-ORBit via py-gnome2, py-gtk2 23PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-ORBit via py-gnome2, py-gtk2
25 24
26.include "../../lang/python/pyversion.mk" 25.include "../../lang/python/pyversion.mk"
27 26
28# The "real" value here is: 27 27# The "real" value here is: 27
29# but because of single-version deps of gnome bits this will only 28# but because of single-version deps of gnome bits this will only
30# ever work for the python version those gnome bits were built with. 29# ever work for the python version those gnome bits were built with.
31PYTHON_VERSIONS_REALLY_ACCEPTED=27 30PYTHON_VERSIONS_REALLY_ACCEPTED=27
32PYTHON_VERSIONS_ACCEPTED= ${PYTHON_VERSION_DEFAULT:M27} 31PYTHON_VERSIONS_ACCEPTED= ${PYTHON_VERSION_DEFAULT:M27}
33 32
34.include "options.mk" 33.include "options.mk"
35 34
36.include "../../lang/python/extension.mk" 35.include "../../lang/python/extension.mk"
37.include "../../devel/libwnck/buildlink3.mk" 36.include "../../devel/libwnck/buildlink3.mk"
38.include "../../graphics/librsvg/buildlink3.mk" 37.include "../../graphics/librsvg/buildlink3.mk"
 38.include "../../graphics/py-cairo/buildlink3.mk"
39.include "../../multimedia/gnome-media/buildlink3.mk" 39.include "../../multimedia/gnome-media/buildlink3.mk"
40.include "../../multimedia/totem-pl-parser/buildlink3.mk" 40.include "../../multimedia/totem-pl-parser/buildlink3.mk"
41# works, but should better be in its own pkg to limit dependencies 41# works, but should better be in its own pkg to limit dependencies
42#.include "../../sysutils/brasero/buildlink3.mk" 42#.include "../../sysutils/brasero/buildlink3.mk"
43BUILDLINK_API_DEPENDS.evince+= evince>=2.32<2.33 43BUILDLINK_API_DEPENDS.evince+= evince>=2.32<2.33
44.include "../../print/evince/buildlink3.mk" 44.include "../../print/evince/buildlink3.mk"
45.include "../../print/libgnomeprint/buildlink3.mk" 45.include "../../print/libgnomeprint/buildlink3.mk"
46.include "../../print/libgnomeprintui/buildlink3.mk" 46.include "../../print/libgnomeprintui/buildlink3.mk"
47.include "../../security/libgnome-keyring/buildlink3.mk" 47.include "../../security/libgnome-keyring/buildlink3.mk"
48.include "../../sysutils/libgtop/buildlink3.mk" 48.include "../../sysutils/libgtop/buildlink3.mk"
49# disabled in configure script by default 49# disabled in configure script by default
50# CONFIGURE_ARGS+= --enable-metacity 50# CONFIGURE_ARGS+= --enable-metacity
51#.include "../../wm/metacity/buildlink3.mk" 51#.include "../../wm/metacity/buildlink3.mk"
cvs diff -r1.109 -r1.110 pkgsrc/x11/py-gtk2/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/py-gtk2/Makefile 2017/11/24 22:15:59 1.109
+++ pkgsrc/x11/py-gtk2/Makefile 2017/11/25 08:58:56 1.110
@@ -1,29 +1,27 @@ @@ -1,29 +1,27 @@
1# $NetBSD: Makefile,v 1.109 2017/11/24 22:15:59 wiz Exp $ 1# $NetBSD: Makefile,v 1.110 2017/11/25 08:58:56 wiz Exp $
2 2
3DISTNAME= pygtk-2.24.0 3DISTNAME= pygtk-2.24.0
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/pygtk/gtk2/} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/pygtk/gtk2/}
5PKGREVISION= 22 5PKGREVISION= 22
6CATEGORIES= x11 python 6CATEGORIES= x11 python
7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pygtk/2.24/} 7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pygtk/2.24/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.pygtk.org/ 11HOMEPAGE= http://www.pygtk.org/
12COMMENT= Python bindings for GTK+2 12COMMENT= Python bindings for GTK+2
13LICENSE= gnu-lgpl-v2.1 13LICENSE= gnu-lgpl-v2.1
14 14
15DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo 
16 
17CONFLICTS= ${PYPKGPREFIX}-gtk<0.6.10 15CONFLICTS= ${PYPKGPREFIX}-gtk<0.6.10
18 16
19# IOError: [Errno 2] No such file or directory: 'gtk-types.defs' 17# IOError: [Errno 2] No such file or directory: 'gtk-types.defs'
20MAKE_JOBS_SAFE= no 18MAKE_JOBS_SAFE= no
21 19
22USE_LIBTOOL= YES 20USE_LIBTOOL= YES
23PKGCONFIG_OVERRIDE+= pygtk-2.0.pc.in 21PKGCONFIG_OVERRIDE+= pygtk-2.0.pc.in
24GNU_CONFIGURE= YES 22GNU_CONFIGURE= YES
25CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} 23CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
26USE_TOOLS+= gmake pkg-config 24USE_TOOLS+= gmake pkg-config
27 25
28PY_PATCHPLIST= YES 26PY_PATCHPLIST= YES
29PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # not yet ported as of 2.24.0 27PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # not yet ported as of 2.24.0
@@ -71,20 +69,21 @@ REPLACE_PYTHON+= examples/simple/dnd.py @@ -71,20 +69,21 @@ REPLACE_PYTHON+= examples/simple/dnd.py
71REPLACE_PYTHON+= examples/simple/hello.py 69REPLACE_PYTHON+= examples/simple/hello.py
72REPLACE_PYTHON+= examples/simple/scribble.py 70REPLACE_PYTHON+= examples/simple/scribble.py
73REPLACE_PYTHON+= examples/simple/simple.py 71REPLACE_PYTHON+= examples/simple/simple.py
74REPLACE_PYTHON+= examples/simple/tooltip.py 72REPLACE_PYTHON+= examples/simple/tooltip.py
75REPLACE_PYTHON+= setup.py 73REPLACE_PYTHON+= setup.py
76REPLACE_PYTHON+= tests/runtests.py 74REPLACE_PYTHON+= tests/runtests.py
77 75
78.include "options.mk" 76.include "options.mk"
79 77
80.include "../../lang/python/application.mk" 78.include "../../lang/python/application.mk"
81.include "../../lang/python/extension.mk" 79.include "../../lang/python/extension.mk"
82 80
83.include "../../devel/libglade/buildlink3.mk" 81.include "../../devel/libglade/buildlink3.mk"
 82.include "../../graphics/py-cairo/buildlink3.mk"
84BUILDLINK_API_DEPENDS.pygobject+= ${PYPKGPREFIX}-gobject>=2.15.3 83BUILDLINK_API_DEPENDS.pygobject+= ${PYPKGPREFIX}-gobject>=2.15.3
85.include "../../devel/py-gobject/buildlink3.mk" 84.include "../../devel/py-gobject/buildlink3.mk"
86BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.16.0 85BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.16.0
87.include "../../x11/gtk2/buildlink3.mk" 86.include "../../x11/gtk2/buildlink3.mk"
88 87
89.include "../../mk/pthread.buildlink3.mk" 88.include "../../mk/pthread.buildlink3.mk"
90.include "../../mk/bsd.pkg.mk" 89.include "../../mk/bsd.pkg.mk"