Add developer version of math/octave as math/octave-devel

https://www.cae.wisc.edu/pipermail/octave-maintainers/2006-August/000500.html

10 files changed, 219 insertions, 69 deletions

diff --git a/math/octave-devel/files/octave.in b/math/octave-devel/files/octave.in
index 30deeea52e4..e4536952856 100644
--- a/math/octave-devel/files/octave.in
+++ b/math/octave-devel/files/octave.in
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/math/octave-devel/files/octave.in,v 1.2 2006-07-09 02:02:27 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/math/octave-devel/files/octave.in,v 1.3 2006-09-03 20:45:53 maho Exp $
 
-OCTAVE_EXEC=%%PREFIX%%/libexec/octave/%%OCTAVE_VERSION%%/octave-%%OCTAVE_VERSION%%
+OCTAVE_EXEC=%%PREFIX%%/libexec/octave/%%OCTAVE_VERSION%%/exec/%%GNU_HOST%%/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
deleted file mode 100644
index d902a0ac32f..00000000000
--- a/math/octave-devel/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/liboctave/Makefile.in.orig	Tue Mar 21 06:10:52 2006
-+++ doc/liboctave/Makefile.in	Sat Jul  1 13:50:50 2006
-@@ -48,7 +48,7 @@
- .PHONY: all
- 
- liboctave.info: $(TEXINFO)
--	-$(MAKEINFO) -I$(srcdir) -I$(srcdir)/.. $<
-+	-$(MAKEINFO) --force --no-split -I$(srcdir) -I$(srcdir)/.. $<
- 
- liboctave.dvi: $(TEXINFO)
- 	-TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):" $(TEXI2DVI) $<
diff --git a/math/octave-devel/files/patch-ab b/math/octave-devel/files/patch-ab
deleted file mode 100644
index 37667cf58d8..00000000000
--- a/math/octave-devel/files/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig	Wed May  7 04:08:03 2003
-+++ configure	Tue Jun 10 01:14:35 2003
-@@ -700,7 +700,6 @@
- fi
- 
- ac_tool_prefix=
--test -n "$host_alias" && ac_tool_prefix=$host_alias-
- 
- test "$silent" = yes && exec 6>/dev/null
- 
-@@ -18767,6 +18766,9 @@
- 	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
- 
- unwind-prot.o: unwind-prot.cc
-+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
-+
-+xdiv.o: xdiv.cc
- 	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
- 
- EOF
diff --git a/math/octave-devel/files/patch-ag b/math/octave-devel/files/patch-ag
deleted file mode 100644
index dbabcbe4213..00000000000
--- a/math/octave-devel/files/patch-ag
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/sysdep.cc.orig	Sat Jan  4 15:21:29 2003
-+++ src/sysdep.cc	Tue Jun 10 01:23:09 2003
-@@ -98,7 +98,11 @@
- #ifndef FP_X_DNML
- #define FP_X_DNML 0
- #endif
-+#if defined(__alpha__)
-+  fpsetmask (~(FP_X_OFL|FP_X_INV|FP_X_DZ|FP_X_UFL|FP_X_IMP));
-+#else
-   fpsetmask (~(FP_X_OFL|FP_X_INV|FP_X_DZ|FP_X_DNML|FP_X_UFL|FP_X_IMP));
-+#endif
- #endif
- }
- #endif
diff --git a/math/octave-devel/files/patch-doc:interpreter:Makefile.in b/math/octave-devel/files/patch-doc:interpreter:Makefile.in
deleted file mode 100644
index 26afc3096a9..00000000000
--- a/math/octave-devel/files/patch-doc:interpreter:Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/interpreter/Makefile.in.orig	Tue Mar 21 06:10:52 2006
-+++ doc/interpreter/Makefile.in	Sat Jul  1 13:52:37 2006
-@@ -89,7 +89,7 @@
- 	@$(top_srcdir)/move-if-change $@.t $@
- 
- octave.info: $(TEXINFO)
--	-$(MAKEINFO) -I$(srcdir) -I$(srcdir)/.. $<
-+	-$(MAKEINFO) --no-split -I$(srcdir) -I$(srcdir)/.. $<
- 
- octave.dvi: $(TEXINFO)
- 	-TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):" $(TEXI2DVI) $<
diff --git a/math/octave-devel/files/patch-examples+Makefile.in b/math/octave-devel/files/patch-examples+Makefile.in
new file mode 100644
index 00000000000..8e1f7cf4dbd
--- /dev/null
+++ b/math/octave-devel/files/patch-examples+Makefile.in
@@ -0,0 +1,17 @@
+--- examples/Makefile.in~	Wed Dec 14 12:13:54 2005
++++ examples/Makefile.in	Wed Jul  5 12:59:06 2006
+@@ -51,10 +51,10 @@
+ 	  rm -f $(DESTDIR)$(imagedir)/$$f; \
+ 	  $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(imagedir)/$$f; \
+ 	done
+-	if test -n "$(DESKTOP_FILE_INSTALL)"; then \
+-	  $(DESKTOP_FILE_INSTALL) --dir=$(DESTDIR)$(datadir)/applications \
+-	    --vendor www.octave.org octave.desktop; \
+-	fi
++#	if test -n "$(DESKTOP_FILE_INSTALL)"; then \
++#	  $(DESKTOP_FILE_INSTALL) --dir=$(DESTDIR)$(datadir)/applications \
++#	    --vendor www.octave.org octave.desktop; \
++#	fi
+ .PHONY: install install-strip
+ 
+ tags:
diff --git a/math/octave-devel/files/patch-liboctave+log2 b/math/octave-devel/files/patch-liboctave+log2
new file mode 100644
index 00000000000..77160c637e3
--- /dev/null
+++ b/math/octave-devel/files/patch-liboctave+log2
@@ -0,0 +1,156 @@
+implimentation of log2 was taken from here
+http://www.freebsd.org/cgi/cvsweb.cgi/ports/graphics/inkscape/files/patch-src_trace_potrace_inkscape-potrace.cpp
+http://www.freebsd.org/cgi/query-pr.cgi?pr=83845
+
+--- liboctave/CmplxDET.cc.orig	Thu Mar  2 12:40:01 2006
++++ liboctave/CmplxDET.cc	Tue Jul  4 21:10:43 2006
+@@ -33,6 +33,8 @@
+ #include "lo-mappers.h"
+ #include "oct-cmplx.h"
+ 
++#include "log2.h"
++
+ bool
+ ComplexDET::value_will_overflow (void) const
+ {
+--- liboctave/dbleDET.cc.orig	Thu Jul 27 02:19:10 2006
++++ liboctave/dbleDET.cc	Thu Aug 31 16:05:44 2006
+@@ -29,6 +29,7 @@
+ #include <cmath>
+ 
+ #include "dbleDET.h"
++#include "log2.h"
+ #include "lo-mappers.h"
+ 
+ bool
+@@ -64,7 +65,7 @@
+ {
+   if (c10 != 0.0)
+     {
+-      double etmp = e10 / log10 (2);
++      double etmp = e10 /  __builtin_log10 (2);
+       e2 = static_cast<int> (xround (etmp));
+       etmp -= e2;
+       c2 = c10 * xexp2 (etmp);
+--- /dev/null	Tue Jul  4 21:11:00 2006
++++ liboctave/log2.h	Tue Jul  4 21:09:55 2006
+@@ -0,0 +1,118 @@
++#ifndef log2
++static const double
++ln2 = 0.6931471805599452862268,
++two54   =  1.80143985094819840000e+16,  /* 43500000 00000000 */
++Lg1 = 6.666666666666735130e-01,  /* 3FE55555 55555593 */
++Lg2 = 3.999999999940941908e-01,  /* 3FD99999 9997FA04 */
++Lg3 = 2.857142874366239149e-01,  /* 3FD24924 94229359 */
++Lg4 = 2.222219843214978396e-01,  /* 3FCC71C5 1D8E78AF */
++Lg5 = 1.818357216161805012e-01,  /* 3FC74664 96CB03DE */
++Lg6 = 1.531383769920937332e-01,  /* 3FC39A09 D078C69F */
++Lg7 = 1.479819860511658591e-01;  /* 3FC2F112 DF3E5244 */
++
++static const double zero = 0.0;
++
++#if BYTE_ORDER == BIG_ENDIAN
++
++typedef union
++{
++      double value;
++        struct
++	      {
++		      u_int32_t msw;
++		          u_int32_t lsw;
++			    } parts;
++} ieee_double_shape_type;
++
++#endif
++
++#if BYTE_ORDER == LITTLE_ENDIAN
++
++typedef union
++{
++      double value;
++        struct
++	      {
++		      u_int32_t lsw;
++		          u_int32_t msw;
++			    } parts;
++} ieee_double_shape_type;
++
++#endif
++
++#define EXTRACT_WORDS(ix0,ix1,d)                                \
++    do {                                                            \
++	  ieee_double_shape_type ew_u;                                  \
++	  ew_u.value = (d);                                             \
++	  (ix0) = ew_u.parts.msw;                                       \
++	  (ix1) = ew_u.parts.lsw;                                       \
++    } while (0)
++
++#define GET_HIGH_WORD(i,d)                                      \
++    do {                                                            \
++	  ieee_double_shape_type gh_u;                                  \
++	  gh_u.value = (d);                                             \
++	  (i) = gh_u.parts.msw;                                         \
++    } while (0)
++
++#define SET_HIGH_WORD(d,v)                                      \
++    do {                                                            \
++	  ieee_double_shape_type sh_u;                                  \
++	  sh_u.value = (d);                                             \
++	  sh_u.parts.msw = (v);                                         \
++	  (d) = sh_u.value;                                             \
++    } while (0)
++
++static double
++_log2(double x)
++{
++    double hfsq,f,s,z,R,w,t1,t2,dk;
++    int32_t k,hx,i,j;
++    u_int32_t lx;
++
++    EXTRACT_WORDS(hx,lx,x);
++
++    k=0;
++    if (hx < 0x00100000) {			/* x < 2**-1022  */
++	if (((hx&0x7fffffff)|lx)==0) 
++	    return -two54/zero;		/* log(+-0)=-inf */
++	if (hx<0) return (x-x)/zero;	/* log(-#) = NaN */
++	k -= 54; x *= two54; /* subnormal number, scale up x */
++	GET_HIGH_WORD(hx,x);
++    }
++    if (hx >= 0x7ff00000) return x+x;
++    k += (hx>>20)-1023;
++    hx &= 0x000fffff;
++    i = (hx+0x95f64)&0x100000;
++    SET_HIGH_WORD(x,hx|(i^0x3ff00000));	/* normalize x or x/2 */
++    k += (i>>20);
++    f = x-1.0;
++    dk = (double)k;
++    if((0x000fffff&(2+hx))<3) {	/* |f| < 2**-20 */
++	if (f==zero)
++	    return (dk);
++	R = f*f*(0.5-0.33333333333333333*f);
++	return (dk-(R-f)/ln2);
++    }
++    s = f/(2.0+f);
++    z = s*s;
++    i = hx-0x6147a;
++    w = z*z;
++    j = 0x6b851-hx;
++    t1= w*(Lg2+w*(Lg4+w*Lg6));
++    t2= z*(Lg1+w*(Lg3+w*(Lg5+w*Lg7)));
++    i |= j;
++    R = t2+t1;
++    if(i>0) {
++	hfsq=0.5*f*f;
++	return (dk-(hfsq-s*(hfsq+R)-f)/ln2);
++    } else
++	return (dk-((s*(f-R))-f)/ln2);
++}
++
++#define log2(x) _log2(x)
++#endif
++
++ 
++ 
++ 
+k
\ No newline at end of file
diff --git a/math/octave-devel/files/patch-mkoctfile.in b/math/octave-devel/files/patch-mkoctfile.in
deleted file mode 100644
index 23a1315142d..00000000000
--- a/math/octave-devel/files/patch-mkoctfile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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"
-     ;;
--    -[lLR]*)
-+    -[lLR]* | -pthread)
-       ldflags="$ldflags $1"
-     ;;
-     -M | --depend)
diff --git a/math/octave-devel/files/patch-nosplitinfo b/math/octave-devel/files/patch-nosplitinfo
new file mode 100644
index 00000000000..7c56511609e
--- /dev/null
+++ b/math/octave-devel/files/patch-nosplitinfo
@@ -0,0 +1,33 @@
+--- doc/liboctave/Makefile.in~	Thu Mar 23 07:25:59 2006
++++ doc/liboctave/Makefile.in	Thu Jul  6 14:23:54 2006
+@@ -47,7 +47,7 @@
+ .PHONY: all
+ 
+ liboctave.info: $(TEXINFO)
+-	-$(MAKEINFO) -I.. -I$(srcdir) -I$(srcdir)/.. $<
++	-$(MAKEINFO) --force --no-split -I.. -I$(srcdir) -I$(srcdir)/.. $<
+ 
+ liboctave.dvi: $(TEXINFO)
+ 	-TEXINPUTS="..:$(srcdir):$(srcdir)/..:$(TEXINPUTS):" $(TEXI2DVI) $<
+--- doc/faq/Makefile.in~	Thu Mar 23 07:25:59 2006
++++ doc/faq/Makefile.in	Thu Jul  6 14:25:08 2006
+@@ -39,7 +39,7 @@
+ .PHONY: all
+ 
+ Octave-FAQ.info: $(TEXINFO)
+-	-$(MAKEINFO) -I.. -I$(srcdir) -I$(srcdir)/.. $<
++	-$(MAKEINFO) --force --no-split -I.. -I$(srcdir) -I$(srcdir)/.. $<
+ 
+ Octave-FAQ.dvi: $(TEXINFO)
+ 	-TEXINPUTS="..:$(srcdir):$(srcdir)/..:$(TEXINPUTS):" $(TEXI2DVI) $<
+--- doc/interpreter/Makefile.in~	Thu Jun 29 01:05:22 2006
++++ doc/interpreter/Makefile.in	Thu Jul  6 14:26:40 2006
+@@ -95,7 +95,7 @@
+ .PHONY: stamp-images
+ 
+ octave.info: stamp-images $(TEXINFO)
+-	-$(MAKEINFO) -I.. -I$(srcdir) -I$(srcdir)/.. -I$(IMAGEDIR) $(MAIN_TEXINFO)
++	-$(MAKEINFO) --force --no-split -I.. -I$(srcdir) -I$(srcdir)/.. -I$(IMAGEDIR) $(MAIN_TEXINFO)
+ 
+ octave.dvi: stamp-images $(TEXINFO)
+ 	-TEXINPUTS="..:$(srcdir):$(srcdir)/..:$(IMAGEDIR):$(TEXINPUTS):" $(TEXI2DVI) $(MAIN_TEXINFO)
diff --git a/math/octave-devel/files/patch-src+Makefile.in b/math/octave-devel/files/patch-src+Makefile.in
new file mode 100644
index 00000000000..e65433ef1cf
--- /dev/null
+++ b/math/octave-devel/files/patch-src+Makefile.in
@@ -0,0 +1,11 @@
+--- src/Makefile.in~	Fri Jun  9 05:37:29 2006
++++ src/Makefile.in	Tue Jul  4 17:45:18 2006
+@@ -311,7 +311,7 @@
+ 	$(OCTAVE_LIBS) \
+ 	$(LEXLIB) $(UMFPACK_LIBS) $(AMD_LIBS) $(COLAMD_LIBS) \
+ 	$(CHOLMOD_LIBS) $(CCOLAMD_LIBS) $(CXSPARSE_LIBS) $(BLAS_LIBS) \
+-	$(FFTW_LIBS) $(LIBS) $(FLIBS)
++	$(FFTW_LIBS) $(LIBS) $(FLIBS) -lcamd
+ 
+ stmp-pic: pic
+ 	@if [ -f stmp-pic ]; then \