git: 0cdb730413e8 - main - math/octave: Use QT Version 6.

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Stephen Montgomery-Smith <stephen_at_FreeBSD.org>
Date: Thu, 20 Jun 2024 14:12:27 UTC
The branch main has been updated by stephen:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0cdb730413e87594b0c8eb41dbd74e1c5cc4e755

commit 0cdb730413e87594b0c8eb41dbd74e1c5cc4e755
Author:     Stephen Montgomery-Smith <stephen@FreeBSD.org>
AuthorDate: 2024-06-20 14:10:24 +0000
Commit:     Stephen Montgomery-Smith <stephen@FreeBSD.org>
CommitDate: 2024-06-20 14:10:24 +0000

    math/octave: Use QT Version 6.
    
    Bump portrevision.
    
    PR:             279819
    Reported by:    Joel Bodenmann <jbo@FreeBSD.org>
---
 math/octave/Makefile  | 16 ++++++++--------
 math/octave/pkg-plist | 46 +++++++++++++++++++++++-----------------------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/math/octave/Makefile b/math/octave/Makefile
index 580a280444fb..cd46cb6912e2 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	octave
 PORTVERSION=	${OCTAVE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	GNU
 
@@ -53,15 +54,14 @@ USES=		charsetfix compiler:c++14-lang desktop-file-utils fortran gl \
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}/${PORTVERSION}
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
-USE_QT=		core gui help network opengl printsupport sql widgets xml \
-		buildtools:build linguist:build qmake:build
+USE_QT=		base 5compat tools sqldriver-sqlite
 USE_XORG=	x11 xcursor xext xfixes xft xinerama xrender
 USE_GL=		gl glu
 
 GNU_HOST=	${ARCH}-portbld-freebsd${OSREL}
 PLIST_SUB=	GNU_HOST=${GNU_HOST} \
 		OCTAVE_VERSION=${OCTAVE_VERSION}
-LDFLAGS+=	-L${LOCALBASE}/lib/qt5
+LDFLAGS+=	-L${LOCALBASE}/lib/qt6
 CONFIGURE_ENV=	ac_cv_path_SED=${LOCALBASE}/bin/gsed \
 		ac_cv_type_max_align_t=yes \
 		GPERF="${LOCALBASE}/bin/gperf" \
@@ -89,24 +89,24 @@ INFO=		octave liboctave
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
-OPTIONS_DEFINE=	DOCS JAVA QT5
+OPTIONS_DEFINE=	DOCS JAVA QT6
 
 OPTIONS_RADIO=		BLAS
 OPTIONS_RADIO_BLAS=	ATLAS NETLIB OPENBLAS
-OPTIONS_DEFAULT=	JAVA OPENBLAS QT5
+OPTIONS_DEFAULT=	JAVA OPENBLAS QT6
 OPTIONS_SUB=		yes
 
 DOCS_CONFIGURE_ENABLE=	docs
 JAVA_CONFIGURE_ENABLE=	java
-QT5_CONFIGURE_WITH=	qscintilla qt=5
+QT6_CONFIGURE_WITH=	qscintilla qt=6
 
-QT5_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
+QT6_LIB_DEPENDS=	libqscintilla2_qt6.so:devel/qscintilla2-qt6
 
 DOCS_USES=	tex
 DOCS_USE=	TEX=dvipsk:build,formats:build
 JAVA_USE=	JAVA=yes
 JAVA_CFLAGS=	-I${JAVA_HOME}/include/${OPSYS:tl}
-QT5_USES=	qt:5
+QT6_USES=	qt:6
 OPENBLAS_USES=	blaslapack:openblas
 NETLIB_USES=	blaslapack:netlib
 ATLAS_USES=	blaslapack:atlas
diff --git a/math/octave/pkg-plist b/math/octave/pkg-plist
index fe31b05ae154..c87925a7fc11 100644
--- a/math/octave/pkg-plist
+++ b/math/octave/pkg-plist
@@ -775,9 +775,9 @@ include/octave-%%OCTAVE_VERSION%%/octave/xpow.h
 lib/octave/%%OCTAVE_VERSION%%/liboctave.so
 lib/octave/%%OCTAVE_VERSION%%/liboctave.so.11
 lib/octave/%%OCTAVE_VERSION%%/liboctave.so.11.0.1
-%%QT5%%lib/octave/%%OCTAVE_VERSION%%/liboctgui.so
-%%QT5%%lib/octave/%%OCTAVE_VERSION%%/liboctgui.so.12
-%%QT5%%lib/octave/%%OCTAVE_VERSION%%/liboctgui.so.12.0.0
+%%QT6%%lib/octave/%%OCTAVE_VERSION%%/liboctgui.so
+%%QT6%%lib/octave/%%OCTAVE_VERSION%%/liboctgui.so.12
+%%QT6%%lib/octave/%%OCTAVE_VERSION%%/liboctgui.so.12.0.0
 lib/octave/%%OCTAVE_VERSION%%/liboctinterp.so
 lib/octave/%%OCTAVE_VERSION%%/liboctinterp.so.12
 lib/octave/%%OCTAVE_VERSION%%/liboctinterp.so.12.0.1
@@ -796,8 +796,8 @@ lib/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/fftw.oct
 lib/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/gzip.oct
 libdata/pkgconfig/octave.pc
 libdata/pkgconfig/octinterp.pc
-%%QT5%%libexec/octave/%%OCTAVE_VERSION%%/exec/%%GNU_HOST%%/octave-gui
-%%QT5%%libexec/octave/%%OCTAVE_VERSION%%/exec/%%GNU_HOST%%/octave-svgconvert
+%%QT6%%libexec/octave/%%OCTAVE_VERSION%%/exec/%%GNU_HOST%%/octave-gui
+%%QT6%%libexec/octave/%%OCTAVE_VERSION%%/exec/%%GNU_HOST%%/octave-svgconvert
 %%PORTDOCS%%share/man/man1/mkoctfile.1.gz
 %%PORTDOCS%%share/man/man1/octave-cli.1.gz
 %%PORTDOCS%%share/man/man1/octave-config.1.gz
@@ -1430,24 +1430,24 @@ share/metainfo/org.octave.Octave.metainfo.xml
 %%DATADIR%%/%%OCTAVE_VERSION%%/imagelib/octave-logo.ico
 %%DATADIR%%/%%OCTAVE_VERSION%%/imagelib/octave-logo.svg
 %%DATADIR%%/%%OCTAVE_VERSION%%/imagelib/octave-sombrero.png
-%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/be_BY.qm
-%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/ca_ES.qm
-%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/de_DE.qm
-%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/en_US.qm
-%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/es_ES.qm
-%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/eu_ES.qm
-%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/fr_FR.qm
-%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/hu_HU.qm
-%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/it_IT.qm
-%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/ja_JP.qm
-%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/lt_LT.qm
-%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/nl_NL.qm
-%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/pt_BR.qm
-%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/pt_PT.qm
-%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/ru_RU.qm
-%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/tr_TR.qm
-%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/uk_UA.qm
-%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/zh_CN.qm
+%%QT6%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/be_BY.qm
+%%QT6%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/ca_ES.qm
+%%QT6%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/de_DE.qm
+%%QT6%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/en_US.qm
+%%QT6%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/es_ES.qm
+%%QT6%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/eu_ES.qm
+%%QT6%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/fr_FR.qm
+%%QT6%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/hu_HU.qm
+%%QT6%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/it_IT.qm
+%%QT6%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/ja_JP.qm
+%%QT6%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/lt_LT.qm
+%%QT6%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/nl_NL.qm
+%%QT6%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/pt_BR.qm
+%%QT6%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/pt_PT.qm
+%%QT6%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/ru_RU.qm
+%%QT6%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/tr_TR.qm
+%%QT6%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/uk_UA.qm
+%%QT6%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/zh_CN.qm
 %%DATADIR%%/%%OCTAVE_VERSION%%/m/+containers/Map.m
 %%DATADIR%%/%%OCTAVE_VERSION%%/m/+matlab/+lang/MemoizedFunction.m
 %%DATADIR%%/%%OCTAVE_VERSION%%/m/+matlab/+lang/makeUniqueStrings.m