From b6fdd52c562634b8d2778af976029790226f87f3 Mon Sep 17 00:00:00 2001
From: jschauma <jschauma@pkgsrc.org>
Date: Fri, 11 Jul 2003 15:40:18 +0000
Subject: Rather than hardcoding IRIX into bsd.pkg.mk when checking if
 xpkgwedge is needed let's use _OPSYS_NEEDS_XPKGWEDGE to be set in
 defs.${OPSYS}.mk

---
 mk/bsd.pkg.mk   | 5 +++--
 mk/defs.IRIX.mk | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'mk')

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 5d46104320f..86837970dc2 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1209 2003/07/10 23:10:07 grant Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1210 2003/07/11 15:40:18 jschauma Exp $
 #
 # This file is in the public domain.
 #
@@ -81,7 +81,8 @@ USE_X11?=		implied
 
 # IRIX *always* needs xpkgwedge
 .if defined(USE_X11BASE)
-.  if ${OPSYS} == "IRIX" ||						\
+.  if ( defined(_OPSYS_NEEDS_XPKGWEDGE) && 				\
+	!empty(_OPSYS_NEEDS_XPKGWEDGE:M[yY][eE][sS]) ) ||
       exists(${LOCALBASE}/lib/X11/config/xpkgwedge.def) ||		\
       exists(${X11BASE}/lib/X11/config/xpkgwedge.def)
 BUILD_DEPENDS+=		xpkgwedge>=1.5:../../pkgtools/xpkgwedge
diff --git a/mk/defs.IRIX.mk b/mk/defs.IRIX.mk
index 3fde33a8bcc..2fa3d35a8d3 100644
--- a/mk/defs.IRIX.mk
+++ b/mk/defs.IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.IRIX.mk,v 1.29 2003/07/02 16:07:02 grant Exp $
+# $NetBSD: defs.IRIX.mk,v 1.30 2003/07/11 15:40:19 jschauma Exp $
 #
 # Variable definitions for the IRIX operating system.
 
@@ -117,6 +117,7 @@ _OPSYS_HAS_JAVA=	no		# Java is not standard
 _OPSYS_HAS_MANZ=	no		# no MANZ for gzipping of man pages
 _OPSYS_HAS_OSSAUDIO=	no		# libossaudio is available
 _OPSYS_LIBTOOL_REQD=    1.4.20010614nb14 # base version of libtool required
+_OPSYS_NEEDS_XPKGWEDGE=	yes		# xpkgwedge is required for X11
 _OPSYS_PERL_REQD=			# no base version of perl required
 _OPSYS_RPATH_NAME=	-rpath,		# name of symbol in rpath directive to linker 
 _PATCH_CAN_BACKUP=	no		# native patch(1) can make backups
-- 
cgit v1.2.3