[pkgsrc/trunk]: pkgsrc/x11/qt3-libs If Darwin, then use real RANLIB.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9391cdf2d58c
branches:  trunk
changeset: 496502:9391cdf2d58c
user:      reed <reed%pkgsrc.org@localhost>
date:      Fri Jul 01 01:10:06 2005 +0000

description:
If Darwin, then use real RANLIB.
No change for other platforms, as QMAKE_RANLIB is set to "true".

And if Darwin and /usr/lib/libresolv.dylib exists, then use -lresolv.

diffstat:

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

diffs (53 lines):

diff -r fb785da343bb -r 9391cdf2d58c x11/qt3-libs/Makefile.common
--- a/x11/qt3-libs/Makefile.common      Fri Jul 01 00:29:06 2005 +0000
+++ b/x11/qt3-libs/Makefile.common      Fri Jul 01 01:10:06 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.53 2005/06/22 21:14:45 jlam Exp $
+# $NetBSD: Makefile.common,v 1.54 2005/07/01 01:10:06 reed Exp $
 #
 DISTNAME=              qt-x11-free-${QTVERSION}
 CATEGORIES=            x11
@@ -61,8 +61,15 @@
 SYS_LIBS=              -lbind -ldb -ldl
 .elif ${OPSYS} == "DragonFly"
 CONFIGURE_ARGS+=       -platform freebsd-g++
+.elif ${OPSYS} == "Darwin"
+QMAKE_RANLIB=          ${RANLIB}
+.  if exists(/usr/lib/libresolv.dylib)
+LDFLAGS+=              -lresolv
+.  endif
 .endif
 
+QMAKE_RANLIB?=         ${TRUE}
+
 .if !exists(${X11BASE}/lib/libXinerama.so)
 CONFIGURE_ARGS+=       -no-xinerama
 .endif
@@ -112,6 +119,7 @@
                -e 's:@PTHREAD_LDFLAGS@:${PTHREAD_LDFLAGS}:g' \
                -e 's:@PTHREAD_LIBS@:${PTHREAD_LIBS}:g' \
                -e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG}:g' \
+               -e 's:@QMAKE_RANLIB@:${QMAKE_RANLIB}:g' \
                ${FILESDIR}/qmake.conf > ${WRKSRC}/qmake.conf
        for dir in ${WRKSRC}/mkspecs/*; do \
                ${CP} ${WRKSRC}/qmake.conf $${dir}; \
diff -r fb785da343bb -r 9391cdf2d58c x11/qt3-libs/files/qmake.conf
--- a/x11/qt3-libs/files/qmake.conf     Fri Jul 01 00:29:06 2005 +0000
+++ b/x11/qt3-libs/files/qmake.conf     Fri Jul 01 01:10:06 2005 +0000
@@ -1,5 +1,5 @@
-# $NetBSD: qmake.conf,v 1.17 2004/11/12 06:39:21 jlam Exp $
-# $Id: qmake.conf,v 1.17 2004/11/12 06:39:21 jlam Exp $
+# $NetBSD: qmake.conf,v 1.18 2005/07/01 01:10:06 reed Exp $
+# $Id: qmake.conf,v 1.18 2005/07/01 01:10:06 reed Exp $
 #
 # qmake configuration for netbsd-g++
 #
@@ -84,7 +84,7 @@
 QMAKE_UIC              = $(QTDIR)/bin/uic
 
 QMAKE_AR               = @AR@ ru
-QMAKE_RANLIB           = true
+QMAKE_RANLIB           = @QMAKE_RANLIB@
 
 QMAKE_TAR              = tar -cf
 QMAKE_GZIP             = gzip -9f