From owner-svn-ports-head@freebsd.org Sat Apr 6 15:21:42 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 AD23B1560E99; Sat, 6 Apr 2019 15:21:42 +0000 (UTC) (envelope-from tcberner@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 5135185BBC; Sat, 6 Apr 2019 15:21:42 +0000 (UTC) (envelope-from tcberner@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 294B8265FD; Sat, 6 Apr 2019 15:21:42 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x36FLgEP029792; Sat, 6 Apr 2019 15:21:42 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x36FLfxQ029791; Sat, 6 Apr 2019 15:21:41 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201904061521.x36FLfxQ029791@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sat, 6 Apr 2019 15:21:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r498144 - in head: Mk/Uses devel/qt5/files X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in head: Mk/Uses devel/qt5/files X-SVN-Commit-Revision: 498144 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 5135185BBC X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.95)[-0.949,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] 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: Sat, 06 Apr 2019 15:21:43 -0000 Author: tcberner Date: Sat Apr 6 15:21:41 2019 New Revision: 498144 URL: https://svnweb.freebsd.org/changeset/ports/498144 Log: devel/qt5-qmake: override hardocded value of localbase with ${LOCALBASE} - The qmake.conf shipped with Qt5 sets /usr/local by default. This patch replaces that string with the value of ${LOCALBASE} to ease use with different prefixes. PR: 229260 Added: head/devel/qt5/files/extrapatch-mkspecs_freebsd-clang_qmake.conf (contents, props changed) Modified: head/Mk/Uses/qt-dist.mk Modified: head/Mk/Uses/qt-dist.mk ============================================================================== --- head/Mk/Uses/qt-dist.mk Sat Apr 6 15:06:44 2019 (r498143) +++ head/Mk/Uses/qt-dist.mk Sat Apr 6 15:21:41 2019 (r498144) @@ -169,7 +169,8 @@ CONFIGURE_ARGS+= -verbose . if ${_QT_DIST} == "base" _EXTRA_PATCHES_QT5= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_create__cmake.prf \ ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_qt__module.prf \ - ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_common_bsd_bsd.conf + ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_common_bsd_bsd.conf \ + ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_freebsd-clang_qmake.conf . if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64 _EXTRA_PATCHES_QT5+= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_g++-base.conf \ ${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_gcc-base.conf @@ -292,7 +293,8 @@ qtbase-pre-configure: post-patch: qtbase-post-patch qtbase-post-patch: ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - ${WRKSRC}//mkspecs/common/bsd/bsd.conf + ${WRKSRC}/mkspecs/common/bsd/bsd.conf \ + ${WRKSRC}/mkspecs/freebsd-clang/qmake.conf . if ${PORTNAME} != "qmake" _QMAKE= ${CONFIGURE_WRKSRC}/bin/qmake Added: head/devel/qt5/files/extrapatch-mkspecs_freebsd-clang_qmake.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/qt5/files/extrapatch-mkspecs_freebsd-clang_qmake.conf Sat Apr 6 15:21:41 2019 (r498144) @@ -0,0 +1,15 @@ +--- mkspecs/freebsd-clang/qmake.conf.orig 2019-04-06 15:03:34 UTC ++++ mkspecs/freebsd-clang/qmake.conf +@@ -7,9 +7,9 @@ QMAKE_PLATFORM = freebsd + + include(../common/bsd/bsd.conf) + +-# Addon software goes into /usr/local on FreeBSD, by default we will look there +-QMAKE_INCDIR_POST = /usr/local/include +-QMAKE_LIBDIR_POST = /usr/local/lib ++# Addon software goes into %%LOCALBASE%% on FreeBSD, by default we will look there ++QMAKE_INCDIR_POST = %%LOCALBASE%%/include ++QMAKE_LIBDIR_POST = %%LOCALBASE%%/lib + + QMAKE_LFLAGS_NOUNDEF = -Wl,--no-undefined +