Fix abusers of LOWER_OPSYS to check OPSYS or MACHINE_PLATFORM instead.

5 files changed, 11 insertions, 11 deletions

diff --git a/graphics/MesaLib/hacks.mk b/graphics/MesaLib/hacks.mk
index eaedc11c500..45955a16a31 100644
--- a/graphics/MesaLib/hacks.mk
+++ b/graphics/MesaLib/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.3 2007/08/13 11:18:43 seb Exp $
+# $NetBSD: hacks.mk,v 1.4 2007/10/16 23:48:58 tnn Exp $
 
 .if !defined(MESALIBS_HACKS_MK)
 MESALIBS_HACKS_MK=	# defined
@@ -7,7 +7,7 @@ MESALIBS_HACKS_MK=	# defined
 ### make sys/types.h not conflict with inttypes.h
 ### (issue is specific to IRIX 5.3)
 ###
-.if ${LOWER_OPSYS} == "irix5.3"
+.if !empty(MACHINE_PLATFORM:MIRIX-5.3-*)
 PKG_HACKS+=		sys_types_h-inttypes_h-conflict
 post-wrapper:
 		${MKDIR} ${BUILDLINK_DIR}/include/sys && ${GREP} -v '^typedef.*[^u_]int[12368]*_t;' /usr/include/sys/types.h > ${BUILDLINK_DIR}/include/sys/types.h
diff --git a/graphics/libwmf/hacks.mk b/graphics/libwmf/hacks.mk
index 01ad9bd5169..99cb47af9ab 100644
--- a/graphics/libwmf/hacks.mk
+++ b/graphics/libwmf/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.1 2006/01/29 21:58:31 schwarz Exp $
+# $NetBSD: hacks.mk,v 1.2 2007/10/16 23:48:59 tnn Exp $
 
 .if !defined(LIBEXIF_HACKS_MK)
 LIBEXIF_HACKS_MK=	# defined
@@ -7,7 +7,7 @@ LIBEXIF_HACKS_MK=	# defined
 ### make sys/types.h not conflict with inttypes.h
 ### (issue is specific to IRIX 5.3)
 ###
-.if ${LOWER_OPSYS} == "irix5.3"
+.if !empty(MACHINE_PLATFORM:MIRIX-5.3-*)
 PKG_HACKS+=		sys_types_h-inttypes_h-conflict
 post-wrapper:
 		${MKDIR} ${BUILDLINK_DIR}/include/sys && ${GREP} -v '^typedef.*[^u_]int[12368]*_t;' /usr/include/sys/types.h > ${BUILDLINK_DIR}/include/sys/types.h
diff --git a/graphics/netpbm/hacks.mk b/graphics/netpbm/hacks.mk
index 852083087aa..f4ea4ef62b7 100644
--- a/graphics/netpbm/hacks.mk
+++ b/graphics/netpbm/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.5 2006/04/03 16:39:04 tron Exp $
+# $NetBSD: hacks.mk,v 1.6 2007/10/16 23:48:59 tnn Exp $
 
 .if !defined(NETPBM_HACKS_MK)
 NETPBM_HACKS_MK=	# defined
@@ -27,7 +27,7 @@ MAKE_FLAGS+=		INTTYPES_H='<sys/types.h>'
 ### make sys/types.h not conflict with inttypes.h
 ### (issue is specific to IRIX 5.3)
 ###
-.if ${LOWER_OPSYS} == "irix5.3"
+.if !empty(MACHINE_PLATFORM:MIRIX-5.3-*)
 PKG_HACKS+=		sys_types_h-inttypes_h-conflict
 post-wrapper:
 		${MKDIR} ${BUILDLINK_DIR}/include/sys && ${GREP} -v '^typedef.*[^u_]int[12368]*_t;' /usr/include/sys/types.h > ${BUILDLINK_DIR}/include/sys/types.h
diff --git a/graphics/xpm/Makefile b/graphics/xpm/Makefile
index fb3a6306b3d..f1438d74771 100644
--- a/graphics/xpm/Makefile
+++ b/graphics/xpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2007/09/25 10:03:53 hira Exp $
+# $NetBSD: Makefile,v 1.59 2007/10/16 23:49:00 tnn Exp $
 
 DISTNAME=	xpm-3.4k
 PKGREVISION=	7
@@ -19,14 +19,14 @@ USE_IMAKE=	yes
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "SunOS" || !empty(LOWER_OPSYS:Mirix5*)
+.if ${OPSYS} == "SunOS" || ${OPSYS} == "IRIX"
 post-install:
 	cd ${PREFIX}/lib && \
 	rm -f libXpm.so.4 && \
 	ln -s libXpm.so.4.11 libXpm.so.4
 .endif
 
-.if !empty(LOWER_OPSYS:Mirix5*)
+.if ${OPSYS} == "IRIX"
 SUBST_CLASSES+=		sodots
 SUBST_STAGE.sodots=	post-configure
 SUBST_FILES.sodots=	lib/Makefile
diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile
index 9a18ce7d528..9b305a13f50 100644
--- a/graphics/xv/Makefile
+++ b/graphics/xv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2007/07/27 23:42:17 joerg Exp $
+# $NetBSD: Makefile,v 1.72 2007/10/16 23:49:00 tnn Exp $
 
 DISTNAME=	xv-3.10a
 PKGREVISION=	13
@@ -51,7 +51,7 @@ SUBST_STAGE.ccflags=	post-configure
 SUBST_MESSAGE.ccflags=	Fixing compiler flags for Solaris.
 .endif
 
-.if !empty(LOWER_OPSYS:Mirix5*) || !empty(LOWER_OPSYS:Msolaris*)
+.if ${OPSYS} == "IRIX" || ${OPSYS} == "SunOS"
 CPPFLAGS+=	-DNEED_ALLOCA_H
 .endif