[pkgsrc/trunk]: pkgsrc Fix more cases of non-chainable PKGSRC_COMPILER tests.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/091a48b36f8e
branches:  trunk
changeset: 538434:091a48b36f8e
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Fri Feb 08 10:34:19 2008 +0000

description:
Fix more cases of non-chainable PKGSRC_COMPILER tests.

diffstat:

 devel/geany/Makefile          |  4 ++--
 devel/nss/Makefile            |  4 ++--
 graphics/netpbm/Makefile      |  4 ++--
 graphics/netpbm/hacks.mk      |  4 ++--
 sysutils/grub/hacks.mk        |  4 ++--
 www/firefox/Makefile.common   |  4 ++--
 www/seamonkey/Makefile.common |  4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diffs (122 lines):

diff -r df67fc9669be -r 091a48b36f8e devel/geany/Makefile
--- a/devel/geany/Makefile      Fri Feb 08 10:25:26 2008 +0000
+++ b/devel/geany/Makefile      Fri Feb 08 10:34:19 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/12/16 15:22:38 drochner Exp $
+# $NetBSD: Makefile,v 1.8 2008/02/08 10:34:19 tnn Exp $
 
 DISTNAME=      geany-0.12
 CATEGORIES=    devel
@@ -23,7 +23,7 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "SunOS" && ${PKGSRC_COMPILER} == "sunpro"
+.if ${OPSYS} == "SunOS" && !empty(PKGSRC_COMPILER:Msunpro)
 CONFIGURE_ARGS+=       CC=sunpro
 BUILDLINK_TRANSFORM+=  rm:-lstdc++
 .else
diff -r df67fc9669be -r 091a48b36f8e devel/nss/Makefile
--- a/devel/nss/Makefile        Fri Feb 08 10:25:26 2008 +0000
+++ b/devel/nss/Makefile        Fri Feb 08 10:34:19 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2007/12/22 07:22:08 obache Exp $
+# $NetBSD: Makefile,v 1.27 2008/02/08 10:34:19 tnn Exp $
 
 DISTNAME=              nss-3.11.5
 CATEGORIES=            security
@@ -31,7 +31,7 @@
 .endif
 PLIST_SUBST+=          SO_SUFFIX=${SO_SUFFIX:Q}
 
-.if ${OPSYS} == "SunOS" && ${PKGSRC_COMPILER} == "gcc"
+.if ${OPSYS} == "SunOS" && !empty(PKGSRC_COMPILER:Mgcc)
 MAKEFLAGS+=    NS_USE_GCC=YES
 .endif
 
diff -r df67fc9669be -r 091a48b36f8e graphics/netpbm/Makefile
--- a/graphics/netpbm/Makefile  Fri Feb 08 10:25:26 2008 +0000
+++ b/graphics/netpbm/Makefile  Fri Feb 08 10:34:19 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.155 2007/09/08 21:57:58 jlam Exp $
+# $NetBSD: Makefile,v 1.156 2008/02/08 10:34:19 tnn Exp $
 
 DISTNAME=      netpbm-10.34
 PKGREVISION=   1
@@ -63,7 +63,7 @@
 MAKE_ENV+=     NETPBMLIBTYPE="unixshared" NETPBMLIBSUFFIX="so"
 .endif
 
-.if ${PKGSRC_COMPILER} == "ido"
+.if !empty(PKGSRC_COMPILER:Mido)
 CPPFLAGS+=     -DSGI_IDO_CC
 .endif
 
diff -r df67fc9669be -r 091a48b36f8e graphics/netpbm/hacks.mk
--- a/graphics/netpbm/hacks.mk  Fri Feb 08 10:25:26 2008 +0000
+++ b/graphics/netpbm/hacks.mk  Fri Feb 08 10:34:19 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.6 2007/10/16 23:48:59 tnn Exp $
+# $NetBSD: hacks.mk,v 1.7 2008/02/08 10:34:19 tnn Exp $
 
 .if !defined(NETPBM_HACKS_MK)
 NETPBM_HACKS_MK=       # defined
@@ -38,7 +38,7 @@
 ### work around bug in Apple's gcc-4.0.0
 ### that shows up when compiling frame.c
 ###
-.if ${OPSYS} == "Darwin" && ${PKGSRC_COMPILER} == "gcc"
+.if ${OPSYS} == "Darwin" && !empty(PKGSRC_COMPILER:Mgcc)
 _BAD_GCC_BUILD!=       ${CC} --version | (${GREP} -c '^powerpc-apple-darwin8-gcc-4\.0\.0.*build\ 4061' || ${TRUE})
 . if ${_BAD_GCC_BUILD} == "1"
 PKG_HACKS+=            apple-gcc-4-bug
diff -r df67fc9669be -r 091a48b36f8e sysutils/grub/hacks.mk
--- a/sysutils/grub/hacks.mk    Fri Feb 08 10:25:26 2008 +0000
+++ b/sysutils/grub/hacks.mk    Fri Feb 08 10:34:19 2008 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: hacks.mk,v 1.1 2006/05/09 18:52:35 joerg Exp $
+# $NetBSD: hacks.mk,v 1.2 2008/02/08 10:34:20 tnn Exp $
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "DragonFly" && ${PKGSRC_COMPILER} == "gcc"
+.if ${OPSYS} == "DragonFly" && !empty(PKGSRC_COMPILER:Mgcc)
 #
 # The standalone modules doesn't support propolice.
 #
diff -r df67fc9669be -r 091a48b36f8e www/firefox/Makefile.common
--- a/www/firefox/Makefile.common       Fri Feb 08 10:25:26 2008 +0000
+++ b/www/firefox/Makefile.common       Fri Feb 08 10:34:19 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2007/08/23 20:27:19 heinz Exp $
+# $NetBSD: Makefile.common,v 1.24 2008/02/08 10:34:19 tnn Exp $
 
 MOZ_DIST_VER?=         ${MOZ_VER}
 DISTNAME?=             mozilla-${MOZ_DIST_VER}-source
@@ -117,7 +117,7 @@
 .endif
 PLIST_SUBST+=          SO_SUFFIX=${SO_SUFFIX:Q}
 
-.if ${OPSYS} == "SunOS" && ${PKGSRC_COMPILER} == "gcc"
+.if ${OPSYS} == "SunOS" && !empty(PKGSRC_COMPILER:Mgcc)
 MAKEFLAGS+=            NS_USE_GCC=YES
 .endif
 
diff -r df67fc9669be -r 091a48b36f8e www/seamonkey/Makefile.common
--- a/www/seamonkey/Makefile.common     Fri Feb 08 10:25:26 2008 +0000
+++ b/www/seamonkey/Makefile.common     Fri Feb 08 10:34:19 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.28 2007/09/21 22:07:54 ghen Exp $
+# $NetBSD: Makefile.common,v 1.29 2008/02/08 10:34:19 tnn Exp $
 
 MOZ_DIST_VER?=         ${MOZ_VER}
 DISTNAME?=             seamonkey-${MOZ_DIST_VER}.source
@@ -125,7 +125,7 @@
 .endif
 PLIST_SUBST+=          SO_SUFFIX=${SO_SUFFIX:Q}
 
-.if ${OPSYS} == "SunOS" && ${PKGSRC_COMPILER} == "gcc"
+.if ${OPSYS} == "SunOS" && !empty(PKGSRC_COMPILER:Mgcc)
 MAKEFLAGS+=            NS_USE_GCC=YES
 .endif