diff options
author | jtb <jtb> | 2001-04-22 20:23:01 +0000 |
---|---|---|
committer | jtb <jtb> | 2001-04-22 20:23:01 +0000 |
commit | ada37f257d451d8b2afe14507350e7ddb1f85cf1 (patch) | |
tree | a1e53880adcd0d7830bd85b4bd48f5af44be3da6 /math/octave-current | |
parent | d06d49887ffe80ff7d8c204d9a1b4336317a5612 (diff) | |
download | pkgsrc-ada37f257d451d8b2afe14507350e7ddb1f85cf1.tar.gz |
Update of octave-current to 2.1.34.
2001-04-19 John W. Eaton <jwe@bevo.che.wisc.edu>
* octMakefile.in (CONF_DISTFILES): Remove config.h.bot from the list.
2001-04-19 David Livings <david.livings@asa.co.uk>
* Makeconf.in (mk-libdir-link): Omit check for $(octlibdir)/octave
existing as a directory.
2001-02-28 Albert Chin-A-Young <china@thewrittenword.com>
* configure.in: Check for getpwnam in libsun only after checking
default libraries first. Check for gethostname in libsocket only
after checking default libraries first.
2001-02-22 John W. Eaton <jwe@bevo.che.wisc.edu>
* configure.in: Allow for using f2c when setting functions to look
for in the BLAS and Lapack libraries.
From Kurt Hornik <Kurt.Hornik@ci.tuwien.ac.at>.
2001-02-10 Mumit Khan <khan@nanotech.wisc.edu>
* test/octave.test/string/dec2hex-1.m: Don't assume hex format
produces lower case letters.
2001-02-07 John W. Eaton <jwe@bevo.che.wisc.edu>
* acconfig.h: Merge contents of config.h.bot.
* config.h.bot: Delete.
* autogen.sh: Allow running of autoconf or autoheader to be skipped.
2001-02-06 John W. Eaton <jwe@bevo.che.wisc.edu>
* readline: Update to new version (4.2-beta1).
2001-02-05 Mumit Khan <khan@nanotech.wisc.edu>
* configure.in (TEMPLATE_AR, TEMPLATE_ARFLAGS): New variables.
* Makeconf.in (TEMPLATE_AR, TEMPLATE_ARFLAGS): Likewise.
* configure.in (XTRA_CXXFLAGS): Use -fno-implicit templates for
pre-gcc3 compilers. Remove -fno-rtti and -fno-exceptions.
(DEPEND_FLAGS, DEPEND_EXTRA_SED_PATTERN): New macros.
(BLAS_LIBS): Fix test for sunperf library on Sun Solaris.
(CPICFLAG, CXXPICFLAG, FPICFLAG, SH_LDFLAGS, RLD_FLAG): Add Sun
compiler support.
* Makefile.in (DEPEND_FLAGS, DEPEND_EXTRA_SED_PATTERN): New
variables.
(%.d : %.cc): Use.
(%.d : %.c): Likewise.
* acconfig.h (CXX_ISO_COMPLIANT_LIBRARY): Add #undef.
2001-01-31 Mumit Khan <khan@nanotech.wisc.edu>
* Makeconf.in (%.d : %.cc): Strip the directory portion of the
target.
(%.d : %.c): Likewise.
* aclocal.m4 (OCTAVE_CXX_ISO_COMPLIANT_LIBRARY): New macro.
* configure.in: Use it.
2001-01-29 John W. Eaton <jwe@bevo.che.wisc.edu>
* Makeconf.in (do-subst-config-vals): Substitute
OCTAVE_CONF_CANONICAL_HOST_TYPE here too.
* octave-bug.in: Substitute OCTAVE_CONF_CANONICAL_HOST_TYPE, not
OCTAVE_CANONICAL_HOST_TYPE.
Diffstat (limited to 'math/octave-current')
-rw-r--r-- | math/octave-current/Makefile | 7 | ||||
-rw-r--r-- | math/octave-current/distinfo | 18 | ||||
-rw-r--r-- | math/octave-current/patches/patch-aa | 70 | ||||
-rw-r--r-- | math/octave-current/patches/patch-ac | 16 | ||||
-rw-r--r-- | math/octave-current/patches/patch-ad | 12 | ||||
-rw-r--r-- | math/octave-current/patches/patch-ae | 14 | ||||
-rw-r--r-- | math/octave-current/patches/patch-af | 10 | ||||
-rw-r--r-- | math/octave-current/patches/patch-ag | 13 | ||||
-rw-r--r-- | math/octave-current/patches/patch-ah | 6 |
9 files changed, 101 insertions, 65 deletions
diff --git a/math/octave-current/Makefile b/math/octave-current/Makefile index 8f6334a1ed2..a28851e523e 100644 --- a/math/octave-current/Makefile +++ b/math/octave-current/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2001/04/19 15:10:35 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.7 2001/04/22 20:23:01 jtb Exp $ DISTNAME= octave-2.1.33 +PKGNAME= octave-2.1.34 CATEGORIES= math MASTER_SITES= ftp://ftp.che.wisc.edu/pub/octave/bleeding-edge/ \ ftp://ftp.math.uni-hamburg.de/pub/soft/math/octave/bleeding-edge/ \ @@ -9,6 +10,10 @@ MASTER_SITES= ftp://ftp.che.wisc.edu/pub/octave/bleeding-edge/ \ ftp://ftp.task.gda.pl/pub/software/octave/bleeding-edge/ EXTRACT_SUFX= .tar.bz2 +PATCHFILES= octave-2.1.33-2.1.34.patch.gz +PATCH_SITES= ${MASTER_SITES} +PATCH_DIST_STRIP= -p1 + MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.che.wisc.edu/octave/ COMMENT= High-level language, primarily intended for numerical computations diff --git a/math/octave-current/distinfo b/math/octave-current/distinfo index ab61140c006..7d9ac55e92f 100644 --- a/math/octave-current/distinfo +++ b/math/octave-current/distinfo @@ -1,15 +1,17 @@ -$NetBSD: distinfo,v 1.4 2001/04/19 15:10:36 dmcmahill Exp $ +$NetBSD: distinfo,v 1.5 2001/04/22 20:23:02 jtb Exp $ SHA1 (octave-2.1.33.tar.bz2) = 15a07d08647a2c2aeedb31917ac41ed3b7bb4245 Size (octave-2.1.33.tar.bz2) = 3740256 bytes -SHA1 (patch-aa) = fbd416adf8cbd6c36863bba413d768e781af6936 +SHA1 (octave-2.1.33-2.1.34.patch.gz) = 0c7d17e781eecf256be9a05c9c21ebc37b51c979 +Size (octave-2.1.33-2.1.34.patch.gz) = 404608 bytes +SHA1 (patch-aa) = 0be7fd7b9aeef26095dcbd7137b546b8a70cc5f3 SHA1 (patch-ab) = 99b395668fd8a48ec03e47f2d24613128c0289da -SHA1 (patch-ac) = b565c7694d7ea3af80744081d0a2cb6306eb9c68 -SHA1 (patch-ad) = c73ef38aacd83cf97bd1ca31276de3edfbcff611 -SHA1 (patch-ae) = 2e5e71766286ba930197e92f84441a807406fdc7 -SHA1 (patch-af) = c3adaf9c041ce96d027d65865b4e8fd4407347f4 -SHA1 (patch-ag) = dad8707e891562e365cf340f0a0172e8f4f5fb50 -SHA1 (patch-ah) = 3c5d82b3bd05766eb22987debe6fdb1447a92ae3 +SHA1 (patch-ac) = bc02ce0417c8d921eb9aa3dc06e84f99cb45eaf3 +SHA1 (patch-ad) = 9d4e10e9097d98901ff5aa313b81b306d3b4e51b +SHA1 (patch-ae) = f9c943521ea21ea6e452ffa50862dfbd9efc3cf8 +SHA1 (patch-af) = 5e5b4a92f5f5fbd23eb5471568fe7a87b85bf90a +SHA1 (patch-ag) = 2ffd116b1b26d95541d89b5c3d37f2b59cdc413a +SHA1 (patch-ah) = 5e1b20562559124a33bbdcdff2194805929d06f9 SHA1 (patch-ai) = 248dbc97c2233c47dc532f86b0fb2fd3ebd18068 SHA1 (patch-aj) = 8e2bbe9afde5567540b32fc183f58b87fbf9a547 SHA1 (patch-ak) = b998dfe27accebec38cffa38555a3e32932c0c07 diff --git a/math/octave-current/patches/patch-aa b/math/octave-current/patches/patch-aa index 948df2c16dd..46d894ff13f 100644 --- a/math/octave-current/patches/patch-aa +++ b/math/octave-current/patches/patch-aa @@ -1,8 +1,9 @@ -$NetBSD: patch-aa,v 1.2 2001/04/19 00:25:23 dmcmahill Exp $ +$NetBSD: patch-aa,v 1.3 2001/04/22 20:23:02 jtb Exp $ ---- configure.orig Fri Jan 5 12:37:51 2001 -+++ configure Wed Apr 18 20:22:03 2001 -@@ -799,7 +799,7 @@ +--- 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 @@ -12,25 +13,31 @@ $NetBSD: patch-aa,v 1.2 2001/04/19 00:25:23 dmcmahill Exp $ +LIBREADLINE='${LOCALBASE}/lib/libreadline.so' # Check whether --enable-readline or --disable-readline was given. if test "${enable_readline+set}" = set; then -@@ -821,5 +821,5 @@ + enableval="$enable_readline" +@@ -821,7 +821,7 @@ + -LIBKPATHSEA='$(TOPDIR)/kpathsea/libkpathsea.$(LIBEXT)' +LIBKPATHSEA='$(TOPDIR)/kpathsea/libkpathsea.a' -@@ -2435,5 +2435,5 @@ + ### 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" -@@ -2725,11 +2725,6 @@ + fi +@@ -2704,13 +2704,8 @@ + -if test "$cross_compiling" = yes; then -+if true; 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 @@ -39,14 +46,18 @@ $NetBSD: patch-aa,v 1.2 2001/04/19 00:25:23 dmcmahill Exp $ - fi else echo $ac_n "checking ${F77-f77}/f2c compatibility""... $ac_c" 1>&6 -@@ -2776,5 +2771,5 @@ + 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) ++#elif (defined (linux) && defined (__ELF__)) || defined (__NetBSD) int MAIN__ () { return 0; } #endif -@@ -2865,8 +2860,6 @@ + EOF +@@ -2844,10 +2839,8 @@ + %.c : %.f %.o : %.f - $(FC) -c $(ALL_FFLAGS) -o $@ $< @@ -56,7 +67,9 @@ $NetBSD: patch-aa,v 1.2 2001/04/19 00:25:23 dmcmahill Exp $ - $(FC) -c $(FPICFLAG) $(ALL_FFLAGS) $< -o $@ EOF -@@ -3047,9 +3040,9 @@ + elif $have_f2c; then +@@ -3026,11 +3019,11 @@ + fi FORTRAN_MAIN_FLAG= -case "$canonical_host_type" in @@ -71,21 +84,27 @@ $NetBSD: patch-aa,v 1.2 2001/04/19 00:25:23 dmcmahill Exp $ +fi if test -n "$FORTRAN_MAIN_FLAG"; then echo "$ac_t""defining FORTRAN_MAIN_FLAG to be $FORTRAN_MAIN_FLAG" 1>&6 -@@ -5066,5 +5059,5 @@ + 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 -@@ -6226,5 +6219,5 @@ + cat > conftest.$ac_ext <<EOF +@@ -6305,7 +6298,7 @@ + TERMLIBS="" -for termlib in ncurses curses termcap terminfo termlib; do +for termlib in curses termcap termlib; do echo $ac_n "checking for tputs in -l${termlib}""... $ac_c" 1>&6 - echo "configure:6231: checking for tputs in -l${termlib}" >&5 -@@ -6277,11 +6270,9 @@ + 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 \ @@ -98,7 +117,9 @@ $NetBSD: patch-aa,v 1.2 2001/04/19 00:25:23 dmcmahill Exp $ + warn_termlibs="I couldn't find -ltermcap, -lcurses, or -ltermlib!" echo "configure: warning: $warn_termlibs" 1>&2 fi -@@ -6990,17 +6981,17 @@ + +@@ -7069,19 +7060,19 @@ + cat << \EOF > $bsd_gcc_kluge_targets_frag lex.o: lex.cc - $(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $< @@ -121,21 +142,27 @@ $NetBSD: patch-aa,v 1.2 2001/04/19 00:25:23 dmcmahill Exp $ + ${LIBTOOL} --mode=compile $(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $< EOF -@@ -7271,5 +7262,5 @@ + ;; +@@ -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:7273: checking for a BSD compatible install" >&5 + 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 -@@ -7915,5 +7906,5 @@ + 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 \ -@@ -8154,8 +8145,4 @@ + test/Makefile dlfcn/Makefile \ +@@ -8237,10 +8228,6 @@ + top_srcdir="$ac_dots$ac_given_srcdir" ;; esac - case "$ac_given_INSTALL" in @@ -144,3 +171,4 @@ $NetBSD: patch-aa,v 1.2 2001/04/19 00:25:23 dmcmahill Exp $ - esac echo creating "$ac_file" + rm -f "$ac_file" diff --git a/math/octave-current/patches/patch-ac b/math/octave-current/patches/patch-ac index 2df5f206991..e08412c8a7f 100644 --- a/math/octave-current/patches/patch-ac +++ b/math/octave-current/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $ +$NetBSD: patch-ac,v 1.2 2001/04/22 20:23:02 jtb Exp $ ---- Makeconf.in.orig Sat Dec 9 07:41:37 2000 -+++ Makeconf.in Fri Dec 29 21:03:25 2000 -@@ -39,7 +39,7 @@ +--- Makeconf.in.orig Sun Apr 22 20:22:09 2001 ++++ Makeconf.in Sun Apr 22 20:37:34 2001 +@@ -42,7 +42,7 @@ RUNTEST = @RUNTEST@ @@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $ DEFAULT_PAGER = @DEFAULT_PAGER@ -@@ -56,7 +56,7 @@ +@@ -59,7 +59,7 @@ SHLEXT = @SHLEXT@ SHLEXT_VER = $(SHLEXT).$(version) @@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $ # Fortran to C translator and associated flags. -@@ -128,7 +128,7 @@ +@@ -134,7 +134,7 @@ $(LD_STATIC_FLAG) $(CPICFLAG) $(LDFLAGS) SH_LD = @SH_LD@ @@ -29,7 +29,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $ SONAME_FLAGS = @SONAME_FLAGS@ -@@ -284,16 +284,12 @@ +@@ -290,16 +290,12 @@ # How to make .o files: %.o : %.c @@ -38,7 +38,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $ %.o : %.cc - $(CXX) -c $(CPPFLAGS) $(ALL_CXXFLAGS) $< -o $@ -+ ${LIBTOOL} --mode=compile $(CXX) -c $(CPPFLAGS) $(ALL_CXXFLAGS) $< ++ ${LIBTOOL} --mode=compile $(CXX) -c $(CPPFLAGS) $(ALL_CXXFLAGS) $< -o $@ -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 67fb699ada0..c14c4feb506 100644 --- a/math/octave-current/patches/patch-ad +++ b/math/octave-current/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $ +$NetBSD: patch-ad,v 1.2 2001/04/22 20:23:02 jtb Exp $ ---- libcruft/Makefile.in.orig Fri Apr 7 09:31:53 2000 -+++ libcruft/Makefile.in Fri Apr 7 14:44:03 2000 -@@ -54,39 +54,14 @@ +--- 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) @@ -40,11 +40,11 @@ $NetBSD: patch-ad,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $ - 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) rm -f $@ -@@ -106,20 +81,7 @@ +@@ -113,20 +88,7 @@ install:: $(top_srcdir)/mkinstalldirs $(octlibdir) diff --git a/math/octave-current/patches/patch-ae b/math/octave-current/patches/patch-ae index dd881ca716e..dc2b3e27f7e 100644 --- a/math/octave-current/patches/patch-ae +++ b/math/octave-current/patches/patch-ae @@ -1,29 +1,31 @@ -$NetBSD: patch-ae,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $ +$NetBSD: patch-ae,v 1.2 2001/04/22 20:23:02 jtb Exp $ ---- libcruft/misc/Makefile.in.orig Fri Apr 7 10:34:43 2000 -+++ libcruft/misc/Makefile.in Fri Apr 7 14:49:50 2000 -@@ -27,15 +27,6 @@ +--- 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/dostop.o pic/f77-fcn.o +- 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 +47,5 @@ +@@ -56,7 +48,6 @@ 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 $@ diff --git a/math/octave-current/patches/patch-af b/math/octave-current/patches/patch-af index 98a7107af25..baefdb1d2f9 100644 --- a/math/octave-current/patches/patch-af +++ b/math/octave-current/patches/patch-af @@ -1,7 +1,7 @@ -$NetBSD: patch-af,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $ +$NetBSD: patch-af,v 1.2 2001/04/22 20:23:02 jtb Exp $ ---- liboctave/Makefile.in.orig Tue Jul 18 07:33:02 2000 -+++ liboctave/Makefile.in Sat Dec 30 10:13:43 2000 +--- 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@ @@ -28,12 +28,12 @@ $NetBSD: patch-af,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $ - libraries: - endif -endif -+libraries: liboctave.$(LIBEXT) +++libraries: liboctave.$(LIBEXT) .PHONY: libraries liboctave.$(LIBEXT): $(OBJECTS) - rm -f $@ -- $(AR) $(ARFLAGS) $@ $^ +- $(TEMPLATE_AR) $(TEMPLATE_ARFLAGS) $@ $^ - $(RANLIB) $@ + ${LIBTOOL} --mode=link cc -o liboctave.${LIBEXT} ${OBJECTS:.o=.lo} -rpath ${PREFIX}/lib -version-info ${version:2.1.%=2:%} diff --git a/math/octave-current/patches/patch-ag b/math/octave-current/patches/patch-ag index d183cc8dc8c..3d197ffe2d6 100644 --- a/math/octave-current/patches/patch-ag +++ b/math/octave-current/patches/patch-ag @@ -1,7 +1,7 @@ -$NetBSD: patch-ag,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $ +$NetBSD: patch-ag,v 1.2 2001/04/22 20:23:03 jtb Exp $ ---- src/Makefile.in.orig Sat Dec 9 07:42:21 2000 -+++ src/Makefile.in Mon Mar 26 21:44:49 2001 +--- src/Makefile.in.orig Sun Apr 22 20:22:24 2001 ++++ src/Makefile.in Sun Apr 22 20:52:40 2001 @@ -143,13 +143,7 @@ OBJECTS_1 := $(patsubst %.c, %.o, $(OBJECTS_2)) OBJECTS := $(patsubst %.cc, %.o, $(OBJECTS_1)) @@ -55,7 +55,7 @@ $NetBSD: patch-ag,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $ liboctinterp.$(LIBEXT): $(OBJECTS) - rm -f $@ -- $(AR) $(ARFLAGS) $@ $^ +- $(TEMPLATE_AR) $(TEMPLATE_ARFLAGS) $@ $^ - $(RANLIB) $@ + ${LIBTOOL} --mode=link cc -o liboctinterp.la ${OBJECTS:.o=.lo} -rpath ${PREFIX}/lib -version-info ${version:2.1.%=2:%} @@ -70,11 +70,10 @@ $NetBSD: patch-ag,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $ stmp-pic: pic @if [ -f stmp-pic ]; then \ -@@ -343,21 +320,7 @@ - .PHONY: install-oct +@@ -344,20 +321,7 @@ install-lib: -- $(top_srcdir)/mkinstalldirs $(octlibdir) + $(top_srcdir)/mkinstalldirs $(octlibdir) - if $(STATIC_LIBS); then \ - rm -f $(octlibdir)/liboctinterp.$(LIBEXT); \ - $(INSTALL_DATA) liboctinterp.$(LIBEXT) \ diff --git a/math/octave-current/patches/patch-ah b/math/octave-current/patches/patch-ah index 83d12bb0092..10f0858a854 100644 --- a/math/octave-current/patches/patch-ah +++ b/math/octave-current/patches/patch-ah @@ -1,7 +1,7 @@ -$NetBSD: patch-ah,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $ +$NetBSD: patch-ah,v 1.2 2001/04/22 20:23:03 jtb Exp $ ---- Makefile.in.orig Fri Dec 29 22:06:34 2000 -+++ Makefile.in Fri Dec 29 22:05:51 2000 +--- 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 |