From nobody Thu Jun 20 14:12:27 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4j9m0HqHz5NrsW; Thu, 20 Jun 2024 14:12:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W4j9l5fRxz4bRj; Thu, 20 Jun 2024 14:12:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718892747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1yr/em2D4Dy6r9BiyvaYtzKC3IzwlqbJnmXc+I+pqPw=; b=oQqL5+ihJz+qfYOEP8/RC1S8RbGfRqrV1XiCob9ZzGt/fuP1MCHsg0XWTpjXhEy1GtOaGz r1bp8ZAtPA696J3mvi6FUZ3kScySaIP+5horXXRbo5ahaaFGu3lcJcNbvIOe6sK66BZmKK zvTDVQQqlPcwZgjkVLQqwePt32/7Teosd9JWzTp13rPnVcDwwNd2+4yu2OxZYFo2I1rvj2 9aDI+DwviH/QksDyN92xzroYKJOjOLDfxWO7M320Ug5lIPiTP+5n4vuG5QTibHoa8QR/ea 3GJiftf3A4EpaDMnaHDnas9cB46YxKdRwESwhAbeTsOC1S2d6aHOExp2iq+7nA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718892747; a=rsa-sha256; cv=none; b=otDGuoV85XN/xY047SG2uXiCD0Uak2+67PKu013OuRmPjhjJIEjl7i5N3emJwznkSPr5Ke 2Ggh/uic9Nm+e6CVgb6n2yQnYaYEiqq69hZ+PJDXfT1azMiSEkrpNL8lj/i7oEjBgbEPgp yGrUR0d4URD/Tb+HDg4FdmD+xGsK5MxlYJMkFItBuEEl3u5yjqNVxVRE6fANEQuN4JDSM4 X/u84MV0fZORfBwyblmAnGqk0vp+dFI2up27dB8G5uvyuv+6pn2Q/t8V9FpXtPaqw2vgrB fQA0zqZ019FN2/HzPUdqzM0lMNs1a7gDA6fCsk4NaGqf7qfoA1/CtBnVKmMhnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718892747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1yr/em2D4Dy6r9BiyvaYtzKC3IzwlqbJnmXc+I+pqPw=; b=Fxxsh4QuQgpmtnBYpb6USj1fluErDhDPWSZtioU/BG96bBWTBhQIGsH6hi6L3hR1cdk4zo N+TcUQnxcBJMlOpoDkx3T1ZIpeDnsJab39B/1N6w14/Tz0hkiaJijoj/BUJERvHf7MvXEy iiYSLXlEL/vIvxMJezu17wLXolM+qtRly00qEd7diN7LdvgtWfmTOZMTHK0LA4FbBK/0NG /6Ux0Ztxr5UWtZ55R/1s73DNz+1Oy+6s5SHw/lb+dPbGRvSdKMwREUS2diwCH6wem/e9Mz hvs2MBKj5/eqgf6YbLSi2Ge2PQkHLcSAxqe1GlIRjHNfVlCltHDfP51DsSyC9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4j9l5FQ4zSwj; Thu, 20 Jun 2024 14:12:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45KECRJc093868; Thu, 20 Jun 2024 14:12:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45KECRx1093865; Thu, 20 Jun 2024 14:12:27 GMT (envelope-from git) Date: Thu, 20 Jun 2024 14:12:27 GMT Message-Id: <202406201412.45KECRx1093865@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Stephen Montgomery-Smith Subject: git: 0cdb730413e8 - main - math/octave: Use QT Version 6. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: stephen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0cdb730413e87594b0c8eb41dbd74e1c5cc4e755 Auto-Submitted: auto-generated The branch main has been updated by stephen: URL: https://cgit.FreeBSD.org/ports/commit/?id=0cdb730413e87594b0c8eb41dbd74e1c5cc4e755 commit 0cdb730413e87594b0c8eb41dbd74e1c5cc4e755 Author: Stephen Montgomery-Smith AuthorDate: 2024-06-20 14:10:24 +0000 Commit: Stephen Montgomery-Smith CommitDate: 2024-06-20 14:10:24 +0000 math/octave: Use QT Version 6. Bump portrevision. PR: 279819 Reported by: Joel Bodenmann --- 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