From da57ef51ede77bcbf3dfe11e0a4c7cb97b1103a2 Mon Sep 17 00:00:00 2001 From: adam Date: Thu, 4 Dec 2003 11:15:37 +0000 Subject: Changes 2.1.52: * Emacs fixes * The ++ and -- operators now work for indexed matrices * The built-in variable argv is now a list of strings instead of a string vec. * The new built-in variable `crash_dumps_octave_core' controls whether Octave writes user variables to the file `octave-core' when it crashes or is killed by a signal. * Loops of the form `for i = STRING ... endfor' are now allowed. * It is now possible to set the iteration limit for lsode using lsode_options ("step limit", N). * New functions * The save command now accepts the option -append to save the variables at the end of the file, leaving the existing contents. * New command-line option --no-history (also available using the single character option -H) inhibits saving command history. * The built-in variable `PWD' has been removed. * New operators. * New built-in data types. * Commas in global statements are no longer special. * It is now possible to declare static variables that retain their values across function calls. More --> See "NEWS" --- math/octave-current/patches/patch-aa | 156 +++-------------------------------- math/octave-current/patches/patch-ab | 13 --- math/octave-current/patches/patch-ac | 42 ++-------- math/octave-current/patches/patch-ad | 79 +++++------------- math/octave-current/patches/patch-ae | 30 ++----- math/octave-current/patches/patch-af | 79 +++++------------- math/octave-current/patches/patch-ag | 146 +++++++++----------------------- math/octave-current/patches/patch-ah | 13 --- math/octave-current/patches/patch-ai | 13 --- math/octave-current/patches/patch-aj | 13 --- math/octave-current/patches/patch-ak | 21 ----- math/octave-current/patches/patch-al | 18 ---- math/octave-current/patches/patch-aq | 19 ----- 13 files changed, 103 insertions(+), 539 deletions(-) delete mode 100644 math/octave-current/patches/patch-ab delete mode 100644 math/octave-current/patches/patch-ah delete mode 100644 math/octave-current/patches/patch-ai delete mode 100644 math/octave-current/patches/patch-aj delete mode 100644 math/octave-current/patches/patch-ak delete mode 100644 math/octave-current/patches/patch-al delete mode 100644 math/octave-current/patches/patch-aq (limited to 'math/octave-current/patches') diff --git a/math/octave-current/patches/patch-aa b/math/octave-current/patches/patch-aa index 46d894ff13f..65641578fd3 100644 --- a/math/octave-current/patches/patch-aa +++ b/math/octave-current/patches/patch-aa @@ -1,127 +1,20 @@ -$NetBSD: patch-aa,v 1.3 2001/04/22 20:23:02 jtb Exp $ +$NetBSD: patch-aa,v 1.4 2003/12/04 11:15:37 adam Exp $ ---- configure.orig Sun Apr 22 20:22:10 2001 -+++ configure Sun Apr 22 20:33:23 2001 -@@ -799,9 +799,9 @@ - ### Allow the user disable support for command line editing using GNU - ### readline. - --READLINE_DIR=readline -+READLINE_DIR="" - USE_READLINE=true --LIBREADLINE='$(TOPDIR)/readline/libreadline.$(LIBEXT)' -+LIBREADLINE='${LOCALBASE}/lib/libreadline.so' - # Check whether --enable-readline or --disable-readline was given. - if test "${enable_readline+set}" = set; then - enableval="$enable_readline" -@@ -821,7 +821,7 @@ - - - --LIBKPATHSEA='$(TOPDIR)/kpathsea/libkpathsea.$(LIBEXT)' -+LIBKPATHSEA='$(TOPDIR)/kpathsea/libkpathsea.a' - - - ### Make it possible to have Octave's array and matrix classes do bounds -@@ -2414,7 +2414,7 @@ - echo "$ac_t""defining F77 to be $F77" 1>&6 - elif $use_g77; then - if test "$with_g77" = yes; then -- F77=g77 -+ F77=${CC} - else - F77="$with_g77" - fi -@@ -2704,13 +2704,8 @@ - - - --if test "$cross_compiling" = yes; then -+if true "$cross_compiling" = yes; then - octave_cv_f2c_f77_compat=yes -- if test "$octave_cv_f77_is_g77" = yes; then -- echo "$ac_t""assuming ${F77-f77} cross compiler is f2c compatible" 1>&6 -- else -- echo "configure: warning: assuming ${F77-f77} cross compiler is f2c compatible" 1>&2 -- fi - else - echo $ac_n "checking ${F77-f77}/f2c compatibility""... $ac_c" 1>&6 - echo "configure:2717: checking ${F77-f77}/f2c compatibility" >&5 -@@ -2755,7 +2750,7 @@ - } - #if defined (sun) - int MAIN_ () { return 0; } --#elif defined (linux) && defined (__ELF__) -+#elif (defined (linux) && defined (__ELF__)) || defined (__NetBSD) - int MAIN__ () { return 0; } - #endif - EOF -@@ -2844,10 +2839,8 @@ +--- configure.orig 2003-11-20 12:44:49.000000000 +0100 ++++ configure +@@ -7984,7 +7984,7 @@ if $have_fortran_compiler; then %.c : %.f %.o : %.f - $(FC) -c $(ALL_FFLAGS) -o $@ $< -+ ${LIBTOOL} --mode=compile $(FC) -c $(ALL_FFLAGS) $< - --pic/%.o : %.f -- $(FC) -c $(FPICFLAG) $(ALL_FFLAGS) $< -o $@ ++ ${LIBTOOL} --mode=compile --tag=CC $(FC) -c $(ALL_FFLAGS) $< - EOF - elif $have_f2c; then -@@ -3026,11 +3019,11 @@ - fi - - FORTRAN_MAIN_FLAG= --case "$canonical_host_type" in -- *-linux-*) -- FORTRAN_MAIN_FLAG="-u MAIN__" -- ;; --esac -+if test "${OBJECT_FMT}" = "ELF"; then -+FORTRAN_MAIN_FLAG="-u MAIN__" -+else -+FORTRAN_MAIN_FLAG="-Wl,-u_MAIN__" -+fi - if test -n "$FORTRAN_MAIN_FLAG"; then - echo "$ac_t""defining FORTRAN_MAIN_FLAG to be $FORTRAN_MAIN_FLAG" 1>&6 - fi -@@ -5145,7 +5138,7 @@ - - GLOB_DIR=glob - LIBGLOB='$(TOPDIR)/glob/glob.o $(TOPDIR)/glob/fnmatch.o' --GLOB_INCFLAGS='-I$(top_srcdir)/glob -I$(TOPDIR)/glob' -+GLOB_INCFLAGS='-I$(top_srcdir)/glob -I$(TOPDIR)/glob -I${LOCALBASE}/include' - if test "$ac_cv_header_fnmatch_h" = yes \ - && test "$ac_cv_header_glob_h" = yes; then - cat > conftest.$ac_ext <&6 - echo "configure:6311: checking for tputs in -l${termlib}" >&5 - ac_lib_var=`echo ${termlib}'_'tputs | sed 'y%./+-%__p_%'` -@@ -6356,13 +6349,11 @@ - - - if test "$ac_cv_lib_termcap_tputs" = yes \ -- || test "$ac_cv_lib_terminfo_tputs" = yes \ -- || test "$ac_cv_lib_ncurses_tputs" = yes \ - || test "$ac_cv_lib_curses_tputs" = yes \ - || test "$ac_cv_lib_termlib_tputs" = yes; then - true - else -- warn_termlibs="I couldn't find -ltermcap, -lterminfo, -lncurses, -lcurses, or -ltermlib!" -+ warn_termlibs="I couldn't find -ltermcap, -lcurses, or -ltermlib!" - echo "configure: warning: $warn_termlibs" 1>&2 - fi - -@@ -7069,19 +7060,19 @@ + pic/%.o : %.f + $(FC) -c $(FPICFLAG) $(ALL_FFLAGS) $< -o $@ +@@ -18762,19 +18762,19 @@ case "$canonical_host_type" in cat << \EOF > $bsd_gcc_kluge_targets_frag - lex.o: lex.cc + lex.o: lex.cc - $(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $< + ${LIBTOOL} --mode=compile $(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $< @@ -137,38 +30,9 @@ $NetBSD: patch-aa,v 1.3 2001/04/22 20:23:02 jtb Exp $ - $(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $< + ${LIBTOOL} --mode=compile $(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $< - unwind-prot.o: unwind-prot.cc + unwind-prot.o: unwind-prot.cc - $(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $< + ${LIBTOOL} --mode=compile $(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $< EOF ;; -@@ -7350,7 +7341,7 @@ - # ./install, which can be erroneously created by make from ./install.sh. - echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 - echo "configure:7353: checking for a BSD compatible install" >&5 --if test -z "$INSTALL"; then -+if true; then - if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -7994,7 +7985,7 @@ - done - - ac_given_srcdir=$srcdir --ac_given_INSTALL="$INSTALL" -+ac_given_INSTALL="${INSTALL}" - - trap 'rm -fr `echo "Makefile octMakefile Makeconf install-octave \ - test/Makefile dlfcn/Makefile \ -@@ -8237,10 +8228,6 @@ - top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - -- case "$ac_given_INSTALL" in -- [/$]*) INSTALL="$ac_given_INSTALL" ;; -- *) INSTALL="$ac_dots$ac_given_INSTALL" ;; -- esac - - echo creating "$ac_file" - rm -f "$ac_file" diff --git a/math/octave-current/patches/patch-ab b/math/octave-current/patches/patch-ab deleted file mode 100644 index 927e831b047..00000000000 --- a/math/octave-current/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $ - ---- liboctave/f2c-main.c.orig Tue Sep 14 23:10:50 1999 -+++ liboctave/f2c-main.c Tue Sep 14 23:11:04 1999 -@@ -33,7 +33,7 @@ - assert (0); - return 0; - } --#elif defined (__linux__) -+#elif defined (__m68k__) - int - MAIN__ () - { diff --git a/math/octave-current/patches/patch-ac b/math/octave-current/patches/patch-ac index e08412c8a7f..5e1f2e6a2bf 100644 --- a/math/octave-current/patches/patch-ac +++ b/math/octave-current/patches/patch-ac @@ -1,50 +1,26 @@ -$NetBSD: patch-ac,v 1.2 2001/04/22 20:23:02 jtb Exp $ +$NetBSD: patch-ac,v 1.3 2003/12/04 11:15:37 adam Exp $ ---- Makeconf.in.orig Sun Apr 22 20:22:09 2001 -+++ Makeconf.in Sun Apr 22 20:37:34 2001 -@@ -42,7 +42,7 @@ +--- Makeconf.in.orig 2003-11-16 01:33:50.000000000 +0100 ++++ Makeconf.in +@@ -73,7 +73,7 @@ SHLLINKEXT= - RUNTEST = @RUNTEST@ - --TEXI2DVI = $(top_srcdir)/texi2dvi -+TEXI2DVI = /usr/bin/texi2dvi - - DEFAULT_PAGER = @DEFAULT_PAGER@ - -@@ -59,7 +59,7 @@ - SHLEXT = @SHLEXT@ - SHLEXT_VER = $(SHLEXT).$(version) + INCLUDE_LINK_DEPS = @INCLUDE_LINK_DEPS@ -LIBEXT = a +LIBEXT = la # Fortran to C translator and associated flags. -@@ -134,7 +134,7 @@ - $(LD_STATIC_FLAG) $(CPICFLAG) $(LDFLAGS) - - SH_LD = @SH_LD@ --SH_LDFLAGS = @SH_LDFLAGS@ -+SH_LDFLAGS = #@SH_LDFLAGS@ - - SONAME_FLAGS = @SONAME_FLAGS@ - -@@ -290,16 +290,12 @@ +@@ -334,10 +334,10 @@ NO_OCT_FILE_STRIP = @NO_OCT_FILE_STRIP@ # How to make .o files: %.o : %.c - $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< -o $@ -+ ${LIBTOOL} --mode=compile $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< ++ ${LIBTOOL} --mode=compile $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< -o $@ %.o : %.cc - $(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 : %.cc -- $(CXX) -c $(CPPFLAGS) $(CXXPICFLAG) $(ALL_CXXFLAGS) $< -o $@ - - # Here is a rule for generating dependencies for .cc files: - + pic/%.o : %.c + $(CC) -c $(CPPFLAGS) $(CPICFLAG) $(ALL_CFLAGS) $< -o $@ diff --git a/math/octave-current/patches/patch-ad b/math/octave-current/patches/patch-ad index c14c4feb506..aedef1f279f 100644 --- a/math/octave-current/patches/patch-ad +++ b/math/octave-current/patches/patch-ad @@ -1,68 +1,27 @@ -$NetBSD: patch-ad,v 1.2 2001/04/22 20:23:02 jtb Exp $ +$NetBSD: patch-ad,v 1.3 2003/12/04 11:15:37 adam Exp $ ---- libcruft/Makefile.in.orig Sun Apr 22 20:22:10 2001 -+++ libcruft/Makefile.in Sun Apr 22 20:41:53 2001 -@@ -61,39 +61,14 @@ - CRUFT_OBJ1 := $(patsubst %.f, %.o, $(CRUFT_OBJ2)) - CRUFT_OBJ := $(CRUFT_OBJ1) $(MISC_OBJ) - --ifeq ($(SHARED_LIBS), true) -- ifdef FPICFLAG -- CRUFT_OBJ_DIR := $(dir $(CRUFT_OBJ)) -- CRUFT_OBJ_PICDIR := $(addsuffix pic/, $(CRUFT_OBJ_DIR)) -- CRUFT_OBJ_NOTDIR := $(notdir $(CRUFT_OBJ)) -- CRUFT_PICOBJ := $(join $(CRUFT_OBJ_PICDIR), $(CRUFT_OBJ_NOTDIR)) -- else -- CRUFT_PICOBJ := $(CRUFT_OBJ) -- endif --endif -- --ifeq ($(SHARED_LIBS), true) -- ifeq ($(STATIC_LIBS), true) -- LIBRARIES = libcruft.$(LIBEXT) libcruft.$(SHLEXT) -- else -- LIBRARIES = libcruft.$(SHLEXT) -- endif --else -- ifeq ($(STATIC_LIBS), true) -- LIBRARIES = libcruft.$(LIBEXT) -- else -- LIBRARIES = -- endif --endif -+LIBRARIES = libcruft.$(LIBEXT) - - libraries: $(SUBDIRS) - $(MAKE) $(LIBRARIES) - .PHONY: libraries +--- libcruft/Makefile.in.orig 2003-10-30 17:48:09.000000000 +0100 ++++ libcruft/Makefile.in +@@ -100,8 +100,8 @@ libraries: $(SUBDIRS) libcruft.$(LIBEXT): $(CRUFT_OBJ) -- rm -f $@ + 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:%} ++ ${LIBTOOL} --mode=link ${CC} -o libcruft.$(LIBEXT) $(CRUFT_OBJ:.o=.lo) \ ++ -rpath ${PREFIX}/lib -version-info ${version:2.1.%=2:%} - libcruft.$(SHLEXT): libcruft.$(SHLEXT_VER) + libcruft.$(SHLEXT_VER): libcruft.$(SHLEXT) rm -f $@ -@@ -113,20 +88,7 @@ - - install:: - $(top_srcdir)/mkinstalldirs $(octlibdir) -- if $(STATIC_LIBS); then \ -- rm -f $(octlibdir)/libcruft.$(LIBEXT) ; \ +@@ -126,9 +126,8 @@ install:: + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir) + if $(STATIC_LIBS); then \ + rm -f $(DESTDIR)$(octlibdir)/libcruft.$(LIBEXT) ; \ - $(INSTALL_DATA) libcruft.$(LIBEXT) \ -- $(octlibdir)/libcruft.$(LIBEXT) ; \ -- $(RANLIB) $(octlibdir)/libcruft.$(LIBEXT) ; \ -- fi -- if $(SHARED_LIBS); then \ -- rm -f $(octlibdir)/libcruft.$(SHLEXT_VER); \ -- $(INSTALL_PROGRAM) \ -- libcruft.$(SHLEXT_VER) $(octlibdir)/libcruft.$(SHLEXT_VER); \ -- cd $(octlibdir); \ -- rm -f libcruft.$(SHLEXT); \ -- $(LN_S) libcruft.$(SHLEXT_VER) libcruft.$(SHLEXT); \ -- fi -+ ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libcruft.${LIBEXT} ${PREFIX}/lib - $(mk-libdir-link) - - install-strip:: +- $(DESTDIR)$(octlibdir)/libcruft.$(LIBEXT) ; \ +- $(RANLIB) $(DESTDIR)$(octlibdir)/libcruft.$(LIBEXT) ; \ ++ ${LIBTOOL} --mode=install $(INSTALL_DATA) libcruft.$(LIBEXT) \ ++ ${PREFIX}/lib; \ + fi + if $(SHARED_LIBS); then \ + rm -f $(DESTDIR)$(octlibdir)/libcruft.$(SHLLIB_VER); \ diff --git a/math/octave-current/patches/patch-ae b/math/octave-current/patches/patch-ae index dc2b3e27f7e..06c7dbf343e 100644 --- a/math/octave-current/patches/patch-ae +++ b/math/octave-current/patches/patch-ae @@ -1,31 +1,13 @@ -$NetBSD: patch-ae,v 1.2 2001/04/22 20:23:02 jtb Exp $ +$NetBSD: patch-ae,v 1.3 2003/12/04 11:15:37 adam Exp $ ---- libcruft/misc/Makefile.in.orig Sun Apr 22 20:22:10 2001 -+++ libcruft/misc/Makefile.in Sun Apr 22 20:43:27 2001 -@@ -27,15 +27,7 @@ - - INCLUDES := f77-fcn.h lo-error.h - --ifeq ($(SHARED_LIBS), true) -- ifdef CPICFLAG -- CPICDEP := pic/machar.o pic/f77-fcn.o -- endif -- ifdef CXXPICFLAG -- CXXPICDEP := pic/f77-extern.o pic/lo-error.o -- endif -- SPECIAL_PICDEPEND := $(CPICDEP) $(CXXPICDEP) --endif -+ - - include ../Makerules - -@@ -56,7 +48,6 @@ +--- libcruft/misc/Makefile.in.orig 2003-11-20 13:50:06.000000000 +0100 ++++ libcruft/misc/Makefile.in +@@ -62,7 +62,7 @@ XCC = $(patsubst -O%, , $(CC)) XALL_CFLAGS = $(patsubst -O%, , $(ALL_CFLAGS)) machar.o: $(srcdir)/machar.c - $(XCC) -c $(CPPFLAGS) $(XALL_CFLAGS) -DDP $< + ${LIBTOOL} --mode=compile $(XCC) -c $(CPPFLAGS) $(XALL_CFLAGS) -DDP $< -+ --pic/machar.o: $(srcdir)/machar.c -- $(XCC) -c $(CPPFLAGS) $(CPICFLAG) $(XALL_CFLAGS) -DDP $< -o $@ + pic/machar.o: $(srcdir)/machar.c + $(XCC) -c $(CPPFLAGS) $(CPICFLAG) $(XALL_CFLAGS) -DDP $< -o $@ diff --git a/math/octave-current/patches/patch-af b/math/octave-current/patches/patch-af index 20e6837bd61..96c9ab47fea 100644 --- a/math/octave-current/patches/patch-af +++ b/math/octave-current/patches/patch-af @@ -1,63 +1,28 @@ -$NetBSD: patch-af,v 1.3 2001/04/22 22:58:47 jtb Exp $ +$NetBSD: patch-af,v 1.4 2003/12/04 11:15:37 adam Exp $ ---- liboctave/Makefile.in.orig Sun Apr 22 20:22:11 2001 -+++ liboctave/Makefile.in Sun Apr 22 20:47:03 2001 -@@ -18,7 +18,7 @@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ +--- liboctave/Makefile.in.orig 2003-11-15 03:01:46.000000000 +0100 ++++ liboctave/Makefile.in +@@ -204,8 +204,9 @@ endif --LIBOCTAVE_LFLAGS = -L../libcruft -L../readline -L../kpathsea \ -+LIBOCTAVE_LFLAGS = -L../libcruft -L${LOCALBASE}/lib -L../kpathsea \ - -L../glob -L. $(RLD_FLAG) - - LIBOCTAVE_LIBS = -lcruft -lreadline -lkpathsea -lglob -@@ -146,25 +146,11 @@ - mkdir pic; \ - fi - --ifeq ($(SHARED_LIBS), true) -- ifeq ($(STATIC_LIBS), true) -- libraries: liboctave.$(LIBEXT) liboctave.$(SHLEXT) -- else -- libraries: liboctave.$(SHLEXT) -- endif --else -- ifeq ($(STATIC_LIBS), true) -- libraries: liboctave.$(LIBEXT) -- else -- libraries: -- endif --endif -+libraries: liboctave.$(LIBEXT) - .PHONY: libraries - - liboctave.$(LIBEXT): $(OBJECTS) -- rm -f $@ -- $(TEMPLATE_AR) $(TEMPLATE_ARFLAGS) $@ $^ + liboctave.$(LIBEXT): $(LIBOCTAVE_OBJECTS) + rm -f $@ +- $(TEMPLATE_AR) $(TEMPLATE_ARFLAGS) $@ $(LIBOCTAVE_OBJECTS) - $(RANLIB) $@ -+ ${LIBTOOL} --mode=link cc -o liboctave.${LIBEXT} ${OBJECTS:.o=.lo} -rpath ${PREFIX}/lib -version-info ${version:2.1.%=2:%} ++ ${LIBTOOL} --mode=link ${CC} -o liboctave.$(LIBEXT) \ ++ $(LIBOCTAVE_OBJECTS:.o=.lo) -rpath ${PREFIX}/lib \ ++ -version-info ${version:2.1.%=2:%} - liboctave.$(SHLEXT): liboctave.$(SHLEXT_VER) + liboctave.$(SHLEXT_VER): liboctave.$(SHLEXT) rm -f $@ -@@ -188,20 +174,7 @@ - - install-lib: - $(top_srcdir)/mkinstalldirs $(octlibdir) -- if $(STATIC_LIBS); then \ -- rm -f $(octlibdir)/liboctave.$(LIBEXT); \ +@@ -232,9 +233,8 @@ install-lib: + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir) + if $(STATIC_LIBS); then \ + rm -f $(DESTDIR)$(octlibdir)/liboctave.$(LIBEXT); \ - $(INSTALL_DATA) liboctave.$(LIBEXT) \ -- $(octlibdir)/liboctave.$(LIBEXT); \ -- $(RANLIB) $(octlibdir)/liboctave.$(LIBEXT); \ -- fi -- if $(SHARED_LIBS); then \ -- rm -f $(octlibdir)/liboctave.$(SHLEXT_VER); \ -- $(INSTALL_PROGRAM) \ -- liboctave.$(SHLEXT_VER) $(octlibdir)/liboctave.$(SHLEXT_VER); \ -- cd $(octlibdir); \ -- rm -f liboctave.$(SHLEXT); \ -- $(LN_S) liboctave.$(SHLEXT_VER) liboctave.$(SHLEXT); \ -- fi -+ ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} liboctave.${LIBEXT} ${PREFIX}/lib - $(mk-libdir-link) - .PHONY: install-lib - +- $(DESTDIR)$(octlibdir)/liboctave.$(LIBEXT); \ +- $(RANLIB) $(DESTDIR)$(octlibdir)/liboctave.$(LIBEXT); \ ++ ${LIBTOOL} --mode=install $(INSTALL_DATA) liboctave.$(LIBEXT) \ ++ ${PREFIX}/lib; \ + fi + if $(SHARED_LIBS); then \ + rm -f $(DESTDIR)$(octlibdir)/liboctave.$(SHLLIB_VER); \ diff --git a/math/octave-current/patches/patch-ag b/math/octave-current/patches/patch-ag index b3d26250d94..67eb963574e 100644 --- a/math/octave-current/patches/patch-ag +++ b/math/octave-current/patches/patch-ag @@ -1,116 +1,44 @@ -$NetBSD: patch-ag,v 1.4 2002/03/07 06:18:36 jmc Exp $ +$NetBSD: patch-ag,v 1.5 2003/12/04 11:15:37 adam Exp $ ---- src/Makefile.in.orig Thu Mar 7 00:07:18 2002 -+++ src/Makefile.in Thu Mar 7 05:14:39 2002 -@@ -143,13 +143,7 @@ - OBJECTS_1 := $(patsubst %.c, %.o, $(OBJECTS_2)) - OBJECTS := $(patsubst %.cc, %.o, $(OBJECTS_1)) +--- src/Makefile.in.orig 2003-11-15 03:41:38.000000000 +0100 ++++ src/Makefile.in +@@ -244,8 +244,9 @@ libraries: $(LIBRARIES) --ifeq ($(SHARED_LIBS), true) -- ifdef CXXPICFLAG -- PICOBJ := $(addprefix pic/, $(OBJECTS)) -- else -- PICOBJ := $(OBJECTS) -- endif --endif -+PICOBJ := $(OBJECTS) - - # Ugh. - -@@ -184,8 +178,8 @@ - - DOC_FILES := $(sort $(DEF_FILES) $(patsubst %, %.df, $(VAR_FILES))) - --OCTAVE_LFLAGS = -L$(TOPDIR)/liboctave -L$(TOPDIR)/libcruft \ -- -L$(TOPDIR)/src $(RLD_FLAG) -+OCTAVE_LFLAGS = -L$(TOPDIR)/liboctave/.libs -L$(TOPDIR)/libcruft/.libs \ -+ -L$(TOPDIR)/src/.libs $(RLD_FLAG) - - OCTAVE_LIBS = $(LIBOCTINTERP) $(LIBOCTAVE) $(SPECIAL_MATH_LIB) $(LIBCRUFT) \ - $(LIBPLPLOT) $(LIBREADLINE) $(LIBKPATHSEA) $(LIBGLOB) $(LIBDLFCN) -@@ -210,30 +204,13 @@ - - XERBLA = ../libcruft/blas-xtra/xerbla.o - --ifeq ($(SHARED_LIBS), true) -- ifeq ($(STATIC_LIBS), true) -- LIBRARIES = liboctinterp.$(LIBEXT) liboctinterp.$(SHLEXT) -- else -- LIBRARIES = liboctinterp.$(SHLEXT) -- XERBLA = ../libcruft/blas-xtra/pic/xerbla.o -- endif --else -- ifeq ($(STATIC_LIBS), true) -- LIBRARIES = liboctinterp.$(LIBEXT) -- else -- ## This is not going to work, but hey, you asked for it... -- LIBRARIES = -- XERBLA = -- endif --endif -+LIBRARIES = liboctinterp.$(LIBEXT) - - libraries: $(LIBRARIES) - .PHONY: libraries - - liboctinterp.$(LIBEXT): $(OBJECTS) -- rm -f $@ + liboctinterp.$(LIBEXT): $(OBJECTS) $(XERBLA) + rm -f $@ - $(TEMPLATE_AR) $(TEMPLATE_ARFLAGS) $@ $^ - $(RANLIB) $@ -+ ${LIBTOOL} --mode=link cc -o liboctinterp.la ${OBJECTS:.o=.lo} -rpath ${PREFIX}/lib -version-info ${version:2.1.%=2:%} ++ ${LIBTOOL} --mode=link ${CC} -o liboctinterp.$(LIBEXT) \ ++ $(OBJECTS:.o=.lo) $(XERBLA:.o=.lo) -rpath ${PREFIX}/lib \ ++ -version-info ${version:2.1.%=2:%} - liboctinterp.$(SHLEXT): liboctinterp.$(SHLEXT_VER) + liboctinterp.$(SHLEXT_VER): liboctinterp.$(SHLEXT) rm -f $@ -@@ -259,7 +236,7 @@ - octave.o builtins.o ops.o $(XERBLA) $(DLD_STATIC_OBJ) \ - $(OCTAVE_LFLAGS) \ - $(OCTAVE_LIBS) \ -- $(LEXLIB) $(TERMLIBS) $(BLAS_LIBS) $(LIBS) $(FLIBS) -+ $(LEXLIB) $(TERMLIBS) $(BLAS_LIBS) $(LIBS) $(FLIBS) -lg2c - - stmp-pic: pic - @if [ -f stmp-pic ]; then \ -@@ -288,6 +265,9 @@ - @$(srcdir)/mkbuiltins def-files var-files > $@.t - @$(top_srcdir)/move-if-change $@.t $@ - -+parse.o: parse.cc -+ ${LIBTOOL} --mode=compile $(CXX) -c $(CPPFLAGS) $(filter-out -O -O2,$(ALL_CXXFLAGS)) $< -o $@ -+ - DOCSTRINGS: gendoc - ./gendoc > $@.t - mv $@.t $@ -@@ -344,20 +324,7 @@ - - install-lib: - $(top_srcdir)/mkinstalldirs $(octlibdir) -- if $(STATIC_LIBS); then \ -- rm -f $(octlibdir)/liboctinterp.$(LIBEXT); \ +@@ -265,6 +266,7 @@ stamp-prereq: defaults.h oct-conf.h oct- + touch stamp-prereq + + octave$(EXEEXT): stamp-prereq $(LIBRARIES) main.o $(DLD_STATIC_OBJ) ++ ${LIBTOOL} --mode=link \ + $(LD_CXX) $(CPPFLAGS) $(ALL_CXXFLAGS) $(RDYNAMIC_FLAG) \ + $(ALL_LDFLAGS) -o $@ \ + main.o $(DLD_STATIC_OBJ) \ +@@ -345,6 +347,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) + .PHONY: install-bin +@@ -364,9 +367,8 @@ install-lib: + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir) + if $(STATIC_LIBS); then \ + rm -f $(DESTDIR)$(octlibdir)/liboctinterp.$(LIBEXT); \ - $(INSTALL_DATA) liboctinterp.$(LIBEXT) \ -- $(octlibdir)/liboctinterp.$(LIBEXT); \ -- $(RANLIB) $(octlibdir)/liboctinterp.$(LIBEXT); \ -- fi -- if $(SHARED_LIBS); then \ -- rm -f $(octlibdir)/liboctinterp.$(SHLEXT_VER); \ -- $(INSTALL_PROGRAM) liboctinterp.$(SHLEXT_VER) \ -- $(octlibdir)/liboctinterp.$(SHLEXT_VER); \ -- cd $(octlibdir); \ -- rm -f liboctinterp.$(SHLEXT); \ -- $(LN_S) liboctinterp.$(SHLEXT_VER) liboctinterp.$(SHLEXT); \ -- fi -+ ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} liboctinterp.la ${PREFIX}/lib - $(mk-libdir-link) - .PHONY: install-lib - -@@ -449,11 +416,6 @@ - .PHONY: bin-dist - - # Special rules -- these files need special things to be defined. -- --parse.cc : parse.y -- @echo "expect 11 shift/reduce conflicts" -- $(YACC) $(YFLAGS) $< -- @$(top_srcdir)/move-if-change y.tab.c $(@F) - - lex.cc : lex.l - $(LEX) $(LFLAGS) $< > $(@F) +- $(DESTDIR)$(octlibdir)/liboctinterp.$(LIBEXT); \ +- $(RANLIB) $(DESTDIR)$(octlibdir)/liboctinterp.$(LIBEXT); \ ++ ${LIBTOOL} --mode=install $(INSTALL_DATA) liboctinterp.$(LIBEXT) \ ++ ${PREFIX}/lib; \ + fi + if $(SHARED_LIBS); then \ + rm -f $(DESTDIR)$(octlibdir)/liboctinterp.$(SHLEXT_VER); \ diff --git a/math/octave-current/patches/patch-ah b/math/octave-current/patches/patch-ah deleted file mode 100644 index 10f0858a854..00000000000 --- a/math/octave-current/patches/patch-ah +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ah,v 1.2 2001/04/22 20:23:03 jtb Exp $ - ---- Makefile.in.orig Sat Dec 9 06:41:37 2000 -+++ Makefile.in Sun Apr 22 20:53:48 2001 -@@ -7,7 +7,7 @@ - # Department of Chemical Engineering - - TARGETS = octave-bug mkoctfile libcruft liboctave kpathsea dlfcn \ -- readline src scripts doc check octave.info INSTALL.OCTAVE BUGS \ -+ src scripts doc check octave.info INSTALL.OCTAVE BUGS \ - install install-strip uninstall tags TAGS dist conf-dist \ - snapshot snapshot-version - diff --git a/math/octave-current/patches/patch-ai b/math/octave-current/patches/patch-ai deleted file mode 100644 index 2064cdc2764..00000000000 --- a/math/octave-current/patches/patch-ai +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ai,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $ - ---- Makefile.orig Fri Dec 29 22:07:09 2000 -+++ Makefile Fri Dec 29 22:07:16 2000 -@@ -8,7 +8,7 @@ - # Department of Chemical Engineering - - TARGETS = octave-bug mkoctfile libcruft liboctave kpathsea dlfcn \ -- readline src scripts doc check octave.info INSTALL.OCTAVE BUGS \ -+ src scripts doc check octave.info INSTALL.OCTAVE BUGS \ - install install-strip uninstall tags TAGS dist conf-dist \ - snapshot snapshot-version - diff --git a/math/octave-current/patches/patch-aj b/math/octave-current/patches/patch-aj deleted file mode 100644 index c805c88e1e2..00000000000 --- a/math/octave-current/patches/patch-aj +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aj,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $ - ---- octMakefile.in.orig Fri Dec 29 22:08:42 2000 -+++ octMakefile.in Fri Dec 29 22:21:07 2000 -@@ -31,7 +31,7 @@ - ChangeLog ChangeLog.[0-9] - - # Complete directory trees to distribute. --DISTDIRS = glob kpathsea readline # plplot -+DISTDIRS = glob kpathsea # plplot - - # Subdirectories in which to run `make all'. - SUBDIRS = @PLPLOT_DIR@ @READLINE_DIR@ @DLFCN_DIR@ @GLOB_DIR@ \ diff --git a/math/octave-current/patches/patch-ak b/math/octave-current/patches/patch-ak deleted file mode 100644 index 30c341ffd99..00000000000 --- a/math/octave-current/patches/patch-ak +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ak,v 1.3 2003/08/02 21:18:07 seb Exp $ - ---- kpathsea/Makefile.in.orig Mon May 4 18:36:19 1998 -+++ kpathsea/Makefile.in -@@ -148,6 +148,7 @@ - INSTALL_SCRIPT = $(INSTALL_PROGRAM) - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_LIBTOOL_LIBS = INSTALL_DATA='$(INSTALL_DATA)' $(LIBTOOL) install-lib -+INSTALL_LIBTOOL_THISLIB = INSTALL_DATA='$(LN)' $(LIBTOOL) install-lib - INSTALL_LIBTOOL_PROG = INSTALL_PROGRAM='$(INSTALL_PROGRAM)' $(LIBTOOL) install-prog - - # Creating (symbolic) links. -@@ -253,7 +253,7 @@ - - $(kpathsea): $(objects) klibtool.version - $(LIBTOOL) archive $(AR) $(ARFLAGS) $@ $(objects) -- $(INSTALL_LIBTOOL_LIBS) . lib$(library).la -+ $(INSTALL_LIBTOOL_THISLIB) . lib$(library).la - - # All the objects depend on the klibtool configuration file. - $(objects): klibtool.config diff --git a/math/octave-current/patches/patch-al b/math/octave-current/patches/patch-al deleted file mode 100644 index 369d9e60824..00000000000 --- a/math/octave-current/patches/patch-al +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-al,v 1.2 2001/04/19 15:10:36 dmcmahill Exp $ - ---- liboctave/lo-ieee.cc.orig Tue Jan 25 16:23:09 2000 -+++ liboctave/lo-ieee.cc Thu Apr 19 08:02:52 2001 -@@ -65,5 +65,5 @@ - double tmp = 1.0; - octave_Inf = 1.0 / (tmp - tmp); --#elif defined (__alpha__) && ! defined (linux) -+#elif defined (__alpha__) && defined (__osf__) - extern unsigned int DINFINITY[2]; - octave_Inf = (*(X_CAST(double *, DINFINITY))); -@@ -84,5 +84,5 @@ - #if defined (HAVE_ISNAN) - --#if defined (__alpha__) && ! defined (linux) -+#if defined (__alpha__) && defined (__osf__) - extern unsigned int DQNAN[2]; - octave_NaN = (*(X_CAST(double *, DQNAN))); diff --git a/math/octave-current/patches/patch-aq b/math/octave-current/patches/patch-aq deleted file mode 100644 index f6609cfb2ab..00000000000 --- a/math/octave-current/patches/patch-aq +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-aq,v 1.1 2003/08/02 21:18:14 seb Exp $ - ---- doc/liboctave/liboctave.texi.orig 2000-03-08 09:30:06.000000000 +0000 -+++ doc/liboctave/liboctave.texi -@@ -5,6 +5,14 @@ - \input texinfo @c -*-texinfo-*- - @setfilename liboctave.info - -+@ifinfo -+@format -+START-INFO-DIR-ENTRY -+* LibOctave: (liboctave). Octave library for numerical computations. -+END-INFO-DIR-ENTRY -+@end format -+@end ifinfo -+ - @c @smallbook - @c @setchapternewpage odd - @c @cropmarks -- cgit v1.2.3