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 (expand / 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,38 +1,38 @@ @@ -1,38 +1,38 @@
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