pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/qt5-qttools adjust for x11/qt5-qtbase/Makefile.com...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b8f037383892
branches:  trunk
changeset: 412428:b8f037383892
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Fri Mar 06 12:30:47 2020 +0000

description:
adjust for x11/qt5-qtbase/Makefile.common r1.38

diffstat:

 x11/qt5-qttools/Makefile |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (32 lines):

diff -r 558566435947 -r b8f037383892 x11/qt5-qttools/Makefile
--- a/x11/qt5-qttools/Makefile  Fri Mar 06 12:25:16 2020 +0000
+++ b/x11/qt5-qttools/Makefile  Fri Mar 06 12:30:47 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2020/01/21 20:25:39 adam Exp $
+# $NetBSD: Makefile,v 1.59 2020/03/06 12:30:47 tnn Exp $
 
 DISTNAME=      qttools-everywhere-src-${QTVERSION}
 PKGNAME=       qt5-qttools-${QTVERSION}
@@ -10,11 +10,12 @@
 INSTALL_ENV+=          INSTALL_ROOT=${DESTDIR}
 INSTALLATION_DIRS+=    lib/pkgconfig
 
+PKG_OPTIONS_VAR=       PKG_OPTIONS.qt5-qttools
 PKG_SUPPORTED_OPTIONS+=        llvm
 PKG_SUGGESTED_OPTIONS+=        llvm
 PLIST_VARS+=           llvm
 
-.include "../../x11/qt5-qtbase/Makefile.common"
+.include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mllvm)
 PLIST.llvm=            yes
@@ -22,6 +23,8 @@
 .include "../../lang/clang/buildlink3.mk"
 .endif
 
+.include "../../x11/qt5-qtbase/Makefile.common"
+
 QTPKGCONFIGPC=         Qt5Designer.pc Qt5Help.pc Qt5UiTools.pc
 
 post-install:



Home | Main Index | Thread Index | Old Index