update to 1.2.12

The step from 1.0.12 to 1.2.12 is too large to mention all changes.
pkgsrc issues:
-use gnome2
-add python support (python23 provides a shared lib)
-XXX I've enabled libgda/gnomedb, this seems to be completelely
 non-functional to me, but perhaps it is just my setup...

math/gnumeric/Makefile

@@ -1,21 +1,16 @@
-# $NetBSD: Makefile,v 1.84 2004/04/27 00:59:36 wiz Exp $
+# $NetBSD: Makefile,v 1.85 2004/05/24 18:13:19 drochner Exp $
 #
 
-DISTNAME=		gnumeric-1.0.13
-PKGREVISION=		7
+DISTNAME=		gnumeric-1.2.12
 CATEGORIES=		math gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnumeric/1.0/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnumeric/1.2/}
 
 MAINTAINER=		rh@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/gnumeric/
 COMMENT=		Spreadsheet program from the GNOME project
 
-# for Python support a shared libpython is required but not provided yet
-#BUILD_DEPENDS+=		python>=2.0:../../lang/python
-
 BUILD_USES_MSGFMT=	YES
 USE_BUILDLINK3=		YES
-USE_DIRS+=		gnome1-1.5
 USE_PKGLOCALEDIR=	YES
 USE_X11BASE=		YES
 USE_GNU_TOOLS+=		make
@@ -23,20 +18,33 @@ USE_PERL5=		YES
 USE_LIBTOOL=		YES
 
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--without-python
-CONFIGURE_ARGS+=	--without-psiconv
-LIBS+=      		-lunicode
+CONFIGURE_ARGS+=	--with-python=python2p3
+PYTHON_VERSION_REQD=	23pth
+GCONF2_SCHEMAS=		gnumeric-dialogs.schemas gnumeric-general.schemas \
+			gnumeric-plugins.schemas
 
-.include "../../devel/bonobo/buildlink3.mk"
-.include "../../devel/gal/buildlink3.mk"
+.include "../../x11/py-gtk2/buildlink3.mk"
+.include "../../lang/python/application.mk"
+.include "../../databases/libgda/buildlink3.mk"
+.include "../../databases/libgnomedb/buildlink3.mk"
+.include "../../devel/libgsf/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/atk/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/pango/buildlink3.mk"
+.include "../../devel/libgnome/buildlink3.mk"
+.include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../devel/libbonobo/buildlink3.mk"
+.include "../../devel/libbonoboui/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libglade/buildlink3.mk"
-.include "../../devel/libole2/buildlink3.mk"
-.include "../../devel/oaf/buildlink3.mk"
-.include "../../lang/guile/buildlink3.mk"
-.include "../../print/gnome-print/buildlink3.mk"
-.include "../../textproc/libunicode/buildlink3.mk"
-.include "../../textproc/libxml/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../devel/libglade2/buildlink3.mk"
+# guile is currently not supported in gnumeric
+#.include "../../lang/guile/buildlink3.mk"
+.include "../../print/libgnomeprint/buildlink3.mk"
+.include "../../print/libgnomeprintui/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../textproc/intltool/buildlink3.mk"
+.include "../../textproc/scrollkeeper/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"

math/gnumeric/distinfo

@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.16 2003/04/25 13:06:04 rh Exp $
+$NetBSD: distinfo,v 1.17 2004/05/24 18:13:19 drochner Exp $
 
-SHA1 (gnumeric-1.0.13.tar.gz) = bbaa6f69823c7abdc07d8a1e577335b2d4765fb5
-Size (gnumeric-1.0.13.tar.gz) = 12876266 bytes
-SHA1 (patch-aa) = ee1d9dd712638c1ce99a3b0280125e5c7788184d
+SHA1 (gnumeric-1.2.12.tar.gz) = 44fcadada3652ffaae9375831552c073351bc267
+Size (gnumeric-1.2.12.tar.gz) = 17851705 bytes
+SHA1 (patch-ab) = fd62712cf582aebe3e5dd99a15fa4d4c02ee7198

math/gnumeric/patches/patch-aa

@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.14 2003/01/09 12:41:12 rh Exp $
-
---- doc/Makefile.in.orig	Sat Jan  4 04:30:42 2003
-+++ doc/Makefile.in
-@@ -274,7 +274,7 @@ sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- 
--SUBDIRS = C de es hu ja nl no pl pt ru sk sv
-+SUBDIRS = C
- 
- EXTRA_DIST = \
- 	sgmldocs.make gnumeric-doc.make make-func-list.pl \

math/gnumeric/patches/patch-ab

@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.6 2004/05/24 18:13:19 drochner Exp $
+
+--- configure.orig	2004-05-21 22:06:50.000000000 +0200
++++ configure
+@@ -24809,7 +24809,7 @@ echo $ECHO_N "checking Look for $PY_PREF
+ 			  echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 			  PY_LIBS="python$PY_VERSION"
+-			  PY_LIB_LOC="-L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config"
++			  PY_LIB_LOC="-L$PY_EXEC_PREFIX/lib"
+ 			  PY_CFLAGS="-I$PY_PREFIX/include/python$PY_VERSION"
+ 			  PY_MAKEFILE="$PY_EXEC_PREFIX/lib/python$PY_VERSION/config/Makefile"
+ 			  PY_LOCALMODLIBS=`sed -n -e 's/^LOCALMODLIBS=\(.*\)/\1/p' $PY_MAKEFILE`