diff options
| author | wiz <wiz@pkgsrc.org> | 2010-01-27 08:46:50 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2010-01-27 08:46:50 +0000 |
| commit | 40256632f1c51c4054edb2784ebfa0708a47a64f (patch) | |
| tree | 0bb648dae310d9dfedb899a1c33a31201ec12010 /x11 | |
| parent | 26eef798546c77cb69e25b0b70592d30f322ad1a (diff) | |
| download | pkgsrc-40256632f1c51c4054edb2784ebfa0708a47a64f.tar.gz | |
Depend on py-expat for all supported python versions, now that
python25 and python26 have been fixed to behave like python24.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gnome-terminal/Makefile | 9 | ||||
| -rw-r--r-- | x11/gtk2/Makefile | 11 |
2 files changed, 9 insertions, 11 deletions
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" |