Revert update to 1.9.7, since it breaks gnucash (at least 2.0.[0-4]).

Welcome back, g-wrap-1.9.6nb2!

2 files changed, 37 insertions, 50 deletions

diff --git a/devel/g-wrap/patches/patch-ab b/devel/g-wrap/patches/patch-ab
index 9e4c8ab02c1..621cd4ac7ac 100644
--- a/devel/g-wrap/patches/patch-ab
+++ b/devel/g-wrap/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.8 2007/01/14 14:24:31 wiz Exp $
+$NetBSD: patch-ab,v 1.9 2007/01/21 12:52:44 wiz Exp $
 
---- libffi/configure.orig	2006-11-07 19:59:34.000000000 +0000
+--- libffi/configure.orig	2005-03-01 18:52:45.000000000 +0100
 +++ libffi/configure
-@@ -20654,6 +20654,7 @@ case "$host" in
+@@ -19903,6 +19903,7 @@ case "$host" in
  i*86-*-linux*) TARGET=X86; TARGETDIR=x86;;
  i*86-*-solaris*) TARGET=X86; TARGETDIR=x86;;
  i*86-*-beos*) TARGET=X86; TARGETDIR=x86;;
@@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.8 2007/01/14 14:24:31 wiz Exp $
  i*86-*-freebsd* | i*86-*-kfreebsd*-gnu) TARGET=X86; TARGETDIR=x86;;
  i*86-*-netbsdelf* | i*86-*-knetbsd*-gnu) TARGET=X86; TARGETDIR=x86;;
  i*86-*-win32*) TARGET=X86_WIN32; TARGETDIR=x86;;
-@@ -20671,7 +20672,7 @@ m68k-*-linux*) TARGET=M68K; TARGETDIR=m6
+@@ -19920,7 +19921,7 @@ m68k-*-linux*) TARGET=M68K; TARGETDIR=m6
  mips64*-*);;
  mips-sgi-irix5.* | mips-sgi-irix6.*) TARGET=MIPS_IRIX; TARGETDIR=mips;;
  mips*-*-linux*) TARGET=MIPS_LINUX; TARGETDIR=mips;;
@@ -19,7 +19,7 @@ $NetBSD: patch-ab,v 1.8 2007/01/14 14:24:31 wiz Exp $
  powerpc-*-beos*) TARGET=POWERPC; TARGETDIR=powerpc;;
  powerpc-*-darwin*) TARGET=POWERPC_DARWIN; TARGETDIR=powerpc;;
  powerpc-*-aix*) TARGET=POWERPC_AIX; TARGETDIR=powerpc;;
-@@ -20680,7 +20681,7 @@ arm*-*-linux-*) TARGET=ARM; TARGETDIR=ar
+@@ -19929,7 +19930,7 @@ arm*-*-linux-*) TARGET=ARM; TARGETDIR=ar
  arm*-*-netbsdelf* | arm*-*-knetbsd*-gnu) TARGET=ARM; TARGETDIR=arm;;
  s390-*-linux-*) TARGET=S390; TARGETDIR=s390;;
  s390x-*-linux-*) TARGET=S390; TARGETDIR=s390;;
diff --git a/devel/g-wrap/patches/patch-ac b/devel/g-wrap/patches/patch-ac
index 3c32a994a1e..cf484b3a384 100644
--- a/devel/g-wrap/patches/patch-ac
+++ b/devel/g-wrap/patches/patch-ac
@@ -1,48 +1,35 @@
-$NetBSD: patch-ac,v 1.7 2007/01/14 14:24:31 wiz Exp $
+$NetBSD: patch-ac,v 1.8 2007/01/21 12:52:44 wiz Exp $
 
---- configure.orig	2006-11-07 19:59:16.000000000 +0000
+--- configure.orig	2005-04-14 14:57:14.000000000 +0000
 +++ configure
-@@ -22859,12 +22859,12 @@ if test -n "$PKG_CONFIG"; then
-         pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib\"") >&5
--  ($PKG_CONFIG --exists --print-errors "glib") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib" 2>/dev/null`
-+  pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -22877,12 +22877,12 @@ if test -n "$PKG_CONFIG"; then
-         pkg_cv_GLIB_LIBS="$GLIB_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib\"") >&5
--  ($PKG_CONFIG --exists --print-errors "glib") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib" 2>/dev/null`
-+  pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -22901,9 +22901,9 @@ else
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib"`
-+	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0"`
-         else
--	        GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib"`
-+	        GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0"`
-         fi
+@@ -21699,8 +21699,8 @@ else
+   if test "x$ac_cv_env_GLIB_CFLAGS_set" = "xset"; then
+ 	pkg_cv_GLIB_CFLAGS=$ac_cv_env_GLIB_CFLAGS_value
+ elif test -n "$PKG_CONFIG"; then
+-	if $PKG_CONFIG --exists "glib" >/dev/null 2>&1; then
+-		pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib" 2>/dev/null`
++	if $PKG_CONFIG --exists "glib-2.0" >/dev/null 2>&1; then
++		pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0" 2>/dev/null`
+ 	else
+ 		pkg_failed=yes
+ 	fi
+@@ -21718,8 +21718,8 @@ else
+   if test "x$ac_cv_env_GLIB_LIBS_set" = "xset"; then
+ 	pkg_cv_GLIB_LIBS=$ac_cv_env_GLIB_LIBS_value
+ elif test -n "$PKG_CONFIG"; then
+-	if $PKG_CONFIG --exists "glib" >/dev/null 2>&1; then
+-		pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib" 2>/dev/null`
++	if $PKG_CONFIG --exists "glib-2.0" >/dev/null 2>&1; then
++		pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0" 2>/dev/null`
+ 	else
+ 		pkg_failed=yes
+ 	fi
+@@ -21731,7 +21731,7 @@ echo "$as_me:$LINENO: result: $pkg_cv_GL
+ echo "${ECHO_T}$pkg_cv_GLIB_LIBS" >&6
+ 
+ if test $pkg_failed = yes; then
+-	GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib"`
++	GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0"`
  	# Put the nasty error message in config.log where it belongs
- 	echo "$GLIB_PKG_ERRORS" >&5
+ 	echo "$GLIB_PKG_ERRORS" 1>&5
+