Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2016Q3

Browse Source
This commit is contained in:
Lionel Sambuc
2016-10-14 07:49:11 +02:00
committed by Lionel Sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949749 additions and 377083 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
math/octave/MESSAGE Normal file
View File

@@ -0,0 +1,7 @@
===========================================================================
$NetBSD: MESSAGE,v 1.1 2016/09/20 21:02:40 maya Exp $
If you are experiencing crashes while plotting, you can try:
>> graphics_toolkit gnuplot
===========================================================================

137
math/octave/Makefile
View File

@@ -1,35 +1,28 @@
# $NetBSD: Makefile,v 1.130 2015/08/18 07:31:01 wiz Exp $
# $NetBSD: Makefile,v 1.140 2016/08/08 12:24:45 prlw1 Exp $
DISTNAME= octave-${OCTAVE_VER}
PKGREVISION= 11
DISTNAME= octave-4.0.3
PKGREVISION= 1
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_GNU:=octave/}
MASTER_SITES+= ftp://ftp.octave.org/pub/octave/
MASTER_SITES+= ftp://ftp.octave.org/pub/octave/bleeding-edge/
EXTRACT_SUFX= .tar.bz2
EXTRACT_SUFX= .tar.xz
MAINTAINER= adam@NetBSD.org
HOMEPAGE= http://www.octave.org/
COMMENT= High-level language, intended for numerical computations
LICENSE= gnu-gpl-v3
BUILD_DEPENDS+= gperf>=2.7:../../devel/gperf
BUILD_DEPENDS+= tex-latex-fonts-[0-9]*:../../fonts/tex-latex-fonts
BUILD_DEPENDS+= dvipsk-[0-9]*:../../print/dvipsk
BUILD_DEPENDS+= tex-epsf-[0-9]*:../../print/tex-epsf
BUILD_DEPENDS+= tex-tex-[0-9]*:../../print/tex-tex
BUILD_DEPENDS+= tex-pdftex-[0-9]*:../../print/tex-pdftex
TOOL_DEPENDS+= gtexinfo>=5.1:../../devel/gtexinfo
# These BUILD_DEPENDS are only needed if we need to rebuild the documentation
#BUILD_DEPENDS+= tex-latex-fonts-[0-9]*:../../fonts/tex-latex-fonts
#BUILD_DEPENDS+= dvipsk-[0-9]*:../../print/dvipsk
#BUILD_DEPENDS+= tex-epsf-[0-9]*:../../print/tex-epsf
#BUILD_DEPENDS+= tex-tex-[0-9]*:../../print/tex-tex
#BUILD_DEPENDS+= tex-pdftex-[0-9]*:../../print/tex-pdftex
#TOOL_DEPENDS+= gtexinfo>=5.1:../../devel/gtexinfo
DEPENDS+= gnuplot>=3.7:../../graphics/gnuplot
OCTAVE_VER= 3.6.4
.if (${MACHINE_ARCH} == "arm32")
BROKEN= Internal compiler error occurs on arm32 (even with gcc-2.95.3)
.endif
USE_LIBTOOL= yes
USE_TOOLS+= autoconf gsed gmake:run makeinfo perl pkg-config bison
USE_TOOLS+= autoconf gsed gmake:run perl pkg-config bison
GNU_CONFIGURE= yes
GCC_REQD+= 3.0
@@ -41,7 +34,20 @@ CONFIGURE_ARGS+= --enable-dl
CONFIGURE_ARGS+= --enable-static
CONFIGURE_ARGS+= --enable-shared
CONFIGURE_ARGS+= --without-opengl
#CONFIGURE_ARGS+= --without-opengl
#CONFIGURE_ARGS+= --with-framework-opengl=no
CONFIGURE_ARGS+= --disable-java
# use this to bypass qt5 portability issues:
#CONFIGURE_ARGS+= CPPFLAGS=-DQT_DISABLE_DEPRECATED_BEFORE=0
.include "../../mk/bsd.prefs.mk"
# When __APPLE__ is defined, fltk headers typedef an alternate version of Window
# which conflicts with the one in the X11 headers, so avoid pulling in X11.
CONFIGURE_ARGS.Darwin+= --without-x
# The OpenGL framework doesn't have osmesa and the X11 one has header conflicts with the framework
CONFIGURE_ARGS.Darwin+= --without-OSMesa
# We use this to install .oct files so it doesn't strip them.
CONFIGURE_ENV+= INSTALL_LIB=${INSTALL_LIB:Q}
@@ -49,72 +55,73 @@ CONFIGURE_ENV+= INSTALL_LIB=${INSTALL_LIB:Q}
.include "options.mk"
INFO_FILES= yes
OCTAVE_DOC= faq/Octave-FAQ.ps liboctave/liboctave.ps \
refcard/refcard-a4.ps refcard/refcard-legal.ps \
refcard/refcard-letter.ps
OCTAVE_DOC= doc/interpreter/octave.pdf doc/liboctave/liboctave.pdf \
doc/refcard/refcard-a4.pdf doc/refcard/refcard-legal.pdf \
doc/refcard/refcard-letter.pdf
INSTALLATION_DIRS+= share/octave/${PKGVERSION_NOREV}/doc
INSTALLATION_DIRS+= share/octave/${OCTAVE_VER}/doc
UNWRAP_FILES+= src/mkoctfile octave-bug src/oct-conf.h
#CHECK_WRKREF_SKIP+= share/octave/${PKGVERSION_NOREV}/etc/config.log
TEST_TARGET= check
#pre-configure:
# cd ${WRKSRC} && autoconf
SUBST_CLASSES+= fix-info
SUBST_STAGE.fix-info= post-patch
SUBST_MESSAGE.fix-info= Fixing info files.
SUBST_FILES.fix-info= doc/interpreter/*.txi doc/liboctave/*.txi \
doc/interpreter/*.texi doc/liboctave/*.texi \
src/*.cc src/DLD-FUNCTIONS/*.cc src/DOCSTRINGS \
scripts/DOCSTRINGS \
scripts/statistics/tests/wilcoxon_test.m \
scripts/statistics/distributions/*.m \
scripts/audio/*.m \
scripts/general/nextpow2.m \
scripts/deprecated/weibcdf.m
SUBST_SED.fix-info= -e 's:@geq{}:>=:g' -e 's:@leq{}:<=:g'
SUBST_CLASSES+= unwrapping
SUBST_STAGE.unwrapping= post-build
SUBST_MESSAGE.unwrapping= Unwrapping wrapper scripts.
SUBST_FILES.unwrapping= src/mkoctfile
SUBST_SED.unwrapping= -e 's:$(DESTDIR)::g'
SUBST_SED.unwrapping+= -e 's:$(BUILDLINK_DIR)/lib:$(PREFIX)/lib:g'
SUBST_CLASSES+= fix-make
SUBST_STAGE.fix-make= post-patch
SUBST_STAGE.fix-make= pre-configure
SUBST_MESSAGE.fix-make= Fixing path to gmake.
SUBST_FILES.fix-make= scripts/pkg/pkg.m
SUBST_SED.fix-make= -e 's:@GMAKE@:$(GMAKE):g'
SUBST_FILES.fix-make= scripts/pkg/private/configure_make.m
SUBST_SED.fix-make= -e 's:@GMAKE@:${GMAKE}:g'
post-extract:
find ${WRKSRC}/doc -type f -name '*.info*' -print | xargs rm -f
mkdir ${WRKSRC}/src/pic
SUBST_CLASSES+= qt5-pkg-config
SUBST_STAGE.qt5-pkg-config= pre-configure
SUBST_MESSAGE.qt5-pkg-config= Updating pkg-config calls for Qt5
SUBST_FILES.qt5-pkg-config= configure.ac configure
SUBST_SED.qt5-pkg-config= -e 's,QtCore,Qt5Core,g'
SUBST_SED.qt5-pkg-config+= -e 's,QtGui,Qt5Widgets,g'
SUBST_SED.qt5-pkg-config+= -e 's,QtNetwork,Qt5Network,g'
SUBST_SED.qt5-pkg-config+= -e 's,QtOpenGL,Qt5OpenGL,g'
# substitute in the real path to various bits of the toolchain because
# mkoctfile will be used potentially by users and it needs to point at the same
# compilers as were used in building octave. We also fix up the path to sed
# otherwise we end up with the buildlink directory in mkoctfile
post-build:
mv ${WRKSRC}/src/mkoctfile ${WRKSRC}/src/mkoctfile.bak
sed -e 's;"${CC}";"${CCPATH}";g' \
-e 's;"${CXX}";"${CXXPATH}";g' \
-e 's;"${FC}";"${FCPATH}";g' \
-e 's@^:[ \t]*\$${SED=.*@: \$$\{SED="${SED}"\}@g' \
${WRKSRC}/src/mkoctfile.bak > ${WRKSRC}/src/mkoctfile
chmod a+x ${WRKSRC}/src/mkoctfile
# Matches reduce-relocations logic in x11/qt5-qtbase
.if ${OPSYS} != "Darwin" && ${OPSYS} != "SunOS" && \
(!empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64))
CFLAGS+= -fPIC
.endif
PREPEND_PATH+= ${QTDIR}/bin
MAKE_ENV+= V=1
#post-extract:
# find ${WRKSRC}/doc -type f -name '*.info*' -print | xargs rm -f
# mkdir ${WRKSRC}/src/pic
post-install:
.for f in ${OCTAVE_DOC}
${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/octave/${PKGVERSION_NOREV}/doc
.endfor
.include "../../audio/libsndfile/buildlink3.mk"
.include "../../devel/ncurses/buildlink3.mk"
.include "../../devel/pcre/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../math/arpack/buildlink3.mk"
.include "../../math/blas/buildlink3.mk"
.include "../../math/fftw/buildlink3.mk"
.include "../../math/fftwf/buildlink3.mk"
.include "../../math/lapack/buildlink3.mk"
.include "../../www/curl/buildlink3.mk"
.if ${OPSYS} != "Darwin"
.include "../../x11/libX11/buildlink3.mk"
.endif
.include "../../x11/qt5-qtbase/buildlink3.mk"
BUILDLINK_DEPMETHOD.qt5-qttools?=build
.include "../../x11/qt5-qttools/buildlink3.mk"
BUILDLINK_DEPMETHOD.gperf?=build
.include "../../devel/gperf/buildlink3.mk"
.include "../../x11/fltk13/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../mk/bsd.pkg.mk"

1193
math/octave/PLIST
View File

File diff suppressed because it is too large Load Diff

4
math/octave/buildlink3.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.17 2015/08/18 07:31:01 wiz Exp $
# $NetBSD: buildlink3.mk,v 1.18 2016/02/16 04:21:40 dbj Exp $
BUILDLINK_TREE+= octave
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= octave
OCTAVE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.octave+= octave>=3.0.0
BUILDLINK_ABI_DEPENDS.octave+= octave>=3.6.4nb11
BUILDLINK_ABI_DEPENDS.octave+= octave>=4.0.0
BUILDLINK_PKGSRCDIR.octave?= ../../math/octave
.include "../../mk/bsd.fast.prefs.mk"

68
math/octave/distinfo
View File

@@ -1,35 +1,35 @@
$NetBSD: distinfo,v 1.42 2015/04/23 06:50:41 dbj Exp $
$NetBSD: distinfo,v 1.48 2016/09/28 02:54:15 maya Exp $
SHA1 (octave-3.6.4.tar.bz2) = 3cc9366b6dbbd336eaf90fe70ad16e63705d82c4
RMD160 (octave-3.6.4.tar.bz2) = b0356f0c5d9366b8129d72ac58bbde837fee1a95
Size (octave-3.6.4.tar.bz2) = 15627315 bytes
SHA1 (patch-configure) = 5525211ee777d0c3afd55ba3f1c4d24d23b0bf4b
SHA1 (patch-configure.ac) = 1ccb10f67fd18646ab8b6c740dffa7ca5fe33191
SHA1 (patch-doc_interpreter_plot.txi) = b205f704ce625694a25ab57f4fad4460d1fbc0e9
SHA1 (patch-doc_liboctave_liboctave.texi) = c53484c70adea766ba1378a1f118942c924a88a5
SHA1 (patch-fflush-fpos_t.c) = 24ed7f95f8431b59bc5ee0dfb0e6624b8029f512
SHA1 (patch-fseeko-fpos_t.c) = ca846a014f9adfd47f7bbcf6557bf26a53f4a8e9
SHA1 (patch-libgnu_stdio.in.h) = 20950b67577e0ff34e761b02ac15338c9cfc4cb9
SHA1 (patch-libgnu_string.in.h) = 4af39b76faa3ac90454a9d664919b7a6cd45fa9d
SHA1 (patch-liboctave_mx-inlines.cc) = 0b69e1166902ef3d5e8737e4f72449e2d202477a
SHA1 (patch-liboctave_oct-time.cc) = 40c21f509b6c95942e6ba43c52494d1d707ed515
SHA1 (patch-scripts_audio_wavread.m) = e679a41cb49eeb32d98d44b81fd5e3d535dd2767
SHA1 (patch-scripts_io_strread.m) = e1b6199e64354f3138f329dbaac831715ed41be5
SHA1 (patch-scripts_miscellaneous_getappdata.m) = 55f9c9d5f30c85b3e8b5af82a271f1db90896fca
SHA1 (patch-scripts_miscellaneous_license.m) = 79f0f590df09a1659aea7b157ed4735ec1be55c4
SHA1 (patch-scripts_miscellaneous_ver.m) = 62a23545f808bdd5895ffbb107ed7ca58f157f98
SHA1 (patch-scripts_pkg_pkg.m) = e6fa838e3910d52164d7cb3ca084c748cd68abb9
SHA1 (patch-scripts_plot_____gnuplot__drawnow____.m) = 6e93e3dd3e12daf2f6f2c6b06cb6d32e888bd3c5
SHA1 (patch-scripts_plot_daspect.m) = 34281cae27ce447feb5ee9f1dc0d7a29e0c621a4
SHA1 (patch-scripts_plot_legend.m) = 3932ce6e6d19c89e852be35809502afa05a6ac4c
SHA1 (patch-scripts_plot_pbaspect.m) = 193f186be2c3e3ffc170cb0ed84900e14ab4e81b
SHA1 (patch-scripts_plot_print.m) = dbcb7c3efbb0abee3b4afbc9c490dd8d27539efb
SHA1 (patch-scripts_polynomial_polyval.m) = d6655d2b9d2755788a02720c2a28ecf2e11a45e2
SHA1 (patch-scripts_set_union.m) = ff976eaa4aa76d19ad73144192aee81c8e60d8bc
SHA1 (patch-scripts_signal_freqz.m) = cc9ba19c5b1b60af64f7c7ec0906ec7eedcea8d4
SHA1 (patch-src_DLD-FUNCTIONS_rand.cc) = 4992844f8ed53963e03e05adab2446397c2f4f02
SHA1 (patch-src_Makefile.am) = 940da74e979e0b4b69b786b8ce8d246ced38c8a0
SHA1 (patch-src_Makefile.in) = 65fd14523446a6c8310f123b786108a51811d057
SHA1 (patch-src_dirfns.cc) = fad1c09d28e6b93a7d9c5de69b5b218b72d5c7c5
SHA1 (patch-src_display.cc) = 486322373656065c3f8d0e95fa1684a6c08028ed
SHA1 (patch-src_oct-conf.h.in) = d3fa5166db289fbd9eba355911341e891fb6d822
SHA1 (octave-4.0.3.tar.xz) = c798346a8271e0141d9dbe5610584dabb8311277
RMD160 (octave-4.0.3.tar.xz) = 32bad5cdb6b832d651183b92f59b396940d6ec04
SHA512 (octave-4.0.3.tar.xz) = bad009235b04be09c051dd27ebef7df2542adec0a0b57c070662deebe33a0cdceb7d6816653f5afc3fc0cc1287ba1ca1a5c50858169004210224039374c9c55d
Size (octave-4.0.3.tar.xz) = 15697064 bytes
SHA1 (patch-configure) = 95ba2b79dc816fdc912c19d04a3e5e1cee94089b
SHA1 (patch-configure.ac) = d70f77d12a660bf9542725c8085fb525f138ce75
SHA1 (patch-fflush-fpos_t.c) = 83d3d731042862920de68f0457fea4f95568125c
SHA1 (patch-fseeko-fpos_t.c) = b38e7a38be2e0b323cd7f168f1d22d3df998691c
SHA1 (patch-libgnu_stdio.in.h) = 112a424655d46c75fb68531fe7a84d9a0e97a984
SHA1 (patch-libgui_graphics_Canvas.cc) = b8161fc9248af2160c6fea012bac85e2128dbad7
SHA1 (patch-libgui_graphics_Object.cc) = f0c0064793d4650e845e217806597bb956cb49fd
SHA1 (patch-libgui_qterminal_libqterminal_QTerminal.cc) = 48827b415a142518a6d764f670db0ce640cf4da4
SHA1 (patch-libgui_qterminal_libqterminal_unix_TerminalView.cpp) = 45c425a0305915eaba1a60c811c2aa52bb84890e
SHA1 (patch-libgui_qterminal_libqterminal_unix_Vt102Emulation.cpp) = 36aaf960d0fc8c9809ef5937c82fc394a0ded8ac
SHA1 (patch-libgui_qterminal_libqterminal_unix_konsole__wcwidth.h) = 6f12b058cb10e3a01306e9973f4e2574cf596da7
SHA1 (patch-libgui_src_find-files-dialog.cc) = 438694fc44a9fe8393ccb2606de71b32196f7058
SHA1 (patch-libgui_src_octave-gui.cc) = 7b596955210052bde684bb5420743d74728c0735
SHA1 (patch-libgui_src_resource-manager.cc) = 09560d42bdf4c00f4e438f40ffb3ae0b9037ee85
SHA1 (patch-libgui_src_shortcut-manager.cc) = 2faf15cc4c779eb3cf32152abd369bf968e1bf18
SHA1 (patch-libgui_src_workspace-model.cc) = bb5a875fcb09064c37572d066a25bb2011ee91cc
SHA1 (patch-libgui_src_workspace-view.cc) = 4be02918359fbb6d4b0dcbc1fcddb63bb3d00b4d
SHA1 (patch-libinterp_Makefile.am) = 29a8b034c743bed2570c90e8ef7a17bc2cf70dfe
SHA1 (patch-libinterp_Makefile.in) = 7fb118b9e2969b54b2510c57a4a7beb16f679bcd
SHA1 (patch-libinterp_corefcn_rand.cc) = e2a33ee323e904e4f3980f49ac363c4a42e5641d
SHA1 (patch-libinterp_dldfcn_config-module.awk) = 50d7173114f597038b01ed4479583c86ed78c3fe
SHA1 (patch-libinterp_dldfcn_module.mk) = 7627fa6132036f26b77743d30dbbe99ed6442b42
SHA1 (patch-libinterp_oct-conf.in.h) = 9a6b0e8d38bc2f9da916cb3d8145307e7a415f4f
SHA1 (patch-liboctave_numeric_oct-fftw.h) = b152566ad3fcf6c5c1808f4428e6d51966ca1daf
SHA1 (patch-liboctave_operators_mx-inlines.cc) = 3f01077700a3b8f51a3a171fdc11bafd784e3ea3
SHA1 (patch-liboctave_system_oct-time.cc) = 7b8a33911c69861572e35320e13c6c777048bc6c
SHA1 (patch-m4_acinclude.m4) = 194b8c3cf6f5e45a0251b229af9b3a47c12aa608
SHA1 (patch-scripts_pkg_private_configure__make.m) = 7d4b620f889faa66c4c9c581ef8a7e7692b68c94
SHA1 (patch-scripts_plot_util_____gnuplot__drawnow____.m) = 449b178aefd78c5c1b03ffd960f2e8be3874efc2

55
math/octave/patches/patch-configure
View File

@@ -1,16 +1,44 @@
$NetBSD: patch-configure,v 1.2 2015/04/23 06:50:41 dbj Exp $
$NetBSD: patch-configure,v 1.4 2016/09/28 02:54:15 maya Exp $
--- configure.orig 2013-02-21 20:21:49.000000000 +0000
install .oct loadable modules with INSTALL_LIB to avoid stripping them
we pass and assume a given MACHINE_GNU_PLATFORM, but this package did not
use this value due to an error.
the guess it had for linux (x86_64-unknown-linux-gnu), seems to trample
over our own tools:
https://mail-index.netbsd.org/pkgsrc-users/2014/03/26/msg019464.html
--- configure.orig 2015-05-26 16:21:37.000000000 +0000
+++ configure
@@ -663,6 +663,7 @@ GPERF
DEFAULT_PAGER
@@ -1952,6 +1952,7 @@ DEFAULT_PAGER
GNUPLOT
GHOSTSCRIPT
DESKTOP_FILE_INSTALL
+INSTALL_LIB
YFLAGS
YACC
LFLAGS
@@ -33819,7 +33820,12 @@ else
LN_S
TEXI2PDF
TEXI2DVI
@@ -5870,7 +5871,7 @@ case $host_os in *\ *) host_os=`echo "$h
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: configuring Octave for unknown system type" >&5
$as_echo "$as_me: WARNING: configuring Octave for unknown system type" >&2;}
fi
- canonical_host_type=$host
+ canonical_host_type=$host_alias
if test -z "$host_cpu"; then
host_cpu=unknown
@@ -8620,7 +8621,9 @@ fi
-INSTALL_SCRIPT='${INSTALL}'
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_LIB" && INSTALL_LIB='${INSTALL_SCRIPT}'
@@ -14005,7 +14008,12 @@ else
fi
done
;;
@@ -24,14 +52,3 @@ $NetBSD: patch-configure,v 1.2 2015/04/23 06:50:41 dbj Exp $
ac_exists=false
for ac_i in $ac_cv_f77_libs; do
if test x"$ac_arg" = x"$ac_i"; then
@@ -60080,7 +60086,9 @@ fi
-INSTALL_SCRIPT='${INSTALL}'
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_LIB" && INSTALL_LIB='${INSTALL_SCRIPT}'
# Extract the first word of "desktop-file-install", so it can be a program name with args.

10
math/octave/patches/patch-configure.ac
View File

@@ -1,9 +1,11 @@
$NetBSD: patch-configure.ac,v 1.1 2015/04/23 06:50:41 dbj Exp $
$NetBSD: patch-configure.ac,v 1.2 2016/02/16 04:21:40 dbj Exp $
--- configure.ac.orig 2013-02-21 20:19:23.000000000 +0000
install .oct loadable modules with INSTALL_LIB to avoid stripping them
--- configure.ac.orig 2015-05-26 16:16:39.000000000 +0000
+++ configure.ac
@@ -1927,8 +1927,10 @@ OCTAVE_PROG_BISON
AC_PROG_LN_S
@@ -149,8 +149,10 @@ AC_PROG_LN_S
AC_PROG_MKDIR_P
AC_PROG_INSTALL
-INSTALL_SCRIPT='${INSTALL}'

25
math/octave/patches/patch-doc_interpreter_plot.txi
View File

@@ -1,25 +0,0 @@
$NetBSD: patch-doc_interpreter_plot.txi,v 1.1 2014/03/06 23:06:58 jperkin Exp $
Texinfo 5.x compatibility.
--- doc/interpreter/plot.txi.orig 2013-02-21 20:19:23.000000000 +0000
+++ doc/interpreter/plot.txi
@@ -2545,15 +2545,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.
-@itemx markeredgecolor
+@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}.
-@itemx markerfacecolor
+@item markerfacecolor
The color of the marker, or @code{"none"} to indicate that the marker
should not be filled. @xref{Colors}.
-@itemx markersize
+@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

21
math/octave/patches/patch-doc_liboctave_liboctave.texi
View File

@@ -1,21 +0,0 @@
$NetBSD: patch-doc_liboctave_liboctave.texi,v 1.1 2014/03/06 23:06:58 jperkin Exp $
Texinfo 5.x compatibility.
--- doc/liboctave/liboctave.texi.orig 2013-02-21 20:19:23.000000000 +0000
+++ doc/liboctave/liboctave.texi
@@ -80,10 +80,10 @@ modified versions.
@end ifnottex
@titlepage
-@title{Octave C++ Classes}
-@subtitle{Edition 1.0 for Octave version @value{VERSION}}
-@subtitle{September 1993}
-@author{John W. Eaton}
+@title Octave C++ Classes
+@subtitle Edition 1.0 for Octave version @value{VERSION}
+@subtitle September 1993
+@author John W. Eaton
@page
@vskip 0pt plus 1filll
Copyright @copyright{} 1996, 1997 John W. Eaton.

16
math/octave/patches/patch-fflush-fpos_t.c
View File

@@ -1,8 +1,8 @@
$NetBSD: patch-fflush-fpos_t.c,v 1.1 2012/03/23 22:32:59 christos Exp $
$NetBSD: patch-fflush-fpos_t.c,v 1.2 2016/02/16 04:21:40 dbj Exp $
--- libgnu/fflush.c.orig 2011-08-03 23:59:51.000000000 -0400
+++ libgnu/fflush.c 2012-03-23 18:24:54.000000000 -0400
@@ -24,6 +24,7 @@
--- libgnu/fflush.c.orig 2015-05-23 14:36:16.000000000 +0000
+++ libgnu/fflush.c
@@ -22,6 +22,7 @@
#include <stdio.h>
#include <errno.h>
@@ -10,10 +10,10 @@ $NetBSD: patch-fflush-fpos_t.c,v 1.1 2012/03/23 22:32:59 christos Exp $
#include <unistd.h>
#include "freading.h"
@@ -97,17 +98,12 @@
@@ -103,17 +104,12 @@ update_fpos_cache (FILE *fp _GL_UNUSED_P
/* fp_->_offset is typed as an integer. */
fp_->_offset = pos;
# else
# else
- /* fp_->_offset is an fpos_t. */
- /* Use a union, since on NetBSD, the compilation flags determine
- whether fpos_t is typedef'd to off_t or a struct containing a
@@ -31,6 +31,6 @@ $NetBSD: patch-fflush-fpos_t.c,v 1.1 2012/03/23 22:32:59 christos Exp $
+ */
+ memset(&fp_->_offset, 0, sizeof(fp_->_offset));
+ memcpy(&fp_->_offset, &pos, sizeof(pos));
# endif
# endif
fp_->_flags |= __SOFF;
#endif
# endif

12
math/octave/patches/patch-fseeko-fpos_t.c
View File

@@ -1,9 +1,9 @@
$NetBSD: patch-fseeko-fpos_t.c,v 1.1 2012/03/23 22:32:59 christos Exp $
$NetBSD: patch-fseeko-fpos_t.c,v 1.2 2016/02/16 04:21:40 dbj Exp $
--- libgnu/fseeko.c.orig 2011-08-09 22:10:48.000000000 -0400
+++ libgnu/fseeko.c 2012-03-23 18:24:47.000000000 -0400
@@ -25,6 +25,9 @@
/* Get off_t and lseek. */
--- libgnu/fseeko.c.orig 2015-05-23 14:36:16.000000000 +0000
+++ libgnu/fseeko.c
@@ -22,6 +22,9 @@
/* Get off_t, lseek, _POSIX_VERSION. */
#include <unistd.h>
+/* mem* */
@@ -12,7 +12,7 @@ $NetBSD: patch-fseeko-fpos_t.c,v 1.1 2012/03/23 22:32:59 christos Exp $
#include "stdio-impl.h"
int
@@ -115,19 +118,12 @@
@@ -132,19 +135,12 @@ fseeko (FILE *fp, off_t offset, int when
/* fp_->_offset is typed as an integer. */
fp_->_offset = pos;
# else

10
math/octave/patches/patch-libgnu_stdio.in.h
View File

@@ -1,19 +1,19 @@
$NetBSD: patch-libgnu_stdio.in.h,v 1.1 2014/03/06 23:09:04 jperkin Exp $
$NetBSD: patch-libgnu_stdio.in.h,v 1.3 2016/08/06 13:03:35 prlw1 Exp $
Do not re-define gets() on SunOS, incompatible prototype.
--- libgnu/stdio.in.h.orig 2013-02-21 20:21:19.000000000 +0000
--- libgnu/stdio.in.h.orig 2016-07-01 18:43:45.000000000 +0000
+++ libgnu/stdio.in.h
@@ -704,10 +704,12 @@ _GL_WARN_ON_USE (getline, "getline is un
@@ -722,10 +722,12 @@ _GL_WARN_ON_USE (getline, "getline is un
/* It is very rare that the developer ever has full control of stdin,
so any use of gets warrants an unconditional warning; besides, C11
removed it. */
+#ifndef __sun
#undef gets
#if HAVE_RAW_DECL_GETS
#if HAVE_RAW_DECL_GETS && !defined __cplusplus
_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
#endif
+#endif
#if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
struct obstack;

25
math/octave/patches/patch-libgnu_string.in.h
View File

@@ -1,25 +0,0 @@
$NetBSD: patch-libgnu_string.in.h,v 1.1 2011/12/24 23:46:02 asau Exp $
--- libgnu/string.in.h.orig 2011-08-04 03:59:53.000000000 +0000
+++ libgnu/string.in.h
@@ -187,6 +187,12 @@ _GL_WARN_ON_USE (mempcpy, "mempcpy is un
#endif
/* Search backwards through a block for a byte (specified as an int). */
+#if defined(__NetBSD__)
+#if defined(__cplusplus)
+extern "C"
+#endif
+void * memrchr(const void *b, int c, size_t len);
+#else
#if @GNULIB_MEMRCHR@
# if ! @HAVE_DECL_MEMRCHR@
_GL_FUNCDECL_SYS (memrchr, void *, (void const *, int, size_t)
@@ -213,6 +219,7 @@ _GL_WARN_ON_USE (memrchr, "memrchr is un
"use gnulib module memrchr for portability");
# endif
#endif
+#endif
/* Find the first occurrence of C in S. More efficient than
memchr(S,C,N), at the expense of undefined behavior if C does not

24
math/octave/patches/patch-libgui_graphics_Canvas.cc Normal file
View File

@@ -0,0 +1,24 @@
$NetBSD: patch-libgui_graphics_Canvas.cc,v 1.1 2016/02/16 04:21:40 dbj Exp $
Changes for compiling with Qt5 instead of Qt4
--- libgui/graphics/Canvas.cc.orig 2015-05-23 14:21:53.000000000 +0000
+++ libgui/graphics/Canvas.cc
@@ -527,7 +527,7 @@ Canvas::canvasMousePressEvent (QMouseEve
QRectF r (bb(0), bb(1), bb(2), bb(3));
r.adjust (-5, -5, 5, 5);
- if (r.contains (event->posF ()))
+ if (r.contains (event->localPos ()))
{
currentObj = childObj;
break;
@@ -554,7 +554,7 @@ Canvas::canvasMousePressEvent (QMouseEve
Matrix bb = it->get_properties ().get_boundingbox (true);
QRectF r (bb(0), bb(1), bb(2), bb(3));
- if (r.contains (event->posF ()))
+ if (r.contains (event->localPos ()))
axesObj = *it;
}

15
math/octave/patches/patch-libgui_graphics_Object.cc Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-libgui_graphics_Object.cc,v 1.1 2016/02/16 04:21:40 dbj Exp $
Changes for compiling with Qt5 instead of Qt4
--- libgui/graphics/Object.cc.orig 2015-05-23 14:21:53.000000000 +0000
+++ libgui/graphics/Object.cc
@@ -183,7 +183,7 @@ Object::fromQObject (QObject* obj)
QVariant v = obj->property ("QtHandles::Object");
if (v.isValid ())
- return reinterpret_cast<Object*> (qVariantValue<void*> (v));
+ return reinterpret_cast<Object*> (qvariant_cast<void*> (v));
return 0;
}

19
math/octave/patches/patch-libgui_qterminal_libqterminal_QTerminal.cc Normal file
View File

@@ -0,0 +1,19 @@
$NetBSD: patch-libgui_qterminal_libqterminal_QTerminal.cc,v 1.1 2016/02/16 04:21:40 dbj Exp $
Changes for compiling with Qt5 instead of Qt4
--- libgui/qterminal/libqterminal/QTerminal.cc.orig 2015-05-23 14:21:53.000000000 +0000
+++ libgui/qterminal/libqterminal/QTerminal.cc
@@ -144,10 +144,10 @@ QTerminal::notice_settings (const QSetti
copy = QKeySequence::Copy; // settings->value () does not work!
// dis- or enable extra interrupt action
- QKeySequence ctrl;
+ Qt::KeyboardModifiers ctrl;
ctrl = Qt::ControlModifier;
- bool extra_ir_action = (copy != QKeySequence (ctrl + Qt::Key_C));
+ bool extra_ir_action = (copy != QKeySequence (ctrl | Qt::Key_C));
_interrupt_action->setEnabled (extra_ir_action);
has_extra_interrupt (extra_ir_action);

14
math/octave/patches/patch-libgui_qterminal_libqterminal_unix_TerminalView.cpp Normal file
View File

@@ -0,0 +1,14 @@
$NetBSD: patch-libgui_qterminal_libqterminal_unix_TerminalView.cpp,v 1.1 2016/02/16 04:21:40 dbj Exp $
Changes for compiling with Qt5 instead of Qt4
--- libgui/qterminal/libqterminal/unix/TerminalView.cpp.orig 2015-05-23 14:21:53.000000000 +0000
+++ libgui/qterminal/libqterminal/unix/TerminalView.cpp
@@ -41,6 +41,7 @@
#include <QPixmap>
#include <QScrollBar>
#include <QStyle>
+#include <QToolTip>
#include <QtCore>
#include <QtGui>

15
math/octave/patches/patch-libgui_qterminal_libqterminal_unix_Vt102Emulation.cpp Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-libgui_qterminal_libqterminal_unix_Vt102Emulation.cpp,v 1.1 2016/02/16 04:21:40 dbj Exp $
Changes for compiling with Qt5 instead of Qt4
--- libgui/qterminal/libqterminal/unix/Vt102Emulation.cpp.orig 2015-05-23 14:21:53.000000000 +0000
+++ libgui/qterminal/libqterminal/unix/Vt102Emulation.cpp
@@ -994,7 +994,7 @@ void Vt102Emulation::sendKeyEvent( QKeyE
"is missing.");
reset();
- receiveData( translatorError.toAscii().constData() , translatorError.count() );
+ receiveData( translatorError.toLatin1().constData() , translatorError.count() );
}
}

14
math/octave/patches/patch-libgui_qterminal_libqterminal_unix_konsole__wcwidth.h Normal file
View File

@@ -0,0 +1,14 @@
$NetBSD: patch-libgui_qterminal_libqterminal_unix_konsole__wcwidth.h,v 1.1 2016/02/16 04:21:40 dbj Exp $
Changes for compiling with Qt5 instead of Qt4
--- libgui/qterminal/libqterminal/unix/konsole_wcwidth.h.orig 2015-05-23 14:21:53.000000000 +0000
+++ libgui/qterminal/libqterminal/unix/konsole_wcwidth.h
@@ -11,7 +11,6 @@
#define _KONSOLE_WCWIDTH_H_
// Qt
-#include <QtCore/QBool>
#include <QtCore/QString>
int konsole_wcwidth(quint16 ucs);

13
math/octave/patches/patch-libgui_src_find-files-dialog.cc Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-libgui_src_find-files-dialog.cc,v 1.1 2016/02/16 04:21:40 dbj Exp $
--- libgui/src/find-files-dialog.cc.orig 2015-05-23 14:21:53.000000000 +0000
+++ libgui/src/find-files-dialog.cc
@@ -125,7 +125,7 @@ find_files_dialog::find_files_dialog (QW
_file_list->horizontalHeader ()->restoreState (
settings->value ("findfiles/column_state").toByteArray ());
_file_list->horizontalHeader ()->setSortIndicatorShown (true);
- _file_list->horizontalHeader ()->setClickable (true);
+ _file_list->horizontalHeader ()->setSectionsClickable (true);
_file_list->horizontalHeader ()->setStretchLastSection (true);
_file_list->sortByColumn (
settings->value ("findfiles/sort_files_by_column",0).toInt (),

33
math/octave/patches/patch-libgui_src_octave-gui.cc Normal file
View File

@@ -0,0 +1,33 @@
$NetBSD: patch-libgui_src_octave-gui.cc,v 1.2 2016/08/06 13:03:35 prlw1 Exp $
Changes for compiling with Qt5 instead of Qt4
--- libgui/src/octave-gui.cc.orig 2016-04-20 18:23:57.000000000 +0000
+++ libgui/src/octave-gui.cc
@@ -92,7 +92,7 @@ private:
// Disable all Qt messages by default.
static void
-message_handler (QtMsgType, const char *)
+message_handler (QtMsgType, const QMessageLogContext &, const QString &)
{
}
@@ -108,7 +108,7 @@ octave_start_gui (int argc, char *argv[]
// Installing our handler suppresses the messages.
if (show_gui_msgs.empty ())
- qInstallMsgHandler (message_handler);
+ qInstallMessageHandler (message_handler);
install___init_qt___functions ();
@@ -119,7 +119,7 @@ octave_start_gui (int argc, char *argv[]
// Set the codec for all strings (before wizard)
#if ! defined (Q_OS_WIN32)
- QTextCodec::setCodecForCStrings (QTextCodec::codecForName ("UTF-8"));
+ QTextCodec::setCodecForLocale (QTextCodec::codecForName ("UTF-8"));
#endif
// show wizard if this is the first run

18
math/octave/patches/patch-libgui_src_resource-manager.cc Normal file
View File

@@ -0,0 +1,18 @@
$NetBSD: patch-libgui_src_resource-manager.cc,v 1.1 2016/02/16 04:21:40 dbj Exp $
Changes for compiling with Qt5 instead of Qt4
--- libgui/src/resource-manager.cc.orig 2015-05-23 14:21:54.000000000 +0000
+++ libgui/src/resource-manager.cc
@@ -61,10 +61,8 @@ resource_manager::resource_manager (void
: settings_directory (), settings_file (), settings (0),
default_settings (0)
{
- QDesktopServices desktopServices;
-
QString home_path
- = desktopServices.storageLocation (QDesktopServices::HomeLocation);
+ = QStandardPaths::writableLocation (QStandardPaths::HomeLocation);
settings_directory = home_path + "/.config/octave";

297
math/octave/patches/patch-libgui_src_shortcut-manager.cc Normal file
View File

@@ -0,0 +1,297 @@
$NetBSD: patch-libgui_src_shortcut-manager.cc,v 1.1 2016/02/16 04:21:40 dbj Exp $
Changes for compiling with Qt5 instead of Qt4
--- libgui/src/shortcut-manager.cc.orig 2015-05-23 14:21:53.000000000 +0000
+++ libgui/src/shortcut-manager.cc
@@ -86,8 +86,8 @@ shortcut_manager::instance_ok (void)
void
shortcut_manager::do_init_data ()
{
- QKeySequence ctrl;
- int prefix;
+ Qt::KeyboardModifiers ctrl;
+ Qt::KeyboardModifiers prefix;
#if defined (Q_OS_MAC)
// Use CMD key as an equivalent of Ctrl key on other platforms
ctrl = Qt::MetaModifier;
@@ -100,15 +100,15 @@ shortcut_manager::do_init_data ()
prefix = Qt::NoModifier;
#endif
- QKeySequence ctrl_shift = ctrl + Qt::ShiftModifier;
- QKeySequence ctrl_alt = ctrl + Qt::AltModifier;
+ Qt::KeyboardModifiers ctrl_shift = ctrl | Qt::ShiftModifier;
+ Qt::KeyboardModifiers ctrl_alt = ctrl | Qt::AltModifier;
// actions of the main window
// file
init (tr ("New File"), "main_file:new_file", QKeySequence::New);
init (tr ("New Function"), "main_file:new_function",
- QKeySequence (ctrl_shift + Qt::Key_N));
+ QKeySequence (ctrl_shift | Qt::Key_N));
init (tr ("New Figure"), "main_file:new_figure", QKeySequence ());
init (tr ("Open File"), "main_file:open_file", QKeySequence::Open);
init (tr ("Load Workspace"), "main_file:load_workspace", QKeySequence ());
@@ -122,7 +122,7 @@ shortcut_manager::do_init_data ()
init (tr ("Select All"), "main_edit:select_all", QKeySequence ());
init (tr ("Clear Clipboard"), "main_edit:clear_clipboard", QKeySequence ());
init (tr ("Find in Files"), "main_edit:find_in_files",
- QKeySequence (ctrl_shift + Qt::Key_F));
+ QKeySequence (ctrl_shift | Qt::Key_F));
init (tr ("Clear Command Window"), "main_edit:clear_command_window",
QKeySequence ());
init (tr ("Clear Command History"), "main_edit:clear_history",
@@ -132,41 +132,41 @@ shortcut_manager::do_init_data ()
// debug
init (tr ("Step"), "main_debug:step_over",
- QKeySequence (prefix + Qt::Key_F10));
+ QKeySequence (prefix | Qt::Key_F10));
init (tr ("Step Into"), "main_debug:step_into",
- QKeySequence (prefix + Qt::Key_F11));
+ QKeySequence (prefix | Qt::Key_F11));
init (tr ("Step Out"), "main_debug:step_out",
- QKeySequence (prefix + Qt::ShiftModifier + Qt::Key_F11));
+ QKeySequence (prefix | Qt::ShiftModifier | Qt::Key_F11));
init (tr ("Continue"), "main_debug:continue",
- QKeySequence (prefix + Qt::Key_F5));
+ QKeySequence (prefix | Qt::Key_F5));
init (tr ("Quit Debug Mode"), "main_debug:quit",
- QKeySequence (prefix + Qt::ShiftModifier + Qt::Key_F5));
+ QKeySequence (prefix | Qt::ShiftModifier | Qt::Key_F5));
// window
init (tr ("Show Command Window"), "main_window:show_command",
- prefix + ctrl_shift + Qt::Key_0);
+ QKeySequence (prefix | ctrl_shift | Qt::Key_0));
init (tr ("Show Command History"), "main_window:show_history",
- prefix + ctrl_shift + Qt::Key_1);
+ QKeySequence (prefix | ctrl_shift | Qt::Key_1));
init (tr ("Show File Browser"), "main_window:show_file_browser",
- prefix + ctrl_shift + Qt::Key_2);
+ QKeySequence (prefix | ctrl_shift | Qt::Key_2));
init (tr ("Show Workspace"), "main_window:show_workspace",
- prefix + ctrl_shift + Qt::Key_3);
+ QKeySequence (prefix | ctrl_shift | Qt::Key_3));
init (tr ("Show Editor"), "main_window:show_editor",
- prefix + ctrl_shift + Qt::Key_4);
+ QKeySequence (prefix | ctrl_shift | Qt::Key_4));
init (tr ("Show Documentation"), "main_window:show_doc",
- prefix + ctrl_shift + Qt::Key_5);
+ QKeySequence (prefix | ctrl_shift | Qt::Key_5));
init (tr ("Command Window"), "main_window:command",
- prefix + ctrl + Qt::Key_0);
+ QKeySequence (prefix | ctrl | Qt::Key_0));
init (tr ("Command History"), "main_window:history",
- prefix + ctrl + Qt::Key_1);
+ QKeySequence (prefix | ctrl | Qt::Key_1));
init (tr ("File Browser"), "main_window:file_browser",
- prefix + ctrl + Qt::Key_2);
+ QKeySequence (prefix | ctrl | Qt::Key_2));
init (tr ("Workspace"), "main_window:workspace",
- prefix + ctrl + Qt::Key_3);
+ QKeySequence (prefix | ctrl | Qt::Key_3));
init (tr ("Editor"), "main_window:editor",
- prefix + ctrl + Qt::Key_4);
+ QKeySequence (prefix | ctrl | Qt::Key_4));
init (tr ("Documentation"), "main_window:doc",
- prefix + ctrl + Qt::Key_5);
+ QKeySequence (prefix | ctrl | Qt::Key_5));
init (tr ("Reset Default Window Layout"), "main_window:reset", QKeySequence ());
// help
@@ -190,7 +190,7 @@ shortcut_manager::do_init_data ()
// file
init (tr ("Edit Function"), "editor_file:edit_function",
- QKeySequence (ctrl + Qt::Key_E));
+ QKeySequence (ctrl | Qt::Key_E));
init (tr ("Save File"), "editor_file:save", QKeySequence::Save);
init (tr ("Save File As"), "editor_file:save_as", QKeySequence::SaveAs);
init (tr ("Close"), "editor_file:close", QKeySequence::Close);
@@ -212,41 +212,41 @@ shortcut_manager::do_init_data ()
init (tr ("Delete to End of Word"), "editor_edit:delete_end_word",
QKeySequence::DeleteEndOfWord);
init (tr ("Delete to Start of Line"), "editor_edit:delete_start_line",
- QKeySequence (ctrl_shift + Qt::Key_Backspace));
+ QKeySequence (ctrl_shift | Qt::Key_Backspace));
init (tr ("Delete to End of Line"), "editor_edit:delete_end_line",
- QKeySequence (ctrl_shift + Qt::Key_Delete));
+ QKeySequence (ctrl_shift | Qt::Key_Delete));
init (tr ("Delete Line"), "editor_edit:delete_line",
- QKeySequence (ctrl_shift + Qt::Key_L));
+ QKeySequence (ctrl_shift | Qt::Key_L));
init (tr ("Copy Line"), "editor_edit:copy_line",
- QKeySequence (ctrl_shift + Qt::Key_C));
+ QKeySequence (ctrl_shift | Qt::Key_C));
init (tr ("Cut Line"), "editor_edit:cut_line",
- QKeySequence (ctrl_shift + Qt::Key_X));
+ QKeySequence (ctrl_shift | Qt::Key_X));
init (tr ("Duplicate Selection/Line"), "editor_edit:duplicate_selection",
- QKeySequence (ctrl + Qt::Key_D));
+ QKeySequence (ctrl | Qt::Key_D));
init (tr ("Transpose Line"), "editor_edit:transpose_line",
- QKeySequence (ctrl + Qt::Key_T));
+ QKeySequence (ctrl | Qt::Key_T));
init (tr ("Show Completion List"), "editor_edit:completion_list",
- QKeySequence (ctrl + Qt::Key_Space));
+ QKeySequence (ctrl | Qt::Key_Space));
init (tr ("Comment Selection"), "editor_edit:comment_selection",
- QKeySequence (ctrl + Qt::Key_R));
+ QKeySequence (ctrl | Qt::Key_R));
init (tr ("Uncomment Selection"), "editor_edit:uncomment_selection",
- QKeySequence (ctrl_shift + Qt::Key_R));
+ QKeySequence (ctrl_shift | Qt::Key_R));
init (tr ("Uppercase Selection"), "editor_edit:upper_case",
- QKeySequence (ctrl + Qt::Key_U));
+ QKeySequence (ctrl | Qt::Key_U));
init (tr ("Lowercase Selection"), "editor_edit:lower_case",
- QKeySequence (ctrl_alt + Qt::Key_U));
+ QKeySequence (ctrl_alt | Qt::Key_U));
#if defined (Q_OS_MAC)
init (tr ("Indent Selection"), "editor_edit:indent_selection",
- QKeySequence (prefix + Qt::Key_Tab));
+ QKeySequence (prefix | Qt::Key_Tab));
init (tr ("Unindent Selection"), "editor_edit:unindent_selection",
- QKeySequence (prefix + Qt::ShiftModifier + Qt::Key_Tab));
+ QKeySequence (prefix | Qt::ShiftModifier | Qt::Key_Tab));
#else
init (tr ("Indent Selection"), "editor_edit:indent_selection",
- QKeySequence (ctrl + Qt::Key_Tab));
+ QKeySequence (ctrl | Qt::Key_Tab));
init (tr ("Unindent Selection"), "editor_edit:unindent_selection",
- QKeySequence (ctrl_shift + Qt::Key_Tab));
+ QKeySequence (ctrl_shift | Qt::Key_Tab));
#endif
init (tr ("Convert Line Endings to Windows"), "editor_edit:conv_eol_winows",
@@ -257,17 +257,17 @@ shortcut_manager::do_init_data ()
QKeySequence ());
init (tr ("Goto Line"), "editor_edit:goto_line",
- QKeySequence (ctrl + Qt::Key_G));
+ QKeySequence (ctrl | Qt::Key_G));
init (tr ("Move to Matching Brace"), "editor_edit:move_to_brace",
- QKeySequence (ctrl + Qt::Key_M));
+ QKeySequence (ctrl | Qt::Key_M));
init (tr ("Select to Matching Brace"), "editor_edit:select_to_brace",
- QKeySequence (ctrl_shift + Qt::Key_M));
+ QKeySequence (ctrl_shift | Qt::Key_M));
init (tr ("Toggle Bookmark"), "editor_edit:toggle_bookmark",
- QKeySequence (prefix + Qt::Key_F7));
+ QKeySequence (prefix | Qt::Key_F7));
init (tr ("Next Bookmark"), "editor_edit:next_bookmark",
- QKeySequence (prefix + Qt::Key_F2));
+ QKeySequence (prefix | Qt::Key_F2));
init (tr ("Previous Bookmark"), "editor_edit:previous_bookmark",
- QKeySequence (prefix + Qt::SHIFT + Qt::Key_F2));
+ QKeySequence (prefix | Qt::SHIFT | Qt::Key_F2));
init (tr ("Remove All Bookmark"), "editor_edit:remove_bookmark",
QKeySequence ());
@@ -289,10 +289,10 @@ shortcut_manager::do_init_data ()
init (tr ("Zoom Out"), "editor_view:zoom_out", QKeySequence::ZoomOut);
#if defined (Q_OS_MAC)
init (tr ("Zoom Normal"), "editor_view:zoom_normal",
- QKeySequence (ctrl + Qt::Key_Underscore));
+ QKeySequence (ctrl | Qt::Key_Underscore));
#else
init (tr ("Zoom Normal"), "editor_view:zoom_normal",
- QKeySequence (ctrl + Qt::Key_Period));
+ QKeySequence (ctrl | Qt::Key_Period));
#endif
// debug
@@ -307,15 +307,15 @@ shortcut_manager::do_init_data ()
// run
init (tr ("Run File"), "editor_run:run_file",
- QKeySequence (prefix + Qt::Key_F5) );
+ QKeySequence (prefix | Qt::Key_F5) );
init (tr ("Run Selection"), "editor_run:run_selection",
- QKeySequence (prefix + Qt::Key_F9) );
+ QKeySequence (prefix | Qt::Key_F9) );
// help
init (tr ("Help on Keyword"), "editor_help:help_keyword",
QKeySequence::HelpContents);
init (tr ("Document on Keyword"), "editor_help:doc_keyword",
- QKeySequence (Qt::SHIFT + Qt::Key_F1));
+ QKeySequence (Qt::SHIFT | Qt::Key_F1));
}
void
@@ -353,7 +353,7 @@ shortcut_manager::do_fill_treewidget (QT
_dialog = 0;
_level_hash.clear ();
- tree_view->header ()->setResizeMode (QHeaderView::ResizeToContents);
+ tree_view->header ()->sectionResizeMode (QHeaderView::ResizeToContents);
QTreeWidgetItem *main = new QTreeWidgetItem (tree_view);
main->setText (0, tr ("Main"));
@@ -419,10 +419,10 @@ shortcut_manager::do_fill_treewidget (QT
// write the shortcuts
tree_item->setText (0, sc.description);
- tree_item->setText (1, sc.default_sc [0]);
- tree_item->setText (2, sc.actual_sc [0]);
- tree_item->setText (3, sc.default_sc [1]);
- tree_item->setText (4, sc.actual_sc [1]);
+ tree_item->setText (1, sc.default_sc [0].toString(QKeySequence::NativeText));
+ tree_item->setText (2, sc.actual_sc [0].toString(QKeySequence::NativeText));
+ tree_item->setText (3, sc.default_sc [1].toString(QKeySequence::NativeText));
+ tree_item->setText (4, sc.actual_sc [1].toString(QKeySequence::NativeText));
_item_index_hash[tree_item] = i + 1; // index+1 to avoid 0
_index_item_hash[i] = tree_item;
@@ -569,8 +569,8 @@ shortcut_manager::shortcut_dialog (int i
}
- _edit_actual->setText (_sc.at (index).actual_sc[_selected_set]);
- _label_default->setText (_sc.at (index).default_sc[_selected_set]);
+ _edit_actual->setText (_sc.at (index).actual_sc[_selected_set].toString(QKeySequence::NativeText));
+ _label_default->setText (_sc.at (index).default_sc[_selected_set].toString(QKeySequence::NativeText));
_handled_index = index;
_edit_actual->setFocus ();
@@ -611,7 +611,7 @@ shortcut_manager::shortcut_dialog_finish
shortcut_t double_shortcut = _sc.at (double_index);
double_shortcut.actual_sc[_selected_set] = QKeySequence ();
_sc.replace (double_index, double_shortcut);
- _index_item_hash[double_index]->setText ((_selected_set + 1)*2, QKeySequence ());
+ _index_item_hash[double_index]->setText ((_selected_set + 1)*2, QKeySequence ().toString(QKeySequence::NativeText));
}
else
return;
@@ -625,7 +625,7 @@ shortcut_manager::shortcut_dialog_finish
_sc.replace (_handled_index, shortcut);
_index_item_hash[_handled_index]->setText ((_selected_set + 1)*2,
- shortcut.actual_sc[_selected_set]);
+ shortcut.actual_sc[_selected_set].toString(QKeySequence::NativeText));
if (! shortcut.actual_sc[_selected_set].isEmpty ())
_shortcut_hash[widget + sep + shortcut.actual_sc[_selected_set].toString ()] =
@@ -653,7 +653,7 @@ shortcut_manager::import_shortcuts (int
// update the tree view
QTreeWidgetItem* tree_item = _index_item_hash[i]; // get related tree item
- tree_item->setText (2*set, sc.actual_sc [set-1]); // display new shortcut
+ tree_item->setText (2*set, sc.actual_sc [set-1].toString(QKeySequence::NativeText)); // display new shortcut
}
}
@@ -744,6 +744,6 @@ enter_shortcut::keyPressEvent (QKeyEvent
if (modifiers & Qt::MetaModifier)
key += Qt::META;
- setText (QKeySequence(key));
+ setText (QKeySequence(key).toString(QKeySequence::NativeText));
}
}

24
math/octave/patches/patch-libgui_src_workspace-model.cc Normal file
View File

@@ -0,0 +1,24 @@
$NetBSD: patch-libgui_src_workspace-model.cc,v 1.2 2016/08/06 13:03:35 prlw1 Exp $
Changes for compiling with Qt5 instead of Qt4
--- libgui/src/workspace-model.cc.orig 2015-05-23 14:21:53.000000000 +0000
+++ libgui/src/workspace-model.cc
@@ -132,7 +132,7 @@ workspace_model::data (const QModelIndex
{
QString class_chars = resource_manager::storage_class_chars ();
int actual_class
- = class_chars.indexOf (_scopes[idx.row ()].toAscii ());
+ = class_chars.indexOf (_scopes[idx.row ()].toLatin1 ());
if (actual_class >= 0)
return QVariant (_storage_class_colors.at (actual_class));
else
@@ -172,7 +172,7 @@ workspace_model::data (const QModelIndex
QString class_chars = resource_manager::storage_class_chars ();
int actual_class
- = class_chars.indexOf (_scopes[idx.row ()].toAscii ());
+ = class_chars.indexOf (_scopes[idx.row ()].toLatin1 ());
if (actual_class >= 0)
{

17
math/octave/patches/patch-libgui_src_workspace-view.cc Normal file
View File

@@ -0,0 +1,17 @@
$NetBSD: patch-libgui_src_workspace-view.cc,v 1.1 2016/08/06 13:03:35 prlw1 Exp $
Changes for compiling with Qt5 instead of Qt4
--- libgui/src/workspace-view.cc.orig 2016-04-20 18:23:57.000000000 +0000
+++ libgui/src/workspace-view.cc
@@ -98,8 +98,8 @@ workspace_view::workspace_view (QWidget
view->horizontalHeader ()->restoreState (
settings->value ("workspaceview/column_state").toByteArray ());
// Set header properties for sorting
- view->horizontalHeader ()->setClickable (true);
- view->horizontalHeader ()->setMovable (true);
+ view->horizontalHeader ()->setSectionsClickable (true);
+ view->horizontalHeader ()->setSectionsMovable (true);
view->horizontalHeader ()->setSortIndicator (
settings->value ("workspaceview/sort_by_column",0).toInt (),
static_cast<Qt::SortOrder>

10
math/octave/patches/patch-src_Makefile.am → math/octave/patches/patch-libinterp_Makefile.am
View File

@@ -1,8 +1,10 @@
$NetBSD: patch-src_Makefile.am,v 1.1 2015/04/23 06:50:41 dbj Exp $
$NetBSD: patch-libinterp_Makefile.am,v 1.1 2016/02/16 04:21:40 dbj Exp $
--- src/Makefile.am.orig 2013-02-21 20:19:24.000000000 +0000
+++ src/Makefile.am
@@ -739,7 +739,7 @@ install-oct:
install .oct loadable modules with INSTALL_LIB to avoid stripping them
--- libinterp/Makefile.am.orig 2015-05-23 14:21:53.000000000 +0000
+++ libinterp/Makefile.am
@@ -351,7 +351,7 @@ install-oct:
f=`echo $$ltlib | $(SED) 's,.*/,,'`; \
dl=`$(SED) -n -e "s/dlname='\([^']*\)'/\1/p" < $$f`; \
if [ -n "$$dl" ]; then \

32
math/octave/patches/patch-libinterp_Makefile.in Normal file
View File

@@ -0,0 +1,32 @@
$NetBSD: patch-libinterp_Makefile.in,v 1.1 2016/02/16 04:21:40 dbj Exp $
install .oct loadable modules with INSTALL_LIB to avoid stripping them
--- libinterp/Makefile.in.orig 2015-05-26 16:21:46.000000000 +0000
+++ libinterp/Makefile.in
@@ -2009,6 +2009,7 @@ INCLUDE_NEXT = @INCLUDE_NEXT@
INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
+INSTALL_LIB = @INSTALL_LIB@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -8760,7 +8761,7 @@ corefcn/oct-tex-parser.yy: corefcn/oct-t
$(AM_V_GEN)$(call subst-bison-api-decls,octave_tex_)
@AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@%.oct : %.la
-@AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@ $(AM_V_GEN)$(INSTALL_PROGRAM) dldfcn/.libs/$(shell $(SED) -n -e "s/dlname='\([^']*\)'/\1/p" < $<) $@
+@AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@ $(AM_V_GEN)$(INSTALL_LIB) dldfcn/.libs/$(shell $(SED) -n -e "s/dlname='\([^']*\)'/\1/p" < $<) $@
dldfcn/__delaunayn__.df: CPPFLAGS += $(QHULL_CPPFLAGS)
dldfcn/__eigs__.df: CPPFLAGS += $(ARPACK_CPPFLAGS) $(SPARSE_XCPPFLAGS)
dldfcn/__fltk_uigetfile__.df: CPPFLAGS += $(FLTK_CPPFLAGS) $(FT2_CPPFLAGS)
@@ -8868,7 +8869,7 @@ uninstall-local: uninstall-oct uninstall
@AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@ f=`echo $$ltlib | $(SED) 's,.*/,,'`; \
@AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@ dl=`$(SED) -n -e "s/dlname='\([^']*\)'/\1/p" < $$f`; \
@AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@ if [ -n "$$dl" ]; then \
-@AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@ $(INSTALL_PROGRAM) $$dl $(DESTDIR)$(octfiledir)/`echo $$f | $(SED) 's,^lib,,; s,\.la$$,.oct,'`; \
+@AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@ $(INSTALL_LIB) $$dl $(DESTDIR)$(octfiledir)/`echo $$f | $(SED) 's,^lib,,; s,\.la$$,.oct,'`; \
@AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@ else \
@AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@ echo "error: dlname is empty in $$ltlib!"; \
@AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@ exit 1; \

8
math/octave/patches/patch-src_DLD-FUNCTIONS_rand.cc → math/octave/patches/patch-libinterp_corefcn_rand.cc
View File

@@ -1,8 +1,8 @@
$NetBSD: patch-src_DLD-FUNCTIONS_rand.cc,v 1.1 2013/09/15 12:30:55 joerg Exp $
$NetBSD: patch-libinterp_corefcn_rand.cc,v 1.1 2016/02/16 04:21:40 dbj Exp $
--- src/DLD-FUNCTIONS/rand.cc.orig 2013-09-14 19:43:59.000000000 +0000
+++ src/DLD-FUNCTIONS/rand.cc
@@ -1032,10 +1032,10 @@ rand(). All permutations are equally lik
--- libinterp/corefcn/rand.cc.orig 2015-05-23 14:21:53.000000000 +0000
+++ libinterp/corefcn/rand.cc
@@ -1139,10 +1139,10 @@ likely.\n\
@end deftypefn")
{

15
math/octave/patches/patch-libinterp_dldfcn_config-module.awk Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-libinterp_dldfcn_config-module.awk,v 1.1 2016/02/16 04:21:40 dbj Exp $
install .oct loadable modules with INSTALL_LIB to avoid stripping them
--- libinterp/dldfcn/config-module.awk.orig 2015-05-23 14:21:53.000000000 +0000
+++ libinterp/dldfcn/config-module.awk
@@ -39,7 +39,7 @@ BEGIN {
print "## of symbolic links";
print "";
print "%.oct : %.la"
- print " $(AM_V_GEN)$(INSTALL_PROGRAM) dldfcn/.libs/$(shell $(SED) -n -e \"s/dlname='\\([^']*\\)'/\\1/p\" < $<) $@"
+ print " $(AM_V_GEN)$(INSTALL_LIB) dldfcn/.libs/$(shell $(SED) -n -e \"s/dlname='\\([^']*\\)'/\\1/p\" < $<) $@"
print ""
print "else";
print "";

15
math/octave/patches/patch-libinterp_dldfcn_module.mk Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-libinterp_dldfcn_module.mk,v 1.1 2016/02/16 04:21:40 dbj Exp $
install .oct loadable modules with INSTALL_LIB to avoid stripping them
--- libinterp/dldfcn/module.mk.orig 2015-05-23 14:36:42.000000000 +0000
+++ libinterp/dldfcn/module.mk
@@ -39,7 +39,7 @@ octlib_LTLIBRARIES += $(DLDFCN_LIBS)
## of symbolic links
%.oct : %.la
- $(AM_V_GEN)$(INSTALL_PROGRAM) dldfcn/.libs/$(shell $(SED) -n -e "s/dlname='\([^']*\)'/\1/p" < $<) $@
+ $(AM_V_GEN)$(INSTALL_LIB) dldfcn/.libs/$(shell $(SED) -n -e "s/dlname='\([^']*\)'/\1/p" < $<) $@
else

13
math/octave/patches/patch-libinterp_oct-conf.in.h Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-libinterp_oct-conf.in.h,v 1.1 2016/02/16 04:21:40 dbj Exp $
--- libinterp/oct-conf.in.h.orig 2015-05-23 14:21:53.000000000 +0000
+++ libinterp/oct-conf.in.h
@@ -631,7 +631,7 @@ along with Octave; see the file COPYING.
#endif
#ifndef OCTAVE_CONF_config_opts
-#define OCTAVE_CONF_config_opts %OCTAVE_CONF_config_opts%
+#define OCTAVE_CONF_config_opts ""
#endif
#endif

13
math/octave/patches/patch-liboctave_numeric_oct-fftw.h Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-liboctave_numeric_oct-fftw.h,v 1.1 2016/02/16 04:21:40 dbj Exp $
--- liboctave/numeric/oct-fftw.h.orig 2015-05-23 14:21:53.000000000 +0000
+++ liboctave/numeric/oct-fftw.h
@@ -99,7 +99,7 @@ public:
return instance_ok () ? instance->do_method (_meth) : dummy;
}
-#if defined (HAVE_FFTW3F_THREADS)
+#if defined (HAVE_FFTW3_THREADS)
static void threads (int _nthreads)
{
if (instance_ok () && _nthreads != threads ())

13
math/octave/patches/patch-liboctave_oct-time.cc
View File

@@ -1,13 +0,0 @@
$NetBSD: patch-liboctave_oct-time.cc,v 1.1 2011/12/24 23:46:02 asau Exp $
--- liboctave/oct-time.cc.orig 2011-09-01 13:38:52.000000000 +0000
+++ liboctave/oct-time.cc
@@ -79,7 +79,7 @@ octave_time::stamp (void)
{
struct timeval tp;
- gnulib::gettimeofday (&tp, 0);
+ gettimeofday (&tp, 0);
ot_unix_time = tp.tv_sec;
ot_usec = tp.tv_usec;

10
math/octave/patches/patch-liboctave_mx-inlines.cc → math/octave/patches/patch-liboctave_operators_mx-inlines.cc
View File

@@ -1,13 +1,13 @@
$NetBSD: patch-liboctave_mx-inlines.cc,v 1.1 2014/06/05 18:33:07 joerg Exp $
$NetBSD: patch-liboctave_operators_mx-inlines.cc,v 1.1 2016/02/16 04:21:40 dbj Exp $
std::pow is required to promote numeric arguments to the smallest
common float type. octave_int<> provides another test of template
specialisations for pow() as well as explicit cast operators.
specializations for pow() as well as explicit cast operators.
The combination of both leads to ambiguous resolutions.
--- liboctave/mx-inlines.cc.orig 2014-06-04 22:00:01.000000000 +0000
+++ liboctave/mx-inlines.cc
@@ -306,7 +306,6 @@ inline void F (size_t n, R *r, X x, cons
--- liboctave/operators/mx-inlines.cc.orig 2015-05-23 14:21:53.000000000 +0000
+++ liboctave/operators/mx-inlines.cc
@@ -307,7 +307,6 @@ inline void F (size_t n, R *r, X x, cons
// Let the compiler decide which pow to use, whichever best matches the
// arguments provided.

13
math/octave/patches/patch-liboctave_system_oct-time.cc Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-liboctave_system_oct-time.cc,v 1.1 2016/02/16 04:21:40 dbj Exp $
--- liboctave/system/oct-time.cc.orig 2015-05-23 14:21:53.000000000 +0000
+++ liboctave/system/oct-time.cc
@@ -85,7 +85,7 @@ octave_time::stamp (void)
{
struct timeval tp;
- gnulib::gettimeofday (&tp, 0);
+ gettimeofday (&tp, 0);
ot_unix_time = tp.tv_sec;
ot_usec = tp.tv_usec;

19
math/octave/patches/patch-m4_acinclude.m4 Normal file
View File

@@ -0,0 +1,19 @@
$NetBSD: patch-m4_acinclude.m4,v 1.1 2016/09/28 02:54:15 maya Exp $
we pass and assume a given MACHINE_GNU_PLATFORM, but this package did not
use this value due to an error.
the guess it had for linux (x86_64-unknown-linux-gnu), seems to trample
over our own tools:
https://mail-index.netbsd.org/pkgsrc-users/2014/03/26/msg019464.html
--- m4/acinclude.m4.orig 2016-04-20 18:23:56.000000000 +0000
+++ m4/acinclude.m4
@@ -1651,7 +1651,7 @@ AC_DEFUN([OCTAVE_CANONICAL_HOST], [
host=unknown-unknown-unknown
AC_MSG_WARN([configuring Octave for unknown system type])
fi
- canonical_host_type=$host
+ canonical_host_type=$host_alias
AC_SUBST(canonical_host_type)
if test -z "$host_cpu"; then
host_cpu=unknown

37
math/octave/patches/patch-scripts_audio_wavread.m
View File

@@ -1,37 +0,0 @@
$NetBSD: patch-scripts_audio_wavread.m,v 1.1 2014/03/06 23:06:58 jperkin Exp $
Texinfo 5.x compatibility.
--- scripts/audio/wavread.m.orig 2013-02-21 20:19:24.000000000 +0000
+++ 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}

15
math/octave/patches/patch-scripts_io_strread.m
View File

@@ -1,15 +0,0 @@
$NetBSD: patch-scripts_io_strread.m,v 1.1 2014/03/06 23:06:58 jperkin Exp $
Texinfo 5.x compatibility.
--- scripts/io/strread.m.orig 2013-02-21 20:19:24.000000000 +0000
+++ 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.
##

21
math/octave/patches/patch-scripts_miscellaneous_getappdata.m
View File

@@ -1,21 +0,0 @@
$NetBSD: patch-scripts_miscellaneous_getappdata.m,v 1.1 2014/03/06 23:06:58 jperkin Exp $
Texinfo 5.x compatibility.
--- scripts/miscellaneous/getappdata.m.orig 2013-02-21 20:19:24.000000000 +0000
+++ 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

46
math/octave/patches/patch-scripts_miscellaneous_license.m
View File

@@ -1,46 +0,0 @@
$NetBSD: patch-scripts_miscellaneous_license.m,v 1.1 2014/03/06 23:06:58 jperkin Exp $
Texinfo 5.x compatibility.
--- scripts/miscellaneous/license.m.orig 2013-02-21 20:19:24.000000000 +0000
+++ 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.
##

36
math/octave/patches/patch-scripts_miscellaneous_ver.m
View File

@@ -1,36 +0,0 @@
$NetBSD: patch-scripts_miscellaneous_ver.m,v 1.1 2014/03/06 23:06:58 jperkin Exp $
Texinfo 5.x compatibility.
--- scripts/miscellaneous/ver.m.orig 2013-02-21 20:19:24.000000000 +0000
+++ 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}

16
math/octave/patches/patch-scripts_pkg_pkg.m
View File

@@ -1,16 +0,0 @@
$NetBSD: patch-scripts_pkg_pkg.m,v 1.1 2012/10/27 13:01:35 asau Exp $
Provide path to GNU make, since this is what assumed here.
--- scripts/pkg/pkg.m.orig 2012-03-09 21:20:48.000000000 +0000
+++ scripts/pkg/pkg.m
@@ -1379,7 +1379,8 @@ function configure_make (desc, packdir,
## Make.
if (exist (fullfile (src, "Makefile"), "file"))
- [status, output] = shell (cstrcat (scenv, "make -C '", src, "'"));
+ make = "@GMAKE@"
+ [status, output] = shell (cstrcat (scenv, make, " -C '", src, "'"));
if (status != 0)
rm_rf (desc.dir);
error ("'make' returned the following error: %s", output);

15
math/octave/patches/patch-scripts_pkg_private_configure__make.m Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-scripts_pkg_private_configure__make.m,v 1.1 2016/02/16 04:21:40 dbj Exp $
Provide path to GNU make, since this is what assumed here.
--- scripts/pkg/private/configure_make.m.orig 2015-05-23 14:21:53.000000000 +0000
+++ scripts/pkg/private/configure_make.m
@@ -88,7 +88,7 @@ function configure_make (desc, packdir,
endif
if (exist (fullfile (src, "Makefile"), "file"))
- [status, output] = shell (sprintf ("%s make --jobs %i --directory '%s'",
+ [status, output] = shell (sprintf ("%s @GMAKE@ --jobs %i --directory '%s'",
scenv, jobs, src), verbose);
if (status != 0)
rmdir (desc.dir, "s");

16
math/octave/patches/patch-scripts_plot_____gnuplot__drawnow____.m
View File

@@ -1,16 +0,0 @@
$NetBSD: patch-scripts_plot_____gnuplot__drawnow____.m,v 1.1 2015/04/23 06:48:53 dbj Exp $
We don't currently install libaquaterm on pkgsrc, so making the gnuplot
"aqua" term the default on the mac is unlikely to work.
--- scripts/plot/__gnuplot_drawnow__.m.orig 2013-02-21 20:19:24.000000000 +0000
+++ scripts/plot/__gnuplot_drawnow__.m
@@ -328,7 +328,7 @@ function term = gnuplot_default_term ()
term = getenv ("GNUTERM");
## If not specified, guess the terminal type.
if (isempty (term))
- if (ismac ())
+ if (0 && ismac ()) ## disabled in pkgsrc because libaquaterm is not installed
term = "aqua";
elseif (! isunix ())
term = "windows";

43
math/octave/patches/patch-scripts_plot_daspect.m
View File

@@ -1,43 +0,0 @@
$NetBSD: patch-scripts_plot_daspect.m,v 1.1 2014/03/06 23:06:58 jperkin Exp $
Texinfo 5.x compatibility.
--- scripts/plot/daspect.m.orig 2013-02-21 20:19:24.000000000 +0000
+++ 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

24
math/octave/patches/patch-scripts_plot_legend.m
View File

@@ -1,24 +0,0 @@
$NetBSD: patch-scripts_plot_legend.m,v 1.1 2014/03/06 23:06:58 jperkin Exp $
Texinfo 5.x compatibility.
--- scripts/plot/legend.m.orig 2013-02-21 20:19:24.000000000 +0000
+++ 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

42
math/octave/patches/patch-scripts_plot_pbaspect.m
View File

@@ -1,42 +0,0 @@
$NetBSD: patch-scripts_plot_pbaspect.m,v 1.1 2014/03/06 23:06:58 jperkin Exp $
Texinfo 5.x compatibility.
--- scripts/plot/pbaspect.m.orig 2013-02-21 20:19:24.000000000 +0000
+++ 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

20
math/octave/patches/patch-scripts_plot_print.m
View File

@@ -1,20 +0,0 @@
$NetBSD: patch-scripts_plot_print.m,v 1.1 2014/03/06 23:06:58 jperkin Exp $
Texinfo 5.x compatibility.
--- scripts/plot/print.m.orig 2013-02-21 20:19:24.000000000 +0000
+++ scripts/plot/print.m
@@ -184,11 +184,11 @@
## is sent to a file the size is determined by the plot box defined by
## the figure's "paperposition" property.
##
-## @itemx -append
+## @item -append
## Appends the PS, or PDF output to a pre-existing file of the
## same type.
##
-## @itemx -r@var{NUM}
+## @item -r@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".

16
math/octave/patches/patch-scripts_plot_util_____gnuplot__drawnow____.m Normal file
View File

@@ -0,0 +1,16 @@
$NetBSD: patch-scripts_plot_util_____gnuplot__drawnow____.m,v 1.1 2016/02/16 04:21:40 dbj Exp $
We don't currently install libaquaterm on pkgsrc, so making the gnuplot
"aqua" term the default on the mac is unlikely to work.
--- scripts/plot/util/__gnuplot_drawnow__.m.orig 2015-05-23 14:21:53.000000000 +0000
+++ scripts/plot/util/__gnuplot_drawnow__.m
@@ -351,7 +351,7 @@ function term = gnuplot_default_term (pl
if (isempty (term) || ! __gnuplot_has_terminal__ (term, plot_stream))
if (isguirunning () && __gnuplot_has_terminal__ ("qt", plot_stream))
term = "qt";
- elseif (ismac ())
+ elseif (0 && ismac ()) ## disabled in pkgsrc because libaquaterm is not installed
term = "aqua";
elseif (! isunix ())
term = "windows";

30
math/octave/patches/patch-scripts_polynomial_polyval.m
View File

@@ -1,30 +0,0 @@
$NetBSD: patch-scripts_polynomial_polyval.m,v 1.1 2014/03/06 23:06:58 jperkin Exp $
Texinfo 5.x compatibility.
--- scripts/polynomial/polyval.m.orig 2013-02-21 20:19:24.000000000 +0000
+++ 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}-@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

23
math/octave/patches/patch-scripts_set_union.m
View File

@@ -1,23 +0,0 @@
$NetBSD: patch-scripts_set_union.m,v 1.1 2014/03/06 23:06:58 jperkin Exp $
Texinfo 5.x compatibility.
--- scripts/set/union.m.orig 2013-02-21 20:19:24.000000000 +0000
+++ 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}.

37
math/octave/patches/patch-scripts_signal_freqz.m
View File

@@ -1,37 +0,0 @@
$NetBSD: patch-scripts_signal_freqz.m,v 1.1 2014/03/06 23:06:58 jperkin Exp $
Texinfo 5.x compatibility.
--- scripts/signal/freqz.m.orig 2013-02-21 20:19:24.000000000 +0000
+++ 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

21
math/octave/patches/patch-src_Makefile.in
View File

@@ -1,21 +0,0 @@
$NetBSD: patch-src_Makefile.in,v 1.1 2015/04/23 06:50:41 dbj Exp $
--- src/Makefile.in.orig 2013-02-21 20:21:48.000000000 +0000
+++ src/Makefile.in
@@ -2572,6 +2572,7 @@ INCLUDE_NEXT = @INCLUDE_NEXT@
INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
+INSTALL_LIB = @INSTALL_LIB@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -9236,7 +9237,7 @@ remove-version-links:
@AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@ f=`echo $$ltlib | $(SED) 's,.*/,,'`; \
@AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@ dl=`$(SED) -n -e "s/dlname='\([^']*\)'/\1/p" < $$f`; \
@AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@ if [ -n "$$dl" ]; then \
-@AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@ $(INSTALL_PROGRAM) $$dl $(DESTDIR)$(octfiledir)/`echo $$f | $(SED) 's,^lib,,; s,\.la$$,.oct,'`; \
+@AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@ $(INSTALL_LIB) $$dl $(DESTDIR)$(octfiledir)/`echo $$f | $(SED) 's,^lib,,; s,\.la$$,.oct,'`; \
@AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@ else \
@AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@ echo "error: dlname is empty in $$ltlib!"; \
@AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@ exit 1; \

18
math/octave/patches/patch-src_dirfns.cc
View File

@@ -1,18 +0,0 @@
$NetBSD: patch-src_dirfns.cc,v 1.1 2014/03/06 23:06:58 jperkin Exp $
Texinfo 5.x compatibility.
--- src/dirfns.cc.orig 2013-02-21 20:19:24.000000000 +0000
+++ 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\
-@itemx *\n\
+@item *\n\
matches any string, including the null string,\n\
-@itemx ?\n\
+@item ?\n\
matches any single character, and\n\
\n\
@item [@dots{}]\n\

25
math/octave/patches/patch-src_display.cc
View File

@@ -1,25 +0,0 @@
$NetBSD: patch-src_display.cc,v 1.1 2015/04/23 06:47:56 dbj Exp $
CGDisplayBitsPerPixel is only good on osx 10.5 or earlier.
CGDisplayModeCopyPixelEncoding should work on 10.6 and later.
--- src/display.cc.orig 2013-02-21 20:19:24.000000000 +0000
+++ src/display.cc
@@ -72,7 +72,16 @@ display_info::init (bool query)
if (display)
{
- dp = CGDisplayBitsPerPixel (display);
+ CGDisplayModeRef mode = CGDisplayCopyDisplayMode (display);
+ CFStringRef pixelEncoding = CGDisplayModeCopyPixelEncoding(mode);
+ CFRelease(mode);
+ if (CFStringCompare (pixelEncoding, CFSTR (IO32BitDirectPixels), 0) == 0)
+ dp = 32;
+ else if (CFStringCompare (pixelEncoding, CFSTR (IO16BitDirectPixels), 0) == 0)
+ dp = 16;
+ else
+ dp = 8; // Unknown pixel encoding (probably not really depth 8)
+ CFRelease(pixelEncoding);
ht = CGDisplayPixelsHigh (display);
wd = CGDisplayPixelsWide (display);

13
math/octave/patches/patch-src_oct-conf.h.in
View File

@@ -1,13 +0,0 @@
$NetBSD: patch-src_oct-conf.h.in,v 1.1 2011/12/24 23:46:02 asau Exp $
--- src/oct-conf.h.in.orig 2011-09-01 13:39:19.000000000 +0000
+++ src/oct-conf.h.in
@@ -541,7 +541,7 @@ along with Octave; see the file COPYING.
#endif
#ifndef OCTAVE_CONF_config_opts
-#define OCTAVE_CONF_config_opts %OCTAVE_CONF_config_opts%
+#define OCTAVE_CONF_config_opts ""
#endif
#endif