5 files changed, 28 insertions, 137 deletions

diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index d4169f3b8121..14723f44fb0d 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	gnumeric
-PORTVERSION=	1.9.3
-PORTREVISION=	2
+PORTVERSION=	1.9.4
 CATEGORIES=	math gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -30,7 +29,7 @@ INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--without-guile --with-bonobo
+CONFIGURE_ARGS=	--without-guile --with-bonobo --with-gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}" \
 		python_prog=${PYTHON_VERSION}
@@ -55,9 +54,6 @@ CONFIGURE_ARGS+=	--without-gda
 PLIST_SUB+=		GNOMEDB="@comment "
 .endif
 
-post-extract:
-	@${CP} ${FILESDIR}/gnumeric-C.omf ${WRKSRC}/doc/C
-
 post-patch:
 	@${RM} -f ${WRKSRC}/GNOME_Gnumeric.server.in
 	@${REINPLACE_CMD} -e 's|gda-3.0 >= 3.1.1|gda-3.0 >= 3.0.1|g' \
diff --git a/math/gnumeric/distinfo b/math/gnumeric/distinfo
index 0f28e41aaafe..4ad9ffa918e3 100644
--- a/math/gnumeric/distinfo
+++ b/math/gnumeric/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnumeric-1.9.3.tar.bz2) = 75f7ea180af40103ecf6a16b68cd5c9c
-SHA256 (gnome2/gnumeric-1.9.3.tar.bz2) = b456d85770af3734a6974900ac45604f40c37217f87b4ea4b4595ed85465914f
-SIZE (gnome2/gnumeric-1.9.3.tar.bz2) = 15294207
+MD5 (gnome2/gnumeric-1.9.4.tar.bz2) = f52fc6ae018e164abffd2448f3bbae0b
+SHA256 (gnome2/gnumeric-1.9.4.tar.bz2) = 357ee84631030ccbf998a1aad2f408452150790cd931bf47ad295bec4fe121fb
+SIZE (gnome2/gnumeric-1.9.4.tar.bz2) = 15859683
diff --git a/math/gnumeric/files/gnumeric-C.omf b/math/gnumeric/files/gnumeric-C.omf
deleted file mode 100644
index a18da047fffb..000000000000
--- a/math/gnumeric/files/gnumeric-C.omf
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE omf PUBLIC "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" "http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd">
-<omf>
-  <resource>
-    <creator>
-      miguel@gnome.org (Miguel de Icaza)
-    </creator>
-    <maintainer>
-      jody@gnome.org (Jody Goldberg)
-    </maintainer>
-    <contributor>
-      acuster@gmail.com (Adrian Custer)
-    </contributor>
-    <contributor>
-      mrproper@ximian.com (Kevin Breit)
-    </contributor>
-    <contributor>
-      aguelzow@taliesin.ca (Andreas Guelzow)
-    </contributor>
-    <contributor>
-      aaron@ximian.com (Aaron Weber)
-    </contributor>
-    <contributor>
-      tommydal@ihug.com.au (Thomas Canty)
-    </contributor>
-    <contributor>
-      kirillov@math.sunysb.edu (Alexander Kirillov)
-    </contributor>
-    <contributor>
-      k_wayne@linuxpower.org (Wayne Schuller)
-    </contributor>
-    <contributor>
-      jiivonen@hutcs.cs.hut.fi (Jukka-Pekka Iivonen)
-    </contributor>
-    <contributor>
-      adrian@gimp.or (Adrian Likins)
-    </contributor>
-
-    <title>
-      The Gnumeric Manual, version 1.8.
-    </title>
-
-    <date>
-      2007-12-20
-    </date>
-
-    <version identifier="1.7" date="2007-10-27" 
-      description="Updated for 1.8"/>
-    <version identifier="1.3" date="2004-12-09" 
-      description="Updated for 1.4"/>
-
-    <subject category="GNOME|Applications|Office"/>
-
-    <description>
-      This is the user's manual for Gnumeric, a GNOME spreadsheet.
-    </description>
-
-    <type>
-      User's Guide
-    </type>
-
-    <format mime="text/xml" dtd="-//OASIS//DTD DocBook XML V4.2//EN"/>
-    <identifier url="gnumeric.xml"/>
-    <language code="C"/>
-    <relation seriesid="c5e3db84-64c3-11d6-85a3-a3e50590e6d1"/>
-    <rights type="GNU FDL" license.version="1.1"
-      license="http://www.gnu.org/licenses/fdl.html" 
-      holder="Miguel de Icaza, Jody Goldberg, Thomas Canty, 
-      Jukka-Pekka Iivonen, Andreas J. Guelzow, Wayne Schuller, 
-      Adrian Custer, Kevin Breit, Aaron Weber, Alexander Kirillov"/>
-  </resource>
-</omf>
diff --git a/math/gnumeric/files/patch-configure b/math/gnumeric/files/patch-configure
index 992b6246c244..19bf11dd46b2 100644
--- a/math/gnumeric/files/patch-configure
+++ b/math/gnumeric/files/patch-configure
@@ -1,46 +1,11 @@
---- configure.orig	2007-09-16 17:10:01.000000000 -0400
-+++ configure	2007-09-16 17:10:01.000000000 -0400
-@@ -23327,12 +23327,12 @@ if test -n "$PKG_CONFIG"; then
-         pkg_cv_GB_CFLAGS="$GB_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgb == 1.17\"") >&5
--  ($PKG_CONFIG --exists --print-errors "libgb == 1.17") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgb = 1.17\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "libgb = 1.17") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_GB_CFLAGS=`$PKG_CONFIG --cflags "libgb == 1.17" 2>/dev/null`
-+  pkg_cv_GB_CFLAGS=`$PKG_CONFIG --cflags "libgb = 1.17" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -23345,12 +23345,12 @@ if test -n "$PKG_CONFIG"; then
-         pkg_cv_GB_LIBS="$GB_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgb == 1.17\"") >&5
--  ($PKG_CONFIG --exists --print-errors "libgb == 1.17") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgb = 1.17\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "libgb = 1.17") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_GB_LIBS=`$PKG_CONFIG --libs "libgb == 1.17" 2>/dev/null`
-+  pkg_cv_GB_LIBS=`$PKG_CONFIG --libs "libgb = 1.17" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -23369,9 +23369,9 @@ else
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        GB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgb == 1.17"`
-+	        GB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgb = 1.17"`
-         else
--	        GB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgb == 1.17"`
-+	        GB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgb = 1.17"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$GB_PKG_ERRORS" >&5
+--- configure.orig	2009-02-23 20:47:18.000000000 -0500
++++ configure	2009-02-23 20:48:20.000000000 -0500
+@@ -14117,7 +14117,7 @@ if test "x$gnumeric_with_gtk" = xtrue -a
+ 
+ # Check whether --with-gnome was given.
+ if test "${with_gnome+set}" = set; then
+-  withval=$with_gnome; if test "x$withval" == xyes; then
++  withval=$with_gnome; if test "x$withval" = xyes; then
+ 			ui_msg="Gnome"
+ 			gnumeric_with_gnome=true
+ 		fi
diff --git a/math/gnumeric/pkg-plist b/math/gnumeric/pkg-plist
index bdade0877ba2..50ed1a69e90d 100644
--- a/math/gnumeric/pkg-plist
+++ b/math/gnumeric/pkg-plist
@@ -123,9 +123,6 @@ lib/gnumeric/%%VERSION%%/include/gnumeric-features.h
 lib/gnumeric/%%VERSION%%/plugins/applix/applix.la
 lib/gnumeric/%%VERSION%%/plugins/applix/applix.so
 lib/gnumeric/%%VERSION%%/plugins/applix/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/corba/corba.la
-lib/gnumeric/%%VERSION%%/plugins/corba/corba.so
-lib/gnumeric/%%VERSION%%/plugins/corba/plugin.xml
 lib/gnumeric/%%VERSION%%/plugins/derivatives/derivatives.la
 lib/gnumeric/%%VERSION%%/plugins/derivatives/derivatives.so
 lib/gnumeric/%%VERSION%%/plugins/derivatives/plugin.xml
@@ -246,9 +243,6 @@ lib/gnumeric/%%VERSION%%/plugins/uihello/plugin.xml
 lib/gnumeric/%%VERSION%%/plugins/xbase/plugin.xml
 lib/gnumeric/%%VERSION%%/plugins/xbase/xbase.la
 lib/gnumeric/%%VERSION%%/plugins/xbase/xbase.so
-lib/goffice/0.7.2/plugins/gnumeric/gnumeric.la
-lib/goffice/0.7.2/plugins/gnumeric/gnumeric.so
-lib/goffice/0.7.2/plugins/gnumeric/plugin.xml
 lib/libspreadsheet-%%VERSION%%.so
 lib/libspreadsheet.la
 lib/libspreadsheet.so
@@ -354,7 +348,6 @@ share/gnumeric/%%VERSION%%/glade/tabulate.glade
 share/gnumeric/%%VERSION%%/glade/variance-tests.glade
 share/gnumeric/%%VERSION%%/glade/view.glade
 share/gnumeric/%%VERSION%%/glade/workbook-attr.glade
-share/gnumeric/%%VERSION%%/idl/GNOME_Gnumeric.idl
 share/gnumeric/%%VERSION%%/templates/invoice.gnumeric
 share/gnumeric/%%VERSION%%/templates/loan.gnumeric
 share/gnumeric/%%VERSION%%/templates/mileage.gnumeric
@@ -428,6 +421,10 @@ share/gnome/help/gnumeric/C/figures/analysistools-exp-smoothing-roberts-formula.
 share/gnome/help/gnumeric/C/figures/analysistools-exp-smoothing-roberts-stderr.png
 share/gnome/help/gnumeric/C/figures/analysistools-fourier-formula.png
 share/gnome/help/gnumeric/C/figures/analysistools-fourier.png
+share/gnome/help/gnumeric/C/figures/analysistools-frequency-cats.png
+share/gnome/help/gnumeric/C/figures/analysistools-frequency-graphs.png
+share/gnome/help/gnumeric/C/figures/analysistools-frequency-results.png
+share/gnome/help/gnumeric/C/figures/analysistools-frequency.png
 share/gnome/help/gnumeric/C/figures/analysistools-ftest-ex1.png
 share/gnome/help/gnumeric/C/figures/analysistools-ftest-ex2.png
 share/gnome/help/gnumeric/C/figures/analysistools-ftest.png
@@ -440,6 +437,10 @@ share/gnome/help/gnumeric/C/figures/analysistools-histogram-ex2.png
 share/gnome/help/gnumeric/C/figures/analysistools-histogram-ex3.png
 share/gnome/help/gnumeric/C/figures/analysistools-histogram-graphs.png
 share/gnome/help/gnumeric/C/figures/analysistools-histogram.png
+share/gnome/help/gnumeric/C/figures/analysistools-kaplan-ex1.png
+share/gnome/help/gnumeric/C/figures/analysistools-kaplan-ex2.png
+share/gnome/help/gnumeric/C/figures/analysistools-kaplan-options.png
+share/gnome/help/gnumeric/C/figures/analysistools-kaplan.png
 share/gnome/help/gnumeric/C/figures/analysistools-moving-average-ex1.png
 share/gnome/help/gnumeric/C/figures/analysistools-moving-average-ex2.png
 share/gnome/help/gnumeric/C/figures/analysistools-moving-average-ex3.png
@@ -835,6 +836,8 @@ share/locale/es/LC_MESSAGES/gnumeric-functions.mo
 share/locale/es/LC_MESSAGES/gnumeric.mo
 share/locale/et/LC_MESSAGES/gnumeric-functions.mo
 share/locale/et/LC_MESSAGES/gnumeric.mo
+share/locale/eu/LC_MESSAGES/gnumeric-functions.mo
+share/locale/eu/LC_MESSAGES/gnumeric.mo
 share/locale/fi/LC_MESSAGES/gnumeric-functions.mo
 share/locale/fi/LC_MESSAGES/gnumeric.mo
 share/locale/fr/LC_MESSAGES/gnumeric-functions.mo
@@ -843,6 +846,8 @@ share/locale/ga/LC_MESSAGES/gnumeric-functions.mo
 share/locale/ga/LC_MESSAGES/gnumeric.mo
 share/locale/gl/LC_MESSAGES/gnumeric-functions.mo
 share/locale/gl/LC_MESSAGES/gnumeric.mo
+share/locale/gu/LC_MESSAGES/gnumeric-functions.mo
+share/locale/gu/LC_MESSAGES/gnumeric.mo
 share/locale/he/LC_MESSAGES/gnumeric-functions.mo
 share/locale/he/LC_MESSAGES/gnumeric.mo
 share/locale/hr/LC_MESSAGES/gnumeric-functions.mo
@@ -915,7 +920,6 @@ share/locale/zh_TW/LC_MESSAGES/gnumeric.mo
 @dirrm share/gnome/help/gnumeric/C
 @dirrm share/gnome/help/gnumeric
 @dirrm share/gnumeric/%%VERSION%%/templates
-@dirrm share/gnumeric/%%VERSION%%/idl
 @dirrm share/gnumeric/%%VERSION%%/glade
 @dirrm share/gnumeric/%%VERSION%%/autoformat-templates/List
 @dirrm share/gnumeric/%%VERSION%%/autoformat-templates/General
@@ -965,13 +969,11 @@ share/locale/zh_TW/LC_MESSAGES/gnumeric.mo
 @dirrm lib/gnumeric/%%VERSION%%/plugins/excel
 @dirrm lib/gnumeric/%%VERSION%%/plugins/dif
 @dirrm lib/gnumeric/%%VERSION%%/plugins/derivatives
-@dirrm lib/gnumeric/%%VERSION%%/plugins/corba
 @dirrm lib/gnumeric/%%VERSION%%/plugins/applix
 @dirrm lib/gnumeric/%%VERSION%%/plugins
 @dirrm lib/gnumeric/%%VERSION%%/include
 @dirrm lib/gnumeric/%%VERSION%%
 @dirrm lib/gnumeric
-@dirrm lib/goffice/0.7.2/plugins/gnumeric
 @dirrm include/libspreadsheet-1.10/spreadsheet
 @dirrm include/libspreadsheet-1.10
 @unexec update-desktop-database > /dev/null || /usr/bin/true