[1]:

  - Update to 2.1.71
  - Use ${INFO}

Moreover:
  - Polish the Makefile

PR:		ports/81482 [1]
Submitted by:	Johan van Selst <johans@stack.nl> [1]

6 files changed, 15 insertions, 40 deletions

diff --git a/math/octave/files/octave b/math/octave/files/octave.in
index 5910ee467fee..a954e720d141 100644
--- a/math/octave/files/octave
+++ b/math/octave/files/octave.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: /tmp/pcvs/ports/math/octave/files/Attic/octave.in,v 1.1 2005-05-26 17:32:40 jylefort Exp $
 
 OCTAVE_EXEC=%%PREFIX%%/bin/octave-%%OCTAVE_VERSION%%
 LD_LIBRARY_PATH=%%PREFIX%%/lib/octave-%%OCTAVE_VERSION%%; export LD_LIBRARY_PATH
diff --git a/math/octave/files/patch-aa b/math/octave/files/patch-aa
index e1e8e37f36a1..2e4bfbb01073 100644
--- a/math/octave/files/patch-aa
+++ b/math/octave/files/patch-aa
@@ -1,11 +1,11 @@
---- doc/liboctave/Makefile.in.orig	Wed Oct 30 10:04:00 2002
-+++ doc/liboctave/Makefile.in	Tue Jun 10 01:25:22 2003
+--- doc/liboctave/Makefile.in.orig	Wed May 25 22:19:58 2005
++++ doc/liboctave/Makefile.in	Wed May 25 22:52:46 2005
 @@ -43,7 +43,7 @@
  .PHONY: all
  
  liboctave.info: $(TEXINFO) ../conf.texi
--	-makeinfo -I$(srcdir) -I$(srcdir)/.. $(srcdir)/liboctave.texi
-+	-makeinfo --force --no-split -I$(srcdir) -I$(srcdir)/.. $(srcdir)/liboctave.texi
+-	-$(MAKEINFO) -I$(srcdir) -I$(srcdir)/.. $(srcdir)/liboctave.texi
++	-$(MAKEINFO) --force --no-split -I$(srcdir) -I$(srcdir)/.. $(srcdir)/liboctave.texi
  
  liboctave.dvi: $(TEXINFO) ../conf.texi
  	-TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):"; \
diff --git a/math/octave/files/patch-doc:interpreter:Makefile.in b/math/octave/files/patch-doc:interpreter:Makefile.in
index 476c0a918e5d..f5e55d53ac7f 100644
--- a/math/octave/files/patch-doc:interpreter:Makefile.in
+++ b/math/octave/files/patch-doc:interpreter:Makefile.in
@@ -1,11 +1,11 @@
---- doc/interpreter/Makefile.in.orig	Thu Feb 27 05:55:47 2003
-+++ doc/interpreter/Makefile.in	Tue Jun 10 01:26:37 2003
-@@ -87,7 +87,7 @@
+--- doc/interpreter/Makefile.in.orig	Wed May 25 22:21:11 2005
++++ doc/interpreter/Makefile.in	Wed May 25 22:21:04 2005
+@@ -89,7 +89,7 @@
  	@$(top_srcdir)/move-if-change $@.t $@
  
  octave.info: $(MAIN_TEXINFO) $(SUB_TEXINFO) ../conf.texi
--	-makeinfo -I$(srcdir) -I$(srcdir)/.. $<
-+	-makeinfo --no-split -I$(srcdir) -I$(srcdir)/.. $<
+-	-$(MAKEINFO) -I$(srcdir) -I$(srcdir)/.. $<
++	-$(MAKEINFO) --no-split -I$(srcdir) -I$(srcdir)/.. $<
  
  octave.dvi: $(MAIN_TEXINFO) $(SUB_TEXINFO) ../conf.texi
  	-TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):"; \
diff --git a/math/octave/files/patch-glob.h b/math/octave/files/patch-glob.h
deleted file mode 100644
index a5946bc37fc7..000000000000
--- a/math/octave/files/patch-glob.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- glob/glob.h.orig	Sun Nov 10 15:32:00 2002
-+++ glob/glob.h	Sun Nov 10 15:32:49 2002
-@@ -48,7 +48,11 @@
- /* We need `size_t' for the following definitions.  */
- #ifndef __size_t
- # if defined __GNUC__ && __GNUC__ >= 2
-+#if (__FreeBSD__ <= 4)
- typedef __SIZE_TYPE__ __size_t;
-+#else
-+#include <sys/types.h>
-+#endif
- # else
- /* This is a guess.  */
- /*hb
diff --git a/math/octave/files/patch-glob::Makefile.in b/math/octave/files/patch-glob::Makefile.in
deleted file mode 100644
index 8a80c4b52029..000000000000
--- a/math/octave/files/patch-glob::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- glob/Makefile.in.orig	Wed Feb  9 14:43:01 2005
-+++ glob/Makefile.in	Wed Feb  9 14:43:13 2005
-@@ -25,7 +25,7 @@
- 
- CC = @CC@
- CPPFLAGS = @CPPFLAGS@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -fPIC
- 
- # Information determined by configure.
- DEFS = @DEFS@
diff --git a/math/octave/files/patch-mkoctfile.in b/math/octave/files/patch-mkoctfile.in
index 0eb4c4c552b4..23a1315142df 100644
--- a/math/octave/files/patch-mkoctfile.in
+++ b/math/octave/files/patch-mkoctfile.in
@@ -1,11 +1,11 @@
---- mkoctfile.in.orig	Thu Jan  2 22:55:47 2003
-+++ mkoctfile.in	Wed Oct 22 10:04:01 2003
-@@ -182,7 +182,7 @@
+--- mkoctfile.in.orig	Sun Mar 27 14:13:29 2005
++++ mkoctfile.in	Wed May 25 23:00:43 2005
+@@ -184,7 +184,7 @@
      -D*)
        defs="$defs $1"
      ;;
--    -[lL]*)
-+    -[lL]* | -pthread)
+-    -[lLR]*)
++    -[lLR]* | -pthread)
        ldflags="$ldflags $1"
      ;;
      -M | --depend)