Update to 1.0.7.

4 files changed, 39 insertions, 40 deletions

diff --git a/math/gnumeric2/files/patch-aa b/math/gnumeric2/files/patch-aa
index 978df6779fac..3bbcde722300 100644
--- a/math/gnumeric2/files/patch-aa
+++ b/math/gnumeric2/files/patch-aa
@@ -1,9 +1,17 @@
 
 $FreeBSD$
 
---- configure.orig	Wed Nov  7 11:20:14 2001
-+++ configure	Wed Nov  7 11:34:43 2001
-@@ -10618,7 +10618,7 @@
+--- configure.orig	Fri Jun  7 21:38:37 2002
++++ configure	Fri Jun  7 21:39:48 2002
+@@ -5913,6 +5913,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'
+@@ -10790,7 +10791,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; }'`
diff --git a/math/gnumeric2/files/patch-doc::gnumeric-doc.make b/math/gnumeric2/files/patch-doc::gnumeric-doc.make
new file mode 100644
index 000000000000..9ae036b7390a
--- /dev/null
+++ b/math/gnumeric2/files/patch-doc::gnumeric-doc.make
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- doc/gnumeric-doc.make	2002/06/07 19:30:21	1.1
++++ doc/gnumeric-doc.make	2002/06/07 19:30:33
+@@ -9,7 +9,7 @@
+ gnumeric_docdir  = $(top_srcdir)/doc
+ sgml_ents = functions.sgml
+ 
+-gnumeric_helpdir = $(datadir)/gnome/help/gnumeric/$(lang)
++gnumeric_helpdir = $(datadir)/help/gnumeric/$(lang)
+ gnumeric_help_DATA = topic.dat
+ 
+ # include generated files to simplify installation
diff --git a/math/gnumeric2/files/patch-doc::sgmldocs.make b/math/gnumeric2/files/patch-doc::sgmldocs.make
new file mode 100644
index 000000000000..ae102ee6a505
--- /dev/null
+++ b/math/gnumeric2/files/patch-doc::sgmldocs.make
@@ -0,0 +1,14 @@
+
+$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/gnumeric2/files/patch-ltmain.sh b/math/gnumeric2/files/patch-ltmain.sh
deleted file mode 100644
index d62ad5aaf764..000000000000
--- a/math/gnumeric2/files/patch-ltmain.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh.orig	Sun Dec 16 07:16:09 2001
-+++ ltmain.sh	Tue Dec 18 07:52:22 2001
-@@ -1052,7 +1052,7 @@
- 	  esac
- 	 elif test "X$arg" = "X-lc_r"; then
- 	  case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd* | *-*-freebsd[234]*)
- 	    # Do not include libc_r directly, use -pthread flag.
- 	    continue
- 	    ;;
-@@ -2359,6 +2359,9 @@
- 	    # problems, so we reset it completely
- 	    verstring=""
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    verstring="0.0"
- 	    ;;
-@@ -4247,10 +4250,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"