Re: upstream math/octave breaks pkgsrc by finding qtchooser

["Dr. Thomas Orgis" <thomas.orgis%uni-hamburg.de@localhost>]

[again without the automated PLIST in the patch]

Am Sat, 29 May 2021 19:49:06 +0200

> configure:77038: checking for x86_64-debian-linux-qtchooser
> configure:77073: result: no
> configure:77087: checking for qtchooser
> configure:77108: found /usr/bin/qtchooser
> 
> So if we neuter that check, things should roll again.   

This is what I do now:

+SUBST_CLASSES+=		qtchooser
+SUBST_STAGE.qtchooser=		pre-configure
+SUBST_MESSAGE.qtchooser=	Avoiding qtchooser assumption (-qt=x argument)
+SUBST_FILES.qtchooser=		configure
+SUBST_SED.qtchooser=		-e 's,-qt=\$$qt_version,,'

Seems to do the trick. The attached update of octave gives me a working
build. With the added deps it is closer to a complete installation. A
big gap is still the suitesparse depdendency that has some question
marks regarding openblas usage.

A question I have is how much such a big package actually should bother
with making smaller dependencies optional. The math stuff for certain
solvers seems rather to the core, while the Qt GUI is actually optional
at runtime (you need to start `octave --gui` to get the graphical mode,
working in the terminal is possible including plotting via gnuplot in
separate windows).

At least qrupdate seems to be an unproblematic dep to me. Opinions on
just adding it as hard dep? Any other problem with the not-too-small
attached patch?


Alrighty then,

Thomas

-- 
Dr. Thomas Orgis
HPC @ Universität Hamburg

Index: buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/math/octave/buildlink3.mk,v
retrieving revision 1.22
diff -u -r1.22 buildlink3.mk
--- buildlink3.mk	12 Oct 2020 21:51:58 -0000	1.22
+++ buildlink3.mk	29 May 2021 22:32:08 -0000
@@ -18,6 +18,18 @@
 .  include "../../devel/hdf5/buildlink3.mk"
 .endif
 
+.if ${PKG_BUILD_OPTIONS.octave:Mqhull}
+.  include "../../math/qhull/buildlink3.mk"
+.endif
+
+.if ${PKG_BUILD_OPTIONS.octave:Mgl2ps}
+.  include "../../graphics/gl2ps/buildlink3.mk"
+.endif
+
+.if ${PKG_BUILD_OPTIONS.octave:Mqrupdate}
+.  include "../../math/qrupdate/buildlink3.mk"
+.endif
+
 .include "../../audio/libsndfile/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/math/octave/distinfo,v
retrieving revision 1.58
diff -u -r1.58 distinfo
--- distinfo	12 Apr 2020 21:19:32 -0000	1.58
+++ distinfo	29 May 2021 22:32:08 -0000
@@ -1,17 +1,17 @@
 $NetBSD: distinfo,v 1.58 2020/04/12 21:19:32 adam Exp $
 
-SHA1 (octave-5.2.0.tar.xz) = ae719ca7043f8662f932a41bb8d9c7ea32ff9cc9
-RMD160 (octave-5.2.0.tar.xz) = 31fc99a3bb9731be5ea4ecfa5b9913b43768e429
-SHA512 (octave-5.2.0.tar.xz) = 1d88e9f7aec4306cad676ba1ccfcd2ac561aa12c3da0769d3a375deff742c4924c8f8660a949db23ad4011495907bfbb856ce05d2f95b3450d8b2a4da4ef2361
-Size (octave-5.2.0.tar.xz) = 25439716 bytes
-SHA1 (patch-configure.ac) = df35493bc99f8b133865d96f079f603a33ef5cc4
+SHA1 (octave-6.2.0.tar.xz) = 0b6826ebf4174fee1f3dd87907e5cd0fa9a3d481
+RMD160 (octave-6.2.0.tar.xz) = 0dd692760091d1144f157209c5af3aa893d34ff6
+SHA512 (octave-6.2.0.tar.xz) = 7a0d9ee5fd739bd9bd5d2d57faf9e800ccc760afbb840ec5e3371d1e1564163a6190587e31b16d22ae834162917049a0e2789663294030aa84ee86430127eade
+Size (octave-6.2.0.tar.xz) = 25131148 bytes
+SHA1 (patch-configure.ac) = 48a2dee11b33ce80a477367479ad348056c2c1f9
 SHA1 (patch-doc_interpreter_module.mk) = 66389cceddbe71fca0c8197275a839170d64ad5b
 SHA1 (patch-fseeko-fpos_t.c) = b38e7a38be2e0b323cd7f168f1d22d3df998691c
-SHA1 (patch-libgnu_stdio.in.h) = 112a424655d46c75fb68531fe7a84d9a0e97a984
+SHA1 (patch-libgnu_stdio.in.h) = 952e8683a70615b5219d034b9232420998cef44a
 SHA1 (patch-libinterp_corefcn_input.cc) = 865fe4e50f2658d2d221cf8d30d778fa9a632f5f
 SHA1 (patch-libinterp_dldfcn_config-module.awk) = 54b64357b1ef80c5e55eb5eccf742d2267eb277d
 SHA1 (patch-libinterp_dldfcn_module.mk) = 2362d824497a8892078437c24757ae1e40e2e556
-SHA1 (patch-liboctave_util_quit.cc) = 47d7c20c34e7474cd302bc28aca438ee3c3b0f57
+SHA1 (patch-liboctave_util_quit.cc) = 17ace431c53de1e5b72b86bb2bf4e15bdc6d4db9
 SHA1 (patch-liboctave_wrappers_iconv-wrappers.h) = 9995e784844ae2c2d7a77f975cd8b8954ab8a773
 SHA1 (patch-m4_acinclude.m4) = 2c5b2fc9bfe3b9b1e1feec805338ed92ed3953e1
 SHA1 (patch-scripts_miscellaneous_unpack.m) = 82c9ca170762e223c8e5a6f88a7dd9fe2a2a33d0
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/math/octave/Makefile,v
retrieving revision 1.219
diff -u -r1.219 Makefile
--- Makefile	24 May 2021 19:52:56 -0000	1.219
+++ Makefile	29 May 2021 22:32:08 -0000
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.219 2021/05/24 19:52:56 wiz Exp $
 
-DISTNAME=	octave-5.2.0
-PKGREVISION=	16
+DISTNAME=	octave-6.2.0
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_GNU:=octave/}
 EXTRACT_SUFX=	.tar.xz
@@ -23,7 +22,7 @@
 
 USE_LANGUAGES=		c c++ fortran77
 USE_LIBTOOL=		yes
-USE_TOOLS+=		autoconf gsed gmake:run perl pkg-config bison bsdtar:run
+USE_TOOLS+=		gsed gmake:run perl pkg-config bison bsdtar:run
 USE_TOOLS+=		makeinfo:test
 GNU_CONFIGURE=		yes
 
@@ -36,6 +35,9 @@
 CONFIGURE_ARGS+=	--disable-java
 TEST_TARGET=		check
 
+CONFIGURE_ARGS+=	--with-blas=${BLAS_LIBS:Q}
+CONFIGURE_ARGS+=	--with-lapack=${LAPACK_LIBS:Q}
+
 # Provide a full path gfortran in MKOCTFILE for octave-forge
 CONFIGURE_ENV+=		MKOCTFILE_F77=${FCPATH}
 
@@ -70,14 +72,11 @@
 SUBST_FILES.fix-make=		scripts/pkg/private/configure_make.m
 SUBST_VARS.fix-make=		GMAKE
 
-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
-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'
+SUBST_CLASSES+=			qtchooser
+SUBST_STAGE.qtchooser=		pre-configure
+SUBST_MESSAGE.qtchooser=	Avoiding qtchooser assumption (-qt=x argument)
+SUBST_FILES.qtchooser=		configure
+SUBST_SED.qtchooser=		-e 's,-qt=\$$qt_version,,'
 
 # Matches reduce-relocations logic in x11/qt5-qtbase
 .if ${OPSYS} != "Darwin" && ${OPSYS} != "SunOS" && \
@@ -89,9 +88,6 @@
 
 CHECK_WRKREF_SKIP+=	lib/octave/${PKGVERSION_NOREV}/liboctinterp.so*
 
-pre-configure:
-	 cd ${WRKSRC} && autoconf
-
 post-install:
 .for f in ${OCTAVE_DOC}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/octave/${PKGVERSION_NOREV}/doc
@@ -105,6 +101,8 @@
 .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-ng/buildlink3.mk"
 .include "../../mk/blas.buildlink3.mk"
 .include "../../math/fftw/buildlink3.mk"
@@ -116,4 +114,5 @@
 .endif
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/qt5-qttools/buildlink3.mk"
+.include "../../x11/qt5-qscintilla/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/math/octave/options.mk,v
retrieving revision 1.6
diff -u -r1.6 options.mk
--- options.mk	1 Aug 2013 18:44:06 -0000	1.6
+++ options.mk	29 May 2021 22:32:08 -0000
@@ -1,8 +1,8 @@
 # $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_SUGGESTED_OPTIONS=	hdf5 qhull
+PKG_SUPPORTED_OPTIONS=	glpk graphicsmagick hdf5 qhull gl2ps qrupdate
+PKG_SUGGESTED_OPTIONS=	hdf5 qhull qrupdate
 
 .include "../../mk/bsd.options.mk"
 
@@ -29,3 +29,11 @@
 .else
 CONFIGURE_ARGS+=	--without-qhull
 .endif
+
+.if !empty(PKG_OPTIONS:Mgl2ps)
+.include "../../graphics/gl2ps/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mqrupdate)
+.include "../../math/qrupdate/buildlink3.mk"
+.endif