pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc py-expat only needed with Python 2.4, make it so.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c47e72d3a864
branches:  trunk
changeset: 551930:c47e72d3a864
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Dec 21 10:35:19 2008 +0000

description:
py-expat only needed with Python 2.4, make it so.

diffstat:

 chat/telepathy-glib/Makefile |  5 ++++-
 x11/gnome-terminal/Makefile  |  6 ++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diffs (41 lines):

diff -r 6f0d364f2b71 -r c47e72d3a864 chat/telepathy-glib/Makefile
--- a/chat/telepathy-glib/Makefile      Sun Dec 21 10:34:59 2008 +0000
+++ b/chat/telepathy-glib/Makefile      Sun Dec 21 10:35:19 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/12/21 09:55:04 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/12/21 10:36:00 wiz Exp $
 #
 
 DISTNAME=      telepathy-glib-0.7.18
@@ -15,7 +15,10 @@
 
 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
 
 BUILDLINK_API_DEPENDS.glib2+=          glib2>=2.16.0
 .include "../../devel/glib2/buildlink3.mk"
diff -r 6f0d364f2b71 -r c47e72d3a864 x11/gnome-terminal/Makefile
--- a/x11/gnome-terminal/Makefile       Sun Dec 21 10:34:59 2008 +0000
+++ b/x11/gnome-terminal/Makefile       Sun Dec 21 10:35:19 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/12/21 09:53:35 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2008/12/21 10:35:19 wiz Exp $
 #
 
 DISTNAME=              gnome-terminal-2.24.2
@@ -25,8 +25,10 @@
 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
 
 BUILDLINK_API_DEPENDS.GConf+=  GConf>=2.14.0
 .include "../../devel/GConf/schemas.mk"



Home | Main Index | Thread Index | Old Index