Compile with libgda-2.99.2 and libgnomedb-2.99.2. Bump PKGREVISION.

3 files changed, 96 insertions, 3 deletions

diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 8a360840075..d89db6de1bd 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.117 2006/10/04 21:47:57 wiz Exp $
+# $NetBSD: Makefile,v 1.118 2007/01/21 19:17:33 wiz Exp $
 #
 
 DISTNAME=		gnumeric-1.6.3
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		math gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnumeric/1.6/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/math/gnumeric/distinfo b/math/gnumeric/distinfo
index 83489821727..9e13ac53245 100644
--- a/math/gnumeric/distinfo
+++ b/math/gnumeric/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.28 2006/09/19 17:45:50 wiz Exp $
+$NetBSD: distinfo,v 1.29 2007/01/21 19:17:33 wiz Exp $
 
 SHA1 (gnumeric-1.6.3.tar.bz2) = 2261b3276ed5ead65047208a6ddb7f3436b7e544
 RMD160 (gnumeric-1.6.3.tar.bz2) = 49be3b72070555ab6b58f1c59a0c22819b9b9096
 Size (gnumeric-1.6.3.tar.bz2) = 12540950 bytes
 SHA1 (patch-aa) = 1601ae861cdf1851d1939aa44666929d9ad4f1e7
 SHA1 (patch-ab) = 2762921405544d83c8a1290afffafe846e47b3d1
+SHA1 (patch-ac) = 6da3a2eea055c4cb68cf902b2a96e58ca1081326
diff --git a/math/gnumeric/patches/patch-ac b/math/gnumeric/patches/patch-ac
new file mode 100644
index 00000000000..655812c0cfd
--- /dev/null
+++ b/math/gnumeric/patches/patch-ac
@@ -0,0 +1,92 @@
+$NetBSD: patch-ac,v 1.8 2007/01/21 19:17:33 wiz Exp $
+
+--- configure.orig	2006-03-22 04:02:52.000000000 +0000
++++ configure
+@@ -22088,12 +22088,12 @@ if test -n "$PKG_CONFIG"; then
+         pkg_cv_GDA_CFLAGS="$GDA_CFLAGS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgda-2.0 >= 1.3.0\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "libgda-2.0 >= 1.3.0") 2>&5
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgda-3.0 >= 1.3.0\"") >&5
++  ($PKG_CONFIG --exists --print-errors "libgda-3.0 >= 1.3.0") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_GDA_CFLAGS=`$PKG_CONFIG --cflags "libgda-2.0 >= 1.3.0" 2>/dev/null`
++  pkg_cv_GDA_CFLAGS=`$PKG_CONFIG --cflags "libgda-3.0 >= 1.3.0" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -22106,12 +22106,12 @@ if test -n "$PKG_CONFIG"; then
+         pkg_cv_GDA_LIBS="$GDA_LIBS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgda-2.0 >= 1.3.0\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "libgda-2.0 >= 1.3.0") 2>&5
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgda-3.0 >= 1.3.0\"") >&5
++  ($PKG_CONFIG --exists --print-errors "libgda-3.0 >= 1.3.0") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_GDA_LIBS=`$PKG_CONFIG --libs "libgda-2.0 >= 1.3.0" 2>/dev/null`
++  pkg_cv_GDA_LIBS=`$PKG_CONFIG --libs "libgda-3.0 >= 1.3.0" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -22130,9 +22130,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        GDA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgda-2.0 >= 1.3.0"`
++	        GDA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgda-3.0 >= 1.3.0"`
+         else
+-	        GDA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgda-2.0 >= 1.3.0"`
++	        GDA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgda-3.0 >= 1.3.0"`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$GDA_PKG_ERRORS" >&5
+@@ -22158,12 +22158,12 @@ if test -n "$PKG_CONFIG"; then
+         pkg_cv_GNOMEDB_CFLAGS="$GNOMEDB_CFLAGS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomedb-2.0 >= 1.3.0\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "libgnomedb-2.0 >= 1.3.0") 2>&5
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomedb-3.0 >= 1.3.0\"") >&5
++  ($PKG_CONFIG --exists --print-errors "libgnomedb-3.0 >= 1.3.0") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_GNOMEDB_CFLAGS=`$PKG_CONFIG --cflags "libgnomedb-2.0 >= 1.3.0" 2>/dev/null`
++  pkg_cv_GNOMEDB_CFLAGS=`$PKG_CONFIG --cflags "libgnomedb-3.0 >= 1.3.0" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -22176,12 +22176,12 @@ if test -n "$PKG_CONFIG"; then
+         pkg_cv_GNOMEDB_LIBS="$GNOMEDB_LIBS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomedb-2.0 >= 1.3.0\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "libgnomedb-2.0 >= 1.3.0") 2>&5
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomedb-3.0 >= 1.3.0\"") >&5
++  ($PKG_CONFIG --exists --print-errors "libgnomedb-3.0 >= 1.3.0") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_GNOMEDB_LIBS=`$PKG_CONFIG --libs "libgnomedb-2.0 >= 1.3.0" 2>/dev/null`
++  pkg_cv_GNOMEDB_LIBS=`$PKG_CONFIG --libs "libgnomedb-3.0 >= 1.3.0" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -22200,9 +22200,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        GNOMEDB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgnomedb-2.0 >= 1.3.0"`
++	        GNOMEDB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgnomedb-3.0 >= 1.3.0"`
+         else
+-	        GNOMEDB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomedb-2.0 >= 1.3.0"`
++	        GNOMEDB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomedb-3.0 >= 1.3.0"`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$GNOMEDB_PKG_ERRORS" >&5