CVS commit: pkgsrc/x11/qt5-qttools

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Fri Mar  6 12:30:47 UTC 2020

Modified Files:
        pkgsrc/x11/qt5-qttools: Makefile

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


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 pkgsrc/x11/qt5-qttools/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/qt5-qttools/Makefile
diff -u pkgsrc/x11/qt5-qttools/Makefile:1.58 pkgsrc/x11/qt5-qttools/Makefile:1.59
--- pkgsrc/x11/qt5-qttools/Makefile:1.58        Tue Jan 21 20:25:39 2020
+++ pkgsrc/x11/qt5-qttools/Makefile     Fri Mar  6 12:30:47 2020
@@ -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 @@ MAKE_ENV+=          QTDIR=${QTDIR}
 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 @@ MAKE_ENV+=            LLVM_INSTALL_DIR=${BUILDLINK
 .include "../../lang/clang/buildlink3.mk"
 .endif
 
+.include "../../x11/qt5-qtbase/Makefile.common"
+
 QTPKGCONFIGPC=         Qt5Designer.pc Qt5Help.pc Qt5UiTools.pc
 
 post-install: