summaryrefslogtreecommitdiff
path: root/x11/gtk2
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2010-01-27 08:46:50 +0000
committerwiz <wiz@pkgsrc.org>2010-01-27 08:46:50 +0000
commit4ff4224bf79bc28564a93c16bae69f04c5adbed9 (patch)
tree0bb648dae310d9dfedb899a1c33a31201ec12010 /x11/gtk2
parent1f84876a8110024171a6831805621c9f5e5a83da (diff)
downloadpkgsrc-4ff4224bf79bc28564a93c16bae69f04c5adbed9.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/gtk2')
-rw-r--r--x11/gtk2/Makefile11
1 files changed, 5 insertions, 6 deletions
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"