Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 21 Jan 2024 11:53:51 GMT
From:      Rene Ladan <rene@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 1a990ca42719 - main - all: unregister support for expired databases/qt5-sqldrivers-ibase
Message-ID:  <202401211153.40LBrpm0005208@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by rene:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1a990ca4271957d83ebc4d27f36ed59b7e77b5b5

commit 1a990ca4271957d83ebc4d27f36ed59b7e77b5b5
Author:     Rene Ladan <rene@FreeBSD.org>
AuthorDate: 2024-01-21 11:42:35 +0000
Commit:     Rene Ladan <rene@FreeBSD.org>
CommitDate: 2024-01-21 11:53:35 +0000

    all: unregister support for expired databases/qt5-sqldrivers-ibase
---
 Mk/Uses/qt.mk                 | 5 +----
 databases/qt5-sql/pkg-message | 1 -
 devel/qt5/Makefile            | 4 ++--
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk
index 8d3eceb73f25..954a1585662a 100644
--- a/Mk/Uses/qt.mk
+++ b/Mk/Uses/qt.mk
@@ -156,9 +156,6 @@ _USE_QT5_ONLY=		assistant buildtools concurrent core dbus \
 			sql-pgsql sql-sqlite2 sql-sqlite3 sql-tds testlib uiplugin \
 			uitools webglplugin websockets-qml \
 			widgets x11extras xml xmlpatterns
-.  if ${ARCH} == amd64 || ${ARCH} == i386
-_USE_QT5_ONLY+=		sql-ibase
-.  endif
 
 _USE_QT6_ONLY=		5compat base coap graphs httpserver languageserver lottie pdf positioning \
 			quick3dphysics quickeffectmaker shadertools tools translations \
@@ -360,7 +357,7 @@ qt-sql-pgsql_PATH=	${LOCALBASE}/${QT_PLUGINDIR_REL}/sqldrivers/libqsqlpsql.so
 
 qt-sql-sqlite3_PATH=	${LOCALBASE}/${QT_PLUGINDIR_REL}/sqldrivers/libqsqlite.so
 
-.  for db in ibase mysql odbc pgsql sqlite2 sqlite3 tds
+.  for db in mysql odbc pgsql sqlite2 sqlite3 tds
 qt-sql-${db}_PORT=	databases/${_QT_RELNAME}-sqldrivers-${db}
 qt-sql-${db}_PATH?=	${LOCALBASE}/${QT_PLUGINDIR_REL}/sqldrivers/libqsql${db:C/^sql//}.so
 .  endfor
diff --git a/databases/qt5-sql/pkg-message b/databases/qt5-sql/pkg-message
index cee398c2b5bf..00820951f27f 100644
--- a/databases/qt5-sql/pkg-message
+++ b/databases/qt5-sql/pkg-message
@@ -3,7 +3,6 @@
   message: <<EOM
 To enable Qt database support, install the database plugin ports. The
 following plugin ports are available:
- - databases/qt5-sqldrivers-ibase	InterBase/Firebird
  - databases/qt5-sqldrivers-mysql	MySQL
  - databases/qt5-sqldrivers-odbc	Open Database Connectivity
  - databases/qt5-sqldrivers-pgsql	PostgreSQL
diff --git a/devel/qt5/Makefile b/devel/qt5/Makefile
index 32ca66567e7b..ff45fb8e040a 100644
--- a/devel/qt5/Makefile
+++ b/devel/qt5/Makefile
@@ -8,8 +8,8 @@ WWW=		https://www.qt.io/
 
 # * phonon4 is not part of Qt itself.
 # * we don't want to pull in wayland just yet.
-# XXX(rene) exclude webengine and sql-ibase
-USE_QT=		${_USE_QT_ALL:Ndeclarative:Nwayland:Nwebengine:Nsql-ibase:S/$/:run/}
+# XXX(rene) exclude webengine
+USE_QT=		${_USE_QT_ALL:Ndeclarative:Nwayland:Nwebengine:S/$/:run/}
 USES=		metaport qt:5
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401211153.40LBrpm0005208>