head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.28
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.26
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.24
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.22
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.20
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.18
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.16
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.14
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.12
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.10
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.8
	pkgsrc-2023Q3-base:1.1
	pkgsrc-2023Q2:1.1.0.6
	pkgsrc-2023Q2-base:1.1
	pkgsrc-2023Q1:1.1.0.4
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.2
	pkgsrc-2022Q4-base:1.1;
locks; strict;
comment	@// @;


1.1
date	2022.11.24.11.11.38;	author nros;	state Exp;
branches;
next	;
commitid	n1BbXXSKAeVzHW2E;


desc
@@


1.1
log
@Add qt6-qtbase version 6.4.1 to pkgsrc-current

Qt6-qtbase is version 6 of the qtbase package
of the Qt C++ GUI framework.
This commit also adds qt6 meta-package needed
for versioning and to be filled with more
packages.
@
text
@$NetBSD: patch-qmake_generators_unix_unixmake2.cpp,v 1.6 2020/09/14 20:08:26 adam Exp $

Append external variables.

--- qmake/generators/unix/unixmake2.cpp.orig	2020-09-02 10:15:07.000000000 +0000
+++ qmake/generators/unix/unixmake2.cpp
@@@@ -191,12 +191,12 @@@@ UnixMakefileGenerator::writeMakeParts(QT
     t << "####### Compiler, tools and options\n\n";
     t << "CC            = " << var("QMAKE_CC") << Qt::endl;
     t << "CXX           = " << var("QMAKE_CXX") << Qt::endl;
-    t << "DEFINES       = "
+    t << "DEFINES      += "
       << varGlue("PRL_EXPORT_DEFINES","-D"," -D"," ")
       << varGlue("DEFINES","-D"," -D","") << Qt::endl;
-    t << "CFLAGS        = " << var("QMAKE_CFLAGS") << " $(DEFINES)\n";
-    t << "CXXFLAGS      = " << var("QMAKE_CXXFLAGS") << " $(DEFINES)\n";
-    t << "INCPATH       =";
+    t << "CFLAGS       += " << var("QMAKE_CFLAGS") << " $(DEFINES)\n";
+    t << "CXXFLAGS     += " << var("QMAKE_CXXFLAGS") << " $(DEFINES)\n";
+    t << "INCPATH      +=";
     {
         const ProStringList &incs = project->values("INCLUDEPATH");
         for(int i = 0; i < incs.size(); ++i) {
@@@@ -215,8 +215,8 @@@@ UnixMakefileGenerator::writeMakeParts(QT
 
     if(!project->isActiveConfig("staticlib")) {
         t << "LINK          = " << var("QMAKE_LINK") << Qt::endl;
-        t << "LFLAGS        = " << var("QMAKE_LFLAGS") << Qt::endl;
-        t << "LIBS          = $(SUBLIBS) " << fixLibFlags("LIBS").join(' ') << ' '
+        t << "LFLAGS       += " << var("QMAKE_LFLAGS") << Qt::endl;
+        t << "LIBS         += $(SUBLIBS) " << fixLibFlags("LIBS").join(' ') << ' '
                                            << fixLibFlags("LIBS_PRIVATE").join(' ') << ' '
                                            << fixLibFlags("QMAKE_LIBS").join(' ') << ' '
                                            << fixLibFlags("QMAKE_LIBS_PRIVATE").join(' ') << Qt::endl;
@