Mon Oct 5 06:28:11 2009 UTC ()
Kludge to work around hardcoded 'grep -o' GNUism.


(sketch)
diff -r1.186 -r1.187 pkgsrc/x11/gtk2/Makefile
cvs diff -r1.186 -r1.187 pkgsrc/x11/gtk2/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/gtk2/Makefile 2009/09/09 11:16:57 1.186
+++ pkgsrc/x11/gtk2/Makefile 2009/10/05 06:28:11 1.187
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.186 2009/09/09 11:16:57 wiz Exp $ 1# $NetBSD: Makefile,v 1.187 2009/10/05 06:28:11 sketch Exp $
2 2
3DISTNAME= gtk+-2.16.6 3DISTNAME= gtk+-2.16.6
4PKGNAME= ${DISTNAME:S/gtk/gtk2/} 4PKGNAME= ${DISTNAME:S/gtk/gtk2/}
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= x11 6CATEGORIES= x11
7MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/2.16/ \ 7MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/2.16/ \
8 ${MASTER_SITE_GNOME:=sources/gtk+/2.16/} 8 ${MASTER_SITE_GNOME:=sources/gtk+/2.16/}
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.gtk.org/ 12HOMEPAGE= http://www.gtk.org/
13COMMENT= GIMP Toolkit v2 - libraries for building X11 user interfaces 13COMMENT= GIMP Toolkit v2 - libraries for building X11 user interfaces
14LICENSE= gnu-lgpl-v2.1 14LICENSE= gnu-lgpl-v2.1
@@ -38,26 +38,33 @@ PKGCONFIG_OVERRIDE+= gdk-2.0.pc.in @@ -38,26 +38,33 @@ PKGCONFIG_OVERRIDE+= gdk-2.0.pc.in
38PKGCONFIG_OVERRIDE+= gtk+-2.0-uninstalled.pc.in 38PKGCONFIG_OVERRIDE+= gtk+-2.0-uninstalled.pc.in
39PKGCONFIG_OVERRIDE+= gtk+-2.0.pc.in 39PKGCONFIG_OVERRIDE+= gtk+-2.0.pc.in
40PKGCONFIG_OVERRIDE+= gtk+-unix-print-2.0.pc.in 40PKGCONFIG_OVERRIDE+= gtk+-unix-print-2.0.pc.in
41PKGCONFIG_OVERRIDE+= gdk-pixbuf-2.0-uninstalled.pc.in 41PKGCONFIG_OVERRIDE+= gdk-pixbuf-2.0-uninstalled.pc.in
42PKGCONFIG_OVERRIDE+= gdk-pixbuf-2.0.pc.in 42PKGCONFIG_OVERRIDE+= gdk-pixbuf-2.0.pc.in
43PKGCONFIG_OVERRIDE+= contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in 43PKGCONFIG_OVERRIDE+= contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in
44 44
45REQD_DIRS+= ${PREFIX}/libdata/gtk-2.0 45REQD_DIRS+= ${PREFIX}/libdata/gtk-2.0
46 46
47BUILD_DIRS= . demos/gtk-demo 47BUILD_DIRS= . demos/gtk-demo
48 48
49.include "../../mk/bsd.prefs.mk" 49.include "../../mk/bsd.prefs.mk"
50 50
 51# gtk/Makefile.am hardcodes 'grep -o' so require GNU grep on platforms
 52# which do not have it.
 53.if ${OPSYS} == "SunOS"
 54DEPENDS+= grep:../../textproc/grep
 55TOOLS_PLATFORM.grep= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}grep
 56.endif
 57
51CPPFLAGS+= -DPREFIX="\"${PREFIX}\"" 58CPPFLAGS+= -DPREFIX="\"${PREFIX}\""
52 59
53SUBST_CLASSES+= pthread 60SUBST_CLASSES+= pthread
54SUBST_STAGE.pthread= pre-configure 61SUBST_STAGE.pthread= pre-configure
55SUBST_MESSAGE.pthread= Fixing pthread flags. 62SUBST_MESSAGE.pthread= Fixing pthread flags.
56SUBST_SED.pthread= -e 's,__PTHREAD_FLAGS__,${BUILDLINK_LDFLAGS.pthread},g' 63SUBST_SED.pthread= -e 's,__PTHREAD_FLAGS__,${BUILDLINK_LDFLAGS.pthread},g'
57SUBST_FILES.pthread= gdk-pixbuf/Makefile.in 64SUBST_FILES.pthread= gdk-pixbuf/Makefile.in
58 65
59PYTHON_PATCH_SCRIPTS= gtk/gtk-builder-convert 66PYTHON_PATCH_SCRIPTS= gtk/gtk-builder-convert
60# gtk-builder-convert uses minidom from xml.dom, which needs expat 67# gtk-builder-convert uses minidom from xml.dom, which needs expat
61.include "../../lang/python/pyversion.mk" 68.include "../../lang/python/pyversion.mk"
62.if ${PYPKGPREFIX} == "py24" 69.if ${PYPKGPREFIX} == "py24"
63DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat 70DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat