Fix abusers of LOWER_OPSYS to check OPSYS or MACHINE_PLATFORM instead.

31 files changed, 64 insertions, 64 deletions

diff --git a/comms/pilot-link-libs/Makefile b/comms/pilot-link-libs/Makefile
index 696a15e7be1..0006cf07046 100644
--- a/comms/pilot-link-libs/Makefile
+++ b/comms/pilot-link-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2007/01/26 01:26:46 markd Exp $
+# $NetBSD: Makefile,v 1.18 2007/10/16 23:56:02 tnn Exp $
 #
 
 .include "../../comms/pilot-link/Makefile.common"
@@ -11,7 +11,7 @@ CONFLICTS+=		pilot-link<0.9.5
 MAKE_ENV+=		PILIB="libsock/libpisock.la"
 MAKE_ENV+=		PICCLIB="libcc/libpicc.a"
 
-.if ${LOWER_OPSYS} == "irix5.3"
+.if !empty(MACHINE_PLATFORM:MIRIX-5.3-*)
 CONFIGURE_ENV+=		ac_cv_header_inttypes_h="no"
 .endif
 
diff --git a/converters/libiconv/hacks.mk b/converters/libiconv/hacks.mk
index f159dfdbd5b..045c7d14508 100644
--- a/converters/libiconv/hacks.mk
+++ b/converters/libiconv/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.1 2006/04/14 21:13:10 schwarz Exp $
+# $NetBSD: hacks.mk,v 1.2 2007/10/16 23:48:58 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/databases/db3/Makefile b/databases/db3/Makefile
index 746e4f33e49..afd31865ef4 100644
--- a/databases/db3/Makefile
+++ b/databases/db3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/03/04 21:29:08 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2007/10/16 23:48:59 tnn Exp $
 
 DISTNAME=	db-3.3.11
 PKGNAME=	db3-3.11.2
@@ -34,7 +34,7 @@ CONFIGURE_ARGS+=	--enable-compat185
 
 .include "../../mk/bsd.prefs.mk"
 
-.if !empty(LOWER_OPSYS:Mirix5*)
+.if ${OPSYS} == "IRIX"
 CONFIGURE_ENV+=		ac_cv_header_inttypes_h=no
 .endif
 
diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common
index e5b1a888c1e..c5138530047 100644
--- a/databases/mysql4-client/Makefile.common
+++ b/databases/mysql4-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.59 2007/07/09 22:27:36 adrianp Exp $
+# $NetBSD: Makefile.common,v 1.60 2007/10/16 23:48:59 tnn Exp $
 
 DISTNAME=		mysql-4.1.22
 CATEGORIES=		databases
@@ -37,7 +37,7 @@ CONFIGURE_ARGS+=	--with-named-z-libs=z
 CONFIGURE_ARGS+=	--without-libwrap
 CONFIGURE_ARGS+=	--with-named-curses-libs="-lcurses -ltermcap"
 
-.if !empty(LOWER_OPSYS:Mirix5*)
+.if ${OPSYS} == "IRIX"
 CFLAGS+=		-DIRIX5 -DNEEDS_BSTRING_H
 # libgen is incorrectly detected
 CONFIGURE_ENV+=		ac_cv_lib_gen_p2open="no"
diff --git a/databases/mysql5-client/Makefile.common b/databases/mysql5-client/Makefile.common
index 1079eaa2d14..5d44e19e4af 100644
--- a/databases/mysql5-client/Makefile.common
+++ b/databases/mysql5-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.26 2007/10/12 14:32:45 rillig Exp $
+# $NetBSD: Makefile.common,v 1.27 2007/10/16 23:49:00 tnn Exp $
 
 DISTNAME=		mysql-5.0.45
 CATEGORIES=		databases
@@ -37,7 +37,7 @@ CONFIGURE_ARGS+=	--with-named-z-libs=z
 CONFIGURE_ARGS+=	--without-libwrap
 CONFIGURE_ARGS+=	--with-named-curses-libs="-lcurses -ltermcap"
 
-.if !empty(LOWER_OPSYS:Mirix5*)
+.if ${OPSYS} == "IRIX"
 CFLAGS+=		-DIRIX5 -DNEEDS_BSTRING_H
 # libgen is incorrectly detected
 CONFIGURE_ENV+=		ac_cv_lib_gen_p2open="no"
diff --git a/devel/doc++/hacks.mk b/devel/doc++/hacks.mk
index 872f86279b8..f57ffa2ed0a 100644
--- a/devel/doc++/hacks.mk
+++ b/devel/doc++/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.1 2006/01/22 22:16:25 schwarz Exp $
+# $NetBSD: hacks.mk,v 1.2 2007/10/16 23:48:58 tnn Exp $
 
 .if !defined(DOCXX_HACKS_MK)
 DOCXX_HACKS_MK=	# defined
@@ -7,7 +7,7 @@ DOCXX_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
 CONFIGURE_ENV+=		ac_cv_header_inttypes_h="no"
 CONFIGURE_ENV+=		jm_ac_cv_header_inttypes_h="no"
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index b5368ed8f7b..4b5039eef6f 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.122 2007/09/22 17:07:29 tnn Exp $
+# $NetBSD: Makefile,v 1.123 2007/10/16 23:49:00 tnn Exp $
 
 # When updating glib2, please apply patch-ak to configure.in
 # Then run a matching version of autoconf to regen patch-aa.
@@ -85,7 +85,7 @@ PRINT_PLIST_AWK+=	/^@dirrm include\/glib$$/ \
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
-.if !empty(LOWER_OPSYS:Mirix5*)
+.if ${OPSYS} == "IRIX"
 CONFIGURE_ARGS+=	--disable-threads
 .else
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/devel/gmp/Makefile b/devel/gmp/Makefile
index 4b8a01641de..1d027d0c97a 100644
--- a/devel/gmp/Makefile
+++ b/devel/gmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2007/06/18 02:45:31 schmonz Exp $
+# $NetBSD: Makefile,v 1.45 2007/10/16 23:49:02 tnn Exp $
 
 DISTNAME=	gmp-4.2.1
 CATEGORIES=	devel math
@@ -21,7 +21,7 @@ INFO_FILES=		# PLIST
 TEST_TARGET=		check
 
 .include "../../mk/bsd.prefs.mk"
-.if !empty(LOWER_OPSYS:Mirix5*) && !empty(ABI)
+.if ${OPSYS} == "IRIX" && !empty(ABI)
 ABI=			o32
 .endif
 
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
 
diff --git a/mail/deliver/Makefile b/mail/deliver/Makefile
index e35dd6bec57..1b9672296da 100644
--- a/mail/deliver/Makefile
+++ b/mail/deliver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/01/07 09:13:57 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2007/10/16 23:49:01 tnn Exp $
 
 DISTNAME=	deliver-2.1.14
 PKGREVISION=	1
@@ -18,7 +18,7 @@ PKG_SUPPORTED_OPTIONS=		deliver-suid
 
 .include "../../mk/bsd.prefs.mk"
 
-.if !empty(LOWER_OPSYS:Mirix5*)
+.if ${OPSYS} == "IRIX"
 CPPFLAGS+=	-DNO_SYS_TIMEB_H
 .endif
 
diff --git a/mail/libesmtp/Makefile b/mail/libesmtp/Makefile
index 6b14aa9f1d7..d65c044f9fa 100644
--- a/mail/libesmtp/Makefile
+++ b/mail/libesmtp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/02/08 18:29:17 drochner Exp $
+# $NetBSD: Makefile,v 1.24 2007/10/16 23:49:01 tnn Exp $
 
 DISTNAME=	libesmtp-1.0.4
 CATEGORIES=	mail devel
@@ -21,7 +21,7 @@ CONFIGURE_ARGS+=	--disable-isoc
 
 .include "../../mk/bsd.prefs.mk"
 
-.if !empty(LOWER_OPSYS:Mirix5*)
+.if ${OPSYS} == "IRIX"
 CONFIGURE_ARGS+=	--enable-emulate-getaddrinfo
 .endif
 
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 41ae74c5a8f..63fb6b33657 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.149 2007/05/27 13:34:16 tron Exp $
+# $NetBSD: Makefile,v 1.150 2007/10/16 23:48:59 tnn Exp $
 
 DISTNAME=		mutt-1.4.2.3
 CATEGORIES=		mail
@@ -31,7 +31,7 @@ MAKE_ENV+=		CHGRP=${CHGRP:Q}
 CONFIGURE_ARGS+=	--without-wc-funcs
 .endif
 
-.if ${LOWER_OPSYS} == "irix5.3"
+.if !empty(MACHINE_PLATFORM:MIRIX-5.3-*)
 CONFIGURE_ENV+=		ac_cv_header_inttypes_h=no
 .endif
 
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index ade072febcd..476031a5662 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2007/02/22 19:26:42 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2007/10/16 23:49:01 tnn Exp $
 
 DISTNAME=		nmh-1.0.4
 PKGREVISION=		7
@@ -25,7 +25,7 @@ CONFLICTS+=		ja-mh6-[0-9]*
 CFLAGS+=		-O1
 .endif
 
-.if !empty(LOWER_OPSYS:Mirix5*)
+.if ${OPSYS} == "IRIX"
 CPPFLAGS+=		-DIRIX5 # for a patch with extra typedefs
 .endif
 
diff --git a/mail/sma/Makefile b/mail/sma/Makefile
index 293c62ccb53..dc6f1b9d5d6 100644
--- a/mail/sma/Makefile
+++ b/mail/sma/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/02/22 19:26:44 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2007/10/16 23:49:01 tnn Exp $
 
 DISTNAME=	sma-1.4
 CATEGORIES=	mail
@@ -16,7 +16,7 @@ BUILD_TARGET=	sma
 
 .include "../../mk/bsd.prefs.mk"
 
-.if empty(LOWER_OPSYS:Mirix5*)
+.if ${OPSYS} == "IRIX"
 CFLAGS+=	-DUSE_REGEXP
 .endif
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man8
diff --git a/mk/features/features-vars.mk b/mk/features/features-vars.mk
index fe459e212a0..0f6650e2fdd 100644
--- a/mk/features/features-vars.mk
+++ b/mk/features/features-vars.mk
@@ -1,4 +1,4 @@
-# $NetBSD: features-vars.mk,v 1.7 2007/10/01 11:47:00 rillig Exp $
+# $NetBSD: features-vars.mk,v 1.8 2007/10/16 23:49:01 tnn Exp $
 #
 # This file is included by bsd.prefs.mk.
 #
@@ -97,7 +97,7 @@ MISSING_FEATURES+=	${_feature_}
 
 .for _feature_ in snprintf vsnprintf
 .  if defined(USE_FEATURES) && !empty(USE_FEATURES:M${_feature_})
-.    if !empty(LOWER_OPSYS:Mirix5*)
+.    if ${OPSYS} == "IRIX"
 MISSING_FEATURES+=	${_feature_}
 .    endif
 .  endif
diff --git a/net/host/Makefile b/net/host/Makefile
index ace6aaa088e..45f83e68894 100644
--- a/net/host/Makefile
+++ b/net/host/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/11/09 09:26:21 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2007/10/16 23:49:01 tnn Exp $
 
 DISTNAME=	host-20040812
 CATEGORIES=	net
@@ -23,7 +23,7 @@ CPPFLAGS+=	-DBIND_8_COMPAT
 BUILDLINK_TRANSFORM+=	rm:-Wl,--warn-common
 BUILDLINK_TRANSFORM+=	rm:-static
 .endif
-.if !empty(LOWER_OPSYS:Mirix5*)
+.if ${OPSYS} == "IRIX"
 CPPFLAGS+=	-DIRIX5
 .endif
 
diff --git a/net/openslp/hacks.mk b/net/openslp/hacks.mk
index 86d0af577b8..99cb47af9ab 100644
--- a/net/openslp/hacks.mk
+++ b/net/openslp/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.1 2006/04/20 10:55:35 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/net/rsync/hacks.mk b/net/rsync/hacks.mk
index 55aebc218fd..bbaabc751db 100644
--- a/net/rsync/hacks.mk
+++ b/net/rsync/hacks.mk
@@ -1,9 +1,9 @@
-# $NetBSD: hacks.mk,v 1.1 2006/11/21 19:36:16 tv Exp $
+# $NetBSD: hacks.mk,v 1.2 2007/10/16 23:48:58 tnn Exp $
 
 ### [Tue Nov 21 19:32:00 UTC 2006 : tvierling]
 ### iconv(..., NULL, 0, NULL, 0) crashes in libc version of iconv(3)
 ###
-.if !empty(LOWER_OPSYS:Minterix*)
+.if ${OPSYS} == "Interix"
 PKG_HACKS+=	pkgsrc-iconv
 .include "../../converters/libiconv/buildlink3.mk"
 .endif
diff --git a/net/xtraceroute/Makefile b/net/xtraceroute/Makefile
index d27a735f4ff..6043da14a24 100644
--- a/net/xtraceroute/Makefile
+++ b/net/xtraceroute/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2007/09/08 21:57:58 jlam Exp $
+# $NetBSD: Makefile,v 1.49 2007/10/16 23:49:01 tnn Exp $
 #
 
 DISTNAME=	xtraceroute-0.8.14
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+= --with-lib-MesaGL
 
 .include "../../mk/bsd.prefs.mk"
 
-.if !empty(LOWER_OPSYS:Mirix5*)
+.if ${OPSYS} == "IRIX"
 CONFIGURE_ARGS+=	--with-traceroute=/usr/etc/traceroute
 .endif
 
diff --git a/print/teTeX3-bin/hacks.mk b/print/teTeX3-bin/hacks.mk
index aca12681c85..2c8203fd1ea 100644
--- a/print/teTeX3-bin/hacks.mk
+++ b/print/teTeX3-bin/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.1 2006/09/10 19:56:03 schwarz Exp $
+# $NetBSD: hacks.mk,v 1.2 2007/10/16 23:48:59 tnn Exp $
 
 .if !defined(TETEX3-BIN_HACKS_MK)
 TETEX3-BIN_HACKS_MK=	# defined
@@ -7,7 +7,7 @@ TETEX3-BIN_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/security/skey/hacks.mk b/security/skey/hacks.mk
index 0db96ee7c88..5268ddd4417 100644
--- a/security/skey/hacks.mk
+++ b/security/skey/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.1 2006/07/09 13:39:06 schwarz Exp $
+# $NetBSD: hacks.mk,v 1.2 2007/10/16 23:49:02 tnn Exp $
 
 .if !defined(SKEY_HACKS_MK)
 SKEY_HACKS_MK=	# defined
@@ -18,7 +18,7 @@ SUBST_SED.tsmp=		-e 's,$$(CATMAN),$$(TROFFMAN),g'
 ### [Sun Jul  9 13:20:30 CDT 2006 : schwarz]
 ### IRIX 5 does not have usleep()
 ###
-.if !empty(LOWER_OPSYS:Mirix5*)
+.if ${OPSYS} == "IRIX"
 PKG_HACKS+=		use-sginap-instead-of-usleep
 SUBST_CLASSES+=		sginap
 SUBST_MESSAGE.sginap=	use sginap() instead of usleep()
@@ -30,7 +30,7 @@ SUBST_SED.sginap=	-e 's,usleep(100000),sginap(CLK_TCK/10),g'
 ### [Sun Jul  9 14:11:23 CDT 2006 : schwarz]
 ### IRIX 5 does not define 64 bit types in sys/types.h
 ###
-.if !empty(LOWER_OPSYS:Mirix5*)
+.if ${OPSYS} == "IRIX"
 PKG_HACKS+=		missing-u_int64_t
 CPPFLAGS+=		-DMISSING-U_INT64_T
 .endif
diff --git a/security/tcp_wrappers/Makefile b/security/tcp_wrappers/Makefile
index 37dcef91f9d..124469c479a 100644
--- a/security/tcp_wrappers/Makefile
+++ b/security/tcp_wrappers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2007/09/07 22:12:22 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2007/10/16 23:49:02 tnn Exp $
 
 DISTNAME=	tcp_wrappers_7.6-ipv6.1
 PKGNAME=	tcp_wrappers-7.6.1
@@ -27,7 +27,7 @@ BUILD_TARGET.Linux=	${LOWER_OPSYS}
 BUILD_TARGET.${OPSYS}=	netbsd
 .endif
 BUILD_TARGET.SunOS=	sunos5
-BUILD_TARGET.IRIX=	${LOWER_OPSYS:C|\..*||}
+BUILD_TARGET.IRIX=	irix5
 BUILD_TARGET=		${BUILD_TARGET.${OPSYS}}
 
 .if !empty(PKG_OPTIONS:Minet6)
diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index a1f80554d60..d438877d47b 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2007/09/18 21:20:12 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2007/10/16 23:49:02 tnn Exp $
 
 DISTNAME=	bash-3.2
 PKGNAME=	bash-3.2.25
@@ -69,7 +69,7 @@ BUILDLINK_DEPMETHOD.readline=	build
 .endif
 
 # the code has problems with older versions of yacc
-.if !empty(LOWER_OPSYS:Mirix5*)
+.if ${OPSYS} == "IRIX"
 USE_TOOLS+=	bison
 .endif
 
diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 252dc5fed8a..1ab3cbc002c 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2007/09/11 18:42:30 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2007/10/16 23:49:00 tnn Exp $
 #
 
 DISTNAME=		aspell-0.60.5
@@ -31,7 +31,7 @@ CONFIGURE_ENV+=		gt_cv_func_gnugettext1_libintl=yes
 
 .include "../../mk/bsd.prefs.mk"
 
-.if !empty(LOWER_OPSYS:Mirix5*)
+.if ${OPSYS} == "IRIX"
 CPPFLAGS+=	-DDECLARE_VSNPRINTF -DDECLARE_SNPRINTF
 # IRIX 5 has an older implementation of signal()
 CPPFLAGS+=	-DHAVE_OLD_SIGNAL
diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index 3dead292f2f..f3b85d60c3c 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2007/08/29 23:26:44 wiz Exp $
+# $NetBSD: Makefile,v 1.78 2007/10/16 23:49:00 tnn Exp $
 
 DISTNAME=	libxslt-1.1.22
 CATEGORIES=	textproc
@@ -24,7 +24,7 @@ CONFIGURE_ARGS+=	--without-python
 TEST_TARGET=		check
 
 .include "../../mk/bsd.prefs.mk"
-.if !empty(LOWER_OPSYS:Mirix5*)
+.if ${OPSYS} == "IRIX"
 CPPFLAGS+=	-Dsocklen_t=int
 .endif
 
diff --git a/textproc/opensp/hacks.mk b/textproc/opensp/hacks.mk
index d5f29ac7577..6edfd676a03 100644
--- a/textproc/opensp/hacks.mk
+++ b/textproc/opensp/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.1 2006/02/19 18:32:27 schwarz Exp $
+# $NetBSD: hacks.mk,v 1.2 2007/10/16 23:49:00 tnn Exp $
 
 .if !defined(OPENSP_HACKS_MK)
 OPENSP_HACKS_MK=	# defined
@@ -6,7 +6,7 @@ OPENSP_HACKS_MK=	# defined
 ### [Sat Feb 11 23:03:26 CET 2006 : schwarz]
 ### IRIX 5 needs to link with libgen to use dirname()
 ###
-.if !empty(LOWER_OPSYS:Mirix5*)
+.if ${OPSYS} == "IRIX"
 PKG_HACKS+=	add-lgen
 LIBS+=		-lgen
 .endif
diff --git a/www/libwww/Makefile b/www/libwww/Makefile
index 22f86d60c46..7d3f5f8548f 100644
--- a/www/libwww/Makefile
+++ b/www/libwww/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2007/04/21 11:17:47 obache Exp $
+# $NetBSD: Makefile,v 1.75 2007/10/16 23:48:58 tnn Exp $
 
 DISTNAME=		w3c-libwww-5.4.0
 PKGNAME=		libwww-5.4.0
@@ -42,7 +42,7 @@ pre-configure:
 
 .include "../../mk/bsd.prefs.mk"
 
-.if empty(LOWER_OPSYS:Mirix5*)
+.if ${OPSYS} != "IRIX"
 # IRIX 5 does not have libregex
 CONFIGURE_ARGS+=	--with-regex
 .endif