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).

4 files changed, 32 insertions, 10 deletions

diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile
index be904200203..6096da61d97 100644
--- a/x11/qt3-libs/Makefile
+++ b/x11/qt3-libs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.68 2007/10/15 11:59:49 abs Exp $
+# $NetBSD: Makefile,v 1.69 2007/10/24 15:50:18 joerg Exp $
 
 PKGNAME=	qt3-libs-${QTVERSION}
-PKGREVISION=	6
+PKGREVISION=	7
 MAINTAINER=	adam@NetBSD.org
 COMMENT=	C++ X GUI toolkit
 
@@ -39,11 +39,11 @@ PKGCONFIG_OVERRIDE=	lib/qt-mt.pc
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/moc ${DESTDIR}${QTPREFIX}/bin
-	${LIBTOOL} ${INSTALL_LIB} ${WRKSRC}/lib/libqt-mt.la ${DESTDIR}${QTPREFIX}/lib
+	${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/libqt-mt.la ${DESTDIR}${QTPREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/include/*.h ${DESTDIR}${QTPREFIX}/include/
 	${INSTALL_DATA} ${WRKSRC}/include/private/*.h ${DESTDIR}${QTPREFIX}/include/private
-	${LIBTOOL} ${INSTALL_LIB} ${WRKSRC}/plugins/imageformats/libqjpeg.la ${DESTDIR}${QTPREFIX}/plugins/imageformats/
-	${LIBTOOL} ${INSTALL_LIB} ${WRKSRC}/plugins/imageformats/libqmng.la ${DESTDIR}${QTPREFIX}/plugins/imageformats/
+	${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/plugins/imageformats/libqjpeg.la ${DESTDIR}${QTPREFIX}/plugins/imageformats/
+	${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/plugins/imageformats/libqmng.la ${DESTDIR}${QTPREFIX}/plugins/imageformats/
 	${INSTALL_DATA} ${WRKSRC}/lib/qt-mt.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
 
 .if ${OPSYS} == "Darwin" && empty(MACHINE_PLATFORM:MDarwin-[567].*)
diff --git a/x11/qt3-libs/distinfo b/x11/qt3-libs/distinfo
index 0230cb9a492..d1f3a364ce5 100644
--- a/x11/qt3-libs/distinfo
+++ b/x11/qt3-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.46 2007/09/15 12:04:01 tron Exp $
+$NetBSD: distinfo,v 1.47 2007/10/24 15:50:18 joerg Exp $
 
 SHA1 (qt-x11-free-3.3.8.tar.bz2) = 91b192cb8e80679607d24ae35d6e20ed68d149d7
 RMD160 (qt-x11-free-3.3.8.tar.bz2) = 7b8e4e35f49014eac4fcfe91b7ec0a45c5569cf4
@@ -14,7 +14,7 @@ SHA1 (patch-ah) = f9e0a77ea62e06b3c037921094e0eb1d50a5ffce
 SHA1 (patch-ai) = 582a02a1b697ef038cd5a8ead5dd3b0910e6297b
 SHA1 (patch-aj) = 414260de4a3cb91cbd6ec384cafda7268205930d
 SHA1 (patch-ak) = de914984eac2b7abc961805c625566bd6d8eb509
-SHA1 (patch-al) = 95c9fa4ffcb7ea1cfd53bf689d3594536010ec75
+SHA1 (patch-al) = 8077b713d7eb43c8212e298a42e9062835638f0b
 SHA1 (patch-am) = d03608cc641edab382f0b6afc6f29b5d97a285a5
 SHA1 (patch-an) = a710aee86198eea2def98cb776280819c4ec556f
 SHA1 (patch-ao) = 3aacba05b27314cadab7dceba3c21d65bab608d3
diff --git a/x11/qt3-libs/patches/patch-al b/x11/qt3-libs/patches/patch-al
index a8b646b5863..6472869468f 100644
--- a/x11/qt3-libs/patches/patch-al
+++ b/x11/qt3-libs/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.1 2006/03/12 06:49:21 minskim Exp $
+$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
@@ -12,7 +12,28 @@ $NetBSD: patch-al,v 1.1 2006/03/12 06:49:21 minskim Exp $
  	    project->variables()["QMAKE_AR_CMD"].append("$(AR) $(TARGET) $(OBJECTS) $(OBJMOC)");
      } else {
  	project->variables()["TARGETA"].append(project->first("DESTDIR") + "lib" + project->first("TARGET") + ".a");
-@@ -1489,7 +1492,7 @@ UnixMakefileGenerator::pkgConfigFileName
+@@ -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)
diff --git a/x11/qt3-tools/Makefile b/x11/qt3-tools/Makefile
index 4472e0dba87..b6e800ae99d 100644
--- a/x11/qt3-tools/Makefile
+++ b/x11/qt3-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2007/01/15 16:19:43 joerg Exp $
+# $NetBSD: Makefile,v 1.53 2007/10/24 15:50:19 joerg Exp $
 
 .include "../../mk/bsd.prefs.mk"
 # XXX: hack - work round an ICE with GCC 3.3 on sparc
@@ -9,6 +9,7 @@ GCC_REQD+=		3.4
 .include "../../x11/qt3-libs/Makefile.common"
 
 PKGNAME=	qt3-tools-${QTVERSION}
+PKGREVISION=	1
 COMMENT=	QT GUI (WYSIWYG) builder and other tools
 
 DEPENDS+=	libtool-base-[0-9]*:../../devel/libtool-base