Re: upstream math/octave breaks pkgsrc by finding qtchooser

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

Am Sun, 30 May 2021 22:08:23 +0200
schrieb "Dr. Thomas Orgis" <thomas.orgis%uni-hamburg.de@localhost>: 

> The qrupdate code is rather ancient Fortran 77 that has been fixed up
> for modern picky compilers now. It is both rather small and unlikely to
> fail, compared to octave itself, anway.

(Btw: I was able to activate upstream for the qrupdate patches …
hopefully, there will be a release sometime so that we can drop those.)

> > From that point of view, adding qt is a really big deal   
> 
> Well, it's already there.

So, in light of this, I revisited my changes to the attached. I just
added qrupdate as mandatory dependency, as it's small and has no
further deps. Also, since we have MesaLib and Qt as direct
dependencies, adding gl2ps also does not add much more.

I also re-enabled the glpk default, as I see no breakage as claimed in
the commit history.

I am testing the attached changes now and will commit once its through.


Alrighty then,

Thomas

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

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	31 May 2021 06:39:44 -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,9 +101,13 @@
 .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 "../../graphics/gl2ps/buildlink3.mk"
 .include "../../math/arpack-ng/buildlink3.mk"
 .include "../../mk/blas.buildlink3.mk"
 .include "../../math/fftw/buildlink3.mk"
+.include "../../math/qrupdate/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/fltk13/buildlink3.mk"
@@ -116,4 +116,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	31 May 2021 06:39:44 -0000
@@ -2,7 +2,7 @@
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.octave
 PKG_SUPPORTED_OPTIONS=	glpk graphicsmagick hdf5 qhull
-PKG_SUGGESTED_OPTIONS=	hdf5 qhull
+PKG_SUGGESTED_OPTIONS=	hdf5 qhull glpk
 
 .include "../../mk/bsd.options.mk"
 
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	31 May 2021 06:39:44 -0000
@@ -18,12 +18,17 @@
 .  include "../../devel/hdf5/buildlink3.mk"
 .endif
 
+.if ${PKG_BUILD_OPTIONS.octave:Mqhull}
+.  include "../../math/qhull/buildlink3.mk"
+.endif
+
 .include "../../audio/libsndfile/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/blas.buildlink3.mk"
 .include "../../math/fftw/buildlink3.mk"
+.include "../../math/qrupdate/buildlink3.mk"
 .endif # OCTAVE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-octave