mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-02 06:03:50 +00:00
Code Issues Releases Activity

Update to 2.9.9.

Browse Source
This commit is contained in:
Maho Nakata 2006-12-27 03:36:46 +00:00
parent d504d9eccf
commit ff7d842637
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=180832
5 changed files with 7 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
math/octave-devel/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= octave
PORTVERSION= 2.9.8
PORTVERSION= 2.9.9
CATEGORIES= math
MASTER_SITES= ftp://ftp.octave.org/pub/octave/bleeding-edge/ \
ftp://ftp.eos.hokudai.ac.jp/pub/GNU/misc/octave/bleeding-edge/\

6
math/octave-devel/distinfo
View File

@ -1,3 +1,3 @@
MD5 (octave-2.9.8.tar.bz2) = 1ccc06e00de7e61cc92e245bd48024a6
SHA256 (octave-2.9.8.tar.bz2) = 81d619bd8fe316ca484f59d3e99131583483e22c86df62ff8c609ba0a5fc1017
SIZE (octave-2.9.8.tar.bz2) = 6993919
MD5 (octave-2.9.9.tar.bz2) = a76a6d88f414285472896a63e4282b7f
SHA256 (octave-2.9.9.tar.bz2) = bb593781c103f9ae1d7d24cb6a38980e50d5154312fd017ef114ef593054941f
SIZE (octave-2.9.9.tar.bz2) = 7025759

156
math/octave-devel/files/patch-liboctave+log2
View File

@ -1,156 +0,0 @@
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

33
math/octave-devel/files/patch-nosplitinfo
View File

@ -1,33 +0,0 @@
--- 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)

3
math/octave-devel/pkg-plist
View File

@ -659,6 +659,7 @@ libexec/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/sort.oct
libexec/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/sparse.oct
libexec/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/spchol.oct
libexec/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/spdet.oct
libexec/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/spfind.oct
libexec/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/spkron.oct
libexec/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/splu.oct
libexec/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/spparms.oct
@ -1079,6 +1080,7 @@ share/octave/%%OCTAVE_VERSION%%/m/miscellaneous/not.m
share/octave/%%OCTAVE_VERSION%%/m/miscellaneous/orderfields.m
share/octave/%%OCTAVE_VERSION%%/m/miscellaneous/pack.m
share/octave/%%OCTAVE_VERSION%%/m/miscellaneous/paren.m
share/octave/%%OCTAVE_VERSION%%/m/miscellaneous/parseparams.m
share/octave/%%OCTAVE_VERSION%%/m/miscellaneous/popen2.m
share/octave/%%OCTAVE_VERSION%%/m/miscellaneous/semicolon.m
share/octave/%%OCTAVE_VERSION%%/m/miscellaneous/setfield.m
@ -1107,6 +1109,7 @@ share/octave/%%OCTAVE_VERSION%%/m/pkg/pkg.m
share/octave/%%OCTAVE_VERSION%%/m/plot/__axis_label__.m
share/octave/%%OCTAVE_VERSION%%/m/plot/__errcomm__.m
share/octave/%%OCTAVE_VERSION%%/m/plot/__errplot__.m
share/octave/%%OCTAVE_VERSION%%/m/plot/__make_using_clause__.m
share/octave/%%OCTAVE_VERSION%%/m/plot/__plot_globals__.m
share/octave/%%OCTAVE_VERSION%%/m/plot/__plr1__.m
share/octave/%%OCTAVE_VERSION%%/m/plot/__plr2__.m