- 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.

7 files changed, 97 insertions, 2 deletions

diff --git a/math/octave-forge/Makefile b/math/octave-forge/Makefile
index 0a734477dae..491372e7506 100644
--- a/math/octave-forge/Makefile
+++ b/math/octave-forge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/12/05 09:03:42 adam Exp $
+# $NetBSD: Makefile,v 1.7 2005/03/14 04:08:42 dmcmahill Exp $
 
 DISTNAME=	octave-forge-2004.11.16
 CATEGORIES=	cad
@@ -30,6 +30,7 @@ TEST_TARGET=	check
 
 GCC_REQD=	3.0
 USE_LANGUAGES=	c c++ fortran
+F77=	${FC}
 
 .include "../../math/octave-current/octave.mk"
 
diff --git a/math/octave-forge/distinfo b/math/octave-forge/distinfo
index fc8ed8783ed..aa9a040d387 100644
--- a/math/octave-forge/distinfo
+++ b/math/octave-forge/distinfo
@@ -1,11 +1,16 @@
-$NetBSD: distinfo,v 1.5 2005/03/13 15:49:03 dmcmahill Exp $
+$NetBSD: distinfo,v 1.6 2005/03/14 04:08:42 dmcmahill Exp $
 
 SHA1 (octave-forge-2004.11.16.tar.gz) = a27dbccd1665eb99b1457d23c1ac6b75eb3a9800
 RMD160 (octave-forge-2004.11.16.tar.gz) = 9356864920a5a4d4a4c1786c3ea74be0ec1e760d
 Size (octave-forge-2004.11.16.tar.gz) = 3639093 bytes
 SHA1 (patch-aa) = 1723f94e7532dd8ddd691bf5a348c5447b4d312b
 SHA1 (patch-ab) = a9c46217e12f9278dfa9123707183c6d9e702070
+SHA1 (patch-ac) = fdd01692f5f762da42551a816972a80eb27a3819
 SHA1 (patch-ad) = 463f05f1061f4ff0e28f91f04be0aee348044ef8
+SHA1 (patch-ae) = 03a320acda082e968868795298de0424871d327b
 SHA1 (patch-af) = f3920b982014a06ecc5aac8d99e527918bf5e4c1
 SHA1 (patch-ag) = 3a9f2dede5f5b59b7997b76357707385806d7873
+SHA1 (patch-ah) = f772adbe28cacfb865f88a741797de117903d1cf
+SHA1 (patch-ai) = 6a6e49edd42115952203ebf33f0bd110e5e908a2
 SHA1 (patch-ak) = 49c63b4b2a92cb971410f325a077152d7b5ebcd8
+SHA1 (patch-al) = 716612d9cb33c4f384f1d40c5c48943e6f71b84e
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
+