update to 1.4.2, and fix Python support

7 files changed, 53 insertions, 37 deletions

diff --git a/math/gnumeric14/Makefile b/math/gnumeric14/Makefile
index b90aa0f445c..b6cbddec3a8 100644
--- a/math/gnumeric14/Makefile
+++ b/math/gnumeric14/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2005/01/01 16:37:55 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2005/01/20 21:35:07 drochner Exp $
 #
 
-DISTNAME=		gnumeric-1.4.1
-PKGREVISION=		1
+DISTNAME=		gnumeric-1.4.2
 CATEGORIES=		math gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnumeric/1.4/}
 EXTRACT_SUFX=		.tar.bz2
@@ -21,8 +20,8 @@ USE_PERL5=		YES
 USE_LIBTOOL=		YES
 
 GNU_CONFIGURE=		YES
-# XXX Python doesn't work yet
-CONFIGURE_ARGS+=	--with-python=python2p3
+CONFIGURE_ARGS+=	--with-python
+CONFIGURE_ENV+=		PYTHON=${PYTHONBIN}
 PYTHON_VERSION_REQD=	23pth
 GCONF2_SCHEMAS=		gnumeric-dialogs.schemas gnumeric-general.schemas \
 			gnumeric-plugins.schemas
diff --git a/math/gnumeric14/PLIST b/math/gnumeric14/PLIST
index b8c46cab717..962baaf4bd0 100644
--- a/math/gnumeric14/PLIST
+++ b/math/gnumeric14/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/12/22 12:08:26 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/01/20 21:35:07 drochner Exp $
 bin/gnumeric
 bin/${PKGNAME}
 bin/ssconvert
@@ -44,6 +44,9 @@ 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/gnome-glossary/glossary-po-header
+lib/gnumeric/${PKGVERSION}/plugins/gnome-glossary/gnome_glossary.py
+lib/gnumeric/${PKGVERSION}/plugins/gnome-glossary/plugin.xml
 lib/gnumeric/${PKGVERSION}/plugins/html/html.la
 lib/gnumeric/${PKGVERSION}/plugins/html/plugin.xml
 lib/gnumeric/${PKGVERSION}/plugins/lotus/lotus.la
@@ -79,6 +82,11 @@ lib/gnumeric/${PKGVERSION}/plugins/plot_xy/gog-bubble-prefs.glade
 lib/gnumeric/${PKGVERSION}/plugins/plot_xy/plot-types.xml
 lib/gnumeric/${PKGVERSION}/plugins/plot_xy/plugin.xml
 lib/gnumeric/${PKGVERSION}/plugins/plot_xy/xy.la
+lib/gnumeric/${PKGVERSION}/plugins/py-func/plugin.xml
+lib/gnumeric/${PKGVERSION}/plugins/py-func/py_func.py
+lib/gnumeric/${PKGVERSION}/plugins/python-loader/plugin.xml
+lib/gnumeric/${PKGVERSION}/plugins/python-loader/python_loader.la
+lib/gnumeric/${PKGVERSION}/plugins/python-loader/ui-console-menu.xml
 lib/gnumeric/${PKGVERSION}/plugins/qpro/plugin.xml
 lib/gnumeric/${PKGVERSION}/plugins/qpro/qpro.la
 lib/gnumeric/${PKGVERSION}/plugins/sample_datasource/plugin.xml
@@ -94,6 +102,8 @@ lib/gnumeric/${PKGVERSION}/plugins/xbase/plugin.xml
 lib/gnumeric/${PKGVERSION}/plugins/xbase/xbase.la
 lib/gnumeric/${PKGVERSION}/plugins/xml_sax/plugin.xml
 lib/gnumeric/${PKGVERSION}/plugins/xml_sax/xml_sax.la
+man/man1/gnumeric.1
+man/man1/ssconvert.1
 share/applications/gnumeric.desktop
 share/gconf/schemas/gnumeric-dialogs.schemas
 share/gconf/schemas/gnumeric-general.schemas
@@ -690,6 +700,7 @@ share/pixmaps/gnumeric/chart_cone_2_1.png
 share/pixmaps/gnumeric/chart_cone_2_2.png
 share/pixmaps/gnumeric/chart_cone_2_3.png
 share/pixmaps/gnumeric/chart_cone_3_1.png
+share/pixmaps/gnumeric/chart_contour_1_1.png
 share/pixmaps/gnumeric/chart_cylinder_1_1.png
 share/pixmaps/gnumeric/chart_cylinder_1_2.png
 share/pixmaps/gnumeric/chart_cylinder_1_3.png
@@ -777,6 +788,8 @@ share/pixmaps/win32-gnumeric.ico
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/sc
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/sample_datasource
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/qpro
+@dirrm lib/gnumeric/${PKGVERSION}/plugins/python-loader
+@dirrm lib/gnumeric/${PKGVERSION}/plugins/py-func
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/plot_xy
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/plot_surface
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/plot_radar
@@ -789,6 +802,7 @@ 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-glossary
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/gnome-db
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/gdaif
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/fn-string
diff --git a/math/gnumeric14/distinfo b/math/gnumeric14/distinfo
index f4c48a42da0..aba1879c20e 100644
--- a/math/gnumeric14/distinfo
+++ b/math/gnumeric14/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/12/22 12:08:26 drochner Exp $
+$NetBSD: distinfo,v 1.2 2005/01/20 21:35:07 drochner Exp $
 
-SHA1 (gnumeric-1.4.1.tar.bz2) = efabd34bf18c9e5e5f3d3dfa991dcddd64f97365
-Size (gnumeric-1.4.1.tar.bz2) = 16827174 bytes
-SHA1 (patch-ab) = ff6e49aa63218993c210e225d4866fa05c65420e
-SHA1 (patch-ac) = 10937866499c3d83ca56db9b25bf05eee7655cf9
+SHA1 (gnumeric-1.4.2.tar.bz2) = 93ba1f4f4754a620bb27af4982fe66fca0d19790
+Size (gnumeric-1.4.2.tar.bz2) = 16914595 bytes
+SHA1 (patch-ab) = e5152e2e0f0dfd0f4912c1e9e34f4224fe092c6b
+SHA1 (patch-ad) = 8341c293d3b90143c802c7ec547bb42b875454d7
+SHA1 (patch-ae) = 06e61c42cadbc3d32ae4895dcd52e351ed9f9db4
diff --git a/math/gnumeric14/patches/patch-ab b/math/gnumeric14/patches/patch-ab
index 5eaa8b4030e..b1c6b2482d9 100644
--- a/math/gnumeric14/patches/patch-ab
+++ b/math/gnumeric14/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/12/22 12:08:26 drochner Exp $
+$NetBSD: patch-ab,v 1.2 2005/01/20 21:35:07 drochner Exp $
 
---- configure.orig	2004-12-10 16:06:34.000000000 +0100
+--- configure.orig	2005-01-15 18:01:09.000000000 +0100
 +++ configure
-@@ -27101,7 +27101,7 @@ echo $ECHO_N "checking Look for $PY_PREF
+@@ -27200,7 +27200,7 @@ echo $ECHO_N "checking Look for $PY_PREF
  	echo "$as_me:$LINENO: result: $marker_ok" >&5
  echo "${ECHO_T}$marker_ok" >&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_LIB_LOC=`$PYTHON -c 'from distutils.sysconfig import get_config_var; print get_config_var("LIBPL")'`
++    	PY_LIB_LOC="$PY_EXEC_PREFIX/lib"
+     	PY_LIB_LOC="-L$PY_LIB_LOC"
  	PY_CFLAGS="-I$PY_PREFIX/include/python$PY_VERSION"
  	echo 'echo_python_libs:
- 	@echo $(MODLIBS) $(LIBS)' >confmake.tmp
diff --git a/math/gnumeric14/patches/patch-ac b/math/gnumeric14/patches/patch-ac
deleted file mode 100644
index 17fa8fe6f4a..00000000000
--- a/math/gnumeric14/patches/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/12/22 12:08:26 drochner Exp $
-
---- templates/autoformat/Makefile.in.orig	2004-12-20 14:38:53.000000000 +0100
-+++ templates/autoformat/Makefile.in
-@@ -470,13 +470,13 @@ install-data-local:
- 		    < $(srcdir)/$$cat.category.in			\
- 		    > $$dir/.category 	;				\
- 		for f in $(srcdir)/autoformat.$$cat.*.xml.in ; do	\
--			echo "	$${f/.*autoformat.$$cat./}" ;		\
-+			echo "	$${f#$(srcdir)/autoformat.$$cat.}" ;		\
- 			sed 						\
- 				-e 's/ _author *=/ author=/'		\
- 				-e 's/ _name *=/ name=/' 		\
- 				-e 's/ _description *=/ description=/'	\
- 			    < $$f 					\
--			    > $$dir/`basename $${f/.xml.in/.xml}` ;	\
-+			    > $$dir/`basename $${f%.in}` ;	\
- 		done							\
- 	done
- 
diff --git a/math/gnumeric14/patches/patch-ad b/math/gnumeric14/patches/patch-ad
new file mode 100644
index 00000000000..7fbbe2069b1
--- /dev/null
+++ b/math/gnumeric14/patches/patch-ad
@@ -0,0 +1,9 @@
+$NetBSD: patch-ad,v 1.1 2005/01/20 21:35:07 drochner Exp $
+
+--- src/tools/solver/lp_solve/commonlib.c.orig	2005-01-20 19:24:30.000000000 +0100
++++ src/tools/solver/lp_solve/commonlib.c
+@@ -1,3 +1,4 @@
++#include "gnumeric-config.h"
+ 
+ #include <sys/types.h>
+ 
diff --git a/math/gnumeric14/patches/patch-ae b/math/gnumeric14/patches/patch-ae
new file mode 100644
index 00000000000..71a8be25ed6
--- /dev/null
+++ b/math/gnumeric14/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2005/01/20 21:35:07 drochner Exp $
+
+--- doc/C/Makefile.in.orig	2005-01-20 19:52:07.000000000 +0100
++++ doc/C/Makefile.in
+@@ -449,7 +449,7 @@ CLEANFILES = omf_timestamp
+ omf_dest_dir = $(datadir)/omf/@PACKAGE@
+ scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
+ 
+-manpagedir = $(datadir)/man/man1
++manpagedir = $(prefix)/man/man1
+ manpage_DATA = gnumeric.1 ssconvert.1
+ subdir = doc/C
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4