diff options
author | adam <adam@pkgsrc.org> | 2005-07-01 16:11:04 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2005-07-01 16:11:04 +0000 |
commit | f4b9f31c2bb13369c3ab7b72232af2edd2f4be6c (patch) | |
tree | a8fcbd1cd21362e1da94e58f5ae033baf5ac5fce | |
parent | ec8dc5a2f36cf21dfe45be1867b6869ee45456f3 (diff) | |
download | pkgsrc-f4b9f31c2bb13369c3ab7b72232af2edd2f4be6c.tar.gz |
Changes 2.9.3:
* Bug fixes
-rw-r--r-- | math/octave-current/Makefile | 8 | ||||
-rw-r--r-- | math/octave-current/PLIST | 14 | ||||
-rw-r--r-- | math/octave-current/distinfo | 14 | ||||
-rw-r--r-- | math/octave-current/patches/patch-aa | 14 | ||||
-rw-r--r-- | math/octave-current/patches/patch-ag | 16 | ||||
-rw-r--r-- | math/octave-current/patches/patch-ah | 6 |
6 files changed, 39 insertions, 33 deletions
diff --git a/math/octave-current/Makefile b/math/octave-current/Makefile index 51a035bcc88..2167bb575d1 100644 --- a/math/octave-current/Makefile +++ b/math/octave-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2005/06/05 23:20:54 minskim Exp $ +# $NetBSD: Makefile,v 1.50 2005/07/01 16:11:05 adam Exp $ DISTNAME= octave-${OCTAVE_VER} PKGNAME= octave-current-${OCTAVE_VER} @@ -17,7 +17,7 @@ BUILD_DEPENDS+= bison>=1.875:../../devel/bison BUILD_DEPENDS+= gperf>=2.7:../../devel/gperf DEPENDS+= gnuplot>=3.7:../../graphics/gnuplot -OCTAVE_VER= 2.9.2 +OCTAVE_VER= 2.9.3 CONFLICTS+= octave-2.* .if (${MACHINE_ARCH} == "arm32") @@ -25,10 +25,10 @@ BROKEN= Internal compiler error occurs on arm32 (even with gcc-2.95.3) .endif USE_GNU_READLINE= yes -USE_TOOLS+= gmake USE_LIBTOOL= yes USE_MAKEINFO= yes -USE_PERL5= build +#USE_PERL5= build +USE_TOOLS+= gmake GNU_CONFIGURE= yes GCC_REQD= 3.0 diff --git a/math/octave-current/PLIST b/math/octave-current/PLIST index 76f4da1dad5..c10e0ae47a3 100644 --- a/math/octave-current/PLIST +++ b/math/octave-current/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.18 2005/06/05 23:20:54 minskim Exp $ +@comment $NetBSD: PLIST,v 1.19 2005/07/01 16:11:05 adam Exp $ bin/mkoctfile bin/mkoctfile-${PKGVERSION} bin/octave @@ -471,7 +471,6 @@ include/octave-${PKGVERSION}/octave/ov-dld-fcn.h include/octave-${PKGVERSION}/octave/ov-fcn-handle.h include/octave-${PKGVERSION}/octave/ov-fcn-inline.h include/octave-${PKGVERSION}/octave/ov-fcn.h -include/octave-${PKGVERSION}/octave/ov-file.h include/octave-${PKGVERSION}/octave/ov-int-traits.h include/octave-${PKGVERSION}/octave/ov-int16.h include/octave-${PKGVERSION}/octave/ov-int32.h @@ -613,6 +612,8 @@ libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/betainc.oct libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/builtin.oct libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/cellfun.oct libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/chol.oct +libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/chol2inv.oct +libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/cholinv.oct libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/clearplot.oct libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/closeplot.oct libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/colamd.oct @@ -673,6 +674,7 @@ libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/lsode.oct libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/lsode_options.oct libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/lu.oct libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/luinc.oct +libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/matrix_type.oct libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/max.oct libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/min.oct libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/minmax.oct @@ -699,6 +701,7 @@ libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/spdet.oct libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/spdiag.oct libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/spfind.oct libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/spinv.oct +libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/spkron.oct libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/splu.oct libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/spmax.oct libexec/octave/${PKGVERSION}/oct/${GNU_PLATFORM_DIR}/spmin.oct @@ -1297,6 +1300,7 @@ share/octave/${PKGVERSION}/m/special-matrix/invhilb.m share/octave/${PKGVERSION}/m/special-matrix/sylvester_matrix.m share/octave/${PKGVERSION}/m/special-matrix/toeplitz.m share/octave/${PKGVERSION}/m/special-matrix/vander.m +share/octave/${PKGVERSION}/m/startup/inputrc share/octave/${PKGVERSION}/m/startup/octaverc share/octave/${PKGVERSION}/m/statistics/base/center.m share/octave/${PKGVERSION}/m/statistics/base/cloglog.m @@ -1475,6 +1479,8 @@ share/octave/${PKGVERSION}/m/time/date.m share/octave/ls-R share/octave/site/m/startup/octaverc @dirrm share/octave/site/m/startup +@dirrm share/octave/site/api-v16/m +@dirrm share/octave/site/api-v16 @dirrm share/octave/${PKGVERSION}/site/m @dirrm share/octave/${PKGVERSION}/site @dirrm share/octave/${PKGVERSION}/m/time @@ -1514,8 +1520,8 @@ share/octave/site/m/startup/octaverc @dirrm share/octave/${PKGVERSION}/doc @dirrm share/octave/${PKGVERSION} @dirrm share/doc/html/octave -@dirrm libexec/octave/site/oct/api-v15/${GNU_PLATFORM_DIR} -@dirrm libexec/octave/site/oct/api-v15 +@dirrm libexec/octave/site/oct/api-v16/${GNU_PLATFORM_DIR} +@dirrm libexec/octave/site/oct/api-v16 @dirrm libexec/octave/site/oct/${GNU_PLATFORM_DIR} @dirrm libexec/octave/site/oct @dirrm libexec/octave/site/exec/${GNU_PLATFORM_DIR} diff --git a/math/octave-current/distinfo b/math/octave-current/distinfo index f2e86f5fdb0..31fe1b6dd7e 100644 --- a/math/octave-current/distinfo +++ b/math/octave-current/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.31 2005/05/26 21:22:27 kristerw Exp $ +$NetBSD: distinfo,v 1.32 2005/07/01 16:11:05 adam Exp $ -SHA1 (octave-2.9.2.tar.bz2) = 53ea2f6a4007fdad374161d5e04f87a3aaf839c0 -RMD160 (octave-2.9.2.tar.bz2) = a4a6dcfa8935db5397db8e6a7633b3dc55f314ff -Size (octave-2.9.2.tar.bz2) = 6166148 bytes -SHA1 (patch-aa) = 271c3463dec0b1859f86cf2340cd3fd61bc3d209 +SHA1 (octave-2.9.3.tar.bz2) = be8a478650943250f0ef65521ddac025c29f0d75 +RMD160 (octave-2.9.3.tar.bz2) = 6b0c922efaa534485f1607f1979c90839394b21d +Size (octave-2.9.3.tar.bz2) = 6213159 bytes +SHA1 (patch-aa) = 34994a9e366675dfaf8aca3ced4fc662504e81c8 SHA1 (patch-ac) = 16ec66a68e5ed80064d811cd1c8dda226a2f5ede SHA1 (patch-ad) = 01d0fb5878897a91d33e2cb7cbc6d2575a04c464 SHA1 (patch-ae) = 79544d09268d41647b081680fc839f4fe481b111 SHA1 (patch-af) = 265a320a349818412b7c469039bf9847fbaf687e -SHA1 (patch-ag) = ab4ea66196487e4e5fac195b0f4867124dd60fe6 -SHA1 (patch-ah) = f7009d8b35354a1d403d5bdeae68a211435b004c +SHA1 (patch-ag) = 67051eca55eb068ab6fb7d66d2c62ad7911bdcee +SHA1 (patch-ah) = f0f1989b0f6979f4978d7f6130b1d8d0776c1580 diff --git a/math/octave-current/patches/patch-aa b/math/octave-current/patches/patch-aa index d6592514196..faa4c0cbfd4 100644 --- a/math/octave-current/patches/patch-aa +++ b/math/octave-current/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.14 2005/05/26 21:22:27 kristerw Exp $ +$NetBSD: patch-aa,v 1.15 2005/07/01 16:11:05 adam Exp $ ---- configure.orig 2005-04-22 19:34:21.000000000 +0200 -+++ configure 2005-05-26 23:18:32.000000000 +0200 -@@ -10521,7 +10521,7 @@ +--- configure.orig 2005-05-18 14:02:46.000000000 +0000 ++++ configure +@@ -10526,7 +10526,7 @@ if $have_fortran_compiler; then %.c : %.f %.o : %.f @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.14 2005/05/26 21:22:27 kristerw Exp $ pic/%.o : %.f $(FC) -c $(FPICFLAG) $(ALL_FFLAGS) $< -o $@ -@@ -13229,7 +13229,7 @@ +@@ -13234,7 +13234,7 @@ TEMPLATE_AR='$(AR)' TEMPLATE_ARFLAGS="$ARFLAGS" library_path_var=LD_LIBRARY_PATH case "$canonical_host_type" in @@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.14 2005/05/26 21:22:27 kristerw Exp $ SH_LD=ld SH_LDFLAGS=-Bshareable ;; -@@ -22682,19 +22682,19 @@ +@@ -22687,19 +22687,19 @@ case "$canonical_host_type" in cat << \EOF > $bsd_gcc_kluge_targets_frag lex.o: lex.cc @@ -45,7 +45,7 @@ $NetBSD: patch-aa,v 1.14 2005/05/26 21:22:27 kristerw Exp $ EOF ;; -@@ -22822,9 +22822,9 @@ +@@ -22827,9 +22827,9 @@ then rm -rf "$tmp" fi diff --git a/math/octave-current/patches/patch-ag b/math/octave-current/patches/patch-ag index 2c82250d6b9..7a2be6e66b3 100644 --- a/math/octave-current/patches/patch-ag +++ b/math/octave-current/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.13 2005/04/01 10:15:19 adam Exp $ +$NetBSD: patch-ag,v 1.14 2005/07/01 16:11:05 adam Exp $ ---- src/Makefile.in.orig 2005-03-27 12:38:21.000000000 +0000 +--- src/Makefile.in.orig 2005-05-18 12:20:51.000000000 +0000 +++ src/Makefile.in -@@ -284,8 +284,9 @@ libraries: $(LIBRARIES) +@@ -287,8 +287,9 @@ libraries: $(LIBRARIES) liboctinterp.$(LIBEXT): $(OBJECTS) $(XERBLA) rm -f $@ @@ -14,7 +14,7 @@ $NetBSD: patch-ag,v 1.13 2005/04/01 10:15:19 adam Exp $ liboctinterp.$(SHLEXT_VER): liboctinterp.$(SHLEXT) rm -f $@ -@@ -293,7 +294,7 @@ liboctinterp.$(SHLEXT_VER): liboctinterp +@@ -296,7 +297,7 @@ liboctinterp.$(SHLEXT_VER): liboctinterp liboctinterp.$(SHLEXT): $(PICOBJ) $(PIC_XERBLA) rm -f $@ @@ -23,7 +23,7 @@ $NetBSD: patch-ag,v 1.13 2005/04/01 10:15:19 adam Exp $ stamp-oct-links: $(OCT_FILES) if [ -n "$(OCT_FILES)" ]; then \ -@@ -305,6 +306,7 @@ stamp-prereq: defaults.h oct-conf.h oct- +@@ -308,6 +309,7 @@ stamp-prereq: defaults.h oct-conf.h oct- touch stamp-prereq octave$(EXEEXT): stamp-prereq $(LIBRARIES) main.o $(DLD_STATIC_OBJ) @@ -31,7 +31,7 @@ $NetBSD: patch-ag,v 1.13 2005/04/01 10:15:19 adam Exp $ $(LD_CXX) $(CPPFLAGS) $(ALL_CXXFLAGS) $(RDYNAMIC_FLAG) \ $(ALL_LDFLAGS) -o $@ \ main.o $(DLD_STATIC_OBJ) \ -@@ -391,6 +393,7 @@ install-strip: +@@ -394,6 +396,7 @@ install-strip: install-bin: $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir) rm -f $(DESTDIR)$(bindir)/octave$(EXEEXT) @@ -39,7 +39,7 @@ $NetBSD: patch-ag,v 1.13 2005/04/01 10:15:19 adam Exp $ $(INSTALL_PROGRAM) octave$(EXEEXT) $(DESTDIR)$(bindir)/octave-$(version)$(EXEEXT) $(LN_S) octave-$(version)$(EXEEXT) $(DESTDIR)$(bindir)/octave$(EXEEXT) .PHONY: install-bin -@@ -401,6 +404,7 @@ install-oct: PKG_ADD +@@ -404,6 +407,7 @@ install-oct: PKG_ADD if [ -n "$(OCT_FILES)" ]; then \ xfiles="$(OCT_FILES)"; \ for f in $$xfiles; do \ @@ -47,7 +47,7 @@ $NetBSD: patch-ag,v 1.13 2005/04/01 10:15:19 adam Exp $ $(INSTALL_PROGRAM) $$f $(DESTDIR)$(octfiledir)/$$f; \ done; \ $(srcdir)/mk-oct-links $(DESTDIR)$(octfiledir) $(DLD_DEF_FILES); \ -@@ -411,9 +415,8 @@ install-lib: +@@ -414,9 +418,8 @@ install-lib: $(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir) if $(STATIC_LIBS); then \ rm -f $(DESTDIR)$(octlibdir)/liboctinterp.$(LIBEXT); \ diff --git a/math/octave-current/patches/patch-ah b/math/octave-current/patches/patch-ah index 9484a081516..d87426b643c 100644 --- a/math/octave-current/patches/patch-ah +++ b/math/octave-current/patches/patch-ah @@ -1,8 +1,8 @@ -$NetBSD: patch-ah,v 1.4 2005/01/12 06:02:29 jlam Exp $ +$NetBSD: patch-ah,v 1.5 2005/07/01 16:11:05 adam Exp $ ---- liboctave/f2c-main.c.orig 2002-04-03 19:44:22.000000000 -0500 +--- liboctave/f2c-main.c.orig 2005-05-18 12:20:20.000000000 +0000 +++ liboctave/f2c-main.c -@@ -20,6 +20,10 @@ Software Foundation, 59 Temple Place - S +@@ -21,6 +21,10 @@ Software Foundation, Inc., 51 Franklin S */ |