head 1.12; access; symbols pkgsrc-2026Q1:1.12.0.94 pkgsrc-2026Q1-base:1.12 pkgsrc-2025Q4:1.12.0.92 pkgsrc-2025Q4-base:1.12 pkgsrc-2025Q3:1.12.0.90 pkgsrc-2025Q3-base:1.12 pkgsrc-2025Q2:1.12.0.88 pkgsrc-2025Q2-base:1.12 pkgsrc-2025Q1:1.12.0.86 pkgsrc-2025Q1-base:1.12 pkgsrc-2024Q4:1.12.0.84 pkgsrc-2024Q4-base:1.12 pkgsrc-2024Q3:1.12.0.82 pkgsrc-2024Q3-base:1.12 pkgsrc-2024Q2:1.12.0.80 pkgsrc-2024Q2-base:1.12 pkgsrc-2024Q1:1.12.0.78 pkgsrc-2024Q1-base:1.12 pkgsrc-2023Q4:1.12.0.76 pkgsrc-2023Q4-base:1.12 pkgsrc-2023Q3:1.12.0.74 pkgsrc-2023Q3-base:1.12 pkgsrc-2023Q2:1.12.0.72 pkgsrc-2023Q2-base:1.12 pkgsrc-2023Q1:1.12.0.70 pkgsrc-2023Q1-base:1.12 pkgsrc-2022Q4:1.12.0.68 pkgsrc-2022Q4-base:1.12 pkgsrc-2022Q3:1.12.0.66 pkgsrc-2022Q3-base:1.12 pkgsrc-2022Q2:1.12.0.64 pkgsrc-2022Q2-base:1.12 pkgsrc-2022Q1:1.12.0.62 pkgsrc-2022Q1-base:1.12 pkgsrc-2021Q4:1.12.0.60 pkgsrc-2021Q4-base:1.12 pkgsrc-2021Q3:1.12.0.58 pkgsrc-2021Q3-base:1.12 pkgsrc-2021Q2:1.12.0.56 pkgsrc-2021Q2-base:1.12 pkgsrc-2021Q1:1.12.0.54 pkgsrc-2021Q1-base:1.12 pkgsrc-2020Q4:1.12.0.52 pkgsrc-2020Q4-base:1.12 pkgsrc-2020Q3:1.12.0.50 pkgsrc-2020Q3-base:1.12 pkgsrc-2020Q2:1.12.0.46 pkgsrc-2020Q2-base:1.12 pkgsrc-2020Q1:1.12.0.26 pkgsrc-2020Q1-base:1.12 pkgsrc-2019Q4:1.12.0.48 pkgsrc-2019Q4-base:1.12 pkgsrc-2019Q3:1.12.0.44 pkgsrc-2019Q3-base:1.12 pkgsrc-2019Q2:1.12.0.42 pkgsrc-2019Q2-base:1.12 pkgsrc-2019Q1:1.12.0.40 pkgsrc-2019Q1-base:1.12 pkgsrc-2018Q4:1.12.0.38 pkgsrc-2018Q4-base:1.12 pkgsrc-2018Q3:1.12.0.36 pkgsrc-2018Q3-base:1.12 pkgsrc-2018Q2:1.12.0.34 pkgsrc-2018Q2-base:1.12 pkgsrc-2018Q1:1.12.0.32 pkgsrc-2018Q1-base:1.12 pkgsrc-2017Q4:1.12.0.30 pkgsrc-2017Q4-base:1.12 pkgsrc-2017Q3:1.12.0.28 pkgsrc-2017Q3-base:1.12 pkgsrc-2017Q2:1.12.0.24 pkgsrc-2017Q2-base:1.12 pkgsrc-2017Q1:1.12.0.22 pkgsrc-2017Q1-base:1.12 pkgsrc-2016Q4:1.12.0.20 pkgsrc-2016Q4-base:1.12 pkgsrc-2016Q3:1.12.0.18 pkgsrc-2016Q3-base:1.12 pkgsrc-2016Q2:1.12.0.16 pkgsrc-2016Q2-base:1.12 pkgsrc-2016Q1:1.12.0.14 pkgsrc-2016Q1-base:1.12 pkgsrc-2015Q4:1.12.0.12 pkgsrc-2015Q4-base:1.12 pkgsrc-2015Q3:1.12.0.10 pkgsrc-2015Q3-base:1.12 pkgsrc-2015Q2:1.12.0.8 pkgsrc-2015Q2-base:1.12 pkgsrc-2015Q1:1.12.0.6 pkgsrc-2015Q1-base:1.12 pkgsrc-2014Q4:1.12.0.4 pkgsrc-2014Q4-base:1.12 pkgsrc-2014Q3:1.12.0.2 pkgsrc-2014Q3-base:1.12 pkgsrc-2014Q2:1.11.0.20 pkgsrc-2014Q2-base:1.11 pkgsrc-2014Q1:1.11.0.18 pkgsrc-2014Q1-base:1.11 pkgsrc-2013Q4:1.11.0.16 pkgsrc-2013Q4-base:1.11 pkgsrc-2013Q3:1.11.0.14 pkgsrc-2013Q3-base:1.11 pkgsrc-2013Q2:1.11.0.12 pkgsrc-2013Q2-base:1.11 pkgsrc-2013Q1:1.11.0.10 pkgsrc-2013Q1-base:1.11 pkgsrc-2012Q4:1.11.0.8 pkgsrc-2012Q4-base:1.11 pkgsrc-2012Q3:1.11.0.6 pkgsrc-2012Q3-base:1.11 pkgsrc-2012Q2:1.11.0.4 pkgsrc-2012Q2-base:1.11 pkgsrc-2012Q1:1.11.0.2 pkgsrc-2012Q1-base:1.11 pkgsrc-2011Q4:1.10.0.8 pkgsrc-2011Q4-base:1.10 pkgsrc-2011Q3:1.10.0.6 pkgsrc-2011Q3-base:1.10 pkgsrc-2011Q2:1.10.0.4 pkgsrc-2011Q2-base:1.10 pkgsrc-2011Q1:1.10.0.2 pkgsrc-2011Q1-base:1.10 pkgsrc-2010Q4:1.9.0.2 pkgsrc-2010Q4-base:1.9 pkgsrc-2010Q3:1.8.0.6 pkgsrc-2010Q3-base:1.8 pkgsrc-2010Q2:1.8.0.4 pkgsrc-2010Q2-base:1.8 pkgsrc-2010Q1:1.8.0.2 pkgsrc-2010Q1-base:1.8 pkgsrc-2009Q4:1.7.0.2 pkgsrc-2009Q4-base:1.7 pkgsrc-2009Q3:1.6.0.8 pkgsrc-2009Q3-base:1.6 pkgsrc-2009Q2:1.6.0.6 pkgsrc-2009Q2-base:1.6 pkgsrc-2009Q1:1.6.0.4 pkgsrc-2009Q1-base:1.6 pkgsrc-2008Q4:1.6.0.2 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.5.0.4 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.2 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.4.0.8 pkgsrc-2008Q2-base:1.4 cwrapper:1.4.0.6 pkgsrc-2008Q1:1.4.0.4 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.2 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.3.0.2 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.2.0.4 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.2 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.1.0.4 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.2 pkgsrc-2006Q3-base:1.1; locks; strict; comment @# @; 1.12 date 2014.08.23.20.09.31; author wiz; state Exp; branches; next 1.11; commitid o11sum6bMoMxAwNx; 1.11 date 2012.01.12.22.59.58; author adam; state Exp; branches; next 1.10; 1.10 date 2011.03.03.05.50.04; author adam; state Exp; branches; next 1.9; 1.9 date 2010.11.15.13.05.45; author adam; state Exp; branches; next 1.8; 1.8 date 2010.01.29.18.19.09; author adam; state Exp; branches; next 1.7; 1.7 date 2009.10.11.09.14.52; author adam; state Exp; branches; next 1.6; 1.6 date 2008.10.26.14.02.33; author adam; state Exp; branches; next 1.5; 1.5 date 2008.07.24.12.55.20; author markd; state Exp; branches; next 1.4; 1.4 date 2007.10.13.12.02.14; author adam; state Exp; branches; next 1.3; 1.3 date 2007.07.28.07.37.51; author adam; state Exp; branches; next 1.2; 1.2 date 2007.03.18.17.34.41; author adam; state Exp; branches; next 1.1; 1.1 date 2006.07.17.15.30.16; author minskim; state Exp; branches; next ; desc @@ 1.12 log @Fix qmake to handle DESTDIR during installation. From Niclas Rosenvik. Bump PKGREVISION. @ text @$NetBSD: patch-ae,v 1.11 2012/01/12 22:59:58 adam Exp $ --- qmake/generators/unix/unixmake.cpp.orig 2013-06-07 05:17:01.000000000 +0000 +++ qmake/generators/unix/unixmake.cpp @@@@ -356,27 +356,29 @@@@ UnixMakefileGenerator::init() if(libtoolify[i].startsWith("QMAKE_LINK") || libtoolify[i] == "QMAKE_AR_CMD") { libtool_flags += " --mode=link"; if(project->isActiveConfig("staticlib")) { - libtool_flags += " -static"; + comp_flags += " -static"; } else { if(!project->isEmpty("QMAKE_LIB_FLAG")) { + if(project->isActiveConfig("plugin")) + comp_flags += " -avoid-version"; + else { int maj = project->first("VER_MAJ").toInt(); int min = project->first("VER_MIN").toInt(); int pat = project->first("VER_PAT").toInt(); - comp_flags += " -version-info " + QString::number(10*maj + min) + - ":" + QString::number(pat) + ":0"; + comp_flags += " -version-info " + QString::number(maj + min) + + ":" + QString::number(pat) + + ":" + QString::number(min); + } if(libtoolify[i] != "QMAKE_AR_CMD") { - QString rpath = Option::output_dir; - if(!project->isEmpty("DESTDIR")) { - rpath = project->first("DESTDIR"); - if(QDir::isRelativePath(rpath)) - rpath.prepend(Option::output_dir + Option::dir_sep); - } + QString rpath = Option::fixPathToTargetOS(project->first("target.path"), FALSE); + if(rpath.right(1) != Option::dir_sep) + rpath += Option::dir_sep; comp_flags += " -rpath " + Option::fixPathToTargetOS(rpath, false); } } } if(project->isActiveConfig("plugin")) - libtool_flags += " -module"; + comp_flags += " -module"; } else { libtool_flags += " --mode=compile"; } @@@@ -741,7 +743,6 @@@@ UnixMakefileGenerator::defaultInstall(co QString targetdir = Option::fixPathToTargetOS(project->first("target.path"), false); if(!destdir.isEmpty() && destdir.right(1) != Option::dir_sep) destdir += Option::dir_sep; - targetdir = fileFixify(targetdir, FileFixifyAbsolute); if(targetdir.right(1) != Option::dir_sep) targetdir += Option::dir_sep; @@@@ -779,11 +780,19 @@@@ UnixMakefileGenerator::defaultInstall(co QString src_targ = target; if(src_targ == "$(TARGET)") src_targ = "$(TARGETL)"; - QString dst_dir = fileFixify(targetdir, FileFixifyAbsolute); + QString dst_dir = targetdir; if(QDir::isRelativePath(dst_dir)) - dst_dir = Option::fixPathToTargetOS(Option::output_dir + Option::dir_sep + dst_dir); - ret = "-$(LIBTOOL) --mode=install cp \"" + src_targ + "\" \"" + filePrefixRoot(root, dst_dir) + "\""; - uninst.append("-$(LIBTOOL) --mode=uninstall \"" + src_targ + "\""); + dst_dir = Option::fixPathToTargetOS(dst_dir); + if(!ret.isEmpty()) + ret += "\n\t"; + if(project->first("TEMPLATE") == "app") { + ret += "-$(LIBTOOL) --mode=install cp \"" + Option::fixPathToTargetOS(destdir + src_targ, false) + "\" \"" + filePrefixRoot(root, dst_dir) + "\""; + } else { + ret += "-$(LIBTOOL) --mode=install cp \"" + src_targ + "\" \"" + filePrefixRoot(root, dst_dir) + "\""; + } + if(!uninst.isEmpty()) + uninst.append("\n\t"); + uninst.append("-$(LIBTOOL) --mode=uninstall \"" + src_targ + "\""); } else { QString src_targ = target; if(!destdir.isEmpty()) @ 1.11 log @Changes 4.8.0: Featuring Qt Platform Abstraction, threaded OpenGL support, multithreaded HTTP and optimized file system access. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.10 2011/03/03 05:50:04 adam Exp $ d3 1 a3 1 --- qmake/generators/unix/unixmake.cpp.orig 2011-02-22 12:02:48.000000000 +0000 d53 1 a53 1 @@@@ -779,10 +780,14 @@@@ UnixMakefileGenerator::defaultInstall(co d62 1 d66 5 a70 1 + ret += "-$(LIBTOOL) --mode=install cp \"" + src_targ + "\" \"" + filePrefixRoot(root, dst_dir) + "\""; d73 1 a73 1 uninst.append("-$(LIBTOOL) --mode=uninstall \"" + src_targ + "\""); d76 1 @ 1.10 log @Changes 4.7.2: This is a maintenance release which contains bug-fixes based on feedback and contributions since the Qt 4.7.1 release back in November. It also marks the official release of Qt Quick. Qt Quick is a new feature within Qt that makes it easy to create light-weight apps and UIs. It contains the new QML language, the Qt Declarative module, and new tooling in Qt Creator to easily build apps. PkgSrc: now builds with Clang. @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 @@@@ -327,27 +327,29 @@@@ UnixMakefileGenerator::init() d45 1 a45 1 @@@@ -708,7 +710,6 @@@@ UnixMakefileGenerator::defaultInstall(co d53 1 a53 1 @@@@ -746,10 +747,14 @@@@ UnixMakefileGenerator::defaultInstall(co @ 1.9 log @Changes 4.7.1: Qt 4.7.1 is a bug-fix release. It maintains both forward and backward compatibility (source and binary) with Qt 4.7.0. For more details, refer to the online documentation included in this distribution. The documentation is also available online: http://qt.nokia.com/doc/4.7 The Qt version 4.7 series is binary compatible with the 4.6.x series. Applications compiled for 4.6 will continue to run with 4.7. Changes 4.7.0: Qt 4.7 introduces many new features and improvements as well as bugfixes over the 4.6.x series. For more details, refer to the online documentation included in this distribution. The documentation is also available online: http://qt.nokia.com/doc/4.7 The Qt version 4.7 series is binary compatible with the 4.6.x series. Applications compiled for 4.6 will continue to run with 4.7. @ text @d3 1 a3 1 --- qmake/generators/unix/unixmake.cpp.orig 2010-09-10 09:04:41.000000000 +0000 d45 1 a45 1 @@@@ -683,7 +685,6 @@@@ UnixMakefileGenerator::defaultInstall(co d53 1 a53 1 @@@@ -721,10 +722,14 @@@@ UnixMakefileGenerator::defaultInstall(co @ 1.8 log @Changes 4.6.1: * Optimized empty QUrl creation * Improve performance of getting the canonical filename on Linux and Symbian by using realpath() system call. * Avoid stat() when opening a file. * Do not look at the Qt patch-level version embedded in plugins' buildkeys when trying to determine if the plugin is compatible * Bug-fixes * load() and loadFromData() can now support compressed GL textures in the DDS, ETC1, PVRTC2, and PVRTC4 formats if the OpenGL graphics system is active and the appropriate extensions are present in the GL implementation. * Fixed a small leak when using the new QPixmapCache::Key based API. @ text @d3 1 a3 1 --- qmake/generators/unix/unixmake.cpp.orig 2010-01-15 17:01:30.000000000 +0000 d5 1 a5 1 @@@@ -325,27 +325,29 @@@@ UnixMakefileGenerator::init() d45 1 a45 1 @@@@ -677,7 +679,6 @@@@ UnixMakefileGenerator::defaultInstall(co d53 1 a53 1 @@@@ -715,10 +716,14 @@@@ UnixMakefileGenerator::defaultInstall(co @ 1.7 log @Changes 4.5.3: * This is a bug-fix release. @ text @d3 1 a3 1 --- qmake/generators/unix/unixmake.cpp.orig 2009-09-29 13:01:33.000000000 +0200 d5 1 a5 1 @@@@ -324,27 +324,29 @@@@ UnixMakefileGenerator::init() d45 1 a45 1 @@@@ -676,7 +678,6 @@@@ UnixMakefileGenerator::defaultInstall(co d53 1 a53 1 @@@@ -714,10 +715,14 @@@@ UnixMakefileGenerator::defaultInstall(co @ 1.6 log @Changes 4.4.3: * Updated application icons and other graphics to reflect the look and feel of the new Qt brand. * Copyright of Qt has been transferred to Nokia Corporation. @ text @d3 1 a3 1 --- qmake/generators/unix/unixmake.cpp.orig 2008-09-27 10:58:43.000000000 +0200 d5 1 a5 1 @@@@ -317,27 +317,29 @@@@ UnixMakefileGenerator::init() d45 1 a45 1 @@@@ -665,7 +667,6 @@@@ UnixMakefileGenerator::defaultInstall(co d53 1 a53 1 @@@@ -703,10 +704,14 @@@@ UnixMakefileGenerator::defaultInstall(co @ 1.5 log @Update qt4 to 4.4.0 Qt 4.4 introduces many new features as well as many improvements and bugfixes over the 4.3.x series. For more details, see the online documentation which is included in this distribution. The documentation is also available at http://doc.trolltech.com/4.4 The Qt version 4.4 series is binary compatible with the 4.3.x series. A long list of changes can be found in the changes-4.4.0 file in the distribution. Update OKed (and initial work provided) by adam@@.. @ text @d3 1 a3 1 --- qmake/generators/unix/unixmake.cpp.orig 2008-04-28 15:11:14.000000000 +0200 d5 1 a5 1 @@@@ -320,27 +320,29 @@@@ UnixMakefileGenerator::init() d45 1 a45 1 @@@@ -668,7 +670,6 @@@@ UnixMakefileGenerator::defaultInstall(co d53 1 a53 1 @@@@ -706,10 +707,14 @@@@ UnixMakefileGenerator::defaultInstall(co @ 1.4 log @Changes 4.3.2: * General Improvements * Fixed incorrect behavior of the widget editing mode that could occur when a form was resized. * Fixed a crash that could occur when several commands were redone in one go. * Enabled MSVC and Borland project generators for the Qt Open Source edition. * Ensured that the QMAKE_CC and QMAKE_CXX variables are not defined in the Xcode project generator to allow distributed (distcc) builds to work again. * more... @ text @d3 1 a3 1 --- qmake/generators/unix/unixmake.cpp.orig 2007-10-01 15:06:33.000000000 +0200 d5 1 a5 1 @@@@ -310,27 +310,29 @@@@ UnixMakefileGenerator::init() d45 1 a45 1 @@@@ -658,7 +660,6 @@@@ UnixMakefileGenerator::defaultInstall(co d53 1 a53 1 @@@@ -696,10 +697,14 @@@@ UnixMakefileGenerator::defaultInstall(co @ 1.3 log @Changes 4.3.0: - Configuration/Compilation * Fixed OpenBSD and NetBSD build issues. - Legal * Added information about the OpenSSL exception to the GPL. - Documentation and Examples * Added information about the TS file format used in Linguist. * Moved platform and compiler support information from www.trolltech.com into the documentation. * Added an Accessibility overview document. * Added new example to show usage of QCompleter with custom tree models. - Translations - Added support for the CP949 Korean Codec. - [138140] The whole Qt source compiles with the QT_NO_CAST_FROM_ASCII and QT_NO_CAST_TO_ASCII defines and therefore is more robust when using codecs. - Added support for HP-UX 11i (Itanium) with the aCC compiler - Changed dialogs to respond much better to the LanguageChange event. (i.e. run time translation now works much better.) - Signals and slots * [61295] Added Qt::BlockingQueuedConnection connection type, which waits for all slots to be called before continuing. * [128646] Ignore optional keywords specified in SIGNAL() and SLOT() signatures (struct, class, and enum). * Optimize emitting signals that do not have anything connected to them. - [121629] Added support for the MinGW/MSYS platform. - [102293] Added search path functionality (QDir::addSearchPath) - Almost all widgets are now styleable using Qt Style Sheets. @ text @d3 1 a3 1 --- qmake/generators/unix/unixmake.cpp.orig 2007-05-25 15:24:38.000000000 +0200 d5 1 a5 1 @@@@ -295,27 +295,29 @@@@ UnixMakefileGenerator::init() d45 1 a45 1 @@@@ -643,7 +645,6 @@@@ UnixMakefileGenerator::defaultInstall(co d53 1 a53 1 @@@@ -681,10 +682,14 @@@@ UnixMakefileGenerator::defaultInstall(co @ 1.2 log @Changes 4.2.3: This is a bug-fix release. It maintains both forward and backward compatibility (source and binary) with Qt 4.2.0. - Configuration/Compilation * Fixed architecture detection on UltraSPARC-T1 systems. * Fixed compilation on embedded architectures when qreal is not double. - Documentation * Completed documentation for "Implementing Atomic Operations", which is useful for people porting Qt to a new hardware architecture. - Translations * Added a new unofficial Portuguese translation courtesy of Helder Correia. - Qt Linguist * Made the columns in the phrasebook resizeable. - lupdate * Fixed bug in the .pro parser of lupdate. It should accept backslashes. * Fixed a severe slowdown in lupdate. (~400x speedup.) * Fixed traversal of subdirectories. - moc * Don't create trigraphs in the generated code for C++ casts. - uic * Fixed a bug that generated excessive margins for Q3GroupBox. @ text @d3 1 a3 1 --- qmake/generators/unix/unixmake.cpp.orig 2007-02-21 10:59:01.000000000 +0100 d5 1 a5 1 @@@@ -280,27 +280,29 @@@@ UnixMakefileGenerator::init() d45 1 a45 1 @@@@ -611,7 +613,6 @@@@ UnixMakefileGenerator::defaultInstall(co d53 1 a53 1 @@@@ -656,10 +657,14 @@@@ UnixMakefileGenerator::defaultInstall(co @ 1.1 log @Use the libtool mode of qmake, instead of patching the non-libtool mode to use libtool. This fixes PR 33951. Bump PKGREVISION for qt4-libs and qt4-tools. @ text @d3 1 a3 1 --- qmake/generators/unix/unixmake.cpp.orig 2006-06-19 03:49:29.000000000 -0700 d5 1 a5 1 @@@@ -250,27 +250,29 @@@@ UnixMakefileGenerator::init() d45 1 a45 1 @@@@ -555,7 +557,6 @@@@ UnixMakefileGenerator::defaultInstall(co d53 1 a53 1 @@@@ -611,10 +612,14 @@@@ UnixMakefileGenerator::defaultInstall(co @