From f87963630cbb4fc06b7cf8102af1187e3cedcc28 Mon Sep 17 00:00:00 2001 From: Jean-Yves Lefort Date: Thu, 26 May 2005 17:32:40 +0000 Subject: [1]: - Update to 2.1.71 - Use ${INFO} Moreover: - Polish the Makefile PR: ports/81482 [1] Submitted by: Johan van Selst [1] --- math/octave-devel/files/octave | 8 -------- math/octave-devel/files/octave.in | 8 ++++++++ math/octave-devel/files/patch-aa | 8 ++++---- math/octave-devel/files/patch-doc:interpreter:Makefile.in | 10 +++++----- math/octave-devel/files/patch-glob.h | 14 -------------- math/octave-devel/files/patch-glob::Makefile.in | 11 ----------- math/octave-devel/files/patch-mkoctfile.in | 10 +++++----- 7 files changed, 22 insertions(+), 47 deletions(-) delete mode 100644 math/octave-devel/files/octave create mode 100644 math/octave-devel/files/octave.in delete mode 100644 math/octave-devel/files/patch-glob.h delete mode 100644 math/octave-devel/files/patch-glob::Makefile.in (limited to 'math/octave-devel/files') diff --git a/math/octave-devel/files/octave b/math/octave-devel/files/octave deleted file mode 100644 index 5910ee467fee..000000000000 --- a/math/octave-devel/files/octave +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ - -OCTAVE_EXEC=%%PREFIX%%/bin/octave-%%OCTAVE_VERSION%% -LD_LIBRARY_PATH=%%PREFIX%%/lib/octave-%%OCTAVE_VERSION%%; export LD_LIBRARY_PATH - -exec $OCTAVE_EXEC "$@" diff --git a/math/octave-devel/files/octave.in b/math/octave-devel/files/octave.in new file mode 100644 index 000000000000..02b15598e3da --- /dev/null +++ b/math/octave-devel/files/octave.in @@ -0,0 +1,8 @@ +#!/bin/sh +# +# $FreeBSD: /tmp/pcvs/ports/math/octave-devel/files/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 + +exec $OCTAVE_EXEC "$@" diff --git a/math/octave-devel/files/patch-aa b/math/octave-devel/files/patch-aa index e1e8e37f36a1..2e4bfbb01073 100644 --- a/math/octave-devel/files/patch-aa +++ b/math/octave-devel/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-devel/files/patch-doc:interpreter:Makefile.in b/math/octave-devel/files/patch-doc:interpreter:Makefile.in index 476c0a918e5d..f5e55d53ac7f 100644 --- a/math/octave-devel/files/patch-doc:interpreter:Makefile.in +++ b/math/octave-devel/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-devel/files/patch-glob.h b/math/octave-devel/files/patch-glob.h deleted file mode 100644 index a5946bc37fc7..000000000000 --- a/math/octave-devel/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 -+#endif - # else - /* This is a guess. */ - /*hb diff --git a/math/octave-devel/files/patch-glob::Makefile.in b/math/octave-devel/files/patch-glob::Makefile.in deleted file mode 100644 index 8a80c4b52029..000000000000 --- a/math/octave-devel/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-devel/files/patch-mkoctfile.in b/math/octave-devel/files/patch-mkoctfile.in index 0eb4c4c552b4..23a1315142df 100644 --- a/math/octave-devel/files/patch-mkoctfile.in +++ b/math/octave-devel/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) -- cgit v1.2.3