Put back a couple of IRIX conditionals the way they used to behave,

e.g. match IRIX 5.x but not 6.x. Some of these may indeed apply to 6.x
too, but let's be conservative. PR pkg/38224.

14 files changed, 29 insertions, 29 deletions

diff --git a/databases/db3/Makefile b/databases/db3/Makefile
index 0def8288dbf..31a35d4ea0e 100644
--- a/databases/db3/Makefile
+++ b/databases/db3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2008/02/21 19:32:23 jlam Exp $
+# $NetBSD: Makefile,v 1.37 2008/03/11 18:47:40 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 ${OPSYS} == "IRIX"
+.if !empty(MACHINE_PLATFORM:MIRIX-5.3*)
 CONFIGURE_ENV+=		ac_cv_header_inttypes_h=no
 .endif
 
diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common
index cf7e89bd210..bea19a771f5 100644
--- a/databases/mysql4-client/Makefile.common
+++ b/databases/mysql4-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.61 2008/03/06 16:01:42 jlam Exp $
+# $NetBSD: Makefile.common,v 1.62 2008/03/11 18:47:40 tnn Exp $
 
 DISTNAME=		mysql-4.1.22
 CATEGORIES=		databases
@@ -36,7 +36,7 @@ CONFIGURE_ARGS+=	--localstatedir=${MYSQL_DATADIR:Q}
 CONFIGURE_ARGS+=	--with-named-z-libs=z
 CONFIGURE_ARGS+=	--without-libwrap
 
-.if ${OPSYS} == "IRIX"
+.if !empty(MACHINE_PLATFORM:MIRIX-5*)
 CFLAGS+=		-DIRIX5 -DNEEDS_BSTRING_H
 # libgen is incorrectly detected
 CONFIGURE_ENV+=		ac_cv_lib_gen_p2open="no"
diff --git a/devel/gmp/Makefile b/devel/gmp/Makefile
index b77c77887e8..05c2fc7014d 100644
--- a/devel/gmp/Makefile
+++ b/devel/gmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2007/12/02 13:04:08 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2008/03/11 18:47:40 tnn Exp $
 
 DISTNAME=	gmp-4.2.2
 CATEGORIES=	devel math
@@ -23,7 +23,7 @@ INFO_FILES=		# PLIST
 TEST_TARGET=		check
 
 .include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "IRIX" && !empty(ABI)
+.if !empty(MACHINE_PLATFORM:MIRIX-5*) && !empty(ABI)
 ABI=			o32
 .endif
 
diff --git a/graphics/xpm/Makefile b/graphics/xpm/Makefile
index f1438d74771..8e6d1ae1299 100644
--- a/graphics/xpm/Makefile
+++ b/graphics/xpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2007/10/16 23:49:00 tnn Exp $
+# $NetBSD: Makefile,v 1.60 2008/03/11 18:47:40 tnn Exp $
 
 DISTNAME=	xpm-3.4k
 PKGREVISION=	7
@@ -19,7 +19,7 @@ USE_IMAKE=	yes
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "SunOS" || ${OPSYS} == "IRIX"
+.if ${OPSYS} == "SunOS" || !empty(MACHINE_PLATFORM:MIRIX-5*)
 post-install:
 	cd ${PREFIX}/lib && \
 	rm -f libXpm.so.4 && \
diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile
index 9b305a13f50..3c999325474 100644
--- a/graphics/xv/Makefile
+++ b/graphics/xv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2007/10/16 23:49:00 tnn Exp $
+# $NetBSD: Makefile,v 1.73 2008/03/11 18:47:40 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 ${OPSYS} == "IRIX" || ${OPSYS} == "SunOS"
+.if ${OPSYS} == "SunOS" || !empty(MACHINE_PLATFORM:MIRIX-5*)
 CPPFLAGS+=	-DNEED_ALLOCA_H
 .endif
 
diff --git a/mail/deliver/Makefile b/mail/deliver/Makefile
index 1b9672296da..43211b24491 100644
--- a/mail/deliver/Makefile
+++ b/mail/deliver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/10/16 23:49:01 tnn Exp $
+# $NetBSD: Makefile,v 1.13 2008/03/11 18:47:40 tnn Exp $
 
 DISTNAME=	deliver-2.1.14
 PKGREVISION=	1
@@ -18,7 +18,7 @@ PKG_SUPPORTED_OPTIONS=		deliver-suid
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "IRIX"
+.if !empty(MACHINE_PLATFORM:MIRIX-5*)
 CPPFLAGS+=	-DNO_SYS_TIMEB_H
 .endif
 
diff --git a/mail/libesmtp/Makefile b/mail/libesmtp/Makefile
index 897d587a858..e9404259e01 100644
--- a/mail/libesmtp/Makefile
+++ b/mail/libesmtp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2008/01/18 05:08:25 tnn Exp $
+# $NetBSD: Makefile,v 1.27 2008/03/11 18:47:40 tnn Exp $
 
 DISTNAME=	libesmtp-1.0.4
 PKGREVISION=	1
@@ -20,7 +20,7 @@ CONFIGURE_ARGS+=	--disable-isoc
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "IRIX"
+.if !empty(MACHINE_PLATFORM:MIRIX-5*)
 CONFIGURE_ARGS+=	--enable-emulate-getaddrinfo
 .endif
 
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index e01b9724b7a..20ddd8a3ebf 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2007/11/17 12:04:13 rillig Exp $
+# $NetBSD: Makefile,v 1.67 2008/03/11 18:47:40 tnn Exp $
 
 DISTNAME=		nmh-1.0.4
 PKGREVISION=		7
@@ -27,7 +27,7 @@ USE_TOOLS+=		lex
 CFLAGS+=		-O1
 .endif
 
-.if ${OPSYS} == "IRIX"
+.if !empty(MACHINE_PLATFORM:MIRIX-5*)
 CPPFLAGS+=		-DIRIX5 # for a patch with extra typedefs
 .endif
 
diff --git a/net/host/Makefile b/net/host/Makefile
index 8e42f1bb703..8ddbcb72bc1 100644
--- a/net/host/Makefile
+++ b/net/host/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2007/12/21 11:20:40 obache Exp $
+# $NetBSD: Makefile,v 1.19 2008/03/11 18:47:41 tnn Exp $
 
 DISTNAME=	host-20040812
 CATEGORIES=	net
@@ -26,7 +26,7 @@ CPPFLAGS+=	-DBIND_8_COMPAT
 BUILDLINK_TRANSFORM+=	rm:-Wl,--warn-common
 BUILDLINK_TRANSFORM+=	rm:-static
 .endif
-.if ${OPSYS} == "IRIX"
+.if !empty(MACHINE_PLATFORM:MIRIX-5*)
 CPPFLAGS+=	-DIRIX5
 .endif
 
diff --git a/net/xtraceroute/Makefile b/net/xtraceroute/Makefile
index 6043da14a24..c61e2707f37 100644
--- a/net/xtraceroute/Makefile
+++ b/net/xtraceroute/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2007/10/16 23:49:01 tnn Exp $
+# $NetBSD: Makefile,v 1.50 2008/03/11 18:47:41 tnn Exp $
 #
 
 DISTNAME=	xtraceroute-0.8.14
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+= --with-lib-MesaGL
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "IRIX"
+.if !empty(MACHINE_PLATFORM:MIRIX-5*)
 CONFIGURE_ARGS+=	--with-traceroute=/usr/etc/traceroute
 .endif
 
diff --git a/security/skey/hacks.mk b/security/skey/hacks.mk
index 5268ddd4417..852bd86f0e4 100644
--- a/security/skey/hacks.mk
+++ b/security/skey/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.2 2007/10/16 23:49:02 tnn Exp $
+# $NetBSD: hacks.mk,v 1.3 2008/03/11 18:47:41 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 ${OPSYS} == "IRIX"
+.if !empty(MACHINE_PLATFORM:MIRIX-5*)
 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 ${OPSYS} == "IRIX"
+.if !empty(MACHINE_PLATFORM:MIRIX-5*)
 PKG_HACKS+=		missing-u_int64_t
 CPPFLAGS+=		-DMISSING-U_INT64_T
 .endif
diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index d438877d47b..214b7627ca6 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2007/10/16 23:49:02 tnn Exp $
+# $NetBSD: Makefile,v 1.38 2008/03/11 18:47:41 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 ${OPSYS} == "IRIX"
+.if !empty(MACHINE_PLATFORM:MIRIX-5*)
 USE_TOOLS+=	bison
 .endif
 
diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 1ab3cbc002c..613ac60d075 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2007/10/16 23:49:00 tnn Exp $
+# $NetBSD: Makefile,v 1.54 2008/03/11 18:47:41 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 ${OPSYS} == "IRIX"
+.if !empty(MACHINE_PLATFORM:MIRIX-5*)
 CPPFLAGS+=	-DDECLARE_VSNPRINTF -DDECLARE_SNPRINTF
 # IRIX 5 has an older implementation of signal()
 CPPFLAGS+=	-DHAVE_OLD_SIGNAL
diff --git a/www/libwww/Makefile b/www/libwww/Makefile
index e2d087cc3dc..d374951a1bf 100644
--- a/www/libwww/Makefile
+++ b/www/libwww/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2008/01/18 05:09:51 tnn Exp $
+# $NetBSD: Makefile,v 1.77 2008/03/11 18:47:41 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 ${OPSYS} != "IRIX"
+.if !empty(MACHINE_PLATFORM:MIRIX-5*)
 # IRIX 5 does not have libregex
 CONFIGURE_ARGS+=	--with-regex
 .endif