diff options
author | dmcmahill <dmcmahill> | 2005-03-14 04:08:42 +0000 |
---|---|---|
committer | dmcmahill <dmcmahill> | 2005-03-14 04:08:42 +0000 |
commit | df2404ac8a46ae960bbcb2329a5bed71c6d4e055 (patch) | |
tree | f362fa38f55e47aaf0dd37468625f56c8d6ddfaa /math/octave-forge/patches | |
parent | fadc49cbe2bf14599cd41ab246b9aba2a341b8b8 (diff) | |
download | pkgsrc-df2404ac8a46ae960bbcb2329a5bed71c6d4e055.tar.gz |
- don't hard code /bin/sh (use the configured shell). Needed to
get a working shell on solaris.
- fix a header file
- avoid passing invalid parameters to mkoctfile.
octave-forge now works on solaris too.
Diffstat (limited to 'math/octave-forge/patches')
-rw-r--r-- | math/octave-forge/patches/patch-ac | 13 | ||||
-rw-r--r-- | math/octave-forge/patches/patch-ae | 13 | ||||
-rw-r--r-- | math/octave-forge/patches/patch-ah | 13 | ||||
-rw-r--r-- | math/octave-forge/patches/patch-ai | 13 | ||||
-rw-r--r-- | math/octave-forge/patches/patch-al | 37 |
5 files changed, 89 insertions, 0 deletions
diff --git a/math/octave-forge/patches/patch-ac b/math/octave-forge/patches/patch-ac new file mode 100644 index 00000000000..d45e326ba9c --- /dev/null +++ b/math/octave-forge/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.4 2005/03/14 04:08:42 dmcmahill Exp $ + +--- FIXES/randmtzig.c.orig 2004-11-08 06:41:25.000000000 -0500 ++++ FIXES/randmtzig.c +@@ -147,7 +147,7 @@ + unsigned long long uint64_t; + instead. + */ +-#include <stdint.h> ++#include <sys/types.h> + + + /* XXX FIXME XXX may want to suppress X86 if sizeof(long)>4 */ diff --git a/math/octave-forge/patches/patch-ae b/math/octave-forge/patches/patch-ae new file mode 100644 index 00000000000..18255ecc937 --- /dev/null +++ b/math/octave-forge/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.4 2005/03/14 04:08:42 dmcmahill Exp $ + +--- Makeconf.base.orig 2004-11-16 05:31:57.000000000 -0500 ++++ Makeconf.base +@@ -6,7 +6,7 @@ + + OCTAVE_FORGE = 1 + +-SHELL = /bin/sh ++SHELL = @SHELL@ + + canonical_host_type = @canonical_host_type@ + prefix = @prefix@ diff --git a/math/octave-forge/patches/patch-ah b/math/octave-forge/patches/patch-ah new file mode 100644 index 00000000000..fdb4a2cb499 --- /dev/null +++ b/math/octave-forge/patches/patch-ah @@ -0,0 +1,13 @@ +$NetBSD: patch-ah,v 1.4 2005/03/14 04:08:42 dmcmahill Exp $ + +--- main/gsl/Makefile.orig 2004-07-14 15:59:13.000000000 -0400 ++++ main/gsl/Makefile +@@ -21,7 +21,7 @@ endif + $(PROGS): Makefile + + gsl_sf.cc: $(SF_BUILDSCRIPT) +- /bin/sh $(SF_BUILDSCRIPT) ++ ${SHELL} $(SF_BUILDSCRIPT) + + $(SF_LINKS): + -$(RM) -f $@ diff --git a/math/octave-forge/patches/patch-ai b/math/octave-forge/patches/patch-ai new file mode 100644 index 00000000000..3b668deb28a --- /dev/null +++ b/math/octave-forge/patches/patch-ai @@ -0,0 +1,13 @@ +$NetBSD: patch-ai,v 1.4 2005/03/14 04:08:42 dmcmahill Exp $ + +--- Makeconf.in.orig 2004-11-16 20:02:36.000000000 -0500 ++++ Makeconf.in +@@ -6,7 +6,7 @@ + + OCTAVE_FORGE = 1 + +-SHELL = /bin/sh ++SHELL = @SHELL@ + + canonical_host_type = @canonical_host_type@ + prefix = @prefix@ diff --git a/math/octave-forge/patches/patch-al b/math/octave-forge/patches/patch-al new file mode 100644 index 00000000000..ec7863ec595 --- /dev/null +++ b/math/octave-forge/patches/patch-al @@ -0,0 +1,37 @@ +$NetBSD: patch-al,v 1.1 2005/03/14 04:08:42 dmcmahill Exp $ + +sometimes X_LIBS ends up with "-Rpath" in it but mkoctfile doesn't +understand that (yet). In an upcoming octave-current release, that +should be fixed. + +--- main/plot/Makefile.orig 2004-01-12 02:39:09.000000000 -0500 ++++ main/plot/Makefile +@@ -9,6 +9,7 @@ ifndef OCTAVE_FORGE + X_LIBS = -L/usr/X11R6/lib + endif + ++X_LIBS2= $(filter-out -R%, ${X_LIBS}) + + %.o: %.cc ; $(MKOCTFILE) -c $(X_CFLAGS) $< + +@@ -22,16 +23,16 @@ endif + $(PROGS:.oct=.o): graphics.h + + grab.oct: grab.o graphics.o +- $(MKOCTFILE) $< graphics.o $(X_LIBS) -o $@ ++ $(MKOCTFILE) $< graphics.o $(X_LIBS2) -o $@ + + gpick.oct: gpick.o graphics.o +- $(MKOCTFILE) $< graphics.o $(X_LIBS) -o $@ ++ $(MKOCTFILE) $< graphics.o $(X_LIBS2) -o $@ + + gtext.oct: gtext.o graphics.o +- $(MKOCTFILE) $< graphics.o $(X_LIBS) -o $@ ++ $(MKOCTFILE) $< graphics.o $(X_LIBS2) -o $@ + + gzoom.oct: gzoom.o graphics.o +- $(MKOCTFILE) $< graphics.o $(X_LIBS) -o $@ ++ $(MKOCTFILE) $< graphics.o $(X_LIBS2) -o $@ + + clean: ; -$(RM) *.o octave-core core *~ *.oct + |