Depend on py-expat for all supported python versions, now that

python25 and python26 have been fixed to behave like python24.

5 files changed, 23 insertions, 31 deletions

diff --git a/chat/telepathy-gabble/Makefile b/chat/telepathy-gabble/Makefile
index c56b4140b70..f14a4042015 100644
--- a/chat/telepathy-gabble/Makefile
+++ b/chat/telepathy-gabble/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2010/01/17 12:02:07 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2010/01/27 08:46:50 wiz Exp $
 #
 
 DISTNAME=	telepathy-gabble-0.9.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	chat
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/telepathy-gabble/
 
@@ -10,17 +10,14 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://telepathy.freedesktop.org/wiki/Components
 COMMENT=	Jabber/XMPP connection manager for Telepathy
 
+BUILD_DEPENDS+=		${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	gmake pkg-config
 
-.include "../../lang/python/pyversion.mk"
-.if ${PYPKGPREFIX} == "py24"
-BUILD_DEPENDS+=		${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
-.endif
-
 pre-configure: wocky-pkg-config-hack
 wocky-pkg-config-hack:
 	${LN} -s ${WRKSRC}/lib/ext/wocky/wocky/wocky-uninstalled.pc \
diff --git a/chat/telepathy-glib/Makefile b/chat/telepathy-glib/Makefile
index 6839e917118..561330d5253 100644
--- a/chat/telepathy-glib/Makefile
+++ b/chat/telepathy-glib/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2009/12/06 22:25:19 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2010/01/27 08:46:50 wiz Exp $
 #
 
 DISTNAME=	telepathy-glib-0.9.2
+PKGREVISION=	1
 CATEGORIES=	chat
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/telepathy-glib/
 
@@ -10,18 +11,16 @@ HOMEPAGE=	http://telepathy.freedesktop.org/wiki/Telepathy%20GLib
 COMMENT=	GObject-based C binding for the Telepathy D-Bus API
 LICENSE=	gnu-gpl-v2 AND modified-bsd
 
+BUILD_DEPENDS+=		${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	gmake pkg-config
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 PKGCONFIG_OVERRIDE+=	telepathy-glib/telepathy-glib.pc.in
 
-.include "../../lang/python/pyversion.mk"
-.if ${PYPKGPREFIX} == "py24"
-BUILD_DEPENDS+=		${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
-.endif
 CONFIGURE_ENV+=		ac_cv_prog_PYTHON=${PYTHONBIN}
 # see https://bugs.freedesktop.org/show_bug.cgi?id=23342
 CONFIGURE_ARGS+=	NM=nm
diff --git a/chat/telepathy-idle/Makefile b/chat/telepathy-idle/Makefile
index 92e334a15a5..5560d647772 100644
--- a/chat/telepathy-idle/Makefile
+++ b/chat/telepathy-idle/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2010/01/17 12:02:07 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2010/01/27 08:46:50 wiz Exp $
 #
 
 DISTNAME=	telepathy-idle-0.1.5
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	chat
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/telepathy-idle/
 
@@ -11,6 +11,8 @@ HOMEPAGE=	http://telepathy.freedesktop.org/wiki/Components
 COMMENT=	Full-featured IRC connection manager for Telepathy
 LICENSE=	gnu-lgpl-v2.1
 
+BUILD_DEPENDS+=		${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	yes
@@ -20,10 +22,6 @@ USE_TOOLS+=	gmake pkg-config
 CONFIGURE_ARGS+=	OPENSSL_CFLAGS=-I${BUILDLINK_PREFIX.openssl}/include
 CONFIGURE_ARGS+=	OPENSSL_LIBS="-L${BUILDLINK_PREFIX.openssl}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib -lssl"
 
-.include "../../lang/python/pyversion.mk"
-.if ${PYPKGPREFIX} == "py24"
-BUILD_DEPENDS+=		${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
-.endif
 CONFIGURE_ENV+=		ac_cv_prog_PYTHON=${PYTHONBIN}
 
 .include "../../chat/telepathy-glib/buildlink3.mk"
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 93190fd4ae2..8506a4a6088 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2009/12/16 17:20:31 drochner Exp $
+# $NetBSD: Makefile,v 1.30 2010/01/27 08:46:50 wiz Exp $
 #
 
 DISTNAME=		gnome-terminal-2.28.2
+PKGREVISION=		1
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-terminal/2.28/}
 EXTRACT_SUFX=		.tar.bz2
@@ -10,6 +11,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Xterm like terminal program for GNOME 2
 
+BUILD_DEPENDS+=		${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 CONFLICTS=		gnome-core-[0-9]* gnome2-terminal-[0-9]*
@@ -24,10 +27,6 @@ CONFIGURE_ENV+=		ac_cv_path_GTK_BUILDER_CONVERT="${PYTHONBIN} ${BUILDLINK_PREFIX
 GCONF_SCHEMAS=	gnome-terminal.schemas
 
 PYTHON_FOR_BUILD_ONLY=	YES
-.include "../../lang/python/pyversion.mk"
-.if ${PYPKGPREFIX} == "py24"
-BUILD_DEPENDS+=		${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
-.endif
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 BUILDLINK_API_DEPENDS.GConf+=	GConf>=2.14.0
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 305f860d8ff..9e13e05d0bf 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.195 2010/01/18 18:23:14 drochner Exp $
+# $NetBSD: Makefile,v 1.196 2010/01/27 08:46:50 wiz Exp $
 
 DISTNAME=		gtk+-2.18.6
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/2.18/ \
 			${MASTER_SITE_GNOME:=sources/gtk+/2.18/}
@@ -12,6 +13,9 @@ HOMEPAGE=		http://www.gtk.org/
 COMMENT=		GIMP Toolkit v2 - libraries for building X11 user interfaces
 LICENSE=		gnu-lgpl-v2.1
 
+# gtk-builder-convert uses minidom from xml.dom, which needs expat
+DEPENDS+=		${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 CONFLICTS=		gtk2-engines<2.6.0
@@ -67,11 +71,6 @@ SUBST_SED.pthread=	-e 's,__PTHREAD_FLAGS__,${BUILDLINK_LDFLAGS.pthread},g'
 SUBST_FILES.pthread=	gdk-pixbuf/Makefile.in
 
 PYTHON_PATCH_SCRIPTS=	gtk/gtk-builder-convert
-# gtk-builder-convert uses minidom from xml.dom, which needs expat
-.include "../../lang/python/pyversion.mk"
-.if ${PYPKGPREFIX} == "py24"
-DEPENDS+=		${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
-.endif
 
 .include "options.mk"