diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 517fe6756cc..1c87a76ee18 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.3 2003/12/31 15:05:16 marcm Exp $
+# $OpenBSD: Makefile,v 1.4 2004/01/28 16:10:33 marcm Exp $
 
 COMMENT=		"spreadsheet application for GNOME"
 
-VERSION=		1.2.1
+VERSION=		1.2.5
 DISTNAME=		gnumeric-${VERSION}
 CATEGORIES=    		math x11/gnome
 
diff --git a/math/gnumeric/distinfo b/math/gnumeric/distinfo
index 9adea40a33e..06565f7f718 100644
--- a/math/gnumeric/distinfo
+++ b/math/gnumeric/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnumeric-1.2.1.tar.gz) = b0292ee01619a1f7f023135ac19695a6
-RMD160 (gnumeric-1.2.1.tar.gz) = ab1acb62e41c6097d3d48d903021b388af66a80a
-SHA1 (gnumeric-1.2.1.tar.gz) = 24ee903703b81455e61e36ecb494ec2e504ae4c0
+MD5 (gnumeric-1.2.5.tar.gz) = 0e0f6509825191a4c4b9d477f8d14e1a
+RMD160 (gnumeric-1.2.5.tar.gz) = d2d9c181c9a5609c9408934c0552c2143422e887
+SHA1 (gnumeric-1.2.5.tar.gz) = b5973ffdc024ab330b47b5edf37ad1a50846e0ef
diff --git a/math/gnumeric/patches/patch-configure b/math/gnumeric/patches/patch-configure
index eeff047c1c5..6c443e89da3 100644
--- a/math/gnumeric/patches/patch-configure
+++ b/math/gnumeric/patches/patch-configure
@@ -1,16 +1,16 @@
-$OpenBSD: patch-configure,v 1.1.1.1 2003/10/14 20:28:20 marcm Exp $
---- configure.orig	2003-10-08 08:56:11.000000000 -0700
-+++ configure	2003-10-10 07:31:45.000000000 -0700
-@@ -20151,7 +20151,7 @@ else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--need_posix=yes
-+need_posix=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- CFLAGS="$saved_CFLAGS"
-@@ -21458,7 +21458,7 @@ if test $ac_cv_func_bind_textdomain_code
+$OpenBSD: patch-configure,v 1.2 2004/01/28 16:10:33 marcm Exp $
+--- configure.orig	2004-01-18 12:49:33.000000000 -0800
++++ configure	2004-01-25 10:32:15.000000000 -0800
+@@ -8523,7 +8523,7 @@ nto-qnx*)
+ openbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+-  need_version=yes
++  need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+@@ -22491,7 +22491,7 @@ if test $ac_cv_func_bind_textdomain_code
                 DATADIRNAME=share
  else
    CATOBJEXT=.mo
diff --git a/math/gnumeric/patches/patch-ltmain_sh b/math/gnumeric/patches/patch-ltmain_sh
index c57c823fb13..638924d5530 100644
--- a/math/gnumeric/patches/patch-ltmain_sh
+++ b/math/gnumeric/patches/patch-ltmain_sh
@@ -1,7 +1,7 @@
-$OpenBSD: patch-ltmain_sh,v 1.1.1.1 2003/10/14 20:28:20 marcm Exp $
---- ltmain.sh.orig	2003-08-01 18:57:12.000000000 -0700
-+++ ltmain.sh	2003-08-21 21:12:13.000000000 -0700
-@@ -1288,6 +1288,17 @@ EOF
+$OpenBSD: patch-ltmain_sh,v 1.2 2004/01/28 16:10:33 marcm Exp $
+--- ltmain.sh.orig	2004-01-03 07:02:12.000000000 -0800
++++ ltmain.sh	2004-01-24 20:14:33.000000000 -0800
+@@ -1355,6 +1355,17 @@ EOF
  	continue
  	;;
  
@@ -19,7 +19,7 @@ $OpenBSD: patch-ltmain_sh,v 1.1.1.1 2003/10/14 20:28:20 marcm Exp $
        -module)
  	module=yes
  	continue
-@@ -1965,6 +1976,9 @@ EOF
+@@ -2000,6 +2011,9 @@ EOF
  	  fi
  	  continue
  	  ;;
@@ -29,7 +29,7 @@ $OpenBSD: patch-ltmain_sh,v 1.1.1.1 2003/10/14 20:28:20 marcm Exp $
  	%DEPLIBS%)
  	  alldeplibs=yes
  	  continue
-@@ -5728,40 +5742,6 @@ relink_command=\"$relink_command\""
+@@ -5763,40 +5777,6 @@ relink_command=\"$relink_command\""
      # Exit here if they wanted silent mode.
      test "$show" = : && exit 0
  
diff --git a/math/gnumeric/patches/patch-schemas_Makefile_in b/math/gnumeric/patches/patch-schemas_Makefile_in
deleted file mode 100644
index 9960f0cdc3b..00000000000
--- a/math/gnumeric/patches/patch-schemas_Makefile_in
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-schemas_Makefile_in,v 1.1.1.1 2003/10/14 20:28:20 marcm Exp $
---- schemas/Makefile.in.orig	2003-09-26 15:55:08.000000000 -0700
-+++ schemas/Makefile.in	2003-09-26 15:55:48.000000000 -0700
-@@ -310,9 +310,6 @@ maintainer-clean
- @INTLTOOL_SCHEMAS_RULE@
- 
- install-data-local:
--	for p in $(schema_DATA) ; do \
--		GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p; \
--	done
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/math/gnumeric/patches/patch-src_Makefile_in b/math/gnumeric/patches/patch-src_Makefile_in
index f018a3bbc88..a963c6bec8c 100644
--- a/math/gnumeric/patches/patch-src_Makefile_in
+++ b/math/gnumeric/patches/patch-src_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_Makefile_in,v 1.1.1.1 2003/10/14 20:28:20 marcm Exp $
---- src/Makefile.in.orig	2003-10-08 15:59:32.000000000 -0700
-+++ src/Makefile.in	2003-10-10 07:31:45.000000000 -0700
-@@ -247,7 +247,7 @@ EXTRA_DIST = GNOME_Gnumeric.xml GNOME_Gn
+$OpenBSD: patch-src_Makefile_in,v 1.2 2004/01/28 16:10:33 marcm Exp $
+--- src/Makefile.in.orig	2004-01-18 13:49:00.000000000 -0800
++++ src/Makefile.in	2004-01-24 20:14:33.000000000 -0800
+@@ -248,7 +248,7 @@ EXTRA_DIST = GNOME_Gnumeric.xml GNOME_Gn
  #	$(INTLLIBS)
  
  # Bonobo requires things to be in a subdir of this form
diff --git a/math/gnumeric/patches/patch-src_cut-n-paste-code_goffice_graph_plugins_plot_xy_gog-xy_c b/math/gnumeric/patches/patch-src_cut-n-paste-code_goffice_graph_plugins_plot_xy_gog-xy_c
new file mode 100644
index 00000000000..5e00c07c732
--- /dev/null
+++ b/math/gnumeric/patches/patch-src_cut-n-paste-code_goffice_graph_plugins_plot_xy_gog-xy_c
@@ -0,0 +1,16 @@
+$OpenBSD: patch-src_cut-n-paste-code_goffice_graph_plugins_plot_xy_gog-xy_c,v 1.1 2004/01/28 16:10:33 marcm Exp $
+--- src/cut-n-paste-code/goffice/graph/plugins/plot_xy/gog-xy.c.orig	2004-01-24 20:50:53.000000000 -0800
++++ src/cut-n-paste-code/goffice/graph/plugins/plot_xy/gog-xy.c	2004-01-24 20:51:19.000000000 -0800
+@@ -358,10 +358,11 @@ static void
+ gog_bubble_plot_class_init (GogPlotClass *plot_klass)
+ {
+ 	GogObjectClass *gog_klass = (GogObjectClass *) plot_klass;
++	Gog2DPlotClass *gog_2d_plot_klass;
+ 
+ 	bubble_parent_klass = g_type_class_peek_parent (plot_klass);
+ 
+-	Gog2DPlotClass *gog_2d_plot_klass = (Gog2DPlotClass*) plot_klass;
++	gog_2d_plot_klass = (Gog2DPlotClass*) plot_klass;
+ 
+ 	gog_2d_plot_klass->adjust_bounds = gog_bubble_plot_adjust_bounds;
+ 	gog_klass->type_name	= gog_bubble_plot_type_name;
diff --git a/math/gnumeric/pkg/PLIST b/math/gnumeric/pkg/PLIST
index 00e01f2679e..ec782233c97 100644
--- a/math/gnumeric/pkg/PLIST
+++ b/math/gnumeric/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2003/12/15 17:33:03 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.4 2004/01/28 16:10:33 marcm Exp $
 bin/gnumeric
 bin/ssconvert
 lib/bonobo/servers/GNOME_Gnumeric.server
@@ -112,6 +112,8 @@ lib/gnumeric/${VERSION}-bonobo/plugins/xml_sax/plugin.xml
 lib/gnumeric/${VERSION}-bonobo/plugins/xml_sax/xml_sax.la
 lib/gnumeric/${VERSION}-bonobo/plugins/xml_sax/xml_sax.so
 libexec/gnumeric-component
+man/man1/gnumeric.1
+man/man1/ssconvert.1
 share/applications/gnumeric.desktop
 share/gnome-2.0/ui/GNOME_Gnumeric.xml
 share/gnome-2.0/ui/GNOME_Gnumeric_Component.xml
@@ -266,6 +268,7 @@ share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/analysistoo
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/analysistools-covariance-ex1.png
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/analysistools-covariance-ex2.png
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/analysistools-covariance.png
+share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/analysistools-descstats-ex1-options.png
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/analysistools-descstats-ex1.png
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/analysistools-descstats-ex2.png
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/analysistools-descstats.png
@@ -344,6 +347,7 @@ share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/button-font
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/button-frame.png
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/button-function.png
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/button-graph.png
+share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/button-graphEditor-add.png
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/button-increase-indent.png
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/button-increase-precision.png
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/button-insert-component.png
@@ -388,6 +392,10 @@ share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/dialog-filt
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/dialog-graphing.png
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/dialog-insert-object.png
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/dialog-summary.png
+share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/example-colGraph-modified.png
+share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/example-colGraph.png
+share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/example-columnSelect.png
+share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/example-data.png
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/file-dialog.png
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/file-formats-import-list.png
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/files-csv-export-ex1.png
@@ -405,6 +413,7 @@ share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/files-html4
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/files-latex-example.png
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/files-xml-example.png
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/gnumeric-empty.png
+share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/gnumeric-icon-24.png
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/gnumeric-labelled.png
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/gnumeric-power-example.png
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/gnumeric-rearranged.png
@@ -418,6 +427,7 @@ share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/label-three
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/label-transparent.png
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/label-two.png
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/menu-context-col-row-header.png
+share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/menu-context-graph.png
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/menu-context-grid.png
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/menu-context-object.png
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/menu-context-tabs.png
@@ -459,6 +469,14 @@ share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/pointer_rig
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/pointer_text_edit.png
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/pointer_zoom_in.png
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/pointer_zoom_out.png
+share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/preferences-files.png
+share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/preferences-font-header.png
+share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/preferences-font.png
+share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/preferences-sorting.png
+share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/preferences-undo.png
+share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/preferences-various-internal.png
+share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/preferences-various.png
+share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/preferences-windows.png
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/print-large.png
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/print-preview-back.png
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/print-preview-first.png
@@ -471,13 +489,13 @@ share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/print-previ
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/print-preview-zoomin.png
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/print-preview-zoomout.png
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/print-preview.png
-share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/print-worksheet.png
+share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/print-worksheet-job.png
+share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/print-worksheet-paper.png
+share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/print-worksheet-printer.png
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/print.png
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/printing-preview.png
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/printing-setup-header-config.png
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/printing-setup-header.png
-share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/printing-setup-margins.png
-share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/printing-setup-page-1.png
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/printing-setup-page.png
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/printing-setup-sheet.png
 share/gnumeric/${VERSION}-bonobo/share/gnome/help/gnumeric/C/figures/selection-1.png
@@ -680,9 +698,7 @@ share/schemas/gnumeric/gnumeric-general.schemas
 share/schemas/gnumeric/gnumeric-plugins.schemas
 @dirrm share/schemas/gnumeric
 @dirrm share/pixmaps/gnumeric
-@dirrm share/pixmaps
 @dirrm share/omf/gnumeric
-@dirrm share/mime-info
 @dirrm share/mc/templates
 @dirrm share/mc
 @dirrm share/locale/en_CA/LC_MESSAGES