From 0a1bd5acad4638865116c0da61447ceb86ee6ef4 Mon Sep 17 00:00:00 2001
From: schmonz <schmonz@pkgsrc.org>
Date: Sat, 7 Dec 2002 02:38:52 +0000
Subject: Replace IGNORE with PKG_FAIL_REASON or PKG_SKIP_REASON as
 appropriate.

---
 graphics/MesaLib/Makefile |  4 ++--
 graphics/blender/Makefile | 10 +++++-----
 graphics/glu/Makefile     |  4 ++--
 graphics/xpm/Makefile     |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'graphics')

diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile
index e621e57612d..fb78d52cbed 100644
--- a/graphics/MesaLib/Makefile
+++ b/graphics/MesaLib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/11/18 07:49:25 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2002/12/07 02:38:56 schmonz Exp $
 
 PKGNAME=		MesaLib-${MESA_VERSION}
 WRKSRC=			${WRKDIR}/${DISTNAME:S/Lib//}
@@ -23,7 +23,7 @@ _IS_BUILTIN_MESA=	0
 .endif
 
 .if (${X11PREFIX} == ${X11BASE}) && (${_IS_BUILTIN_MESA} != "0")
-IGNORE=		"MesaLib/GLX has already been installed as part of XFree-4.x"
+PKG_SKIP_REASON= "${PKGNAME} is part of your X11 distribution"
 .endif
 
 post-install:
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index 55377f1e98e..7c56d94e712 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2002/09/25 12:53:20 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.15 2002/12/07 02:38:56 schmonz Exp $
 
 PKGNAME=	blender-2.11
 PKGREVISION=	5
@@ -24,7 +24,7 @@ ONLY_FOR_PLATFORM= *-*-i386 *-*-powerpc *-*-sparc
 
 .if (${MACHINE_ARCH} == "alpha")
 .if !exists(/emul/linux/lib/ld.so.1)
-IGNORE=		"${PKGNAME} requires Linux libraries - see compat_linux(8)"
+PKG_FAIL_REASON= "${PKGNAME} requires Linux libraries - see compat_linux(8)"
 .endif
 DISTNAME=	blender2.11-linux-glibc2.1.3-alpha
 #
@@ -36,7 +36,7 @@ PLIST_ARCH=	linux-i386
 .elif (${MACHINE_ARCH} == "sparc")
 .if ${OPSYS} == "NetBSD"
 .if !exists(/emul/svr4/usr/lib/ld.so)
-IGNORE=		"${PKGNAME} requires Solaris libraries - see compat_svr4(8)"
+PKG_FAIL_REASON= "${PKGNAME} requires Solaris libraries - see compat_svr4(8)"
 .endif
 .endif
 DISTNAME=	blender2.11-solaris-2.6-sparc
@@ -45,7 +45,7 @@ EXTRACT_SUFX=	.tar.Z
 #
 .elif (${MACHINE_ARCH} == "powerpc")
 .if !exists(/emul/linux/lib/ld.so.1)
-IGNORE=		"${PKGNAME} requires Linux libraries - see compat_linux(8)"
+PKG_FAIL_REASON= "${PKGNAME} requires Linux libraries - see compat_linux(8)"
 .endif
 DEPENDS+=	linuxppc_lib>=2000.4.2:../../emulators/linuxppc_lib
 DISTNAME=	blender2.11-linux-glibc2.1.3-powerpc-static
@@ -53,7 +53,7 @@ PLIST_ARCH=	linux-powerpc
 #
 .else
 DISTNAME=	# dummy, don't break pkg system
-IGNORE=		"Your platform is not supported and the package is buggy!"
+PKG_FAIL_REASON= "Your platform is not supported and the package is buggy!"
 .endif
 
 PLIST_SRC=	${PKGDIR}/PLIST.${PLIST_ARCH}
diff --git a/graphics/glu/Makefile b/graphics/glu/Makefile
index 771f5d926c4..aa2b38bfdc6 100644
--- a/graphics/glu/Makefile
+++ b/graphics/glu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2002/11/18 07:49:25 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2002/12/07 02:38:56 schmonz Exp $
 
 PKGNAME=		${DISTNAME:C/MesaLib/glu/}
 WRKSRC=			${WRKDIR}/${DISTNAME:C/Lib//}
@@ -25,7 +25,7 @@ _IS_BUILTIN_GLU=	0
 .endif
 
 .if (${X11PREFIX} == ${X11BASE}) && (${_IS_BUILTIN_GLU} != "0")
-IGNORE=		"GLU has already been installed as part of XFree86-4.x"
+PKG_SKIP_REASON= "${PKGNAME} is part of your X11 distribution"
 .endif
 
 post-install:
diff --git a/graphics/xpm/Makefile b/graphics/xpm/Makefile
index 0ec7157defa..ca8b96ac167 100644
--- a/graphics/xpm/Makefile
+++ b/graphics/xpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2002/09/01 15:13:42 tron Exp $
+# $NetBSD: Makefile,v 1.26 2002/12/07 02:38:57 schmonz Exp $
 
 DISTNAME=       xpm-3.4k
 CATEGORIES=	graphics x11
@@ -27,7 +27,7 @@ _IS_BUILTIN_XPM!=	(/usr/sbin/pkgchk -l SUNWxwinc | ${EGREP} -c xpm.h) || ${TRUE}
 .endif
 
 .if ${_IS_BUILTIN_XPM} != "0"
-IGNORE=		"The Xpm library is included in your X11 distribution."
+PKG_SKIP_REASON= "${PKGNAME} is part of your X11 distribution"
 .endif
 
 .if (${OPSYS} == SunOS)
-- 
cgit v1.2.3