Sun Dec 21 10:58:53 2008 UTC ()
Also depend on py-expat for Python 2.3 (noted by Joerg) and Python 2.1.


(wiz)
diff -r1.3 -r1.4 pkgsrc/chat/telepathy-glib/Makefile
diff -r1.15 -r1.16 pkgsrc/x11/gnome-terminal/Makefile
cvs diff -r1.3 -r1.4 pkgsrc/chat/telepathy-glib/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/telepathy-glib/Makefile 2008/12/21 10:36:00 1.3
+++ pkgsrc/chat/telepathy-glib/Makefile 2008/12/21 10:58:52 1.4
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1# $NetBSD: Makefile,v 1.3 2008/12/21 10:36:00 wiz Exp $ 1# $NetBSD: Makefile,v 1.4 2008/12/21 10:58:52 wiz Exp $
2# 2#
3 3
4DISTNAME= telepathy-glib-0.7.18 4DISTNAME= telepathy-glib-0.7.18
5CATEGORIES= chat 5CATEGORIES= chat
6MASTER_SITES= http://telepathy.freedesktop.org/releases/telepathy-glib/ 6MASTER_SITES= http://telepathy.freedesktop.org/releases/telepathy-glib/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://telepathy.freedesktop.org/wiki/Telepathy%20GLib 9HOMEPAGE= http://telepathy.freedesktop.org/wiki/Telepathy%20GLib
10COMMENT= GObject-based C binding for the Telepathy D-Bus API 10COMMENT= GObject-based C binding for the Telepathy D-Bus API
11 11
12GNU_CONFIGURE= yes 12GNU_CONFIGURE= yes
13USE_LIBTOOL= yes 13USE_LIBTOOL= yes
14USE_TOOLS+= gmake pkg-config 14USE_TOOLS+= gmake pkg-config
15 15
16PKGCONFIG_OVERRIDE+= telepathy-glib/telepathy-glib.pc.in 16PKGCONFIG_OVERRIDE+= telepathy-glib/telepathy-glib.pc.in
17 17
18.include "../../lang/python/pyversion.mk" 18.include "../../lang/python/pyversion.mk"
19.if ${PYPKGPREFIX} == "py24" 19.if ${PYPKGPREFIX} == "py24" || ${PYPKGPREFIX} == "py23" || ${PYPKGPREFIX} == "py21"
20BUILD_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat 20BUILD_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
21.endif 21.endif
22 22
23BUILDLINK_API_DEPENDS.glib2+= glib2>=2.16.0 23BUILDLINK_API_DEPENDS.glib2+= glib2>=2.16.0
24.include "../../devel/glib2/buildlink3.mk" 24.include "../../devel/glib2/buildlink3.mk"
25.include "../../lang/python/application.mk" 25.include "../../lang/python/application.mk"
26BUILDLINK_API_DEPENDS.dbus-glib+= dbus-glib>=0.73 26BUILDLINK_API_DEPENDS.dbus-glib+= dbus-glib>=0.73
27.include "../../sysutils/dbus-glib/buildlink3.mk" 27.include "../../sysutils/dbus-glib/buildlink3.mk"
28BUILDLINK_API_DEPENDS.dbus+= dbus>=0.95 28BUILDLINK_API_DEPENDS.dbus+= dbus>=0.95
29.include "../../sysutils/dbus/buildlink3.mk" 29.include "../../sysutils/dbus/buildlink3.mk"
30.include "../../textproc/gtk-doc/buildlink3.mk" 30.include "../../textproc/gtk-doc/buildlink3.mk"
31.include "../../textproc/libxslt/buildlink3.mk" 31.include "../../textproc/libxslt/buildlink3.mk"
32.include "../../mk/bsd.pkg.mk" 32.include "../../mk/bsd.pkg.mk"
cvs diff -r1.15 -r1.16 pkgsrc/x11/gnome-terminal/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/gnome-terminal/Makefile 2008/12/21 10:35:19 1.15
+++ pkgsrc/x11/gnome-terminal/Makefile 2008/12/21 10:58:53 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.15 2008/12/21 10:35:19 wiz Exp $ 1# $NetBSD: Makefile,v 1.16 2008/12/21 10:58:53 wiz Exp $
2# 2#
3 3
4DISTNAME= gnome-terminal-2.24.2 4DISTNAME= gnome-terminal-2.24.2
5CATEGORIES= x11 gnome 5CATEGORIES= x11 gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-terminal/2.24/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-terminal/2.24/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.gnome.org/ 10HOMEPAGE= http://www.gnome.org/
11COMMENT= Xterm like terminal program for GNOME 2 11COMMENT= Xterm like terminal program for GNOME 2
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
@@ -16,27 +16,27 @@ CONFLICTS= gnome-core-[0-9]* gnome2-ter @@ -16,27 +16,27 @@ CONFLICTS= gnome-core-[0-9]* gnome2-ter
16 16
17GNU_CONFIGURE= YES 17GNU_CONFIGURE= YES
18USE_DIRS+= gnome2-1.5 18USE_DIRS+= gnome2-1.5
19USE_PKGLOCALEDIR= YES 19USE_PKGLOCALEDIR= YES
20USE_TOOLS+= gmake intltool msgfmt perl pkg-config 20USE_TOOLS+= gmake intltool msgfmt perl pkg-config
21USE_LIBTOOL= YES 21USE_LIBTOOL= YES
22 22
23CONFIGURE_ENV+= ac_cv_path_GTK_BUILDER_CONVERT="${PYTHONBIN} ${BUILDLINK_PREFIX.gtk2}/bin/gtk-builder-convert" 23CONFIGURE_ENV+= ac_cv_path_GTK_BUILDER_CONVERT="${PYTHONBIN} ${BUILDLINK_PREFIX.gtk2}/bin/gtk-builder-convert"
24 24
25GCONF_SCHEMAS= gnome-terminal.schemas 25GCONF_SCHEMAS= gnome-terminal.schemas
26 26
27PYTHON_FOR_BUILD_ONLY= YES 27PYTHON_FOR_BUILD_ONLY= YES
28.include "../../lang/python/pyversion.mk" 28.include "../../lang/python/pyversion.mk"
29.if ${PYPKGPREFIX} == "py24" 29.if ${PYPKGPREFIX} == "py24" || ${PYPKGPREFIX} == "py23" || ${PYPKGPREFIX} == "py21"
30BUILD_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat 30BUILD_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
31.endif 31.endif
32 32
33BUILDLINK_API_DEPENDS.GConf+= GConf>=2.14.0 33BUILDLINK_API_DEPENDS.GConf+= GConf>=2.14.0
34.include "../../devel/GConf/schemas.mk" 34.include "../../devel/GConf/schemas.mk"
35BUILDLINK_API_DEPENDS.glib2+= glib2>=2.16.0 35BUILDLINK_API_DEPENDS.glib2+= glib2>=2.16.0
36.include "../../devel/glib2/buildlink3.mk" 36.include "../../devel/glib2/buildlink3.mk"
37.include "../../devel/libglade/buildlink3.mk" 37.include "../../devel/libglade/buildlink3.mk"
38BUILDLINK_API_DEPENDS.libgnome+= libgnome>=2.14.0 38BUILDLINK_API_DEPENDS.libgnome+= libgnome>=2.14.0
39.include "../../devel/libgnome/buildlink3.mk" 39.include "../../devel/libgnome/buildlink3.mk"
40.include "../../devel/libgnomeui/buildlink3.mk" 40.include "../../devel/libgnomeui/buildlink3.mk"
41.include "../../devel/pango/buildlink3.mk" 41.include "../../devel/pango/buildlink3.mk"
42.include "../../lang/python/application.mk" 42.include "../../lang/python/application.mk"