Fix path generation so that security/qca{,-tls} don't have to patch Makefile

or override do-install.  Bump qt3-tools PKGREVISION.

3 files changed, 20 insertions, 10 deletions

diff --git a/x11/qt3-libs/distinfo b/x11/qt3-libs/distinfo
index 3d16967934e..4c7b55bdbb4 100644
--- a/x11/qt3-libs/distinfo
+++ b/x11/qt3-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2006/03/12 06:49:21 minskim Exp $
+$NetBSD: distinfo,v 1.36 2006/03/13 21:53:47 minskim Exp $
 
 SHA1 (qt-x11-free-3.3.5.tar.bz2) = 8d7c7ba0b39848ef60b3cd93fc1d33e9527694ec
 RMD160 (qt-x11-free-3.3.5.tar.bz2) = 376ae3fc36c70ec864653ca78582ba29410def7f
@@ -13,7 +13,7 @@ SHA1 (patch-ag) = a413055f8df258b0bb91e46d6f611e9ec511b913
 SHA1 (patch-ah) = f9e0a77ea62e06b3c037921094e0eb1d50a5ffce
 SHA1 (patch-ai) = 582a02a1b697ef038cd5a8ead5dd3b0910e6297b
 SHA1 (patch-aj) = 414260de4a3cb91cbd6ec384cafda7268205930d
-SHA1 (patch-ak) = d7ebd00b6173be00c40e951dc4ac6bd2b0245818
+SHA1 (patch-ak) = de914984eac2b7abc961805c625566bd6d8eb509
 SHA1 (patch-al) = 95c9fa4ffcb7ea1cfd53bf689d3594536010ec75
 SHA1 (patch-am) = d03608cc641edab382f0b6afc6f29b5d97a285a5
 SHA1 (patch-bb) = b6a15a4b2b7b83b89bd3610cf2e48c242dbce2e5
diff --git a/x11/qt3-libs/patches/patch-ak b/x11/qt3-libs/patches/patch-ak
index 98f2cd49898..05330f98ba1 100644
--- a/x11/qt3-libs/patches/patch-ak
+++ b/x11/qt3-libs/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.1 2006/03/12 06:49:21 minskim Exp $
+$NetBSD: patch-ak,v 1.2 2006/03/13 21:53:47 minskim Exp $
 
---- qmake/generators/unix/unixmake.cpp.orig	2005-09-02 12:43:19.000000000 +0000
+--- qmake/generators/unix/unixmake.cpp.orig	2005-09-02 05:43:19.000000000 -0700
 +++ qmake/generators/unix/unixmake.cpp
-@@ -340,27 +340,31 @@ UnixMakefileGenerator::init()
+@@ -340,27 +340,30 @@ UnixMakefileGenerator::init()
  		if(libtoolify[i].startsWith("QMAKE_LINK") || libtoolify[i] == "QMAKE_AR_CMD") {
  		    libtool_flags += " --mode=link";
  		    if(project->isActiveConfig("staticlib")) {
@@ -31,7 +31,6 @@ $NetBSD: patch-ak,v 1.1 2006/03/12 06:49:21 minskim Exp $
 -				}
 +			        QString rpath = Option::fixPathToTargetOS(project->first("target.path")\
 +									      , FALSE);
-+				rpath = fileFixify(rpath);
 +				if(rpath.right(1) != Option::dir_sep)
 +				    rpath += Option::dir_sep;
  				comp_flags += " -rpath " + Option::fixPathToTargetOS(rpath, FALSE);
@@ -44,9 +43,20 @@ $NetBSD: patch-ak,v 1.1 2006/03/12 06:49:21 minskim Exp $
  		} else {
  		    libtool_flags += " --mode=compile";
  		}
-@@ -820,8 +824,12 @@ UnixMakefileGenerator::defaultInstall(co
+@@ -730,7 +733,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);
+     if(targetdir.right(1) != Option::dir_sep)
+ 	targetdir += Option::dir_sep;
+ 
+@@ -818,10 +820,14 @@ UnixMakefileGenerator::defaultInstall(co
+ 	QString src_targ = target;
+ 	if(src_targ == "$(TARGET)")
  	    src_targ = "$(TARGETL)";
- 	QString dst_dir = fileFixify(targetdir);
+-	QString dst_dir = fileFixify(targetdir);
++	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 + "\" \"" + root + dst_dir + "\"";
diff --git a/x11/qt3-tools/Makefile b/x11/qt3-tools/Makefile
index 47da9e806e2..b4e2c108b0a 100644
--- a/x11/qt3-tools/Makefile
+++ b/x11/qt3-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2006/03/12 06:49:21 minskim Exp $
+# $NetBSD: Makefile,v 1.44 2006/03/13 21:53:47 minskim Exp $
 
 .include "../../mk/bsd.prefs.mk"
 # XXX: hack - work round an ICE with GCC 3.3 on sparc
@@ -9,7 +9,7 @@ GCC_REQD+=		3.4
 .include "../../x11/qt3-libs/Makefile.common"
 
 PKGNAME=	qt3-tools-${QTVERSION}
-PKGREVISION=	5
+PKGREVISION=	6
 COMMENT=	QT GUI (WYSIWYG) builder and other tools
 
 DEPENDS+=	libtool-base-[0-9]*:../../devel/libtool-base