From owner-svn-ports-head@freebsd.org Sun Mar 10 10:02:39 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E614D152E0BC; Sun, 10 Mar 2019 10:02:38 +0000 (UTC) (envelope-from adridg@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8B0646EAC7; Sun, 10 Mar 2019 10:02:38 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 80680218D2; Sun, 10 Mar 2019 10:02:38 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2AA2c3B003819; Sun, 10 Mar 2019 10:02:38 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2AA2c0R003818; Sun, 10 Mar 2019 10:02:38 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <201903101002.x2AA2c0R003818@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Sun, 10 Mar 2019 10:02:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495245 - head/Mk/Uses X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: head/Mk/Uses X-SVN-Commit-Revision: 495245 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 8B0646EAC7 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.961,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Mar 2019 10:02:39 -0000 Author: adridg Date: Sun Mar 10 10:02:38 2019 New Revision: 495245 URL: https://svnweb.freebsd.org/changeset/ports/495245 Log: During the transition from Mk/bsd.qt.mk to Mk/Uses/qt.mk in r473503, a previous change to the former was omitted; in particular, r463394: "Disable Qt4 sql-ibase plugin on not-(i386|amd64) ibase is Firebird, which only builds on i386 and amd64. This patch squashes the ibase plugin for Qt4." Re-apply lost change (databases/qt5-sqldrivers-ibase is x86-only). PR: 236307 Submitted by: linimon Modified: head/Mk/Uses/qt.mk Modified: head/Mk/Uses/qt.mk ============================================================================== --- head/Mk/Uses/qt.mk Sun Mar 10 09:57:36 2019 (r495244) +++ head/Mk/Uses/qt.mk Sun Mar 10 10:02:38 2019 (r495245) @@ -140,9 +140,12 @@ _QT_MK_POST_INCLUDED= qt.mk _USE_QT_ALL= assistant dbus declarative designer doc gui help \ imageformats l10n linguist linguisttools multimedia \ network opengl pixeltool qdbusviewer qmake script \ - scripttools sql sql-ibase sql-mysql sql-odbc sql-pgsql \ + scripttools sql sql-mysql sql-odbc sql-pgsql \ sql-sqlite2 sql-sqlite3 svg testlib webkit \ xml xmlpatterns +.if ${ARCH} == amd64 || ${ARCH} == i386 +_USE_QT_ALL+= sql-ibase +.endif _USE_QT4_ONLY= accessible assistant-adp assistantclient clucene codecs-cn codecs-jp \ codecs-kr codecs-tw corelib demo graphicssystems-opengl \