[121950] trunk/dports/math/octave
sean at macports.org
sean at macports.org
Fri Jul 11 22:24:46 PDT 2014
Revision: 121950
https://trac.macports.org/changeset/121950
Author: sean at macports.org
Date: 2014-07-11 22:24:46 -0700 (Fri, 11 Jul 2014)
Log Message:
-----------
octave: update to 3.8.1
Modified Paths:
--------------
trunk/dports/math/octave/Portfile
Added Paths:
-----------
trunk/dports/math/octave/files/Info.plist
trunk/dports/math/octave/files/Octave
trunk/dports/math/octave/files/Octave.icns
Removed Paths:
-------------
trunk/dports/math/octave/files/patch-configure.diff
trunk/dports/math/octave/files/patch-liboctave-eigs-base.cc.diff
trunk/dports/math/octave/files/patch-liboctave-regexp.h.diff
trunk/dports/math/octave/files/patch-src-display.cc.diff
trunk/dports/math/octave/files/texinfo5.patch
Modified: trunk/dports/math/octave/Portfile
===================================================================
--- trunk/dports/math/octave/Portfile 2014-07-12 05:24:36 UTC (rev 121949)
+++ trunk/dports/math/octave/Portfile 2014-07-12 05:24:46 UTC (rev 121950)
@@ -11,8 +11,7 @@
name octave
-version 3.6.4
-revision 14
+version 3.8.1
#conflicts octave-devel
categories math science
maintainers michaelld openmaintainer
@@ -33,27 +32,9 @@
master_sites gnu:octave
use_bzip2 yes
-checksums \
- rmd160 b0356f0c5d9366b8129d72ac58bbde837fee1a95 \
- sha256 fa185df9591f5d740f4d37ff6eaf06db576fdd3e0ddd9d0737365799e5d1c962
+checksums rmd160 a76587b29a964791982bd9c803b0394411b9f874 \
+ sha256 d6762ed2ad4a042243a095fb44c7a1d3a91c635b6dca37fcef15a5efdffa9bbd
-# temporary patches; these are already, or will be, fixed upstream.
-
-patchfiles-append \
- patch-liboctave-eigs-base.cc.diff \
- patch-liboctave-regexp.h.diff \
- patch-configure.diff \
- texinfo5.patch
-
-if {${os.major} >= 11} {
-
- # 10.7 and newer requires an extra patch; this patch will
- # break the build on 10.6 and prior.
-
- patchfiles-append patch-src-display.cc.diff
-
-}
-
depends_build-append \
port:bison \
port:flex \
@@ -62,7 +43,6 @@
port:pkgconfig
depends_lib-append \
- path:lib/libgcc/libgcc_s.1.dylib:libgcc \
port:arpack \
port:curl \
port:fftw-3 \
@@ -91,10 +71,12 @@
universal_variant no
# common configure arguments
-
configure.args \
--disable-dependency-tracking \
- --with-umfpack="-lumfpack -lSuiteSparse"
+ --with-umfpack="-lumfpack -lSuiteSparse" \
+ --disable-java \
+ --with-opengl \
+ --with-framework-opengl
# octave uses a number of other ports to create sources from template:
# perl, gawk, gsed, flex, bison, texinfo. Make sure these are the
@@ -177,7 +159,7 @@
# NOTE: libtatlas does not work as of 3.10.1_5
configure.args-append \
--with-blas="-lcblas -lf77blas -latlas" \
- --with-lapack="-llapack -lgfortran"
+ --with-lapack="-llapack"
}
@@ -210,25 +192,39 @@
}
-variant fltk description {Enable FLTK as a graphical front-end} {}
+variant gui description {Enable experimental gui} {}
-if {[variant_isset fltk]} {
+if {[variant_isset gui]} {
- depends_lib-append path:lib/libfltk.dylib:fltk \
- port:fontconfig \
- port:freetype
- configure.args-append --with-opengl
+ depends_lib-append port:qt4-mac
+ configure.args-append --enable-gui
} else {
- configure.args-append --without-opengl
+ configure.args-append --disable-gui
}
+# jit build fails for 3.8.1
+# variant jit description {Enable experimental JIT compiler} {}
+
+# if {[variant_isset jit]} {
+
+# depends_lib-append port:clang-3.3
+# configure.args-append --enable-jit
+# configure.env-append LLVM_CONFIG=${prefix}/bin/llvm-config-mp-3.3 \
+# SHLIB_CXXLD=clang++-mp-3.3
+# configure.cc clang-mp-3.3
+# configure.cxx clang++-mp-3.3
+
+# } else {
+
+# configure.args-append --disable-jit
+
+# }
+
variant metis description {Use SuiteSparse + Metis for graph partitioning} {
- pre-fetch {
- ui_msg "\nWARNING: ${name} variant +metis uses the metis port, whose license is incompatible with Octave's. You can use this combination locally, but you cannot distribute them as a single package (e.g., tarball, m/pkg, archive)."
- }
+ notes-append "\nWARNING: ${name} variant +metis uses the metis port, whose license is incompatible with Octave's. You can use this combination locally, but you cannot distribute them as a single package (e.g., tarball, m/pkg, archive)."
}
if {[variant_isset metis]} {
@@ -248,28 +244,37 @@
}
-pre-fetch {
+# check for +accelerate here as well as in dependent ports;
+# Apple's VecLib has bugs that cause Octave to crash sometimes,
+# while Atlas does not have these issues. Print a warning if this
+# variant is in use, but do not force the use of +atlas (for now).
- # check for +accelerate here as well as in dependent ports;
- # Apple's VecLib has bugs that cause Octave to crash sometimes,
- # while Atlas does not have these issues. Print a warning if this
- # variant is in use, but do not force the use of +atlas (for now).
-
- if {![catch {set result [active_variants arpack accelerate {}]}]} {
- if {$result} {
- ui_msg "\nWARNING: Dependency 'arpack' is installed with the +accelerate variant, using Apple's Vector Libraries which have known bugs that can cause Octave to crash if using certain functions in arpack. The +atlas variant does not have these issues with Octave, and is considered by Octave developers a better way to go.\n"
- }
+if {![catch {set result [active_variants arpack accelerate {}]}]} {
+ if {$result} {
+ notes-append "\nWARNING: Dependency 'arpack' is installed with the +accelerate variant, using Apple's Vector Libraries which have some known bugs that can cause Octave to crash if using certain functions in arpack. The +atlas variant does not have these issues with Octave, but does take many hours to compile even on modern hardware.\n"
}
+}
- if {[variant_isset accelerate]} {
- ui_msg "\nWARNING: The +accelerate variant has been selected, using Apple's Vector Libraries which have known bugs that can cause Octave to crash. The +atlas variant does not have these issues with Octave, and is considered by Octave developers a better way to go.\n"
- }
+if {[variant_isset accelerate]} {
+ notes-append "\nWARNING: The +accelerate variant has been selected, using Apple's Vector Libraries which have some known bugs that can cause Octave to crash. The +atlas variant does not have these issues with Octave, but does take many hours to compile even on modern hardware.\n"
}
-# https://trac.macports.org/ticket/41582
+post-destroot {
+ system "echo 'graphics_toolkit(\"gnuplot\");' >> ${destroot}${prefix}/share/octave/site/m/startup/octaverc"
-use_parallel_build no
+ if {[variant_isset gui]} {
+ set appdir ${destroot}${applications_dir}/Octave.app
+ xinstall -d ${appdir}/Contents/MacOS
+ xinstall -d ${appdir}/Contents/Resources
+ xinstall -m 644 ${filespath}/Info.plist ${appdir}/Contents/
+ xinstall -m 644 ${filespath}/Octave.icns ${appdir}/Contents/Resources/
+ xinstall -m 755 ${filespath}/Octave ${appdir}/Contents/MacOS
+
+ reinplace -W ${appdir}/Contents "s,@@VERSION@@,${version},g" Info.plist
+ }
+}
+
livecheck.type regex
livecheck.url http://www.gnu.org/software/octave/download.html
livecheck.regex GNU Octave (\[\^\ \]*) was
Added: trunk/dports/math/octave/files/Info.plist
===================================================================
--- trunk/dports/math/octave/files/Info.plist (rev 0)
+++ trunk/dports/math/octave/files/Info.plist 2014-07-12 05:24:46 UTC (rev 121950)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>NSUIElement</key>
+ <string>1</string>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleExecutable</key>
+ <string>Octave</string>
+ <key>CFBundleIconFile</key>
+ <string>Octave.icns</string>
+ <key>CFBundleDocumentTypes</key>
+ <array>
+ <dict>
+ <key>CFBundleTypeExtensions</key>
+ <array>
+ <string>m</string>
+ </array>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>CFBundleTypeOSTypes</key>
+ <string>Mfile</string>
+ </dict>
+ </array>
+ <key>CFBundleIdentifier</key>
+ <string>org.octave.Octave</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleSignature</key>
+ <string>Octave</string>
+ <key>CFBundleVersion</key>
+ <string>@@VERSION@@</string>
+ <key>CFBundleShortVersion</key>
+ <string>@@VERSION@@</string>
+</dict>
+</plist>
Added: trunk/dports/math/octave/files/Octave
===================================================================
--- trunk/dports/math/octave/files/Octave (rev 0)
+++ trunk/dports/math/octave/files/Octave 2014-07-12 05:24:46 UTC (rev 121950)
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/opt/local/bin/octave --force-gui
Property changes on: trunk/dports/math/octave/files/Octave
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/dports/math/octave/files/Octave.icns
===================================================================
(Binary files differ)
Property changes on: trunk/dports/math/octave/files/Octave.icns
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/dports/math/octave/files/patch-configure.diff
===================================================================
--- trunk/dports/math/octave/files/patch-configure.diff 2014-07-12 05:24:36 UTC (rev 121949)
+++ trunk/dports/math/octave/files/patch-configure.diff 2014-07-12 05:24:46 UTC (rev 121950)
@@ -1,11 +0,0 @@
---- configure.orig 2013-11-01 12:13:00.000000000 -0400
-+++ configure 2013-11-01 12:44:53.000000000 -0400
-@@ -58248,7 +58248,7 @@
- main ()
- {
-
-- std::unordered_map m;
-+ std::unordered_map<int,int> m;
-
- ;
- return 0;
Deleted: trunk/dports/math/octave/files/patch-liboctave-eigs-base.cc.diff
===================================================================
--- trunk/dports/math/octave/files/patch-liboctave-eigs-base.cc.diff 2014-07-12 05:24:36 UTC (rev 121949)
+++ trunk/dports/math/octave/files/patch-liboctave-eigs-base.cc.diff 2014-07-12 05:24:46 UTC (rev 121950)
@@ -1,58 +0,0 @@
---- liboctave/eigs-base.cc.orig 2013-07-08 16:37:38.000000000 -0400
-+++ liboctave/eigs-base.cc 2013-07-08 16:47:33.000000000 -0400
-@@ -3833,43 +3833,43 @@
- #endif
-
- #ifndef _MSC_VER
--template static octave_idx_type
-+template octave_idx_type
- lusolve (const SparseMatrix&, const SparseMatrix&, Matrix&);
-
--template static octave_idx_type
-+template octave_idx_type
- lusolve (const SparseComplexMatrix&, const SparseComplexMatrix&,
- ComplexMatrix&);
-
--template static octave_idx_type
-+template octave_idx_type
- lusolve (const Matrix&, const Matrix&, Matrix&);
-
--template static octave_idx_type
-+template octave_idx_type
- lusolve (const ComplexMatrix&, const ComplexMatrix&, ComplexMatrix&);
-
--template static ComplexMatrix
-+template ComplexMatrix
- ltsolve (const SparseComplexMatrix&, const ColumnVector&,
- const ComplexMatrix&);
-
--template static Matrix
-+template Matrix
- ltsolve (const SparseMatrix&, const ColumnVector&, const Matrix&);
-
--template static ComplexMatrix
-+template ComplexMatrix
- ltsolve (const ComplexMatrix&, const ColumnVector&, const ComplexMatrix&);
-
--template static Matrix
-+template Matrix
- ltsolve (const Matrix&, const ColumnVector&, const Matrix&);
-
--template static ComplexMatrix
-+template ComplexMatrix
- utsolve (const SparseComplexMatrix&, const ColumnVector&,
- const ComplexMatrix&);
-
--template static Matrix
-+template Matrix
- utsolve (const SparseMatrix&, const ColumnVector&, const Matrix&);
-
--template static ComplexMatrix
-+template ComplexMatrix
- utsolve (const ComplexMatrix&, const ColumnVector&, const ComplexMatrix&);
-
--template static Matrix
-+template Matrix
- utsolve (const Matrix&, const ColumnVector&, const Matrix&);
- #endif
-
Deleted: trunk/dports/math/octave/files/patch-liboctave-regexp.h.diff
===================================================================
--- trunk/dports/math/octave/files/patch-liboctave-regexp.h.diff 2014-07-12 05:24:36 UTC (rev 121949)
+++ trunk/dports/math/octave/files/patch-liboctave-regexp.h.diff 2014-07-12 05:24:46 UTC (rev 121950)
@@ -1,11 +0,0 @@
---- liboctave/regexp.h.orig 2013-07-08 15:56:42.000000000 -0400
-+++ liboctave/regexp.h 2013-07-08 15:56:48.000000000 -0400
-@@ -87,7 +87,7 @@
- std::string replace (const std::string& buffer,
- const std::string& replacement);
-
-- struct opts
-+ class opts
- {
- public:
-
Deleted: trunk/dports/math/octave/files/patch-src-display.cc.diff
===================================================================
--- trunk/dports/math/octave/files/patch-src-display.cc.diff 2014-07-12 05:24:36 UTC (rev 121949)
+++ trunk/dports/math/octave/files/patch-src-display.cc.diff 2014-07-12 05:24:46 UTC (rev 121950)
@@ -1,32 +0,0 @@
---- src/display.cc.orig 2012-09-21 11:29:13.000000000 -0400
-+++ src/display.cc 2012-09-21 11:29:27.000000000 -0400
-@@ -41,6 +41,29 @@
-
- display_info *display_info::instance = 0;
-
-+#if defined (HAVE_FRAMEWORK_CARBON)
-+// for 10.7 and newer only; would work with 10.6, but the function
-+// "CGDisplayBitsPerPixel" is still provided by the Carbon framework
-+// with a warning that it will be deprecated (but, it works).
-+size_t
-+CGDisplayBitsPerPixel (CGDirectDisplayID display)
-+{
-+ CGDisplayModeRef originalMode = CGDisplayCopyDisplayMode (display);
-+ CFStringRef pixelEncoding = CGDisplayModeCopyPixelEncoding (originalMode);
-+ size_t rv = 8;
-+
-+ if (CFStringCompare (pixelEncoding, CFSTR (IO32BitDirectPixels), 0) == 0) {
-+ rv = 32;
-+ } else {
-+ if (CFStringCompare (pixelEncoding, CFSTR (IO16BitDirectPixels), 0) == 0) {
-+ rv = 16;
-+ }
-+ // else rv <= 8, by default.
-+ }
-+ return (rv);
-+}
-+#endif
-+
- void
- display_info::init (bool query)
- {
Deleted: trunk/dports/math/octave/files/texinfo5.patch
===================================================================
--- trunk/dports/math/octave/files/texinfo5.patch 2014-07-12 05:24:36 UTC (rev 121949)
+++ trunk/dports/math/octave/files/texinfo5.patch 2014-07-12 05:24:46 UTC (rev 121950)
@@ -1,632 +0,0 @@
-This patch was constructed using the following changesets from the
-Octave Mercurial repository (http://www.octave.org/hg/octave):
-
- 16094:8899c785cc99 (http://www.octave.org/hg/octave/rev/8899c785cc99)
- 16096:9720ecf8d257 (http://www.octave.org/hg/octave/rev/9720ecf8d257)
- 16489:36dba9be680b (http://www.octave.org/hg/octave/rev/36dba9be680b)
- 16490:f50fe9c50f55 (http://www.octave.org/hg/octave/rev/f50fe9c50f55)
- 16806:ab0454713ded (http://www.octave.org/hg/octave/rev/ab0454713ded)
- 17242:3f4091dddc13 (http://www.octave.org/hg/octave/rev/3f4091dddc13)
- 17591:7c479b7d3aab (http://www.octave.org/hg/octave/rev/7c479b7d3aab)
-
-Index: doc/interpreter/octave.texi
-===================================================================
---- doc/interpreter/octave.texi.orig
-+++ doc/interpreter/octave.texi
-@@ -129,7 +129,8 @@ modified versions.
- @sp 2
- @multitable @columnfractions 0.4 0.025 0.65
- @item
-- at flushright @image{octave_logo,2.1in} @end flushright
-+ at flushright @image{octave_logo,2.1in}
-+ at end flushright
- @tab
- @c this is a spacer column
- @tab
-@@ -535,6 +536,9 @@ High-Level Plotting
- * Plot Annotations::
- * Multiple Plots on One Page::
- * Multiple Plot Windows::
-+* Use of @code{axis}@comma{} @code{line}@comma{} and @code{patch} Functions
-+* Manipulation of Plot Windows::
-+* Use of the @code{interpreter} Property::
- * Printing and Saving Plots::
- * Interacting with Plots::
- * Test Plotting Functions::
-Index: doc/interpreter/plot.txi
-===================================================================
---- doc/interpreter/plot.txi.orig
-+++ doc/interpreter/plot.txi
-@@ -62,6 +62,9 @@ and @ref{Advanced Plotting}.
- * Plot Annotations::
- * Multiple Plots on One Page::
- * Multiple Plot Windows::
-+* Use of @code{axis}@comma{} @code{line}@comma{} and @code{patch} Functions::
-+* Manipulation of Plot Windows::
-+* Use of the @code{interpreter} Property::
- * Printing and Saving Plots::
- * Interacting with Plots::
- * Test Plotting Functions::
-@@ -511,8 +514,9 @@ creates two figures, with the first disp
- the second a cosine wave. Figure numbers must be positive integers.
-
- @DOCSTRING(figure)
-- at subsection Use of @code{axis}, @code{line}, and @code{patch} functions
-- at cindex use of @code{axis}, @code{line}, and @code{patch} functions
-+
-+ at node Use of @code{axis}@comma{} @code{line}@comma{} and @code{patch} Functions
-+ at subsection Use of @code{axis}@comma{} @code{line}@comma{} and @code{patch} Functions
-
- You can create axes, line, and patch objects directly using the
- @code{axes}, @code{line}, and @code{patch} functions. These objects
-@@ -526,8 +530,8 @@ become children of the current axes obje
-
- @DOCSTRING(surface)
-
-- at subsection Manipulation of plot windows
-- at cindex manipulation of plot windows
-+ at node Manipulation of Plot Windows
-+ at subsection Manipulation of Plot Windows
-
- By default, Octave refreshes the plot window when a prompt is printed,
- or when waiting for input. The
-@@ -585,8 +589,8 @@ figure window, call the @code{close} fun
-
- @DOCSTRING(closereq)
-
-+ at node Use of the @code{interpreter} Property
- @subsection Use of the @code{interpreter} Property
-- at cindex use of the @code{interpreter} property
-
- All text objects, including titles, labels, legends, and text, include
- the property 'interpreter', this property determines the manner in which
-@@ -2545,15 +2549,15 @@ Marker styles are specified by the follo
- A character indicating a plot marker to be place at each data point, or
- @code{"none"}, meaning no markers should be displayed.
-
-- at itemx markeredgecolor
-+ at item markeredgecolor
- The color of the edge around the marker, or @code{"auto"}, meaning that
- the edge color is the same as the face color. @xref{Colors}.
-
-- at itemx markerfacecolor
-+ at item markerfacecolor
- The color of the marker, or @code{"none"} to indicate that the marker
- should not be filled. @xref{Colors}.
-
-- at itemx markersize
-+ at item markersize
- A number specifying the size of the marker. The default is 1. A value
- of 2 is twice as large as the default, etc.
- @end table
-Index: doc/interpreter/tips.txi
-===================================================================
---- doc/interpreter/tips.txi.orig
-+++ doc/interpreter/tips.txi
-@@ -296,20 +296,20 @@ starting double-quote is not part of the
- When choosing variable names try to adhere to the following guidelines.
-
- @table @asis
-- at item
--vectors : x,y,z,t,w
-+ at item vectors :
-+x,y,z,t,w
-
-- at item
--matrices : A,B,M
-+ at item matrices :
-+A,B,M
-
-- at item
--strings : @nospell{str},s
-+ at item strings :
-+ at nospell{str},s
-
-- at item
--filenames : @nospell{fname}
-+ at item filenames :
-+ at nospell{fname}
-
-- at item
--cells, at nospell{cellstrs} : c, at nospell{cstr}
-+ at item cells, at nospell{cellstrs} :
-+c, at nospell{cstr}
- @end table
-
- @item
-Index: scripts/io/strread.m
-===================================================================
---- scripts/io/strread.m.orig
-+++ scripts/io/strread.m
-@@ -39,7 +39,7 @@
- ## @item %s
- ## The word is parsed as a string.
- ##
--## @itemx %f
-+## @item %f
- ## @itemx %n
- ## The word is parsed as a number and converted to double.
- ##
-Index: scripts/plot/legend.m
-===================================================================
---- scripts/plot/legend.m.orig
-+++ scripts/plot/legend.m
-@@ -86,7 +86,7 @@
- ## @item "hide"
- ## Hide legend on the plot
- ##
--## @itemx "toggle"
-+## @item "toggle"
- ## Toggles between "hide" and "show"
- ##
- ## @item "boxon"
-@@ -101,7 +101,7 @@
- ## @item "right"
- ## Place text to the right of the keys
- ##
--## @itemx "off"
-+## @item "off"
- ## Delete the legend object
- ## @end table
- ## @end deftypefn
-Index: scripts/plot/print.m
-===================================================================
---- scripts/plot/print.m.orig
-+++ scripts/plot/print.m
-@@ -184,11 +184,10 @@
- ## is sent to a file the size is determined by the plot box defined by
- ## the figure's "paperposition" property.
- ##
--## @itemx -append
--## Appends the PS, or PDF output to a pre-existing file of the
--## same type.
-+## @item -append
-+## Appends the PS, or PDF output to a pre-existing file of the same type.
- ##
--## @itemx -r at var{NUM}
-+## @item -r at var{NUM}
- ## Resolution of bitmaps in pixels per inch. For both metafiles and
- ## SVG the default is the screen resolution, for other it is 150 dpi.
- ## To specify screen resolution, use "-r0".
-Index: scripts/time/datetick.m
-===================================================================
---- scripts/time/datetick.m.orig
-+++ scripts/time/datetick.m
-@@ -22,13 +22,12 @@
- ## @deftypefnx {Function File} {} datetick (@var{axis}, @var{form})
- ## @deftypefnx {Function File} {} datetick (@dots{}, "keeplimits")
- ## @deftypefnx {Function File} {} datetick (@dots{}, "keepticks")
--## @deftypefnx {Function File} {} datetick (@dots{ax}, @dots{})
--## Add date formatted tick labels to an axis. The axis the apply the
--## ticks to is determined by @var{axis} that can take the values "x",
--## "y" or "z". The default value is "x". The formatting of the labels is
--## determined by the variable @var{form}, that can either be a string in
--## the format needed by @code{dateform}, or a positive integer that can
--## be accepted by @code{datestr}.
-+## @deftypefnx {Function File} {} datetick (@var{hax}, @dots{})
-+## Add date formatted tick labels to an axis. The axis to apply the
-+## ticks to is determined by @var{axis} which can take the values "x",
-+## "y", or "z". The default value is "x". The formatting of the labels is
-+## determined by the variable @var{form}, which can either be a string or
-+## positive integer that @code{datestr} accepts.
- ## @seealso{datenum, datestr}
- ## @end deftypefn
-
-Index: src/dirfns.cc
-===================================================================
---- src/dirfns.cc.orig
-+++ src/dirfns.cc
-@@ -555,9 +555,9 @@ them, or an empty cell array if no patte
- interpreted as filename globbing patterns (as they are used by Unix shells).\n\
- Within a pattern\n\
- @table @code\n\
-- at itemx *\n\
-+ at item *\n\
- matches any string, including the null string,\n\
-- at itemx ?\n\
-+ at item ?\n\
- matches any single character, and\n\
- \n\
- @item [@dots{}]\n\
-Index: src/file-io.cc
-===================================================================
---- src/file-io.cc.orig
-+++ src/file-io.cc
-@@ -633,23 +633,23 @@ must also open the file in binary mode.\
- The parameter @var{arch} is a string specifying the default data format\n\
- for the file. Valid values for @var{arch} are:\n\
- \n\
-- at table @asis\n\
-- at samp{native}\n\
-+ at table @samp\n\
-+ at item native\n\
- The format of the current machine (this is the default).\n\
- \n\
-- at samp{ieee-be}\n\
-+ at item ieee-be\n\
- IEEE big endian format.\n\
- \n\
-- at samp{ieee-le}\n\
-+ at item ieee-le\n\
- IEEE little endian format.\n\
- \n\
-- at samp{vaxd}\n\
-+ at item vaxd\n\
- VAX D floating format.\n\
- \n\
-- at samp{vaxg}\n\
-+ at item vaxg\n\
- VAX G floating format.\n\
- \n\
-- at samp{cray}\n\
-+ at item cray\n\
- Cray floating format.\n\
- @end table\n\
- \n\
-Index: scripts/audio/wavread.m
-===================================================================
---- scripts/audio/wavread.m.orig
-+++ scripts/audio/wavread.m
-@@ -18,21 +18,26 @@
-
- ## -*- texinfo -*-
- ## @deftypefn {Function File} {@var{y} =} wavread (@var{filename})
-+## @deftypefnx {Function File} {[@var{y}, @var{Fs}, @var{bps}] =} wavread (@var{filename})
-+## @deftypefnx {Function File} {[@dots{}] =} wavread (@var{filename}, @var{n})
-+## @deftypefnx {Function File} {[@dots{}] =} wavread (@var{filename}, @var{n1} @var{n2})
-+## @deftypefnx {Function File} {[@var{samples}, @var{channels}] =} wavread (@var{filename}, "size")
-+##
- ## Load the RIFF/WAVE sound file @var{filename}, and return the samples
- ## in vector @var{y}. If the file contains multichannel data, then
- ## @var{y} is a matrix with the channels represented as columns.
- ##
--## @deftypefnx {Function File} {[@var{y}, @var{Fs}, @var{bps}] =} wavread (@var{filename})
-+## @code{[@var{y}, @var{Fs}, @var{bps}] = wavread (@var{filename})}
- ## Additionally return the sample rate (@var{fs}) in Hz and the number of bits
- ## per sample (@var{bps}).
- ##
--## @deftypefnx {Function File} {[@dots{}] =} wavread (@var{filename}, @var{n})
-+## @code{[@dots{}] = wavread (@var{filename}, @var{n})}
- ## Read only the first @var{n} samples from each channel.
- ##
--## @deftypefnx {Function File} {[@dots{}] =} wavread (@var{filename}, @var{n1} @var{n2})
-+## @code{wavread (@var{filename}, @var{n1} @var{n2})}
- ## Read only samples @var{n1} through @var{n2} from each channel.
- ##
--## @deftypefnx {Function File} {[@var{samples}, @var{channels}] =} wavread (@var{filename}, "size")
-+## @code{[@var{samples}, @var{channels}] = wavread (@var{filename}, "size")}
- ## Return the number of samples (@var{n}) and channels (@var{ch})
- ## instead of the audio data.
- ## @seealso{wavwrite}
-Index: scripts/miscellaneous/getappdata.m
-===================================================================
---- scripts/miscellaneous/getappdata.m.orig
-+++ scripts/miscellaneous/getappdata.m
-@@ -16,10 +16,12 @@
-
- ## -*- texinfo -*-
- ## @deftypefn {Function File} {@var{value} =} getappdata (@var{h}, @var{name})
-+## @deftypefnx {Function File} {@var{appdata} =} getappdata (@var{h})
-+##
- ## Return the @var{value} for named application data for the object(s) with
- ## handle(s) @var{h}.
--## @deftypefnx {Function File} {@var{appdata} =} getappdata (@var{h})
--## Return a structure, @var{appdata}, whose fields correspond to the appdata
-+##
-+## @code{getappdata(@var{h})} returns a structure, @var{appdata}, whose fields correspond to the appdata
- ## properties.
- ## @end deftypefn
-
-Index: scripts/miscellaneous/license.m
-===================================================================
---- scripts/miscellaneous/license.m.orig
-+++ scripts/miscellaneous/license.m
-@@ -18,20 +18,26 @@
-
- ## -*- texinfo -*-
- ## @deftypefn {Function File} {} license
-+## @deftypefnx {Function File} {} license ("inuse")
-+## @deftypefnx {Function File} {@var{retval} =} license ("inuse")
-+## @deftypefnx {Function File} {@var{retval} =} license ("test", @var{feature})
-+## @deftypefnx {Function File} {} license ("test", @var{feature}, @var{toggle})
-+## @deftypefnx {Function File} {@var{retval} =} license ("checkout", @var{feature})
-+##
- ## Display the license of Octave.
- ##
--## @deftypefnx {Function File} {} license ("inuse")
-+## @code{license ("inuse")}
- ## Display a list of packages currently being used.
- ##
--## @deftypefnx {Function File} {@var{retval} =} license ("inuse")
-+## @code{@var{retval} = license ("inuse")}
- ## Return a structure containing the fields @code{feature} and @code{user}.
- ##
--## @deftypefnx {Function File} {@var{retval} =} license ("test", @var{feature})
-+## @code{@var{retval} = license ("test", @var{feature})}
- ## Return 1 if a license exists for the product identified by the string
- ## @var{feature} and 0 otherwise. The argument @var{feature} is case
- ## insensitive and only the first 27 characters are checked.
- ##
--## @deftypefnx {Function File} {} license ("test", @var{feature}, @var{toggle})
-+## @code{license ("test", @var{feature}, @var{toggle})}
- ## Enable or disable license testing for @var{feature}, depending on
- ## @var{toggle}, which may be one of:
- ##
-@@ -44,7 +50,7 @@
- ## Future tests for the specified license of @var{feature} return 0.
- ## @end table
- ##
--## @deftypefnx {Function File} {@var{retval} =} license ("checkout", @var{feature})
-+## @code{@var{retval} = license ("checkout", @var{feature})}
- ## Check out a license for @var{feature}, returning 1 on success and 0
- ## on failure.
- ##
-Index: scripts/miscellaneous/ver.m
-===================================================================
---- scripts/miscellaneous/ver.m.orig
-+++ scripts/miscellaneous/ver.m
-@@ -18,11 +18,15 @@
-
- ## -*- texinfo -*-
- ## @deftypefn {Function File} {} ver ()
-+## @deftypefnx {Function File} {v =} ver ()
-+## @deftypefnx {Function File} {v =} ver ("Octave")
-+## @deftypefnx {Function File} {v =} ver (@var{package})
-+##
- ## Display a header containing the current Octave version number, license
- ## string and operating system, followed by the installed package names,
- ## versions, and installation directories.
- ##
--## @deftypefnx {Function File} {v =} ver ()
-+## @code{v = ver ()}
- ## Return a vector of structures, respecting Octave and each installed package.
- ## The structure includes the following fields.
- ##
-@@ -40,10 +44,10 @@
- ## Date respecting the version/revision.
- ## @end table
- ##
--## @deftypefnx {Function File} {v =} ver ("Octave")
-+## @code{v = ver ("Octave")}
- ## Return version information for Octave only.
- ##
--## @deftypefnx {Function File} {v =} ver (@var{package})
-+## @code{v = ver (@var{package})}
- ## Return version information for @var{package}.
- ##
- ## @seealso{version, octave_config_info}
-Index: scripts/plot/daspect.m
-===================================================================
---- scripts/plot/daspect.m.orig
-+++ scripts/plot/daspect.m
-@@ -18,22 +18,23 @@
-
- ## -*- texinfo -*-
- ## @deftypefn {Function File} {} daspect (@var{data_aspect_ratio})
--## Set the data aspect ratio of the current axes. The aspect ratio is
--## a normalized 3-element vector representing the span of the x, y, and
--## z-axes limits.
--##
--## @deftypefnx {Function File} {@var{data_aspect_ratio} =} daspect ( )
--## Return the data aspect ratio of the current axes.
--##
-+## @deftypefnx {Function File} {@var{data_aspect_ratio} =} daspect ()
- ## @deftypefnx {Function File} {} daspect (@var{mode})
--## Set the data aspect ratio mode of the current axes.
--##
- ## @deftypefnx {Function File} {@var{data_aspect_ratio_mode} =} daspect ("mode")
--## Return the data aspect ratio mode of the current axes.
--##
- ## @deftypefnx {Function File} {} daspect (@var{hax}, @dots{})
--## Use the axes, with handle @var{hax}, instead of the current axes.
--##
-+## @code{daspect} sets the data aspect ratio of the current axes. The aspect
-+## ratio is a normalized 3-element vector representing the span of the x, y, and
-+## z-axes limits.
-+##
-+## When called without any arguments it returns data aspect ratio of the current axes.
-+##
-+## @code{(daspect (@var{mode}))} sets the data aspect ratio mode of the current axes.
-+##
-+## @code{daspect ("mode")} returns the data aspect ratio mode of the current axes.
-+##
-+## @code{daspect (@var{hax}, @dots{})} uses the axes, with handle @var{hax},
-+## instead of the current axes.
-+##
- ## @seealso{axis, pbaspect, xlim, ylim, zlim}
- ## @end deftypefn
-
-Index: scripts/plot/pbaspect.m
-===================================================================
---- scripts/plot/pbaspect.m.orig
-+++ scripts/plot/pbaspect.m
-@@ -18,21 +18,24 @@
-
- ## -*- texinfo -*-
- ## @deftypefn {Function File} {} pbaspect (@var{plot_box_aspect_ratio})
--## Set the plot box aspect ratio of the current axes. The aspect ratio
--## is a normalized 3-element vector representing the rendered lengths of
--## the x, y, and z-axes.
--##
- ## @deftypefnx {Function File} {@var{plot_box_aspect_ratio} =} pbaspect ( )
--## Return the plot box aspect ratio of the current axes.
--##
- ## @deftypefnx {Function File} {} pbaspect (@var{mode})
--## Set the plot box aspect ratio mode of the current axes.
--##
- ## @deftypefnx {Function File} {@var{plot_box_aspect_ratio_mode} =} pbaspect ("mode")
--## Return the plot box aspect ratio mode of the current axes.
--##
- ## @deftypefnx {Function File} {} pbaspect (@var{hax}, @dots{})
--## Use the axes, with handle @var{hax}, instead of the current axes.
-+##
-+## Set the plot box aspect ratio of the current axes. The aspect ratio
-+## is a normalized 3-element vector representing the rendered lengths of
-+## the x, y, and z-axes.
-+##
-+## When called without any arguments, returns the plot box aspect ratio of
-+## the current axes.
-+##
-+## @code{pbaspect(@var{mode})} sets the plot box aspect ratio mode of the current axes.
-+##
-+## @code{pbaspect ("mode")} returns the plot box aspect ratio mode of the current axes.
-+##
-+## @code{pbaspect (@var{hax}, @dots{})} uses the axes, with handle @var{hax}, instead
-+## of the current axes.
- ##
- ## @seealso{axis, daspect, xlim, ylim, zlim}
- ## @end deftypefn
-Index: scripts/polynomial/polyval.m
-===================================================================
---- scripts/polynomial/polyval.m.orig
-+++ scripts/polynomial/polyval.m
-@@ -19,19 +19,21 @@
- ## -*- texinfo -*-
- ## @deftypefn {Function File} {@var{y} =} polyval (@var{p}, @var{x})
- ## @deftypefnx {Function File} {@var{y} =} polyval (@var{p}, @var{x}, [], @var{mu})
-+## @deftypefnx {Function File} {[@var{y}, @var{dy}] =} polyval (@var{p}, @var{x}, @var{s})
-+## @deftypefnx {Function File} {[@var{y}, @var{dy}] =} polyval (@var{p}, @var{x}, @var{s}, @var{mu})
-+##
- ## Evaluate the polynomial @var{p} at the specified values of @var{x}. When
- ## @var{mu} is present, evaluate the polynomial for
- ## (@var{x}- at var{mu}(1))/@var{mu}(2).
- ## If @var{x} is a vector or matrix, the polynomial is evaluated for each of
- ## the elements of @var{x}.
- ##
--## @deftypefnx {Function File} {[@var{y}, @var{dy}] =} polyval (@var{p}, @var{x}, @var{s})
--## @deftypefnx {Function File} {[@var{y}, @var{dy}] =} polyval (@var{p}, @var{x}, @var{s}, @var{mu})
- ## In addition to evaluating the polynomial, the second output
- ## represents the prediction interval, @var{y} +/- @var{dy}, which
- ## contains at least 50% of the future predictions. To calculate the
- ## prediction interval, the structured variable @var{s}, originating
- ## from @code{polyfit}, must be supplied.
-+##
- ## @seealso{polyvalm, polyaffine, polyfit, roots, poly}
- ## @end deftypefn
-
-Index: scripts/set/union.m
-===================================================================
---- scripts/set/union.m.orig
-+++ scripts/set/union.m
-@@ -20,6 +20,8 @@
- ## -*- texinfo -*-
- ## @deftypefn {Function File} {} union (@var{a}, @var{b})
- ## @deftypefnx {Function File} {} union (@var{a}, @var{b}, "rows")
-+## @deftypefnx {Function File} {[@var{c}, @var{ia}, @var{ib}] =} union (@var{a}, @var{b})
-+##
- ## Return the set of elements that are in either of the sets @var{a} and
- ## @var{b}. @var{a}, @var{b} may be cell arrays of string(s).
- ## For example:
-@@ -44,7 +46,6 @@
- ## @end group
- ## @end example
- ##
--## @deftypefnx {Function File} {[@var{c}, @var{ia}, @var{ib}] =} union (@var{a}, @var{b})
- ##
- ## Return index vectors @var{ia} and @var{ib} such that @code{a(ia)} and
- ## @code{b(ib)} are disjoint sets whose union is @var{c}.
-Index: scripts/signal/freqz.m
-===================================================================
---- scripts/signal/freqz.m.orig
-+++ scripts/signal/freqz.m
-@@ -18,6 +18,10 @@
-
- ## -*- texinfo -*-
- ## @deftypefn {Function File} {[@var{h}, @var{w}] =} freqz (@var{b}, @var{a}, @var{n}, "whole")
-+## @deftypefnx {Function File} {@var{h} =} freqz (@var{b}, @var{a}, @var{w})
-+## @deftypefnx {Function File} {[@dots{}] =} freqz (@dots{}, @var{Fs})
-+## @deftypefnx {Function File} {} freqz (@dots{})
-+##
- ## Return the complex frequency response @var{h} of the rational IIR filter
- ## whose numerator and denominator coefficients are @var{b} and @var{a},
- ## respectively. The response is evaluated at @var{n} angular frequencies
-@@ -49,16 +53,16 @@
- ## For fastest computation, @var{n} should factor into a small number of
- ## small primes.
- ##
--## @deftypefnx {Function File} {@var{h} =} freqz (@var{b}, @var{a}, @var{w})
-+## @code{freqz (@var{b}, @var{a}, @var{w})}
- ## Evaluate the response at the specific frequencies in the vector @var{w}.
- ## The values for @var{w} are measured in radians.
- ##
--## @deftypefnx {Function File} {[@dots{}] =} freqz (@dots{}, @var{Fs})
-+## @code{[@dots{}] = freqz (@dots{}, @var{Fs})}
- ## Return frequencies in Hz instead of radians assuming a sampling rate
- ## @var{Fs}. If you are evaluating the response at specific frequencies
- ## @var{w}, those frequencies should be requested in Hz rather than radians.
- ##
--## @deftypefnx {Function File} {} freqz (@dots{})
-+## @code{freqz (@dots{})}
- ## Plot the pass band, stop band and phase response of @var{h} rather
- ## than returning them.
- ## @end deftypefn
-Index: doc/liboctave/liboctave.texi
-===================================================================
---- doc/liboctave/liboctave.texi.orig
-+++ doc/liboctave/liboctave.texi
-@@ -80,10 +80,10 @@ modified versions.
- @end ifnottex
-
- @titlepage
-- at title{Octave C++ Classes}
-- at subtitle{Edition 1.0 for Octave version @value{VERSION}}
-- at subtitle{September 1993}
-- at author{John W. Eaton}
-+ at title Octave C++ Classes
-+ at subtitle Edition 1.0 for Octave version @value{VERSION}
-+ at subtitle September 1993
-+ at author John W. Eaton
- @page
- @vskip 0pt plus 1filll
- Copyright @copyright{} 1996, 1997 John W. Eaton.
-Index: scripts/miscellaneous/version.m
-===================================================================
---- scripts/miscellaneous/version.m.orig
-+++ scripts/miscellaneous/version.m
-@@ -21,8 +21,8 @@
- ## Return the version number of Octave, as a string.
- ##
- ## This is an alias for the function @w{@env{OCTAVE_VERSION}} provided for
--## compatibility
--## @seealso{OCTAVE_VERSION}.
-+## compatibility.
-+## @seealso{OCTAVE_VERSION}
- ## @end deftypefn
-
- ## Author: jwe
-Index: scripts/help/get_first_help_sentence.m
-===================================================================
---- scripts/help/get_first_help_sentence.m.orig
-+++ scripts/help/get_first_help_sentence.m
-@@ -104,10 +104,9 @@ function [text, status] = first_sentence
- for k = 1:length (def_idx)
- endl = endl_idx (find (endl_idx > def_idx (k), 1));
- if (isempty (endl))
-- keep (def_idx (k):end) = false;
-- else
-- keep (def_idx (k):endl) = false;
-+ endl = numel (keep);
- endif
-+ keep(def_idx(k):endl) = false;
- endfor
-
- ## Remove the @end ... that corresponds to the @def we removed above
-@@ -122,16 +121,11 @@ function [text, status] = first_sentence
- sep_idx = min (space_idx, bracket_idx);
- def_type = help_text (def1+1:sep_idx-1);
-
-- end_idx = strfind (help_text, sprintf ("@end %s", def_type));
-+ end_idx = strfind (help_text, sprintf ("@end %s", def_type))(1);
- if (isempty (end_idx))
- error ("get_first_help_sentence: couldn't parse texinfo");
- endif
-- endl = endl_idx (find (endl_idx > end_idx, 1));
-- if (isempty (endl))
-- keep (end_idx:end) = false;
-- else
-- keep (end_idx:endl) = false;
-- endif
-+ keep(end_idx:end) = false;
-
- help_text = help_text (keep);
- endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140711/1c18a4e5/attachment-0001.html>
More information about the macports-changes
mailing list