Date: Sat, 6 Apr 2019 15:21:41 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> 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 Message-ID: <201904061521.x36FLfxQ029791@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904061521.x36FLfxQ029791>