Fix qmake to handle DESTDIR correctly.

From Niclas Rosenvik.
Bump PKGREVISION.

3 files changed, 13 insertions, 8 deletions

diff --git a/x11/qt5-qtbase/Makefile b/x11/qt5-qtbase/Makefile
index e94307beaf6..4d8117de1c8 100644
--- a/x11/qt5-qtbase/Makefile
+++ b/x11/qt5-qtbase/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2014/08/19 10:37:53 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2014/08/23 20:25:11 wiz Exp $
 
 PKGNAME=	qt5-qtbase-${QTVERSION}
-PKGREVISION=	4
+PKGREVISION=	5
 COMMENT=	C++ X GUI toolkit
 
 .include "../../x11/qt5-qtbase/Makefile.common"
diff --git a/x11/qt5-qtbase/distinfo b/x11/qt5-qtbase/distinfo
index 406de2423ed..b861455e892 100644
--- a/x11/qt5-qtbase/distinfo
+++ b/x11/qt5-qtbase/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2014/07/24 15:51:56 jperkin Exp $
+$NetBSD: distinfo,v 1.12 2014/08/23 20:25:11 wiz Exp $
 
 SHA1 (qt-everywhere-opensource-src-5.2.1.tar.xz) = cc68265c62321670bd40e29bdd484ea881bd6af3
 RMD160 (qt-everywhere-opensource-src-5.2.1.tar.xz) = 9b716c5875a6186968392896ac8bd3261fae9b24
@@ -9,7 +9,7 @@ SHA1 (patch-qtbase_mkspecs_features_mac_objective__c.prf) = 40d56c675deabea27cdb
 SHA1 (patch-qtbase_mkspecs_features_qt__module__pris.prf) = b58b4a9e1a0a76cfa99c8b2c540514159707043b
 SHA1 (patch-qtbase_qmake_Makefile.unix) = cdde195c16f55bc5f22ff095c20a59b7c2cdc883
 SHA1 (patch-qtbase_qmake_generators_makefile.cpp) = 18831f38df9d4abf61dbd0a1f780bffc0b1cabf4
-SHA1 (patch-qtbase_qmake_generators_unix_unixmake.cpp) = df77053e3f98e5be682bb7b4440c13d542556798
+SHA1 (patch-qtbase_qmake_generators_unix_unixmake.cpp) = 9bf95f4edb70d4c53cbd5fffcf051988a0958f4e
 SHA1 (patch-qtbase_qmake_generators_unix_unixmake2.cpp) = 77f9e4114c48398676dbda1a564ba004a33c2a0b
 SHA1 (patch-qtbase_src_concurrent_qtconcurrentiteratekernel.cpp) = 9a00bc1538136c29992e15b60bc23f9b40db900a
 SHA1 (patch-qtbase_src_corelib_arch_sparc_arch.pri) = 0af37348671d681cbfc5033dfe5347df33d59f27
diff --git a/x11/qt5-qtbase/patches/patch-qtbase_qmake_generators_unix_unixmake.cpp b/x11/qt5-qtbase/patches/patch-qtbase_qmake_generators_unix_unixmake.cpp
index 71d177042a8..6c0b336dd5c 100644
--- a/x11/qt5-qtbase/patches/patch-qtbase_qmake_generators_unix_unixmake.cpp
+++ b/x11/qt5-qtbase/patches/patch-qtbase_qmake_generators_unix_unixmake.cpp
@@ -1,8 +1,9 @@
-$NetBSD: patch-qtbase_qmake_generators_unix_unixmake.cpp,v 1.1 2013/12/13 14:38:35 ryoon Exp $
+$NetBSD: patch-qtbase_qmake_generators_unix_unixmake.cpp,v 1.2 2014/08/23 20:25:11 wiz Exp $
 
 * First chunk, add a whitespace after -rpath.
+* fix install target so that destdir is added when installing QMAKE_TARGET
 
---- qtbase/qmake/generators/unix/unixmake.cpp.orig	2013-11-27 01:01:10.000000000 +0000
+--- qtbase/qmake/generators/unix/unixmake.cpp.orig	2014-02-01 20:37:29.000000000 +0000
 +++ qtbase/qmake/generators/unix/unixmake.cpp
 @@ -156,7 +156,7 @@ UnixMakefileGenerator::init()
          const ProStringList &rpathdirs = project->values("QMAKE_RPATHDIR");
@@ -61,7 +62,7 @@ $NetBSD: patch-qtbase_qmake_generators_unix_unixmake.cpp,v 1.1 2013/12/13 14:38:
      if(targetdir.right(1) != Option::dir_sep)
          targetdir += Option::dir_sep;
  
-@@ -760,10 +761,14 @@ UnixMakefileGenerator::defaultInstall(co
+@@ -760,10 +761,18 @@ UnixMakefileGenerator::defaultInstall(co
          QString src_targ = target;
          if(src_targ == "$(TARGET)")
              src_targ = "$(TARGETL)";
@@ -73,7 +74,11 @@ $NetBSD: patch-qtbase_qmake_generators_unix_unixmake.cpp,v 1.1 2013/12/13 14:38:
 +            dst_dir = Option::fixPathToTargetOS(dst_dir);
 +        if(!ret.isEmpty())
 +            ret += "\n\t";
-+        ret += "-$(LIBTOOL) --mode=install cp \"" + src_targ + "\" \"" + filePrefixRoot(root, dst_dir) + "\"";
++        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 + "\"");