summaryrefslogtreecommitdiff
path: root/math/octave/patches
diff options
context:
space:
mode:
Diffstat (limited to 'math/octave/patches')
-rw-r--r--math/octave/patches/patch-aa57
-rw-r--r--math/octave/patches/patch-ab23
-rw-r--r--math/octave/patches/patch-ac20
-rw-r--r--math/octave/patches/patch-ad26
-rw-r--r--math/octave/patches/patch-ae8
-rw-r--r--math/octave/patches/patch-af26
-rw-r--r--math/octave/patches/patch-ag53
-rw-r--r--math/octave/patches/patch-ah6
-rw-r--r--math/octave/patches/patch-ai23
-rw-r--r--math/octave/patches/patch-aj13
10 files changed, 140 insertions, 115 deletions
diff --git a/math/octave/patches/patch-aa b/math/octave/patches/patch-aa
index 15514400b46..64703746eb5 100644
--- a/math/octave/patches/patch-aa
+++ b/math/octave/patches/patch-aa
@@ -1,58 +1,13 @@
-$NetBSD: patch-aa,v 1.11 2005/07/01 11:49:02 adam Exp $
+$NetBSD: patch-aa,v 1.12 2008/01/11 01:23:44 adam Exp $
---- configure.orig 2005-05-18 20:25:53.000000000 +0000
+--- configure.orig 2007-12-05 16:41:30.000000000 +0100
+++ configure
-@@ -8823,7 +8823,7 @@ if $have_fortran_compiler; then
- %.c : %.f
-
- %.o : %.f
-- $(FC) -c $(ALL_FFLAGS) -o $@ $<
-+ ${LIBTOOL} --mode=compile --tag=CC $(FC) -c $(ALL_FFLAGS) $<
-
- pic/%.o : %.f
- $(FC) -c $(FPICFLAG) $(ALL_FFLAGS) $< -o $@
-@@ -11033,7 +11033,7 @@ TEMPLATE_AR='$(AR)'
- TEMPLATE_ARFLAGS="$ARFLAGS"
+@@ -15732,7 +15732,7 @@ OCTAVE_DLL_DEFS=
+ OCTINTERP_DLL_DEFS=
library_path_var=LD_LIBRARY_PATH
case "$canonical_host_type" in
-- *-*-386bsd* | *-*-openbsd* | *-*-netbsd*)
-+ *-*-386bsd* | *-*-openbsd* )
+- *-*-386bsd* | *-*-netbsd*)
++ *-*-386bsd*)
SH_LD=ld
SH_LDFLAGS=-Bshareable
;;
-@@ -20486,19 +20486,19 @@ case "$canonical_host_type" in
- cat << \EOF > $bsd_gcc_kluge_targets_frag
-
- lex.o: lex.cc
-- $(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
-+ ${LIBTOOL} --mode=compile $(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
-
- pt-plot.o: pt-plot.cc
-- $(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
-+ ${LIBTOOL} --mode=compile $(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
-
- symtab.o: symtab.cc
-- $(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
-+ ${LIBTOOL} --mode=compile $(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
-
- toplev.o: toplev.cc
-- $(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
-+ ${LIBTOOL} --mode=compile $(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
-
- unwind-prot.o: unwind-prot.cc
-- $(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
-+ ${LIBTOOL} --mode=compile $(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
-
- EOF
- ;;
-@@ -20626,9 +20626,9 @@ then
- rm -rf "$tmp"
-
- fi
-+SED=$octave_cv_path_sed
-
- fi
--SED=$octave_cv_path_sed
-
- echo "$as_me:$LINENO: result: $SED" >&5
- echo "${ECHO_T}$SED" >&6
diff --git a/math/octave/patches/patch-ab b/math/octave/patches/patch-ab
new file mode 100644
index 00000000000..f98eeaef008
--- /dev/null
+++ b/math/octave/patches/patch-ab
@@ -0,0 +1,23 @@
+$NetBSD: patch-ab,v 1.3 2008/01/11 01:23:44 adam Exp $
+
+--- src/DLD-FUNCTIONS/__glpk__.cc.orig 2007-10-12 23:27:34.000000000 +0200
++++ src/DLD-FUNCTIONS/__glpk__.cc
+@@ -25,6 +25,7 @@ along with Octave; see the file COPYING.
+ #endif
+
+ #include <cfloat>
++#include <cmath>
+ #include <csetjmp>
+ #include <ctime>
+
+@@ -35,6 +36,10 @@ along with Octave; see the file COPYING.
+ #include "oct-obj.h"
+ #include "pager.h"
+
++#if defined(_GLIBCXX_USE_C99_MATH) && !defined(_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC)
++using std::isinf;
++#endif
++
+ #if defined (HAVE_GLPK)
+
+ extern "C"
diff --git a/math/octave/patches/patch-ac b/math/octave/patches/patch-ac
index 759e32b58c5..e85602e5214 100644
--- a/math/octave/patches/patch-ac
+++ b/math/octave/patches/patch-ac
@@ -1,17 +1,17 @@
-$NetBSD: patch-ac,v 1.5 2005/07/01 11:49:02 adam Exp $
+$NetBSD: patch-ac,v 1.6 2008/01/11 01:23:44 adam Exp $
---- Makeconf.in.orig 2005-05-18 12:19:58.000000000 +0000
+--- Makeconf.in.orig 2007-12-04 21:51:25.000000000 +0100
+++ Makeconf.in
-@@ -73,7 +73,7 @@ SHLBIN = @SHLBIN@
+@@ -95,7 +95,7 @@ SHLBIN = @SHLBIN@
SHLBIN_VER = @SHLBIN_VER@
SHLLINKEXT=
-LIBEXT = a
+LIBEXT = la
+ LIBPRE = @LIBPRE@
# Fortran to C translator and associated flags.
-
-@@ -157,7 +157,7 @@ BUILD_LDFLAGS = @BUILD_LDFLAGS@
+@@ -195,7 +195,7 @@ BUILD_LDFLAGS = @BUILD_LDFLAGS@
SH_LD = @SH_LD@
SH_LDFLAGS = @SH_LDFLAGS@
@@ -20,9 +20,13 @@ $NetBSD: patch-ac,v 1.5 2005/07/01 11:49:02 adam Exp $
DL_LDFLAGS = @DL_LDFLAGS@
SONAME_FLAGS = @SONAME_FLAGS@
-@@ -335,10 +335,10 @@ NO_OCT_FILE_STRIP = @NO_OCT_FILE_STRIP@
+@@ -365,13 +365,13 @@ NO_OCT_FILE_STRIP = @NO_OCT_FILE_STRIP@
# How to make .o files:
+ %.o : %.f
+- $(FC) -c $(ALL_FFLAGS) -o $@ $<
++ ${LIBTOOL} --mode=compile $(FC) -c $(ALL_FFLAGS) -o $@ $<
+
%.o : %.c
- $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< -o $@
+ ${LIBTOOL} --mode=compile $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< -o $@
@@ -31,5 +35,5 @@ $NetBSD: patch-ac,v 1.5 2005/07/01 11:49:02 adam Exp $
- $(CXX) -c $(CPPFLAGS) $(ALL_CXXFLAGS) $< -o $@
+ ${LIBTOOL} --mode=compile $(CXX) -c $(CPPFLAGS) $(ALL_CXXFLAGS) $< -o $@
- pic/%.o : %.c
- $(CC) -c $(CPPFLAGS) $(CPICFLAG) $(ALL_CFLAGS) $< -o $@
+ pic/%.o : %.f
+ $(FC) -c $(FPICFLAG) $(ALL_FFLAGS) $< -o $@
diff --git a/math/octave/patches/patch-ad b/math/octave/patches/patch-ad
index 3cf237d0168..ef769c72c7f 100644
--- a/math/octave/patches/patch-ad
+++ b/math/octave/patches/patch-ad
@@ -1,27 +1,27 @@
-$NetBSD: patch-ad,v 1.3 2005/04/01 10:16:24 adam Exp $
+$NetBSD: patch-ad,v 1.4 2008/01/11 01:23:44 adam Exp $
---- libcruft/Makefile.in.orig 2004-02-16 19:57:21.000000000 +0000
+--- libcruft/Makefile.in.orig 2007-10-12 23:27:12.000000000 +0200
+++ libcruft/Makefile.in
-@@ -98,8 +98,8 @@ libraries: $(SUBDIRS)
+@@ -121,8 +121,8 @@ libraries: cruft.def
- libcruft.$(LIBEXT): $(CRUFT_OBJ)
+ $(LIBPRE)cruft.$(LIBEXT): $(CRUFT_OBJ)
rm -f $@
- $(AR) $(ARFLAGS) $@ $^
- $(RANLIB) $@
+ ${LIBTOOL} --mode=link ${CC} -o libcruft.$(LIBEXT) $(CRUFT_OBJ:.o=.lo) \
-+ -rpath ${PREFIX}/lib -version-info ${version:2.1.%=2:%}
++ -rpath ${PREFIX}/lib -version-info ${version:3.0.%=3:%}
- libcruft.$(SHLEXT_VER): libcruft.$(SHLEXT)
+ $(LIBPRE)cruft.$(SHLEXT_VER): $(LIBPRE)cruft.$(SHLEXT)
rm -f $@
-@@ -124,9 +124,8 @@ install::
+@@ -147,9 +147,8 @@ install::
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir)
if $(STATIC_LIBS); then \
- rm -f $(DESTDIR)$(octlibdir)/libcruft.$(LIBEXT) ; \
-- $(INSTALL_DATA) libcruft.$(LIBEXT) \
-- $(DESTDIR)$(octlibdir)/libcruft.$(LIBEXT) ; \
-- $(RANLIB) $(DESTDIR)$(octlibdir)/libcruft.$(LIBEXT) ; \
+ rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(LIBEXT) ; \
+- $(INSTALL_DATA) $(LIBPRE)cruft.$(LIBEXT) \
+- $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(LIBEXT) ; \
+- $(RANLIB) $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(LIBEXT) ; \
+ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libcruft.$(LIBEXT) \
-+ ${PREFIX}/lib; \
++ ${PREFIX}/lib; \
fi
if $(SHARED_LIBS); then \
- rm -f $(DESTDIR)$(octlibdir)/libcruft.$(SHLLIB_VER); \
+ rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(SHLLIB_VER); \
diff --git a/math/octave/patches/patch-ae b/math/octave/patches/patch-ae
index 9bbb9030f56..37820a715bd 100644
--- a/math/octave/patches/patch-ae
+++ b/math/octave/patches/patch-ae
@@ -1,12 +1,12 @@
-$NetBSD: patch-ae,v 1.4 2005/04/01 10:15:47 adam Exp $
+$NetBSD: patch-ae,v 1.5 2008/01/11 01:23:44 adam Exp $
---- libcruft/misc/Makefile.in.orig 2003-11-20 13:50:06.000000000 +0100
+--- libcruft/misc/Makefile.in.orig 2007-10-12 23:27:12.000000000 +0200
+++ libcruft/misc/Makefile.in
-@@ -62,7 +62,7 @@ XCC = $(patsubst -O%, , $(CC))
+@@ -64,7 +64,7 @@ XCC = $(patsubst -O%, , $(CC))
XALL_CFLAGS = $(patsubst -O%, , $(ALL_CFLAGS))
machar.o: $(srcdir)/machar.c
-- $(XCC) -c $(CPPFLAGS) $(XALL_CFLAGS) -DDP $<
+- $(XCC) -c $(CPPFLAGS) $(XALL_CFLAGS) -DDP $< -o $@
+ ${LIBTOOL} --mode=compile $(XCC) -c $(CPPFLAGS) $(XALL_CFLAGS) -DDP $<
pic/machar.o: $(srcdir)/machar.c
diff --git a/math/octave/patches/patch-af b/math/octave/patches/patch-af
index 7a2991fbe50..6629a90b129 100644
--- a/math/octave/patches/patch-af
+++ b/math/octave/patches/patch-af
@@ -1,28 +1,28 @@
-$NetBSD: patch-af,v 1.3 2005/04/01 10:15:47 adam Exp $
+$NetBSD: patch-af,v 1.4 2008/01/11 01:23:44 adam Exp $
---- liboctave/Makefile.in.orig 2004-11-12 05:34:57.000000000 +0000
+--- liboctave/Makefile.in.orig 2007-11-30 19:53:30.000000000 +0100
+++ liboctave/Makefile.in
-@@ -208,8 +208,9 @@ endif
+@@ -256,8 +256,9 @@ endif
- liboctave.$(LIBEXT): $(LIBOCTAVE_OBJECTS)
+ $(LIBPRE)octave.$(LIBEXT): $(LIBOCTAVE_OBJECTS)
rm -f $@
- $(TEMPLATE_AR) $(TEMPLATE_ARFLAGS) $@ $(LIBOCTAVE_OBJECTS)
- $(RANLIB) $@
+ ${LIBTOOL} --mode=link ${CC} -o liboctave.$(LIBEXT) \
+ $(LIBOCTAVE_OBJECTS:.o=.lo) -rpath ${PREFIX}/lib \
-+ -version-info ${version:2.1.%=2:%}
++ -version-info ${version:3.0.%=3:%}
- liboctave.$(SHLEXT_VER): liboctave.$(SHLEXT)
+ $(LIBPRE)octave.$(SHLEXT_VER): $(LIBPRE)octave.$(SHLEXT)
rm -f $@
-@@ -236,9 +237,8 @@ install-lib:
+@@ -284,9 +285,8 @@ install-lib:
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir)
if $(STATIC_LIBS); then \
- rm -f $(DESTDIR)$(octlibdir)/liboctave.$(LIBEXT); \
-- $(INSTALL_DATA) liboctave.$(LIBEXT) \
-- $(DESTDIR)$(octlibdir)/liboctave.$(LIBEXT); \
-- $(RANLIB) $(DESTDIR)$(octlibdir)/liboctave.$(LIBEXT); \
+ rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(LIBEXT); \
+- $(INSTALL_DATA) $(LIBPRE)octave.$(LIBEXT) \
+- $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(LIBEXT); \
+- $(RANLIB) $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(LIBEXT); \
+ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} liboctave.$(LIBEXT) \
-+ ${PREFIX}/lib; \
++ ${PREFIX}/lib; \
fi
if $(SHARED_LIBS); then \
- rm -f $(DESTDIR)$(octlibdir)/liboctave.$(SHLLIB_VER); \
+ rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(SHLLIB_VER); \
diff --git a/math/octave/patches/patch-ag b/math/octave/patches/patch-ag
index 0a57be04e16..776881067d0 100644
--- a/math/octave/patches/patch-ag
+++ b/math/octave/patches/patch-ag
@@ -1,29 +1,36 @@
-$NetBSD: patch-ag,v 1.3 2005/04/01 10:15:47 adam Exp $
+$NetBSD: patch-ag,v 1.4 2008/01/11 01:23:44 adam Exp $
---- src/Makefile.in.orig 2004-11-12 05:34:58.000000000 +0000
+--- src/Makefile.in.orig 2007-12-05 18:08:28.000000000 +0100
+++ src/Makefile.in
-@@ -267,8 +267,9 @@ libraries: $(LIBRARIES)
+@@ -204,7 +204,7 @@ BUILT_EXTRAS := graphics.h mxarray.h
- liboctinterp.$(LIBEXT): $(OBJECTS) $(XERBLA)
+ EXTRAS := ov-base-int.cc ov-base-mat.cc ov-base-scalar.cc
+
+-EXTRA_OBJECTS := oct-errno.o octave.o builtins.o ops.o
++EXTRA_OBJECTS := oct-errno.o builtins.o ops.o
+
+ INCLUDES_FOR_INSTALL := $(INCLUDES) $(EXTRAS) $(BUILT_EXTRAS)
+
+@@ -318,8 +318,9 @@ libraries: $(LIBRARIES)
+
+ $(LIBPRE)octinterp.$(LIBEXT): $(OBJECTS) $(XERBLA)
rm -f $@
- $(TEMPLATE_AR) $(TEMPLATE_ARFLAGS) $@ $^
- $(RANLIB) $@
+ ${LIBTOOL} --mode=link ${CC} -o liboctinterp.$(LIBEXT) \
+ $(OBJECTS:.o=.lo) $(XERBLA:.o=.lo) -rpath ${PREFIX}/lib \
-+ -version-info ${version:2.1.%=2:%}
++ -version-info ${version:3.0.%=3:%}
- liboctinterp.$(SHLEXT_VER): liboctinterp.$(SHLEXT)
+ $(LIBPRE)octinterp.$(SHLEXT_VER): $(LIBPRE)octinterp.$(SHLEXT)
rm -f $@
-@@ -276,7 +277,7 @@ liboctinterp.$(SHLEXT_VER): liboctinterp
+@@ -327,12 +328,13 @@ $(LIBPRE)octinterp.$(SHLEXT_VER): $(LIBP
- liboctinterp.$(SHLEXT): $(PICOBJ) $(PIC_XERBLA)
+ $(LIBPRE)octinterp.$(SHLEXT): $(PICOBJ) $(PIC_XERBLA)
rm -f $@
- $(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ $^ $(OCTINTERP_LINK_DEPS)
+ ${LIBTOOL} --mode=link $(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ $^ $(OCTINTERP_LINK_DEPS)
- stamp-oct-links: $(OCT_FILES)
- if [ -n "$(OCT_FILES)" ]; then \
-@@ -288,6 +289,7 @@ stamp-prereq: defaults.h oct-conf.h oct-
+ stamp-prereq: defaults.h graphics.h oct-conf.h oct-gperf.h parse.cc lex.cc __gnuplot_raw__.cc $(OPT_HANDLERS)
touch stamp-prereq
octave$(EXEEXT): stamp-prereq $(LIBRARIES) main.o $(DLD_STATIC_OBJ)
@@ -31,31 +38,31 @@ $NetBSD: patch-ag,v 1.3 2005/04/01 10:15:47 adam Exp $
$(LD_CXX) $(CPPFLAGS) $(ALL_CXXFLAGS) $(RDYNAMIC_FLAG) \
$(ALL_LDFLAGS) -o $@ \
main.o $(DLD_STATIC_OBJ) \
-@@ -368,6 +370,7 @@ install-strip:
+@@ -421,6 +423,7 @@ install-strip:
install-bin:
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
rm -f $(DESTDIR)$(bindir)/octave$(EXEEXT)
+ ${LIBTOOL} --mode=install \
$(INSTALL_PROGRAM) octave$(EXEEXT) $(DESTDIR)$(bindir)/octave-$(version)$(EXEEXT)
- $(LN_S) octave-$(version)$(EXEEXT) $(DESTDIR)$(bindir)/octave$(EXEEXT)
+ cd $(DESTDIR)$(bindir) ; $(LN_S) octave-$(version)$(EXEEXT) octave$(EXEEXT)
.PHONY: install-bin
-@@ -377,6 +380,7 @@ install-oct:
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(octfiledir); \
+@@ -431,6 +434,7 @@ install-oct:
+ if [ -n "$(OCT_FILES)" ]; then \
xfiles="$(OCT_FILES)"; \
for f in $$xfiles; do \
+ ${LIBTOOL} --mode=install \
$(INSTALL_PROGRAM) $$f $(DESTDIR)$(octfiledir)/$$f; \
done; \
- $(srcdir)/mk-oct-links $(DESTDIR)$(octfiledir) $(DLD_DEF_FILES); \
-@@ -387,9 +391,8 @@ install-lib:
+ fi
+@@ -440,9 +444,8 @@ install-lib:
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir)
if $(STATIC_LIBS); then \
- rm -f $(DESTDIR)$(octlibdir)/liboctinterp.$(LIBEXT); \
-- $(INSTALL_DATA) liboctinterp.$(LIBEXT) \
-- $(DESTDIR)$(octlibdir)/liboctinterp.$(LIBEXT); \
-- $(RANLIB) $(DESTDIR)$(octlibdir)/liboctinterp.$(LIBEXT); \
+ rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(LIBEXT); \
+- $(INSTALL_DATA) $(LIBPRE)octinterp.$(LIBEXT) \
+- $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(LIBEXT); \
+- $(RANLIB) $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(LIBEXT); \
+ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} liboctinterp.$(LIBEXT) \
-+ ${PREFIX}/lib; \
++ ${PREFIX}/lib; \
fi
if $(SHARED_LIBS); then \
- rm -f $(DESTDIR)$(octlibdir)/liboctinterp.$(SHLEXT_VER); \
+ rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(SHLEXT_VER); \
diff --git a/math/octave/patches/patch-ah b/math/octave/patches/patch-ah
index deb56d924cc..a206335289f 100644
--- a/math/octave/patches/patch-ah
+++ b/math/octave/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.3 2005/05/18 15:42:22 adam Exp $
+$NetBSD: patch-ah,v 1.4 2008/01/11 01:23:44 adam Exp $
---- liboctave/f2c-main.c.orig 2005-05-02 11:16:23.000000000 +0000
+--- liboctave/f2c-main.c.orig 2007-10-12 23:27:16.000000000 +0200
+++ liboctave/f2c-main.c
-@@ -21,6 +21,10 @@ Software Foundation, Inc., 51 Franklin S
+@@ -20,6 +20,10 @@ along with Octave; see the file COPYING.
*/
diff --git a/math/octave/patches/patch-ai b/math/octave/patches/patch-ai
new file mode 100644
index 00000000000..ebd53a0ad34
--- /dev/null
+++ b/math/octave/patches/patch-ai
@@ -0,0 +1,23 @@
+$NetBSD: patch-ai,v 1.3 2008/01/11 01:23:44 adam Exp $
+
+--- liboctave/oct-time.cc.orig 2007-12-10 07:26:20.000000000 +0100
++++ liboctave/oct-time.cc
+@@ -34,6 +34,8 @@ along with Octave; see the file COPYING.
+ #include <unistd.h>
+ #endif
+
++#include <time.h>
++
+ #if defined (OCTAVE_USE_WINDOWS_API)
+ #include <windows.h>
+ #undef min
+@@ -355,6 +357,9 @@ octave_strptime::init (const std::string
+ char *p = strsave (str.c_str ());
+
+ char *q = oct_strptime (p, fmt.c_str (), &t);
++ /* fill in wday and yday */
++ t.tm_isdst = -1;
++ mktime(&t);
+
+ // Fill in wday and yday, but only if mday is valid and the mon and year
+ // are filled in, avoiding issues with mktime and invalid dates.
diff --git a/math/octave/patches/patch-aj b/math/octave/patches/patch-aj
new file mode 100644
index 00000000000..674b48a049b
--- /dev/null
+++ b/math/octave/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.3 2008/01/11 01:23:45 adam Exp $
+
+--- liboctave/file-ops.cc.orig 2007-12-29 04:26:48.000000000 +0100
++++ liboctave/file-ops.cc
+@@ -854,7 +854,7 @@ file_ops::unlink (const std::string& nam
+ bool
+ file_ops::is_dir_sep (char c)
+ {
+- return dir_sep_chars.find (c) != NPOS;
++ return c == dir_sep_char;
+ }
+
+ std::string