comment out two non-portable shell variable substitutions and revert

the "bash" requirement for "configure", works around build problems
due to unresolved problems with bash on Dragonfly
(PR pkg/45059 by Matthias Rampke)

3 files changed, 23 insertions, 8 deletions

diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 68d0840d1bb..d88bd7569fc 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.216 2011/04/28 01:57:38 obache Exp $
+# $NetBSD: Makefile,v 1.217 2011/06/15 15:48:50 drochner Exp $
 
 DISTNAME=		gtk+-2.24.4
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
@@ -30,8 +30,8 @@ USE_LIBTOOL=		yes
 PTHREAD_AUTO_VARS=	yes
 
 GNU_CONFIGURE=		 yes
-# XXX there is a subtle bashism in "configure" or a bug in NetBSD's sh
-CONFIG_SHELL=		bash
+# bashism in "configure" (illegal variable substitution), patched
+#CONFIG_SHELL=		bash
 CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/libdata
 # Work around build problems, disable unstable PAPI, PR #41608:
 CONFIGURE_ARGS+=	--disable-papi
diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index ac322f48882..e1878a04ace 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.134 2011/04/05 17:50:06 drochner Exp $
+$NetBSD: distinfo,v 1.135 2011/06/15 15:48:50 drochner Exp $
 
 SHA1 (gtk+-2.24.4.tar.bz2) = c15a25ba49eb459b2c4cdc46baedf6cecf08cbcf
 RMD160 (gtk+-2.24.4.tar.bz2) = 56a6f731cfdc47686c71f8f6b4253484e08dd230
 Size (gtk+-2.24.4.tar.bz2) = 17607752 bytes
 SHA1 (patch-aa) = 9eec7fc4764b18856455a18b49f1bb101e5e6b11
 SHA1 (patch-ab) = 9c82cc60f3825d377a197c876fcc6faa379cbde3
-SHA1 (patch-af) = 9e3009396f2377ece4dba1f79d6f65c3478ec81f
+SHA1 (patch-af) = 169430dd9a0c8ddfd30022f0ba46dabc0093ff1f
 SHA1 (patch-aj) = 9887573ac7ade9e8f8ee2ead68e279f67836a1a3
diff --git a/x11/gtk2/patches/patch-af b/x11/gtk2/patches/patch-af
index 57ba77c8148..8eccca313e4 100644
--- a/x11/gtk2/patches/patch-af
+++ b/x11/gtk2/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.19 2010/11/15 18:28:45 drochner Exp $
+$NetBSD: patch-af,v 1.20 2011/06/15 15:48:50 drochner Exp $
 
---- configure.orig	2010-09-23 14:27:27.000000000 +0000
+--- configure.orig	2011-04-01 21:41:11.000000000 +0000
 +++ configure
-@@ -21936,7 +21936,7 @@ _ACEOF
+@@ -22773,7 +22773,7 @@ _ACEOF
  if ac_fn_c_try_link "$LINENO"; then :
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
@@ -11,3 +11,18 @@ $NetBSD: patch-af,v 1.19 2010/11/15 18:28:45 drochner Exp $
  else
    LIBS="$ac_xsave_LIBS -R $x_libraries"
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -24724,10 +24724,10 @@ $as_echo "$found_introspection" >&6; }
+        INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
+        INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+        INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
+-       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+-       INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)}
+-       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+-       INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)}
++#       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
++#       INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)}
++#       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
++#       INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)}
+        INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+        INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+        INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection