Fix more cases of non-chainable PKGSRC_COMPILER tests.

7 files changed, 14 insertions, 14 deletions

diff --git a/devel/geany/Makefile b/devel/geany/Makefile
index 26805b23e74..26669ba8597 100644
--- a/devel/geany/Makefile
+++ b/devel/geany/Makefile
@@ -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 @@ MAKE_FLAGS+=		CCLD=${CXX:Q}
 
 .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 --git a/devel/nss/Makefile b/devel/nss/Makefile
index 675aacf6b2d..b70aa238bd9 100644
--- a/devel/nss/Makefile
+++ b/devel/nss/Makefile
@@ -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 @@ SO_SUFFIX=		so.1.0
 .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 --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 98c15441171..85e92ad58d0 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -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="sl"
 MAKE_ENV+=	NETPBMLIBTYPE="unixshared" NETPBMLIBSUFFIX="so"
 .endif
 
-.if ${PKGSRC_COMPILER} == "ido"
+.if !empty(PKGSRC_COMPILER:Mido)
 CPPFLAGS+=	-DSGI_IDO_CC
 .endif
 
diff --git a/graphics/netpbm/hacks.mk b/graphics/netpbm/hacks.mk
index f4ea4ef62b7..ee8c8cd6aa2 100644
--- a/graphics/netpbm/hacks.mk
+++ b/graphics/netpbm/hacks.mk
@@ -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 @@ post-wrapper:
 ### 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 --git a/sysutils/grub/hacks.mk b/sysutils/grub/hacks.mk
index 0c14ca1ccd7..a16471533b2 100644
--- a/sysutils/grub/hacks.mk
+++ b/sysutils/grub/hacks.mk
@@ -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 --git a/www/firefox/Makefile.common b/www/firefox/Makefile.common
index da5be2bad0b..7af105e9bcf 100644
--- a/www/firefox/Makefile.common
+++ b/www/firefox/Makefile.common
@@ -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 @@ SCRIPTS_ENV+=		MOZ_INSTALL_LIB=${INSTALL_PROGRAM:Q}
 .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 --git a/www/seamonkey/Makefile.common b/www/seamonkey/Makefile.common
index 18c91565dd5..089e1ce7bde 100644
--- a/www/seamonkey/Makefile.common
+++ b/www/seamonkey/Makefile.common
@@ -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 @@ SCRIPTS_ENV+=		MOZ_INSTALL_LIB=${INSTALL_PROGRAM:Q}
 .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