[pkgsrc/trunk]: pkgsrc/x11/qt3-libs only pass gcc specific flags if we are us...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c80b935f91b2
branches:  trunk
changeset: 462211:c80b935f91b2
user:      grant <grant%pkgsrc.org@localhost>
date:      Sun Sep 28 05:27:06 2003 +0000

description:
only pass gcc specific flags if we are using gcc.

diffstat:

 x11/qt3-libs/Makefile.common  |   7 +++++--
 x11/qt3-libs/distinfo         |   3 ++-
 x11/qt3-libs/files/qmake.conf |   6 +++---
 x11/qt3-libs/patches/patch-ah |  12 ++++++++++++
 4 files changed, 22 insertions(+), 6 deletions(-)

diffs (81 lines):

diff -r bd2e62d8685e -r c80b935f91b2 x11/qt3-libs/Makefile.common
--- a/x11/qt3-libs/Makefile.common      Sun Sep 28 01:34:40 2003 +0000
+++ b/x11/qt3-libs/Makefile.common      Sun Sep 28 05:27:06 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2003/09/28 01:34:40 grant Exp $
+# $NetBSD: Makefile.common,v 1.23 2003/09/28 05:27:06 grant Exp $
 #
 DISTNAME=              qt-x11-free-${QTVERSION}
 CATEGORIES=            x11
@@ -27,7 +27,6 @@
                        -system-zlib -system-libpng \
                        -system-libmng -system-libjpeg
 CONFIGURE_ARGS+=       -qt-gif # qt3 does not write compressed GIFs
-CONFIGURE_ARGS+=       -no-g++-exceptions
 
 CONFIGURE_ARGS+=       < ${FILESDIR}/license-acceptance
 
@@ -42,6 +41,10 @@
 
 .include "../../mk/bsd.prefs.mk"
 
+.if !empty(CC_VERSION:Mgcc*)
+CONFIGURE_ARGS+=       -no-g++-exceptions
+.endif
+
 .if ${OPSYS} == "SunOS"
 CONFIGURE_SCRIPT=      ${SH} ./configure
 .  if !empty(CC_VERSION:Mgcc*)
diff -r bd2e62d8685e -r c80b935f91b2 x11/qt3-libs/distinfo
--- a/x11/qt3-libs/distinfo     Sun Sep 28 01:34:40 2003 +0000
+++ b/x11/qt3-libs/distinfo     Sun Sep 28 05:27:06 2003 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2003/07/22 17:17:19 drochner Exp $
+$NetBSD: distinfo,v 1.15 2003/09/28 05:27:06 grant Exp $
 
 SHA1 (qt-x11-free-3.1.2.tar.bz2) = eddcf56d34c4ee98fd2b48be6b6aa32b66f302a5
 Size (qt-x11-free-3.1.2.tar.bz2) = 13358932 bytes
@@ -7,6 +7,7 @@
 SHA1 (patch-ac) = 842ac48bd9d1f8a4d92bdaf0ccd8f14a1b7c4512
 SHA1 (patch-ad) = 5f3d133051a9894aa45df1b1a6e1d0b6d964c49c
 SHA1 (patch-ag) = 4b1d279a7ff1793eac7ca0c98df61f43a762d50a
+SHA1 (patch-ah) = 4f608169d9b2fa190844bf2ab5efaae2ed28e7b2
 SHA1 (patch-ba) = 0f5baae5501a83ea53e5d4df846bb1f338e4d802
 SHA1 (patch-bb) = 5196eb7c63f33fc36fe3569273d6c7061aeb9dbb
 SHA1 (patch-bc) = 1dcf6b9583461525400bd62b625f8cf7f5b41a5f
diff -r bd2e62d8685e -r c80b935f91b2 x11/qt3-libs/files/qmake.conf
--- a/x11/qt3-libs/files/qmake.conf     Sun Sep 28 01:34:40 2003 +0000
+++ b/x11/qt3-libs/files/qmake.conf     Sun Sep 28 05:27:06 2003 +0000
@@ -1,5 +1,5 @@
-# $NetBSD: qmake.conf,v 1.9 2003/03/18 08:36:25 skrll Exp $
-# $Id: qmake.conf,v 1.9 2003/03/18 08:36:25 skrll Exp $
+# $NetBSD: qmake.conf,v 1.10 2003/09/28 05:27:06 grant Exp $
+# $Id: qmake.conf,v 1.10 2003/09/28 05:27:06 grant Exp $
 #
 # qmake configuration for netbsd-g++
 #
@@ -15,7 +15,7 @@
 QMAKE_YACCFLAGS                = -d
 QMAKE_CFLAGS           = @CFLAGS@
 QMAKE_CFLAGS_DEPS      = -M
-QMAKE_CFLAGS_WARN_ON   = -Wall -W
+QMAKE_CFLAGS_WARN_ON   = 
 QMAKE_CFLAGS_WARN_OFF  =
 QMAKE_CFLAGS_RELEASE   = -O2
 QMAKE_CFLAGS_DEBUG     = -g
diff -r bd2e62d8685e -r c80b935f91b2 x11/qt3-libs/patches/patch-ah
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/qt3-libs/patches/patch-ah     Sun Sep 28 05:27:06 2003 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-ah,v 1.1 2003/09/28 05:27:30 grant Exp $
+
+--- configure.orig     2003-02-11 14:19:48.000000000 +1100
++++ configure
+@@ -501,7 +501,6 @@ while [ "$#" -gt 0 ]; do
+           CFG_EXCEPTION_SUPPORT=no
+           QMAKE_VARS="$QMAKE_VARS \"QMAKE_CFLAGS+=-fno-exceptions\""
+           QMAKE_VARS="$QMAKE_VARS \"QMAKE_CXXFLAGS+=-fno-exceptions\""
+-          QMAKE_VARS="$QMAKE_VARS \"QMAKE_LFLAGS+=-fno-exceptions\""
+       else
+           UNKNOWN_OPT=yes
+       fi