From fd984d3408dc1be9e461ccf52829ce052ea5593e Mon Sep 17 00:00:00 2001 From: adam Date: Thu, 26 Feb 2004 16:47:35 +0000 Subject: Changes 2.1.55: * Generally bug-fixes and enhancement (it's hard to find out by reading NEWS and ChangeLog) * Uses BUILDLINK3 --- math/octave-current/Makefile | 28 ++++++++++++------------ math/octave-current/PLIST | 42 ++++++++++++++++++++---------------- math/octave-current/distinfo | 14 ++++++------ math/octave-current/patches/patch-aa | 8 +++---- math/octave-current/patches/patch-ac | 12 +++++------ math/octave-current/patches/patch-ad | 8 +++---- math/octave-current/patches/patch-af | 8 +++---- 7 files changed, 63 insertions(+), 57 deletions(-) (limited to 'math/octave-current') diff --git a/math/octave-current/Makefile b/math/octave-current/Makefile index 4b4fbb02937..481d25fd1db 100644 --- a/math/octave-current/Makefile +++ b/math/octave-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2004/01/24 13:58:23 grant Exp $ +# $NetBSD: Makefile,v 1.28 2004/02/26 16:47:35 adam Exp $ # DISTNAME= octave-${OCTAVE_VER} @@ -18,21 +18,21 @@ BUILD_DEPENDS+= bison>=1.875:../../devel/bison BUILD_DEPENDS+= gperf>=2.7:../../devel/gperf DEPENDS+= gnuplot>=3.7:../../graphics/gnuplot -OCTAVE_VER= 2.1.53 +OCTAVE_VER= 2.1.55 CONFLICTS+= octave-2.0.* .if (${MACHINE_ARCH} == "arm32") BROKEN= Internal compiler error occurs on arm32 (even with gcc-2.95.3) .endif -USE_BUILDLINK2= YES -USE_FORTRAN= YES +USE_BUILDLINK3= yes +USE_FORTRAN= yes USE_GNU_TOOLS+= make -USE_GNU_READLINE= YES -USE_MAKEINFO= YES -USE_LIBTOOL= YES +USE_GNU_READLINE= yes +USE_MAKEINFO= yes +USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -GNU_CONFIGURE= YES +GNU_CONFIGURE= yes INFO_FILES= octave.info liboctave.info LIBOCTAVE_INFO= liboctave.info liboctave.info-1 \ @@ -59,10 +59,10 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/$f ${PREFIX}/share/doc/html/octave .endfor -.include "../../audio/libsndfile/buildlink2.mk" -.include "../../devel/readline/buildlink2.mk" -.include "../../devel/ncurses/buildlink2.mk" -.include "../../math/blas/buildlink2.mk" -.include "../../math/fftw2/buildlink2.mk" -.include "../../math/lapack/buildlink2.mk" +.include "../../audio/libsndfile/buildlink3.mk" +.include "../../devel/readline/buildlink3.mk" +.include "../../devel/ncurses/buildlink3.mk" +.include "../../math/blas/buildlink3.mk" +.include "../../math/fftw2/buildlink3.mk" +.include "../../math/lapack/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/octave-current/PLIST b/math/octave-current/PLIST index affb74f7f54..ceb5ba96a88 100644 --- a/math/octave-current/PLIST +++ b/math/octave-current/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2004/01/23 13:26:20 adam Exp $ +@comment $NetBSD: PLIST,v 1.7 2004/02/26 16:47:35 adam Exp $ bin/mkoctfile bin/mkoctfile-${PKGVERSION} bin/octave @@ -332,17 +332,17 @@ lib/libcruft.a lib/libcruft.la lib/libcruft.so lib/libcruft.so.2 -lib/libcruft.so.2.53 +lib/libcruft.so.2.55 lib/liboctave.a lib/liboctave.la lib/liboctave.so lib/liboctave.so.2 -lib/liboctave.so.2.53 +lib/liboctave.so.2.55 lib/liboctinterp.a lib/liboctinterp.la lib/liboctinterp.so lib/liboctinterp.so.2 -lib/liboctinterp.so.2.53 +lib/liboctinterp.so.2.55 libexec/octave/${PKGVERSION}/exec/${MACHINE_GNU_PLATFORM}/info-emacs-info libexec/octave/${PKGVERSION}/exec/${MACHINE_GNU_PLATFORM}/info-emacs-octave-help libexec/octave/ls-R @@ -529,14 +529,17 @@ share/octave/${PKGVERSION}/m/control/obsolete/syschnames.m share/octave/${PKGVERSION}/m/control/obsolete/unpacksys.m share/octave/${PKGVERSION}/m/control/system/__abcddims__.m share/octave/${PKGVERSION}/m/control/system/__syschnamesl__.m +share/octave/${PKGVERSION}/m/control/system/__sysconcat__.m share/octave/${PKGVERSION}/m/control/system/__syscont_disc__.m share/octave/${PKGVERSION}/m/control/system/__sysdefioname__.m share/octave/${PKGVERSION}/m/control/system/__sysdefstname__.m share/octave/${PKGVERSION}/m/control/system/__sysgroupn__.m share/octave/${PKGVERSION}/m/control/system/__tf2sysl__.m +share/octave/${PKGVERSION}/m/control/system/__tfl__.m share/octave/${PKGVERSION}/m/control/system/__zp2ssg2__.m share/octave/${PKGVERSION}/m/control/system/abcddim.m share/octave/${PKGVERSION}/m/control/system/buildssic.m +share/octave/${PKGVERSION}/m/control/system/cellidx.m share/octave/${PKGVERSION}/m/control/system/c2d.m share/octave/${PKGVERSION}/m/control/system/d2c.m share/octave/${PKGVERSION}/m/control/system/dmr2d.m @@ -557,6 +560,7 @@ share/octave/${PKGVERSION}/m/control/system/moddemo.m share/octave/${PKGVERSION}/m/control/system/ord2.m share/octave/${PKGVERSION}/m/control/system/packedform.m share/octave/${PKGVERSION}/m/control/system/parallel.m +share/octave/${PKGVERSION}/m/control/system/ss.m share/octave/${PKGVERSION}/m/control/system/ss2sys.m share/octave/${PKGVERSION}/m/control/system/ss2tf.m share/octave/${PKGVERSION}/m/control/system/ss2zp.m @@ -588,11 +592,13 @@ share/octave/${PKGVERSION}/m/control/system/sysscale.m share/octave/${PKGVERSION}/m/control/system/syssetsignals.m share/octave/${PKGVERSION}/m/control/system/syssub.m share/octave/${PKGVERSION}/m/control/system/sysupdate.m +share/octave/${PKGVERSION}/m/control/system/tf.m share/octave/${PKGVERSION}/m/control/system/tf2ss.m share/octave/${PKGVERSION}/m/control/system/tf2sys.m share/octave/${PKGVERSION}/m/control/system/tf2zp.m share/octave/${PKGVERSION}/m/control/system/tfout.m share/octave/${PKGVERSION}/m/control/system/ugain.m +share/octave/${PKGVERSION}/m/control/system/zp.m share/octave/${PKGVERSION}/m/control/system/zp2ss.m share/octave/${PKGVERSION}/m/control/system/zp2sys.m share/octave/${PKGVERSION}/m/control/system/zp2tf.m @@ -1049,21 +1055,21 @@ share/octave/${PKGVERSION}/m/time/asctime.m share/octave/${PKGVERSION}/m/time/clock.m share/octave/${PKGVERSION}/m/time/ctime.m share/octave/${PKGVERSION}/m/time/date.m -share/octave/2.1.53/m/general/ind2sub.m -share/octave/2.1.53/m/general/sub2ind.m -share/octave/2.1.53/m/miscellaneous/PKG_ADD -share/octave/2.1.53/m/miscellaneous/computer.m -share/octave/2.1.53/m/miscellaneous/delete.m -share/octave/2.1.53/m/miscellaneous/dir.m -share/octave/2.1.53/m/miscellaneous/ispc.m -share/octave/2.1.53/m/miscellaneous/isunix.m -share/octave/2.1.53/m/miscellaneous/not.m -share/octave/2.1.53/m/miscellaneous/unix.m +share/octave/${PKGVERSION}/m/general/ind2sub.m +share/octave/${PKGVERSION}/m/general/sub2ind.m +share/octave/${PKGVERSION}/m/miscellaneous/PKG_ADD +share/octave/${PKGVERSION}/m/miscellaneous/computer.m +share/octave/${PKGVERSION}/m/miscellaneous/delete.m +share/octave/${PKGVERSION}/m/miscellaneous/dir.m +share/octave/${PKGVERSION}/m/miscellaneous/ispc.m +share/octave/${PKGVERSION}/m/miscellaneous/isunix.m +share/octave/${PKGVERSION}/m/miscellaneous/not.m +share/octave/${PKGVERSION}/m/miscellaneous/unix.m share/octave/ls-R share/octave/site/m/startup/octaverc @dirrm share/octave/site/m/startup -@dirrm share/octave/site/api-v4/m -@dirrm share/octave/site/api-v4 +@dirrm share/octave/site/api-v6/m +@dirrm share/octave/site/api-v6 @dirrm share/octave/${PKGVERSION}/site/m @dirrm share/octave/${PKGVERSION}/site @dirrm share/octave/${PKGVERSION}/m/time @@ -1101,8 +1107,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-v4/${MACHINE_GNU_PLATFORM} -@dirrm libexec/octave/site/oct/api-v4 +@dirrm libexec/octave/site/oct/api-v6/${MACHINE_GNU_PLATFORM} +@dirrm libexec/octave/site/oct/api-v6 @dirrm libexec/octave/site/oct/${MACHINE_GNU_PLATFORM} @dirrm libexec/octave/site/oct @dirrm libexec/octave/site/exec/${MACHINE_GNU_PLATFORM} diff --git a/math/octave-current/distinfo b/math/octave-current/distinfo index 14f9f949ca4..0c52cb154ef 100644 --- a/math/octave-current/distinfo +++ b/math/octave-current/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.14 2004/01/23 13:26:20 adam Exp $ +$NetBSD: distinfo,v 1.15 2004/02/26 16:47:35 adam Exp $ -SHA1 (octave-2.1.53.tar.bz2) = 6c5122be89c5f997c2de6c4a8f25a9551b5d5cfa -Size (octave-2.1.53.tar.bz2) = 4184523 bytes -SHA1 (patch-aa) = 5377b595ca28fc1a2b8e010d7b8c22c75e31ea4b -SHA1 (patch-ac) = e788ad9681bbc91fb986c1a53bc7405319990891 -SHA1 (patch-ad) = 879339a2600ad0d29e4e1123815ee402cf977bea +SHA1 (octave-2.1.55.tar.bz2) = fe6cda19a51943fc6e8037c6676d2ad4aa91cee3 +Size (octave-2.1.55.tar.bz2) = 4197965 bytes +SHA1 (patch-aa) = 987d081e29539c2b6730e35bd784ac9a82c961e8 +SHA1 (patch-ac) = 201e5e6a58f6934371daa9ccac8d4f1f01533a4c +SHA1 (patch-ad) = 03dfbfb17b1262d5094dbc42758a99011e05fdd4 SHA1 (patch-ae) = 79544d09268d41647b081680fc839f4fe481b111 -SHA1 (patch-af) = f4448a1d9be8fb44d56afdd3de54264159cea6af +SHA1 (patch-af) = 615b71576afc542c449aff41caf1333a04d9aeab SHA1 (patch-ag) = 96aca7c59bfebbd1462c09ec9f8000f210123cb8 diff --git a/math/octave-current/patches/patch-aa b/math/octave-current/patches/patch-aa index 94b83473049..87b891affc0 100644 --- a/math/octave-current/patches/patch-aa +++ b/math/octave-current/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.5 2004/01/23 13:26:20 adam Exp $ +$NetBSD: patch-aa,v 1.6 2004/02/26 16:47:35 adam Exp $ ---- configure.orig 2004-01-23 04:15:38.000000000 +0000 +--- configure.orig 2004-02-20 21:17:41.000000000 +0000 +++ configure -@@ -8048,7 +8048,7 @@ if $have_fortran_compiler; then +@@ -7977,7 +7977,7 @@ if $have_fortran_compiler; then %.c : %.f %.o : %.f @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.5 2004/01/23 13:26:20 adam Exp $ pic/%.o : %.f $(FC) -c $(FPICFLAG) $(ALL_FFLAGS) $< -o $@ -@@ -18826,19 +18826,19 @@ case "$canonical_host_type" in +@@ -18764,19 +18764,19 @@ case "$canonical_host_type" in cat << \EOF > $bsd_gcc_kluge_targets_frag lex.o: lex.cc diff --git a/math/octave-current/patches/patch-ac b/math/octave-current/patches/patch-ac index 5e1f2e6a2bf..c091eee65ec 100644 --- a/math/octave-current/patches/patch-ac +++ b/math/octave-current/patches/patch-ac @@ -1,17 +1,17 @@ -$NetBSD: patch-ac,v 1.3 2003/12/04 11:15:37 adam Exp $ +$NetBSD: patch-ac,v 1.4 2004/02/26 16:47:35 adam Exp $ ---- Makeconf.in.orig 2003-11-16 01:33:50.000000000 +0100 +--- Makeconf.in.orig 2004-02-16 19:57:21.000000000 +0000 +++ Makeconf.in -@@ -73,7 +73,7 @@ SHLLINKEXT= - - INCLUDE_LINK_DEPS = @INCLUDE_LINK_DEPS@ +@@ -71,7 +71,7 @@ SHLBIN = @SHLBIN@ + SHLBIN_VER = @SHLBIN_VER@ + SHLLINKEXT= -LIBEXT = a +LIBEXT = la # Fortran to C translator and associated flags. -@@ -334,10 +334,10 @@ NO_OCT_FILE_STRIP = @NO_OCT_FILE_STRIP@ +@@ -335,10 +335,10 @@ NO_OCT_FILE_STRIP = @NO_OCT_FILE_STRIP@ # How to make .o files: %.o : %.c diff --git a/math/octave-current/patches/patch-ad b/math/octave-current/patches/patch-ad index aedef1f279f..a194aa0ef56 100644 --- a/math/octave-current/patches/patch-ad +++ b/math/octave-current/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.3 2003/12/04 11:15:37 adam Exp $ +$NetBSD: patch-ad,v 1.4 2004/02/26 16:47:35 adam Exp $ ---- libcruft/Makefile.in.orig 2003-10-30 17:48:09.000000000 +0100 +--- libcruft/Makefile.in.orig 2004-02-16 19:57:21.000000000 +0000 +++ libcruft/Makefile.in -@@ -100,8 +100,8 @@ libraries: $(SUBDIRS) +@@ -98,8 +98,8 @@ libraries: $(SUBDIRS) libcruft.$(LIBEXT): $(CRUFT_OBJ) rm -f $@ @@ -13,7 +13,7 @@ $NetBSD: patch-ad,v 1.3 2003/12/04 11:15:37 adam Exp $ libcruft.$(SHLEXT_VER): libcruft.$(SHLEXT) rm -f $@ -@@ -126,9 +126,8 @@ install:: +@@ -124,9 +124,8 @@ install:: $(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir) if $(STATIC_LIBS); then \ rm -f $(DESTDIR)$(octlibdir)/libcruft.$(LIBEXT) ; \ diff --git a/math/octave-current/patches/patch-af b/math/octave-current/patches/patch-af index 96c9ab47fea..0b978706fba 100644 --- a/math/octave-current/patches/patch-af +++ b/math/octave-current/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.4 2003/12/04 11:15:37 adam Exp $ +$NetBSD: patch-af,v 1.5 2004/02/26 16:47:35 adam Exp $ ---- liboctave/Makefile.in.orig 2003-11-15 03:01:46.000000000 +0100 +--- liboctave/Makefile.in.orig 2004-02-16 19:57:21.000000000 +0000 +++ liboctave/Makefile.in -@@ -204,8 +204,9 @@ endif +@@ -201,8 +201,9 @@ endif liboctave.$(LIBEXT): $(LIBOCTAVE_OBJECTS) rm -f $@ @@ -14,7 +14,7 @@ $NetBSD: patch-af,v 1.4 2003/12/04 11:15:37 adam Exp $ liboctave.$(SHLEXT_VER): liboctave.$(SHLEXT) rm -f $@ -@@ -232,9 +233,8 @@ install-lib: +@@ -229,9 +230,8 @@ install-lib: $(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir) if $(STATIC_LIBS); then \ rm -f $(DESTDIR)$(octlibdir)/liboctave.$(LIBEXT); \ -- cgit v1.2.3