CVS commit: pkgsrc/math/octave

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Tue Jul 17 09:55:37 UTC 2018

Modified Files:
        pkgsrc/math/octave: Makefile distinfo
Added Files:
        pkgsrc/math/octave/patches: patch-libgui_src_settings-dialog.h

Log Message:
octave: force gfortran, g95 is broken is most setups.
build fix for newer qt.

bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.170 -r1.171 pkgsrc/math/octave/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/math/octave/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/math/octave/patches/patch-libgui_src_settings-dialog.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/octave/Makefile
diff -u pkgsrc/math/octave/Makefile:1.170 pkgsrc/math/octave/Makefile:1.171
--- pkgsrc/math/octave/Makefile:1.170   Fri Jul  6 15:06:47 2018
+++ pkgsrc/math/octave/Makefile Tue Jul 17 09:55:36 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.170 2018/07/06 15:06:47 ryoon Exp $
+# $NetBSD: Makefile,v 1.171 2018/07/17 09:55:36 maya Exp $
 
 DISTNAME=      octave-4.2.0
-PKGREVISION=   25
+PKGREVISION=   26
 CATEGORIES=    math
 MASTER_SITES=  ${MASTER_SITE_GNU:=octave/}
 
@@ -25,6 +25,7 @@ USE_TOOLS+=           autoconf gsed gmake:run per
 GNU_CONFIGURE=         yes
 
 USE_LANGUAGES=         c c++ fortran77
+PKGSRC_FORTRAN=                gfortran
 
 # needed for loading of shared objects such as those in the
 # octave-forge package or user written ones compiled with mkoctfile

Index: pkgsrc/math/octave/distinfo
diff -u pkgsrc/math/octave/distinfo:1.52 pkgsrc/math/octave/distinfo:1.53
--- pkgsrc/math/octave/distinfo:1.52    Tue Aug  1 11:06:18 2017
+++ pkgsrc/math/octave/distinfo Tue Jul 17 09:55:36 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.52 2017/08/01 11:06:18 maya Exp $
+$NetBSD: distinfo,v 1.53 2018/07/17 09:55:36 maya Exp $
 
 SHA1 (octave-4.2.0.tar.gz) = 9fac578c08a7efabd79ccc38bc196b9627e3212f
 RMD160 (octave-4.2.0.tar.gz) = 07ff9bae3a0128c93f9113ebf952dea129b58284
@@ -8,6 +8,7 @@ SHA1 (patch-configure) = fe31eb2e1b0f15f
 SHA1 (patch-configure.ac) = 0dba5f4b862e9862687021f985109451ea2672e7
 SHA1 (patch-fseeko-fpos_t.c) = b38e7a38be2e0b323cd7f168f1d22d3df998691c
 SHA1 (patch-libgnu_stdio.in.h) = 112a424655d46c75fb68531fe7a84d9a0e97a984
+SHA1 (patch-libgui_src_settings-dialog.h) = 5bf82e5d313e06ec470a1da1a615c39f74bb880f
 SHA1 (patch-libinterp_build-env.in.cc) = 09431962403996d0f979c7dcd080b721dad55055
 SHA1 (patch-libinterp_dldfcn_config-module.awk) = 0746cca7f69995abbe3af793181b96a99cf866c3
 SHA1 (patch-libinterp_dldfcn_module.mk) = a38b2b70780d33ed7e5c0f586fc9521367be0e28

Added files:

Index: pkgsrc/math/octave/patches/patch-libgui_src_settings-dialog.h
diff -u /dev/null pkgsrc/math/octave/patches/patch-libgui_src_settings-dialog.h:1.1
--- /dev/null   Tue Jul 17 09:55:37 2018
+++ pkgsrc/math/octave/patches/patch-libgui_src_settings-dialog.h       Tue Jul 17 09:55:37 2018
@@ -0,0 +1,14 @@
+$NetBSD: patch-libgui_src_settings-dialog.h,v 1.1 2018/07/17 09:55:37 maya Exp $
+
+Build fix.
+
+--- libgui/src/settings-dialog.h.orig  2016-11-13 15:16:10.000000000 +0000
++++ libgui/src/settings-dialog.h
+@@ -23,6 +23,7 @@ along with Octave; see the file COPYING.
+ #if ! defined (octave_settings_dialog_h)
+ #define octave_settings_dialog_h 1
+ 
++#include <QButtonGroup>
+ #include <QDialog>
+ #include <QSettings>
+ #include <QLineEdit>