Sat Jul 19 20:32:16 2014 UTC ()
fix CONFIG_SHELL for bash to correctly use TOOLS_PATH


(richard)
diff -r1.51 -r1.52 pkgsrc/x11/gtk3/Makefile
cvs diff -r1.51 -r1.52 pkgsrc/x11/gtk3/Makefile (switch to unified diff)

--- pkgsrc/x11/gtk3/Makefile 2014/06/18 09:28:18 1.51
+++ pkgsrc/x11/gtk3/Makefile 2014/07/19 20:32:15 1.52
@@ -1,102 +1,102 @@ @@ -1,102 +1,102 @@
1# $NetBSD: Makefile,v 1.51 2014/06/18 09:28:18 wiz Exp $ 1# $NetBSD: Makefile,v 1.52 2014/07/19 20:32:15 richard Exp $
2 2
3DISTNAME= gtk+-3.10.7 3DISTNAME= gtk+-3.10.7
4PKGNAME= ${DISTNAME:S/gtk/gtk3/} 4PKGNAME= ${DISTNAME:S/gtk/gtk3/}
5PKGREVISION= 4 5PKGREVISION= 4
6CATEGORIES= x11 gnome 6CATEGORIES= x11 gnome
7MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/${PKGVERSION_NOREV:R}/ \ 7MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/${PKGVERSION_NOREV:R}/ \
8 ${MASTER_SITE_GNOME:=sources/gtk+/${PKGVERSION_NOREV:R}/} 8 ${MASTER_SITE_GNOME:=sources/gtk+/${PKGVERSION_NOREV:R}/}
9EXTRACT_SUFX= .tar.xz 9EXTRACT_SUFX= .tar.xz
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 v3 - libraries for building X11 user interfaces 13COMMENT= GIMP Toolkit v3 - libraries for building X11 user interfaces
14LICENSE= gnu-lgpl-v2.1 14LICENSE= gnu-lgpl-v2.1
15 15
16USE_PKGLOCALEDIR= yes 16USE_PKGLOCALEDIR= yes
17USE_TOOLS+= gmake msgfmt perl pkg-config bash 17USE_TOOLS+= gmake msgfmt perl pkg-config bash
18USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
19USE_LIBTOOL= yes 19USE_LIBTOOL= yes
20PTHREAD_AUTO_VARS= yes 20PTHREAD_AUTO_VARS= yes
21BUILD_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen 21BUILD_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
22 22
23GNU_CONFIGURE= yes 23GNU_CONFIGURE= yes
24# XXX there is a subtle bashism in "configure" or a bug in NetBSD's sh 24# XXX there is a subtle bashism in "configure" or a bug in NetBSD's sh
25CONFIG_SHELL= bash 25CONFIG_SHELL= ${TOOLS_PATH.bash}
26CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/libdata 26CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/libdata
27# Work around build problems, disable unstable PAPI, PR #41608: 27# Work around build problems, disable unstable PAPI, PR #41608:
28CONFIGURE_ARGS+= --disable-papi 28CONFIGURE_ARGS+= --disable-papi
29# XXX for now, to avoid conflict 29# XXX for now, to avoid conflict
30CONFIGURE_ARGS+= --enable-gtk2-dependency 30CONFIGURE_ARGS+= --enable-gtk2-dependency
31# Avoid regeneration of Makefile.in after configure.ac patch 31# Avoid regeneration of Makefile.in after configure.ac patch
32CONFIGURE_ARGS+= --disable-maintainer-mode 32CONFIGURE_ARGS+= --disable-maintainer-mode
33DEPENDS+= gtk2+-[0-9]*:../../x11/gtk2 33DEPENDS+= gtk2+-[0-9]*:../../x11/gtk2
34MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} 34MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR}
35TEST_TARGET= check 35TEST_TARGET= check
36 36
37PKGCONFIG_OVERRIDE+= gdk-3.0.pc.in 37PKGCONFIG_OVERRIDE+= gdk-3.0.pc.in
38PKGCONFIG_OVERRIDE+= gtk+-3.0.pc.in 38PKGCONFIG_OVERRIDE+= gtk+-3.0.pc.in
39PKGCONFIG_OVERRIDE+= gtk+-unix-print-3.0.pc.in 39PKGCONFIG_OVERRIDE+= gtk+-unix-print-3.0.pc.in
40PKGCONFIG_OVERRIDE+= gail-3.0.pc.in 40PKGCONFIG_OVERRIDE+= gail-3.0.pc.in
41 41
42INSTALLATION_DIRS+= lib/gtk-3.0/immodules 42INSTALLATION_DIRS+= lib/gtk-3.0/immodules
43INSTALLATION_DIRS+= lib/gtk-3.0/modules 43INSTALLATION_DIRS+= lib/gtk-3.0/modules
44INSTALLATION_DIRS+= lib/gtk-3.0/3.0.0/filesystems 44INSTALLATION_DIRS+= lib/gtk-3.0/3.0.0/filesystems
45 45
46#REQD_DIRS+= ${PREFIX}/libdata/gtk-2.0 46#REQD_DIRS+= ${PREFIX}/libdata/gtk-2.0
47 47
48BUILD_DIRS= . demos/gtk-demo 48BUILD_DIRS= . demos/gtk-demo
49 49
50.include "../../mk/bsd.prefs.mk" 50.include "../../mk/bsd.prefs.mk"
51 51
52# gtk/Makefile.am hardcodes 'grep -o' so require GNU grep on platforms 52# gtk/Makefile.am hardcodes 'grep -o' so require GNU grep on platforms
53# which do not have it. 53# which do not have it.
54.if ${OPSYS} == "SunOS" 54.if ${OPSYS} == "SunOS"
55BUILD_DEPENDS+= grep-[0-9]*:../../textproc/grep 55BUILD_DEPENDS+= grep-[0-9]*:../../textproc/grep
56TOOLS_PATH.grep= ${LOCALBASE}/bin/ggrep 56TOOLS_PATH.grep= ${LOCALBASE}/bin/ggrep
57.endif 57.endif
58# isnan and isinf are part of libc, not libm on DragonFly 58# isnan and isinf are part of libc, not libm on DragonFly
59# conf tests fail detection due to conflicting definitions, just skip them 59# conf tests fail detection due to conflicting definitions, just skip them
60.if ${OPSYS} == "DragonFly" 60.if ${OPSYS} == "DragonFly"
61CONFIGURE_ENV+= ac_cv_func_isnan=yes 61CONFIGURE_ENV+= ac_cv_func_isnan=yes
62CONFIGURE_ENV+= ac_cv_func_isinf=yes 62CONFIGURE_ENV+= ac_cv_func_isinf=yes
63.endif 63.endif
64 64
65CFLAGS.SunOS+= -std=gnu99 65CFLAGS.SunOS+= -std=gnu99
66 66
67CPPFLAGS+= -DPREFIX="\"${PREFIX}\"" 67CPPFLAGS+= -DPREFIX="\"${PREFIX}\""
68 68
69# We remove the module databases during post-install since we create them 69# We remove the module databases during post-install since we create them
70# anew in the +INSTALL script as part of the POST-INSTALL action. 70# anew in the +INSTALL script as part of the POST-INSTALL action.
71# 71#
72post-install: 72post-install:
73 ${RM} -f ${DESTDIR}${GTK3_IMMODULES_DB} 73 ${RM} -f ${DESTDIR}${GTK3_IMMODULES_DB}
74 74
75_BUILDING_GTK3= yes 75_BUILDING_GTK3= yes
76.include "modules.mk" 76.include "modules.mk"
77 77
78.include "../../databases/shared-mime-info/buildlink3.mk" 78.include "../../databases/shared-mime-info/buildlink3.mk"
79BUILDLINK_API_DEPENDS.atk+= atk>=2.7.5 79BUILDLINK_API_DEPENDS.atk+= atk>=2.7.5
80.include "../../devel/atk/buildlink3.mk" 80.include "../../devel/atk/buildlink3.mk"
81.include "../../devel/gettext-lib/buildlink3.mk" 81.include "../../devel/gettext-lib/buildlink3.mk"
82BUILDLINK_API_DEPENDS.glib2+= glib2>=2.37.5 82BUILDLINK_API_DEPENDS.glib2+= glib2>=2.37.5
83.include "../../devel/glib2/buildlink3.mk" 83.include "../../devel/glib2/buildlink3.mk"
84BUILDLINK_API_DEPENDS.gdk-pixbuf2+= gdk-pixbuf2>=2.27.1 84BUILDLINK_API_DEPENDS.gdk-pixbuf2+= gdk-pixbuf2>=2.27.1
85.include "../../graphics/gdk-pixbuf2/buildlink3.mk" 85.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
86BUILDLINK_DEPMETHOD.gobject-introspection:= build 86BUILDLINK_DEPMETHOD.gobject-introspection:= build
87BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=1.32 87BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=1.32
88.include "../../devel/gobject-introspection/buildlink3.mk" 88.include "../../devel/gobject-introspection/buildlink3.mk"
89 89
90.include "options.mk" 90.include "options.mk"
91 91
92.include "../../devel/glib2/schemas.mk" 92.include "../../devel/glib2/schemas.mk"
93 93
94BUILDLINK_API_DEPENDS.pango+= pango>=1.32.4 94BUILDLINK_API_DEPENDS.pango+= pango>=1.32.4
95.include "../../devel/pango/buildlink3.mk" 95.include "../../devel/pango/buildlink3.mk"
96.include "../../fonts/fontconfig/buildlink3.mk" 96.include "../../fonts/fontconfig/buildlink3.mk"
97BUILDLINK_API_DEPENDS.cairo+= cairo>=1.12.0 97BUILDLINK_API_DEPENDS.cairo+= cairo>=1.12.0
98.include "../../graphics/cairo/buildlink3.mk" 98.include "../../graphics/cairo/buildlink3.mk"
99.include "../../graphics/cairo-gobject/buildlink3.mk" 99.include "../../graphics/cairo-gobject/buildlink3.mk"
100.include "../../graphics/freetype2/buildlink3.mk" 100.include "../../graphics/freetype2/buildlink3.mk"
101 101
102.include "../../mk/bsd.pkg.mk" 102.include "../../mk/bsd.pkg.mk"