[pkgsrc/trunk]: pkgsrc/x11/qt3-libs Convert qt3-libs to use BUILDLINK3. Based...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d881bee10052
branches:  trunk
changeset: 477633:d881bee10052
user:      reed <reed%pkgsrc.org@localhost>
date:      Tue Jul 06 16:01:10 2004 +0000

description:
Convert qt3-libs to use BUILDLINK3. Based on patches from Joachim
Kuebart in PR#25753. Tested by myself on Linux and NetBSD 1.6.2_STABLE.
(Also tested on NetBSD 2.0_BETA by wiz@. And tested by jschauma
under Linux.)

diffstat:

 x11/qt3-libs/Makefile         |  26 +++++++++++++-------------
 x11/qt3-libs/Makefile.common  |   7 ++++---
 x11/qt3-libs/files/qmake.conf |   6 +++---
 3 files changed, 20 insertions(+), 19 deletions(-)

diffs (94 lines):

diff -r 748b5bf28a32 -r d881bee10052 x11/qt3-libs/Makefile
--- a/x11/qt3-libs/Makefile     Tue Jul 06 15:06:19 2004 +0000
+++ b/x11/qt3-libs/Makefile     Tue Jul 06 16:01:10 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2004/04/16 14:30:44 recht Exp $
+# $NetBSD: Makefile,v 1.25 2004/07/06 16:01:10 reed Exp $
 #
 
 LIBQT=                 ${WRKSRC}/lib/libqt-mt.la
@@ -8,7 +8,7 @@
 PKGNAME=               qt3-libs-${QTVERSION}
 COMMENT=               C++ X GUI toolkit
 
-USE_BUILDLINK2=                yes
+USE_BUILDLINK3=                yes
 GCC_REQD+=             2.95.3
 
 ALL_TARGET=            sub-plugins
@@ -34,16 +34,16 @@
        ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/plugins/imageformats/libqjpeg.la ${QTPREFIX}/plugins/imageformats
        ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/plugins/imageformats/libqmng.la ${QTPREFIX}/plugins/imageformats
 
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../fonts/Xft2/buildlink2.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../graphics/MesaLib/buildlink2.mk"
-.include "../../graphics/glu/buildlink2.mk"
-.include "../../graphics/mng/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-.include "../../graphics/freetype2/buildlink2.mk"
-.include "../../x11/Xrandr/buildlink2.mk"
-.include "../../x11/xcursor/buildlink2.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../fonts/Xft2/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../graphics/mng/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../x11/Xrandr/buildlink3.mk"
+.include "../../x11/xcursor/buildlink3.mk"
 
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 748b5bf28a32 -r d881bee10052 x11/qt3-libs/Makefile.common
--- a/x11/qt3-libs/Makefile.common      Tue Jul 06 15:06:19 2004 +0000
+++ b/x11/qt3-libs/Makefile.common      Tue Jul 06 16:01:10 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.30 2004/03/30 21:50:19 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.31 2004/07/06 16:01:10 reed Exp $
 #
 DISTNAME=              qt-x11-free-${QTVERSION}
 CATEGORIES=            x11
@@ -26,8 +26,7 @@
 CONFIGURE_ARGS+=       -shared -sm -thread -no-stl \
                        -system-zlib -system-libpng \
                        -system-libmng -system-libjpeg \
-                       -I${BUILDLINK_DIR}/include \
-                       -L${BUILDLINK_DIR}/lib
+                       ${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-Wl*:S/-Wl,//}
 CONFIGURE_ARGS+=       -qt-gif # qt3 does not write compressed GIFs
 
 CONFIGURE_ARGS+=       < ${FILESDIR}/license-acceptance
@@ -89,6 +88,8 @@
                -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' \
                ${FILESDIR}/qmake.conf > ${WRKSRC}/qmake.conf
        for dir in ${WRKSRC}/mkspecs/*; do \
                ${CP} ${WRKSRC}/qmake.conf $${dir}; \
diff -r 748b5bf28a32 -r d881bee10052 x11/qt3-libs/files/qmake.conf
--- a/x11/qt3-libs/files/qmake.conf     Tue Jul 06 15:06:19 2004 +0000
+++ b/x11/qt3-libs/files/qmake.conf     Tue Jul 06 16:01:10 2004 +0000
@@ -1,5 +1,5 @@
-# $NetBSD: qmake.conf,v 1.12 2003/12/10 14:24:35 adam Exp $
-# $Id: qmake.conf,v 1.12 2003/12/10 14:24:35 adam Exp $
+# $NetBSD: qmake.conf,v 1.13 2004/07/06 16:01:10 reed Exp $
+# $Id: qmake.conf,v 1.13 2004/07/06 16:01:10 reed Exp $
 #
 # qmake configuration for netbsd-g++
 #
@@ -62,7 +62,7 @@
 QMAKE_LFLAGS_SHLIB     = 
 QMAKE_LFLAGS_PLUGIN    = $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME    =
-QMAKE_RPATH            = 
+QMAKE_RPATH            = @_COMPILER_LD_FLAG@@_OPSYS_RPATH_NAME@
 
 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 $@ $<