14 files changed, 73 insertions, 123 deletions

diff --git a/math/gnumeric/files/extra-patch-plugins_Makefile.in b/math/gnumeric/files/extra-patch-plugins_Makefile.in
new file mode 100644
index 000000000000..30ca07376c2a
--- /dev/null
+++ b/math/gnumeric/files/extra-patch-plugins_Makefile.in
@@ -0,0 +1,21 @@
+--- plugins/Makefile.in.orig	Mon Nov  1 23:32:23 2004
++++ plugins/Makefile.in	Mon Nov  1 23:33:19 2004
+@@ -322,15 +322,15 @@
+ SUBDIRS_FUNCTIONS = numtheory fn-database fn-date fn-eng fn-erlang fn-financial fn-info \
+ 	fn-logical fn-complex fn-lookup fn-math fn-stat fn-string fn-random \
+ 	derivatives \
+-	$(PERL_DIR) $(GUILE_DIR) \
++	$(GUILE_DIR) \
+ 	$(GDA_DIR) $(GNOMEDB_DIR)
+ 
+ 
+-SUBDIRS_LOADERS = $(PERL_LOADER_DIR) $(PYTHON_LOADER_DIR) $(CORBA_DIR)
++SUBDIRS_LOADERS = $(PYTHON_LOADER_DIR) $(CORBA_DIR)
+ 
+ SUBDIRS_DATA_SOURCES = sample_datasource
+ 
+-SUBDIRS_EXAMPLES = $(GNOME_GLOSSARY_DIR) $(PERL_FUNC_DIR) $(PYFUNC_DIR) uihello
++SUBDIRS_EXAMPLES = $(GNOME_GLOSSARY_DIR) $(PYFUNC_DIR) uihello
+ @PLUGIN_LIST_GIVEN_FALSE@SUBDIRS = $(SUBDIRS_FILE_FORMATS) $(SUBDIRS_FUNCTIONS) $(SUBDIRS_LOADERS) $(SUBDIRS_DATA_SOURCES) $(SUBDIRS_EXAMPLES)
+ 
+ @PLUGIN_LIST_GIVEN_TRUE@SUBDIRS = @PLUGIN_LIST@
diff --git a/math/gnumeric/files/patch-aa b/math/gnumeric/files/patch-aa
deleted file mode 100644
index d182a0f6270f..000000000000
--- a/math/gnumeric/files/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.orig	Thu Dec 12 14:44:07 2002
-+++ configure	Tue Dec 24 00:22:37 2002
-@@ -9014,6 +9014,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -17878,7 +17879,7 @@
- 	if gnome-config --libs gb > /dev/null 2>&1; then
- 		verstxt=`gnome-config --modversion gb 2>/dev/null`
- 		vers=`echo "$verstxt" | awk -F. '{ printf "%d", $1 * 10000 + $2 * 100 + $3; }'`
--		if test "$vers" -eq 000017; then
-+		if test "$vers" -ge 000017; then
- 			echo "$as_me:$LINENO: result: $marker_ok found $verstxt" >&5
- echo "${ECHO_T}$marker_ok found $verstxt" >&6
- 
diff --git a/math/gnumeric/files/patch-ba b/math/gnumeric/files/patch-ba
deleted file mode 100644
index 3447b30f39b5..000000000000
--- a/math/gnumeric/files/patch-ba
+++ /dev/null
@@ -1,7 +0,0 @@
---- Makefile.in.orig	Mon Nov 13 19:56:19 2000
-+++ Makefile.in	Tue Nov 14 15:34:05 2000
-@@ -164,3 +164,3 @@
- 
--confexecdir = $(libdir)
-+confexecdir = $(sysconfdir)
- confexec_DATA = gnumericConf.sh
diff --git a/math/gnumeric/files/patch-configure b/math/gnumeric/files/patch-configure
new file mode 100644
index 000000000000..b7039389f456
--- /dev/null
+++ b/math/gnumeric/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Sun Nov  7 14:51:35 2004
++++ configure	Sun Nov  7 14:52:12 2004
+@@ -27270,7 +27270,7 @@
+ }'
+ fi
+ 
+-DEFS=-DHAVE_CONFIG_H
++DEFS="$DEFS -DHAVE_CONFIG_H"
+ 
+ ac_libobjs=
+ ac_ltlibobjs=
diff --git a/math/gnumeric/files/patch-doc::Makefile.in b/math/gnumeric/files/patch-doc::Makefile.in
deleted file mode 100644
index f9c47f90ea95..000000000000
--- a/math/gnumeric/files/patch-doc::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- doc/Makefile.in.orig	Wed Mar 13 00:26:49 2002
-+++ doc/Makefile.in	Wed Mar 13 00:25:45 2002
-@@ -185,7 +185,7 @@
- perl_val = @perl_val@
- python_val = @python_val@
- 
--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 	translating.sgml			Design					Future-Roadmap				README					saving.txt				writing-functions.sgml			excel-format-doc.txt			linux-expo-99-gnumeric.tex      	linuxexpo.sty 				Dependencies.txt 			Styles.txt 				features.txt 				pref-attributes.txt 			guile-gnumeric.txt			python-gnumeric.txt 			stf-export.txt 				stf-parser.txt
- 
diff --git a/math/gnumeric/files/patch-doc::sgmldocs.make b/math/gnumeric/files/patch-doc::sgmldocs.make
deleted file mode 100644
index ae102ee6a505..000000000000
--- a/math/gnumeric/files/patch-doc::sgmldocs.make
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- doc/sgmldocs.make	2002/06/07 19:38:15	1.1
-+++ doc/sgmldocs.make	2002/06/07 19:38:30
-@@ -32,7 +32,7 @@
- #   dist-hook: app-dist-hook
- #
- 
--docdir = $(datadir)/gnome/help/$(docname)/$(lang)
-+docdir = $(datadir)/help/$(docname)/$(lang)
- 
- doc_DATA = index.html
- 
diff --git a/math/gnumeric/files/patch-plugins::gb::Makefile.in b/math/gnumeric/files/patch-plugins::gb::Makefile.in
deleted file mode 100644
index 5465dd84775a..000000000000
--- a/math/gnumeric/files/patch-plugins::gb::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/gb/Makefile.in.orig	Tue Dec 24 00:29:02 2002
-+++ plugins/gb/Makefile.in	Tue Dec 24 00:29:57 2002
-@@ -311,7 +311,7 @@
- gnum_gb_la_LIBADD = \
- 	$(GB_LIBS)		\
- 	$(GNUMERIC_LIBS)	\
--	-lm @GLIB_LIBS@ -lgb -lgbrun
-+	-lm @GLIB_LIBS@ -lgbrun
- 
- 
- xml_in_files = plugin.xml.in
diff --git a/math/gnumeric/files/patch-plugins::html::html.c b/math/gnumeric/files/patch-plugins::html::html.c
deleted file mode 100644
index 22d9a59975a0..000000000000
--- a/math/gnumeric/files/patch-plugins::html::html.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- plugins/html/html.c.orig	Sun Sep 19 16:34:22 2004
-+++ plugins/html/html.c	Sun Sep 19 16:34:43 2004
-@@ -410,6 +410,7 @@
- "</HEAD>\n<BODY>\n", fp);
- 		break;
- 	default:
-+		break;
- 	}
- 
- 	sheets = workbook_sheets (wb);
diff --git a/math/gnumeric/files/patch-plugins::psiconv::psiconv-read.c b/math/gnumeric/files/patch-plugins::psiconv::psiconv-read.c
deleted file mode 100644
index a14b75c2f0c5..000000000000
--- a/math/gnumeric/files/patch-plugins::psiconv::psiconv-read.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- plugins/psiconv/psiconv-read.c.orig	Sun Sep 19 16:43:32 2004
-+++ plugins/psiconv/psiconv-read.c	Sun Sep 19 16:44:35 2004
-@@ -301,7 +301,7 @@
- 	/*	case psiconv_formula_mark_opend: */
- 		default:
- 	/*		kind = -1; */
--	/*		break;     */
-+			break;
- 	}
- 
- 	if (kind == -1) {
-@@ -336,6 +336,7 @@
- 			v = value_new_cellrange(cr1,cr2,1,1);
- 			break;
- 		default:
-+			break;
- 		}
- 		if (!v)
- 			return NULL;
-@@ -407,6 +408,7 @@
- 				return NULL;
- 			return parse_subexpr(psi_form1);
- 		default:
-+			break;
- 		}
- 	}
- 		
diff --git a/math/gnumeric/files/patch-src::mathfunc.h b/math/gnumeric/files/patch-src::mathfunc.h
deleted file mode 100644
index 5ece38afaf53..000000000000
--- a/math/gnumeric/files/patch-src::mathfunc.h
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/mathfunc.h.orig	Thu Apr 26 20:47:46 2001
-+++ src/mathfunc.h	Mon May 21 12:08:51 2001
-@@ -7,2 +7,6 @@
- 
-+#ifdef __FreeBSD__
-+#define FINITE finite
-+#endif
-+
- #ifndef FINITE
diff --git a/math/gnumeric/files/patch-src::stf-parse.c b/math/gnumeric/files/patch-src::stf-parse.c
deleted file mode 100644
index b45569925e68..000000000000
--- a/math/gnumeric/files/patch-src::stf-parse.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/stf-parse.c.orig	Fri Mar  1 21:03:09 2002
-+++ src/stf-parse.c	Fri Mar  1 21:03:17 2002
-@@ -870,8 +870,7 @@
- 		if (len == -1)
- 			return (char *)s;
- 		if (len > 1) {
--			if (mbstowcs (&wstr, s, 1) == 1 &&
--			    !iswprint (wstr) && !iswspace (wstr))
-+			if (mbstowcs (&wstr, s, 1) == 1)
- 				return (char *)s;
- 			s += len;
- 		} else {
diff --git a/math/gnumeric/files/patch-src_numbers.h b/math/gnumeric/files/patch-src_numbers.h
new file mode 100644
index 000000000000..6448e88617ea
--- /dev/null
+++ b/math/gnumeric/files/patch-src_numbers.h
@@ -0,0 +1,10 @@
+--- src/numbers.h.orig	Fri Dec 10 21:36:23 2004
++++ src/numbers.h	Fri Dec 10 21:37:02 2004
+@@ -3,6 +3,7 @@
+ 
+ #include <math.h>
+ #ifdef HAVE_IEEEFP_H
++#include <sys/types.h>
+ #include <ieeefp.h>
+ #endif
+ #ifdef HAVE_IEEE754_H
diff --git a/math/gnumeric/files/patch-src_regutf8.h b/math/gnumeric/files/patch-src_regutf8.h
new file mode 100644
index 000000000000..04040ac56405
--- /dev/null
+++ b/math/gnumeric/files/patch-src_regutf8.h
@@ -0,0 +1,11 @@
+--- src/regutf8.h.orig	Thu Sep 12 00:17:54 2002
++++ src/regutf8.h	Thu Sep 12 00:18:02 2002
+@@ -19,7 +19,7 @@
+ #endif
+ 
+ #ifndef REG_OK
+-#define REG_OK REG_NOERROR
++#define REG_OK 0
+ #endif
+ 
+ // ----------------------------------------------------------------------------
diff --git a/math/gnumeric/files/patch-templates_autoformat_Makefile.in b/math/gnumeric/files/patch-templates_autoformat_Makefile.in
new file mode 100644
index 000000000000..4fe70cfdd407
--- /dev/null
+++ b/math/gnumeric/files/patch-templates_autoformat_Makefile.in
@@ -0,0 +1,20 @@
+--- templates/autoformat/Makefile.in.orig	Mon Nov  1 23:52:27 2004
++++ templates/autoformat/Makefile.in	Mon Nov  1 23:53:49 2004
+@@ -464,13 +464,15 @@
+ 		    < $(srcdir)/$$cat.category.in			\
+ 		    > $$dir/.category 	;				\
+ 		for f in $(srcdir)/autoformat.$$cat.*.xml.in ; do	\
+-			echo "	$${f/.*autoformat.$$cat./}" ;		\
++			f1=`echo $${f} | sed -e 's/.*autoformat.$$cat.//'`; \
++			f2=`echo $${f} | sed -e 's/.xml.in/.xml/'`;	\
++			echo "	$${f1}" ;				\
+ 			sed 						\
+ 				-e 's/ _author *=/ author=/'		\
+ 				-e 's/ _name *=/ name=/' 		\
+ 				-e 's/ _description *=/ description=/'	\
+ 			    < $$f 					\
+-			    > $$dir/`basename $${f/.xml.in/.xml}` ;	\
++			    > $$dir/`basename $${f2}` ;			\
+ 		done							\
+ 	done
+