head 1.3; access; symbols pkgsrc-2017Q3:1.2.0.86 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.82 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.80 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.78 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.76 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.74 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.72 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.70 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.68 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.66 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.64 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.62 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.60 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.58 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.56 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.54 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.52 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.50 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.48 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.46 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.44 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.42 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.40 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.38 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.36 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.34 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.32 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.30 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.28 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.26 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.24 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.22 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.20 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.18 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.16 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.14 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.12 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.10 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.8 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.6 pkgsrc-2008Q1:1.2.0.4 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.2 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.1.0.14 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.12 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.10 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.8 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.6 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.4 pkgsrc-2006Q2-base:1.1 pkgsrc-2006Q1:1.1.0.2 pkgsrc-2006Q1-base:1.1; locks; strict; comment @# @; 1.3 date 2017.09.26.10.27.22; author wiz; state dead; branches; next 1.2; commitid 9ARpkXTuh9Wg2H8A; 1.2 date 2007.10.24.15.50.18; author joerg; state Exp; branches; next 1.1; 1.1 date 2006.03.12.06.49.21; author minskim; state Exp; branches; next ; desc @@ 1.3 log @*: remove qt3 and the packages using it, including KDE3 Announced in https://mail-index.netbsd.org/pkgsrc-users/2017/09/10/msg025556.html @ text @$NetBSD: patch-al,v 1.2 2007/10/24 15:50:18 joerg Exp $ --- qmake/generators/unix/unixmake2.cpp.orig 2005-09-02 12:43:19.000000000 +0000 +++ qmake/generators/unix/unixmake2.cpp @@@@ -1206,6 +1206,9 @@@@ void UnixMakefileGenerator::init2() project->variables()["TARGET"].first().prepend("lib"); project->variables()["TARGET"].first() += ".a"; if(project->variables()["QMAKE_AR_CMD"].isEmpty()) + if( project->isActiveConfig("compile_libtool") ) + project->variables()["QMAKE_AR_CMD"].append("$(CXX) -o $(TARGET) $(OBJECTS) $(OBJMOC)"); + else project->variables()["QMAKE_AR_CMD"].append("$(AR) $(TARGET) $(OBJECTS) $(OBJMOC)"); } else { project->variables()["TARGETA"].append(project->first("DESTDIR") + "lib" + project->first("TARGET") + ".a"); @@@@ -1362,20 +1365,6 @@@@ void UnixMakefileGenerator::init2() if(!project->isActiveConfig("compile_libtool")) project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_SONAME"]; } - QString destdir = project->first("DESTDIR"); - if ( !destdir.isEmpty() && !project->variables()["QMAKE_RPATH"].isEmpty() ) { - QString rpath_destdir = destdir; - if(QDir::isRelativePath(rpath_destdir)) { - QFileInfo fi(Option::fixPathToLocalOS(rpath_destdir)); - if(fi.convertToAbs()) //strange, shouldn't really happen - rpath_destdir = Option::fixPathToTargetOS(rpath_destdir, FALSE); - else - rpath_destdir = fi.filePath(); - } else { - rpath_destdir = Option::fixPathToTargetOS(rpath_destdir, FALSE); - } - project->variables()["QMAKE_LFLAGS"] += project->first("QMAKE_RPATH") + rpath_destdir; - } } QStringList &quc = project->variables()["QMAKE_EXTRA_UNIX_COMPILERS"]; for(QStringList::Iterator it = quc.begin(); it != quc.end(); ++it) { @@@@ -1489,7 +1478,7 @@@@ UnixMakefileGenerator::pkgConfigFileName QString ret = var("TARGET"); int slsh = ret.findRev(Option::dir_sep); if(slsh != -1) - ret = ret.right(ret.length() - slsh); + ret = ret.right(ret.length() - slsh - 1); if(ret.startsWith("lib")) ret = ret.mid(3); int dot = ret.find('.'); @ 1.2 log @Change qmake to not add the target directory as rpath. This would leak rpath references to the build directory and libtool should take care of this already. Non-libtool builds might be broken by this, but they shouldn't use -Wl,-R either, but -Wl,-rpath. Bump revision of qt3-libs (rpath changes) and qt3-tools (qmake changes). @ text @d1 1 a1 1 $NetBSD: patch-al,v 1.1 2006/03/12 06:49:21 minskim Exp $ @ 1.1 log @Force to use the libtool mode of qmake, instead of patching the non-libtool mode to use libool. In this way, qmake will generates valid install commands. This closes PR pkg/29572. Bump qt3-tools PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ d15 22 a36 1 @@@@ -1489,7 +1492,7 @@@@ UnixMakefileGenerator::pkgConfigFileName @