diff -x CVS -ruN pkgsrc-2017Q1/math/octave/buildlink3.mk pkgsrc/math/octave/buildlink3.mk
--- pkgsrc-2017Q1/math/octave/buildlink3.mk	2016-12-31 10:26:31.000000000 +0100
+++ pkgsrc/math/octave/buildlink3.mk	2017-04-15 11:56:08.432872915 +0200
@@ -22,9 +22,13 @@
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.if !empty(PKG_BUILD_OPTIONS.octave:Mopenblas)
+.include "../../math/openblas/buildlink3.mk"
+.else
 .include "../../math/blas/buildlink3.mk"
-.include "../../math/fftw/buildlink3.mk"
 .include "../../math/lapack/buildlink3.mk"
+.endif
+.include "../../math/fftw/buildlink3.mk"
 .endif # OCTAVE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-octave
diff -x CVS -ruN pkgsrc-2017Q1/math/octave/Makefile pkgsrc/math/octave/Makefile
--- pkgsrc-2017Q1/math/octave/Makefile	2017-02-28 16:20:08.000000000 +0100
+++ pkgsrc/math/octave/Makefile	2017-04-14 18:39:56.678593225 +0200
@@ -106,11 +106,11 @@
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+# Also can use osmesa for plotting.
+.include "../../graphics/MesaLib/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"
@@ -122,5 +122,7 @@
 .include "../../devel/gperf/buildlink3.mk"
 .include "../../x11/fltk13/buildlink3.mk"
 
+.include "../../math/arpack/buildlink3.mk"
+
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff -x CVS -ruN pkgsrc-2017Q1/math/octave/options.mk pkgsrc/math/octave/options.mk
--- pkgsrc-2017Q1/math/octave/options.mk	2013-08-01 20:44:06.000000000 +0200
+++ pkgsrc/math/octave/options.mk	2017-04-14 21:41:02.659118277 +0200
@@ -1,7 +1,7 @@
 # $NetBSD: options.mk,v 1.6 2013/08/01 18:44:06 riastradh Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.octave
-PKG_SUPPORTED_OPTIONS=	glpk graphicsmagick hdf5 qhull
+PKG_SUPPORTED_OPTIONS=	glpk graphicsmagick hdf5 qhull openblas suitesparse gl2ps qrupdate
 PKG_SUGGESTED_OPTIONS=	hdf5 qhull
 
 .include "../../mk/bsd.options.mk"
@@ -29,3 +29,22 @@
 .else
 CONFIGURE_ARGS+=	--without-qhull
 .endif
+
+.if !empty(PKG_OPTIONS:Mopenblas)
+.include "../../wip/OpenBLAS/buildlink3.mk"
+.else
+.include "../../math/blas/buildlink3.mk"
+.include "../../math/lapack/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Msuitesparse)
+.include "../../wip/suitesparse/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mgl2ps)
+.include "../../wip/gl2ps/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mqrupdate)
+.include "../../wip/qrupdate/buildlink3.mk"
+.endif