Sat Jun 12 12:50:44 2010 UTC ()
fix build with gtk2-2.20, problem reported by Greg Oster per PR pkg/43460


(drochner)
diff -r1.30 -r1.31 pkgsrc/x11/gnome-terminal/Makefile
cvs diff -r1.30 -r1.31 pkgsrc/x11/gnome-terminal/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/gnome-terminal/Makefile 2010/01/27 08:46:50 1.30
+++ pkgsrc/x11/gnome-terminal/Makefile 2010/06/12 12:50:44 1.31
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.30 2010/01/27 08:46:50 wiz Exp $ 1# $NetBSD: Makefile,v 1.31 2010/06/12 12:50:44 drochner Exp $
2# 2#
3 3
4DISTNAME= gnome-terminal-2.28.2 4DISTNAME= gnome-terminal-2.28.2
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= x11 gnome 6CATEGORIES= x11 gnome
7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-terminal/2.28/} 7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-terminal/2.28/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.gnome.org/ 11HOMEPAGE= http://www.gnome.org/
12COMMENT= Xterm like terminal program for GNOME 2 12COMMENT= Xterm like terminal program for GNOME 2
13 13
14BUILD_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat 14BUILD_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
@@ -17,26 +17,27 @@ PKG_DESTDIR_SUPPORT= user-destdir @@ -17,26 +17,27 @@ PKG_DESTDIR_SUPPORT= user-destdir
17 17
18CONFLICTS= gnome-core-[0-9]* gnome2-terminal-[0-9]* 18CONFLICTS= gnome-core-[0-9]* gnome2-terminal-[0-9]*
19 19
20GNU_CONFIGURE= YES 20GNU_CONFIGURE= YES
21USE_PKGLOCALEDIR= YES 21USE_PKGLOCALEDIR= YES
22USE_TOOLS+= gmake intltool msgfmt perl pkg-config 22USE_TOOLS+= gmake intltool msgfmt perl pkg-config
23USE_LIBTOOL= YES 23USE_LIBTOOL= YES
24 24
25CONFIGURE_ENV+= ac_cv_path_GTK_BUILDER_CONVERT="${PYTHONBIN} ${BUILDLINK_PREFIX.gtk2}/bin/gtk-builder-convert" 25CONFIGURE_ENV+= ac_cv_path_GTK_BUILDER_CONVERT="${PYTHONBIN} ${BUILDLINK_PREFIX.gtk2}/bin/gtk-builder-convert"
26 26
27GCONF_SCHEMAS= gnome-terminal.schemas 27GCONF_SCHEMAS= gnome-terminal.schemas
28 28
29PYTHON_FOR_BUILD_ONLY= YES 29PYTHON_FOR_BUILD_ONLY= YES
 30BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED
30 31
31.include "../../sysutils/desktop-file-utils/desktopdb.mk" 32.include "../../sysutils/desktop-file-utils/desktopdb.mk"
32BUILDLINK_API_DEPENDS.GConf+= GConf>=2.14.0 33BUILDLINK_API_DEPENDS.GConf+= GConf>=2.14.0
33.include "../../devel/GConf/schemas.mk" 34.include "../../devel/GConf/schemas.mk"
34BUILDLINK_API_DEPENDS.glib2+= glib2>=2.16.0 35BUILDLINK_API_DEPENDS.glib2+= glib2>=2.16.0
35.include "../../devel/glib2/buildlink3.mk" 36.include "../../devel/glib2/buildlink3.mk"
36.include "../../lang/python/application.mk" 37.include "../../lang/python/application.mk"
37.include "../../sysutils/dbus-glib/buildlink3.mk" 38.include "../../sysutils/dbus-glib/buildlink3.mk"
38.include "../../textproc/gnome-doc-utils/buildlink3.mk" 39.include "../../textproc/gnome-doc-utils/buildlink3.mk"
39.include "../../mk/omf-scrollkeeper.mk" 40.include "../../mk/omf-scrollkeeper.mk"
40BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.13.6 41BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.13.6
41.include "../../x11/gtk2/buildlink3.mk" 42.include "../../x11/gtk2/buildlink3.mk"
42.include "../../x11/libSM/buildlink3.mk" 43.include "../../x11/libSM/buildlink3.mk"