Update to 1.7.11. Disable libgda support, pkgsrc version not new enough.

Changes since 1.7.10:
This starts the run up towards 1.8 in the fall with lots of polish
and patching. The win32 build is also getting some love. I have
not checked on how to make a fancy shmansy installer just yet but
here's a tarball of the necessary binaries and docs that patches
some of the missing features in 1.7.10. There are still issues with
print preview somewhere in cairo that we're looking into.

    * Andreas
          o Save and restore default paper, margins and various other print settings.
          o Handle differences in page setup between sheets when printing multiple sheets.
          o Fix handling of "print even if only style". [Bug 438743].
          o Implement printing of row and column headers.
          o Fix saving of null header/footer items [Bug 449836].
          o Fix TINV for large degree of freedom.
    * Jean
          o Fix check for long double support in goffice.
          o Import legend and axis labels fonts from excel in charts. [Bug 437858].
          o Fix performance issues in float_range_function2 and fn-tsa plugin.
    * Jody
          o Fix drawing of large cursor while sheet scrolls. [Bug 444610].
          o Fix drawing of merged cells in RTL. [Bug 442463], [442467].
          o Fix editing in RTL, and for merged cells.
          o Properties to store fine tuned capabilities in protected sheets.
          o Read/Write of protected sheet capabilities for XLS/XLSX.
          o Move the OpenPkg support code into libgsf from our xlsx plugin.
          o Fix placement of validation combo in merged cells.
          o Eval validation functions as arrays.
          o Make Morten's pdf exporter available from gnumeric too.
          o Start to implement limits to selection in protected sheets.
          o Handle array expressions in SYLK importer.
          o ODF import/export for hidden and RTL sheets.
          o Fix redraw of spanning cells when toggling RTL.
          o Work around ODF's lack of a default col/row style.
          o Fix crash in t-test. [Bug 450676].
          o Sylk import support for arrays, and encoding.
          o Sylk export.
          o Configurability for which direction moves.
          o Calc property import/export for xlsx.
          o Update validation combo moving between identical styles. [Bug 453525].
          o Patch the problems found by coverity.
          o Fix win32 docs. [Bug 443726].
          o Be more flexible about range relocation for ins/del cells. [Bug 439347].
    * Morten
          o Make ssconvert able to export to pdf. [Bug 381965].
          o Fix loading of tab text colour. [Bug 437743].
          o Improve handling of foreign recently-used files. [Bug 438918].
          o Improve save-on-exit dialog.
          o Fix potentially confusing save-in-wrong-format-on-exit bug.
          o Tentatively fix issue with recent Pango. [Bug 440514].
          o Provide good mime type for recent documents.
          o Fix localized-format problem in cell format dialog. [Bug 442657].
          o Fix R1C1 problem. [Bug 443832].
          o Fix performance problem when selecting large areas. [Bug 445617].
          o Fix loading/saving of R1C1 attribute. [Bug 448714].
          o Fix overflow problem when int!=long. [Bug 458158].
    * Nils Kanning
          o Fix the inline documentation for python addins. [Bug 412804].

4 files changed, 25 insertions, 115 deletions

diff --git a/math/gnumeric-current/Makefile b/math/gnumeric-current/Makefile
index 9d0ea8b334e..12a7cadc1e5 100644
--- a/math/gnumeric-current/Makefile
+++ b/math/gnumeric-current/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2007/08/04 14:14:29 obache Exp $
+# $NetBSD: Makefile,v 1.6 2007/08/30 06:10:26 wiz Exp $
 #
 
-DISTNAME=		gnumeric-1.7.10
-PKGREVISION=		4
+DISTNAME=		gnumeric-1.7.11
 CATEGORIES=		math gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnumeric/1.7/}
 EXTRACT_SUFX=		.tar.bz2
@@ -28,9 +27,10 @@ PKGCONFIG_OVERRIDE=	libspreadsheet-1.7.pc.in
 #.include "../../lang/python/application.mk"
 #.include "../../x11/py-gtk2/buildlink3.mk"
 
-BUILDLINK_API_DEPENDS.libgda+=	libgda>=1.9.103
-.include "../../databases/libgda/buildlink3.mk"
-.include "../../databases/libgnomedb/buildlink3.mk"
+# XXX: that version's not in pkgsrc yet
+#BUILDLINK_API_DEPENDS.libgda+=	libgda>=3.1.1
+#.include "../../databases/libgda/buildlink3.mk"
+#.include "../../databases/libgnomedb/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libgsf+=	libgsf>=1.14.2
 .include "../../devel/libgsf/buildlink3.mk"
 .include "../../devel/GConf2/schemas.mk"
diff --git a/math/gnumeric-current/PLIST b/math/gnumeric-current/PLIST
index e1ca8a97958..b421685235a 100644
--- a/math/gnumeric-current/PLIST
+++ b/math/gnumeric-current/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2007/07/28 14:56:53 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2007/08/30 06:10:26 wiz Exp $
 bin/${PKGNAME}
 bin/gnumeric
 bin/ssconvert
@@ -30,14 +30,14 @@ include/libspreadsheet-1-7/func.h
 include/libspreadsheet-1-7/gnm-datetime.h
 include/libspreadsheet-1-7/gnm-format.h
 include/libspreadsheet-1-7/gnm-graph-window.h
+include/libspreadsheet-1-7/gnm-pane-impl.h
+include/libspreadsheet-1-7/gnm-pane.h
 include/libspreadsheet-1-7/gnm-plugin.h
 include/libspreadsheet-1-7/gnm-so-filled.h
 include/libspreadsheet-1-7/gnm-so-line.h
 include/libspreadsheet-1-7/gnm-so-polygon.h
 include/libspreadsheet-1-7/gnm-style-impl.h
-include/libspreadsheet-1-7/gnumeric-canvas.h
 include/libspreadsheet-1-7/gnumeric-gconf.h
-include/libspreadsheet-1-7/gnumeric-pane.h
 include/libspreadsheet-1-7/gnumeric-simple-canvas.h
 include/libspreadsheet-1-7/gnumeric.h
 include/libspreadsheet-1-7/graph.h
@@ -164,11 +164,6 @@ lib/gnumeric/${PKGVERSION}/plugins/fn-string/plugin.la
 lib/gnumeric/${PKGVERSION}/plugins/fn-string/plugin.xml
 lib/gnumeric/${PKGVERSION}/plugins/fn-tsa/plugin.la
 lib/gnumeric/${PKGVERSION}/plugins/fn-tsa/plugin.xml
-lib/gnumeric/${PKGVERSION}/plugins/gdaif/gdaif.la
-lib/gnumeric/${PKGVERSION}/plugins/gdaif/plugin.xml
-lib/gnumeric/${PKGVERSION}/plugins/gnome-db/gnomedb.la
-lib/gnumeric/${PKGVERSION}/plugins/gnome-db/plugin.xml
-lib/gnumeric/${PKGVERSION}/plugins/gnome-db/ui.xml
 lib/gnumeric/${PKGVERSION}/plugins/html/html.la
 lib/gnumeric/${PKGVERSION}/plugins/html/plugin.xml
 lib/gnumeric/${PKGVERSION}/plugins/lotus/lotus.la
@@ -200,8 +195,6 @@ lib/gnumeric/${PKGVERSION}/plugins/uihello/plugin.la
 lib/gnumeric/${PKGVERSION}/plugins/uihello/plugin.xml
 lib/gnumeric/${PKGVERSION}/plugins/xbase/plugin.xml
 lib/gnumeric/${PKGVERSION}/plugins/xbase/xbase.la
-lib/goffice/0.4.2/plugins/gnumeric/gnumeric.la
-lib/goffice/0.4.2/plugins/gnumeric/plugin.xml
 lib/libspreadsheet.la
 lib/pkgconfig/libspreadsheet-1.7.pc
 man/man1/gnumeric.1
@@ -235,6 +228,7 @@ share/gnome/help/gnumeric/C/data-delete.xml
 share/gnome/help/gnumeric/C/data-entry-advanced.xml
 share/gnome/help/gnumeric/C/data-entry-external.xml
 share/gnome/help/gnumeric/C/data-entry.xml
+share/gnome/help/gnumeric/C/data-filter.xml
 share/gnome/help/gnumeric/C/data-format.xml
 share/gnome/help/gnumeric/C/data-generate.xml
 share/gnome/help/gnumeric/C/data-insert.xml
@@ -612,7 +606,6 @@ share/gnome/help/gnumeric/C/welcome.xml
 share/gnome/help/gnumeric/C/workbooks.xml
 share/gnome/help/gnumeric/C/worksheets.xml
 share/gnumeric/${PKGVERSION}/GNOME_Gnumeric-gtk.xml
-share/gnumeric/${PKGVERSION}/Gnumeric-embed.xml
 share/gnumeric/${PKGVERSION}/autoformat-templates/3D/.category
 share/gnumeric/${PKGVERSION}/autoformat-templates/3D/autoformat.3D.button.xml
 share/gnumeric/${PKGVERSION}/autoformat-templates/3D/autoformat.3D.list.xml
@@ -854,8 +847,6 @@ share/pixmaps/win32-gnumeric.ico
 @dirrm share/gnome/help/gnumeric
 @comment in GConf2: @dirrm share/gconf/schemas
 @comment in xdg-dirs: @dirrm share/applications
-@dirrm lib/goffice/0.4.2/plugins/gnumeric
-@comment in goffice: @dirrm lib/goffice/0.4.2/plugins
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/xbase
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/uihello
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/sylk
@@ -871,8 +862,6 @@ share/pixmaps/win32-gnumeric.ico
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/mps
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/lotus
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/html
-@dirrm lib/gnumeric/${PKGVERSION}/plugins/gnome-db
-@dirrm lib/gnumeric/${PKGVERSION}/plugins/gdaif
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/fn-tsa
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/fn-string
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/fn-stat
diff --git a/math/gnumeric-current/distinfo b/math/gnumeric-current/distinfo
index 74139f997fe..7e47372563d 100644
--- a/math/gnumeric-current/distinfo
+++ b/math/gnumeric-current/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2007/08/09 16:15:51 drochner Exp $
+$NetBSD: distinfo,v 1.3 2007/08/30 06:10:26 wiz Exp $
 
-SHA1 (gnumeric-1.7.10.tar.bz2) = 8222ecec9ea3e3f9d9e1d3c0b223224658697a9a
-RMD160 (gnumeric-1.7.10.tar.bz2) = 202e2f6513b251617eb4f7b9dafcf9ba2ff52d89
-Size (gnumeric-1.7.10.tar.bz2) = 13373300 bytes
-SHA1 (patch-ac) = 2010a7c2a862545851749b4d5394dc1b2cb2f670
+SHA1 (gnumeric-1.7.11.tar.bz2) = 9ca083460a365249c5f33007506648a326b9f099
+RMD160 (gnumeric-1.7.11.tar.bz2) = e7968f3049d261063f8764711ecadd0caf3c30fb
+Size (gnumeric-1.7.11.tar.bz2) = 13077190 bytes
+SHA1 (patch-ac) = bf7b01e13a646113e023ee15b17ffc2db40c468b
 SHA1 (patch-ad) = ee7c4d8a3bb90799297dff4620bd6a8612a894c2
diff --git a/math/gnumeric-current/patches/patch-ac b/math/gnumeric-current/patches/patch-ac
index e83f09d9dad..2af79b45aa7 100644
--- a/math/gnumeric-current/patches/patch-ac
+++ b/math/gnumeric-current/patches/patch-ac
@@ -1,92 +1,13 @@
-$NetBSD: patch-ac,v 1.1.1.1 2007/05/05 21:34:14 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2007/08/30 06:10:27 wiz Exp $
 
---- configure.orig	2007-05-03 23:46:50.000000000 +0000
+--- configure.orig	2007-07-24 00:59:19.000000000 +0000
 +++ configure
-@@ -23749,12 +23749,12 @@ if test -n "$PKG_CONFIG"; then
-         pkg_cv_GDA_CFLAGS="$GDA_CFLAGS"
+@@ -27943,7 +27943,7 @@ echo $ECHO_N "checking
+ ======== for python = 2.x... $ECHO_C" >&6; }
+     PY_VERSION=`$PYTHON -c 'import sys ; sys.stdout.write(sys.version[0:3])'`
+      major_ver=`$PYTHON -c 'import sys ; sys.stdout.write(sys.version[0:1])'`
+-    if test "x$major_ver" == "x2"; then
++    if test "x$major_ver" = "x2"; then
+ 	{ echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
      else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgda-2.0 >= 1.9.103\"") >&5
--  ($PKG_CONFIG --exists --print-errors "libgda-2.0 >= 1.9.103") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgda-3.0 >= 1.9.103\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "libgda-3.0 >= 1.9.103") 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.9.103" 2>/dev/null`
-+  pkg_cv_GDA_CFLAGS=`$PKG_CONFIG --cflags "libgda-3.0 >= 1.9.103" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -23767,12 +23767,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.9.103\"") >&5
--  ($PKG_CONFIG --exists --print-errors "libgda-2.0 >= 1.9.103") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgda-3.0 >= 1.9.103\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "libgda-3.0 >= 1.9.103") 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.9.103" 2>/dev/null`
-+  pkg_cv_GDA_LIBS=`$PKG_CONFIG --libs "libgda-3.0 >= 1.9.103" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -23791,9 +23791,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.9.103"`
-+	        GDA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgda-3.0 >= 1.9.103"`
-         else
--	        GDA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgda-2.0 >= 1.9.103"`
-+	        GDA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgda-3.0 >= 1.9.103"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$GDA_PKG_ERRORS" >&5
-@@ -23819,12 +23819,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
-@@ -23837,12 +23837,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
-@@ -23861,9 +23861,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