From b1a1d38bf9ef78334b640d30046388a9c055c3a9 Mon Sep 17 00:00:00 2001 From: "Tobias C. Berner" Date: Thu, 28 Jun 2018 17:39:53 +0000 Subject: Replace bsd.qt.mk by Uses/qt.mk and Uses/qt-dist.mk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From now on, ports that depend on Qt4 will have to set USES= qt:4 USE_QT= foo bar ports depending on Qt5 will use USES= qt:5 USE_QT= foo bar PR: 229225 Exp-run by: antoine Reviewed by: mat Approved by: portmgr (antoine) Differential Revision: →https://reviews.freebsd.org/D15540 --- graphics/poppler/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'graphics/poppler') diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile index c00aa8ac9d52..840d27982291 100644 --- a/graphics/poppler/Makefile +++ b/graphics/poppler/Makefile @@ -64,7 +64,8 @@ CONFIGURE_ARGS+=--disable-poppler-glib .if ${SLAVEPORT}==qt4 CONFIGURE_ARGS+=--enable-poppler-qt4 CONFIGURE_ENV+= MOCQT4=${MOC} -USE_QT4= gui corelib xml qtestlib moc_build +USES+= qt:4 +USE_QT= gui corelib xml qtestlib moc_build BUILD_WRKSRC= ${WRKSRC}/qt4 INSTALL_WRKSRC= ${WRKSRC}/qt4 .else @@ -74,7 +75,8 @@ CONFIGURE_ARGS+=--disable-poppler-qt4 .if ${SLAVEPORT}==qt5 CONFIGURE_ARGS+=--enable-poppler-qt5 CONFIGURE_ENV+= MOCQT5=${MOC} -USE_QT5= core gui widgets xml buildtools_build testlib_build +USES+= qt:5 +USE_QT= core gui widgets xml buildtools_build testlib_build # Qt from 5.7.0 on requires c++11. USE_CXXSTD= c++11 BUILD_WRKSRC= ${WRKSRC}/qt5 -- cgit v1.2.3