[pkgsrc/trunk]: pkgsrc/x11/qt3-libs Change to use COMPILER_RPATH_FLAG.

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/73f3c219ac92
branches:  trunk
changeset: 479998:73f3c219ac92
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Aug 27 18:44:11 2004 +0000

description:
Change to use COMPILER_RPATH_FLAG.

diffstat:

 x11/qt3-libs/Makefile.common  |  5 ++---
 x11/qt3-libs/files/qmake.conf |  6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diffs (39 lines):

diff -r dccb11772d47 -r 73f3c219ac92 x11/qt3-libs/Makefile.common
--- a/x11/qt3-libs/Makefile.common      Fri Aug 27 17:13:20 2004 +0000
+++ b/x11/qt3-libs/Makefile.common      Fri Aug 27 18:44:11 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.33 2004/08/11 14:18:12 markd Exp $
+# $NetBSD: Makefile.common,v 1.34 2004/08/27 18:44:11 jlam Exp $
 #
 DISTNAME=              qt-x11-free-${QTVERSION}
 CATEGORIES=            x11
@@ -96,8 +96,7 @@
                -e 's:@AR@:${AR}:g' \
                -e 's:@LIBQT@:${LIBQT}:g' \
                -e 's:@PTHREAD_LDFLAGS@:${PTHREAD_LDFLAGS}:g' \
-               -e 's:@_COMPILER_LD_FLAG@:${_COMPILER_LD_FLAG}:g' \
-               -e 's:@_OPSYS_RPATH_NAME@:${_OPSYS_RPATH_NAME}:g' \
+               -e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG}:g' \
                ${FILESDIR}/qmake.conf > ${WRKSRC}/qmake.conf
        for dir in ${WRKSRC}/mkspecs/*; do \
                ${CP} ${WRKSRC}/qmake.conf $${dir}; \
diff -r dccb11772d47 -r 73f3c219ac92 x11/qt3-libs/files/qmake.conf
--- a/x11/qt3-libs/files/qmake.conf     Fri Aug 27 17:13:20 2004 +0000
+++ b/x11/qt3-libs/files/qmake.conf     Fri Aug 27 18:44:11 2004 +0000
@@ -1,5 +1,5 @@
-# $NetBSD: qmake.conf,v 1.14 2004/07/31 22:23:40 markd Exp $
-# $Id: qmake.conf,v 1.14 2004/07/31 22:23:40 markd Exp $
+# $NetBSD: qmake.conf,v 1.15 2004/08/27 18:44:11 jlam Exp $
+# $Id: qmake.conf,v 1.15 2004/08/27 18:44:11 jlam Exp $
 #
 # qmake configuration for netbsd-g++
 #
@@ -62,7 +62,7 @@
 QMAKE_LFLAGS_SHLIB     = 
 QMAKE_LFLAGS_PLUGIN    = $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME    =
-QMAKE_RPATH            = @_COMPILER_LD_FLAG@@_OPSYS_RPATH_NAME@
+QMAKE_RPATH            = @COMPILER_RPATH_FLAG@
 
 QMAKE_RUN_CC           = @LIBTOOL@ --mode=compile @CC@ -c $(CFLAGS) $(INCPATH) -o $obj $src
 QMAKE_RUN_CC_IMP       = @LIBTOOL@ --mode=compile @CC@ -c $(CFLAGS) $(INCPATH) -o $@ $<