From dbb71432c1380918f61104a2e5d18effa27af2ab Mon Sep 17 00:00:00 2001 From: schmonz Date: Sat, 7 Dec 2002 02:38:52 +0000 Subject: Replace IGNORE with PKG_FAIL_REASON or PKG_SKIP_REASON as appropriate. --- audio/realplayer/Makefile | 4 ++-- chat/irchat-pj/Makefile | 4 ++-- devel/libg++/Makefile | 4 ++-- devel/libgetopt/Makefile | 4 ++-- devel/libgtop/Makefile | 21 +++++++++++---------- devel/libgtop2/Makefile | 20 ++++++++++---------- devel/py-kqueue/Makefile | 4 ++-- fonts/mkfontscale/Makefile | 4 ++-- games/quake6/Makefile | 4 ++-- graphics/MesaLib/Makefile | 4 ++-- graphics/blender/Makefile | 10 +++++----- graphics/glu/Makefile | 4 ++-- graphics/xpm/Makefile | 4 ++-- inputmethod/kinput2/Makefile | 4 ++-- lang/fort77/Makefile | 4 ++-- lang/guavac/Makefile | 4 ++-- lang/libperl/Makefile | 4 ++-- lang/python/extension.mk | 4 ++-- lang/python20/Makefile.inc | 4 ++-- lang/ruby-base/Makefile.common | 4 ++-- mail/mailwrapper/Makefile | 4 ++-- misc/dt/Makefile | 4 ++-- net/arla/Makefile | 4 ++-- net/bind4/Makefile | 4 ++-- net/citrix_ica/Makefile | 4 ++-- net/hesiod/Makefile | 4 ++-- pkgtools/pkg_install/Makefile | 4 ++-- pkgtools/x11-links/Makefile | 4 ++-- print/acroread/Makefile | 6 +++--- print/acroread3/Makefile | 6 +++--- print/acroread5/Makefile | 4 ++-- security/isakmpd/Makefile | 4 ++-- security/openssh/Makefile.intree | 6 +++--- security/openssl/Makefile | 4 ++-- security/racoon/Makefile | 4 ++-- sysutils/fdgw/Makefile | 6 +++--- sysutils/top/Makefile | 4 ++-- sysutils/user/Makefile | 4 ++-- textproc/rman/Makefile | 4 ++-- www/apache6/Makefile | 4 ++-- www/navigator/Makefile.common | 14 +++++++------- x11/XF86Setup/Makefile | 4 ++-- x11/gdkxft/Makefile | 4 ++-- x11/xservers/Makefile | 4 ++-- x11/xvattr/Makefile | 4 ++-- 45 files changed, 119 insertions(+), 118 deletions(-) diff --git a/audio/realplayer/Makefile b/audio/realplayer/Makefile index 4816a3a5338..cdc0644d57a 100644 --- a/audio/realplayer/Makefile +++ b/audio/realplayer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2002/09/28 23:52:42 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2002/12/07 02:38:52 schmonz Exp $ PKGNAME= realplayer-8.0.1 WRKSRC= ${WRKDIR}/RealPlayer8 @@ -24,7 +24,7 @@ COMMENT= RealAudio and RealVideo player DEPENDS+= suse_x11>=6.1:../../emulators/${SUSE_DIR_PREFIX}_x11 . elif ${MACHINE} == "sparc" . 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 .endif diff --git a/chat/irchat-pj/Makefile b/chat/irchat-pj/Makefile index c16d9643498..929c86f7b6e 100644 --- a/chat/irchat-pj/Makefile +++ b/chat/irchat-pj/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/09/17 06:28:11 uebayasi Exp $ +# $NetBSD: Makefile,v 1.2 2002/12/07 02:38:53 schmonz Exp $ DISTNAME= irchat-pj-2.4.24.20 CATEGORIES= chat @@ -18,7 +18,7 @@ ALL_TARGET= package INSTALL_TARGET= install-package PLIST_SRC= ${PKGDIR}/PLIST.xemacs .else -IGNORE+= "Unknown Emacs flavor" +PKG_FAIL_REASON+= "Unknown Emacs flavor" .endif .include "../../mk/bsd.pkg.mk" diff --git a/devel/libg++/Makefile b/devel/libg++/Makefile index 97c265d3dee..f18dd040b04 100644 --- a/devel/libg++/Makefile +++ b/devel/libg++/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2002/11/06 06:52:00 sjg Exp $ +# $NetBSD: Makefile,v 1.23 2002/12/07 02:38:53 schmonz Exp $ # DISTNAME= libg++-${GXXVERSION} @@ -9,7 +9,7 @@ MAINTAINER= packages@netbsd.org COMMENT= GNU C++ Class Library .if !exists(/usr/lib/libstdc++.so.2.0) && !exists(/usr/lib/libstdc++.so) -IGNORE= '${PKGNAME} is designed for NetBSD>=1.4. NetBSD 1.3(.x) comes with this in-tree' +PKG_SKIP_REASON= '${PKGNAME} is part of your NetBSD-1.3.x distribution. This is designed for NetBSD>=1.4.' .endif # used by internal Makefile diff --git a/devel/libgetopt/Makefile b/devel/libgetopt/Makefile index 03610b22989..90c620efcbf 100644 --- a/devel/libgetopt/Makefile +++ b/devel/libgetopt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/07/29 05:32:34 tron Exp $ +# $NetBSD: Makefile,v 1.11 2002/12/07 02:38:53 schmonz Exp $ # DISTNAME= libgetopt-${VERS} @@ -14,7 +14,7 @@ COMMENT= Library for handling --long options NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL .if exists(/usr/include/getopt.h) -IGNORE= "${PKGNAME} is part of your NetBSD distribution" +PKG_SKIP_REASON= "${PKGNAME} is part of your ${OPSYS} distribution" .endif VERS= 1.3 diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile index 3273791ece8..23a9c179038 100644 --- a/devel/libgtop/Makefile +++ b/devel/libgtop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.65 2002/11/30 23:21:37 salo Exp $ +# $NetBSD: Makefile,v 1.66 2002/12/07 02:38:54 schmonz Exp $ DISTNAME= libgtop-1.0.13 CATEGORIES= devel gnome @@ -15,16 +15,17 @@ NOT_FOR_PLATFORM= SunOS-*-* OSVERSION_SPECIFIC= yes .include "../../mk/bsd.prefs.mk" + .if ${OPSYS} == NetBSD -.if (${MACHINE_ARCH} != alpha) && (${MACHINE_ARCH} != arm32) && \ - (${MACHINE_ARCH} != i386) && (${MACHINE_ARCH} != m68k) && \ - (${MACHINE_ARCH} != mipsel) && (${MACHINE_ARCH} != powerpc) && \ - (${MACHINE_ARCH} != sparc) && (${MACHINE_ARCH} != sparc64) -IGNORE= "${PKGNAME} has not yet been ported to ${MACHINE_ARCH}." -IGNORE+= "Please look at /usr/include/${MACHINE_ARCH}/pcb.h" -IGNORE+= "and update patches/patch-al appropriately." -IGNORE+= "(More information can be found in libgtop.info.)" -.endif +. if (${MACHINE_ARCH} != alpha) && (${MACHINE_ARCH} != arm32) && \ + (${MACHINE_ARCH} != i386) && (${MACHINE_ARCH} != m68k) && \ + (${MACHINE_ARCH} != mipsel) && (${MACHINE_ARCH} != powerpc) && \ + (${MACHINE_ARCH} != sparc) && (${MACHINE_ARCH} != sparc64) +PKG_FAIL_REASON= "${PKGNAME} has not yet been ported to ${MACHINE_ARCH}." +PKG_FAIL_REASON+= "Please look at /usr/include/${MACHINE_ARCH}/pcb.h" +PKG_FAIL_REASON+= "and update patches/patch-al appropriately." +PKG_FAIL_REASON+= "(More information can be found in libgtop.info.)" +. endif .endif USE_PERL5= build diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile index 0eb44f71744..433e4da7936 100644 --- a/devel/libgtop2/Makefile +++ b/devel/libgtop2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/11/30 23:21:38 salo Exp $ +# $NetBSD: Makefile,v 1.4 2002/12/07 02:38:54 schmonz Exp $ DISTNAME= libgtop-2.0.0 PKGNAME= ${DISTNAME:S/-/2-/} @@ -17,15 +17,15 @@ OSVERSION_SPECIFIC= YES .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == NetBSD -.if (${MACHINE_ARCH} != alpha) && (${MACHINE_ARCH} != arm32) && \ - (${MACHINE_ARCH} != i386) && (${MACHINE_ARCH} != m68k) && \ - (${MACHINE_ARCH} != mipsel) && (${MACHINE_ARCH} != powerpc) && \ - (${MACHINE_ARCH} != sparc) && (${MACHINE_ARCH} != sparc64) -IGNORE= "${PKGNAME} has not yet been ported to ${MACHINE_ARCH}." -IGNORE+= "Please look at /usr/include/${MACHINE_ARCH}/pcb.h" -IGNORE+= "and update patches/patch-al appropriately." -IGNORE+= "(More information can be found in libgtop.info.)" -.endif +. if (${MACHINE_ARCH} != alpha) && (${MACHINE_ARCH} != arm32) && \ + (${MACHINE_ARCH} != i386) && (${MACHINE_ARCH} != m68k) && \ + (${MACHINE_ARCH} != mipsel) && (${MACHINE_ARCH} != powerpc) && \ + (${MACHINE_ARCH} != sparc) && (${MACHINE_ARCH} != sparc64) +PKG_FAIL_REASON= "${PKGNAME} has not yet been ported to ${MACHINE_ARCH}." +PKG_FAIL_REASON+= "Please look at /usr/include/${MACHINE_ARCH}/pcb.h" +PKG_FAIL_REASON+= "and update patches/patch-al appropriately." +PKG_FAIL_REASON+= "(More information can be found in libgtop.info.)" +. endif .endif USE_PERL5= build diff --git a/devel/py-kqueue/Makefile b/devel/py-kqueue/Makefile index a4de1e45c6b..406b68a864c 100644 --- a/devel/py-kqueue/Makefile +++ b/devel/py-kqueue/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/11/24 09:30:24 jdolecek Exp $ +# $NetBSD: Makefile,v 1.2 2002/12/07 02:38:55 schmonz Exp $ DISTNAME= py-kqueue-2.0 PKGNAME= ${PYPKGPREFIX}-kqueue-2.0 @@ -14,7 +14,7 @@ PYDISTUTILSPKG= # defined .include "../../mk/bsd.prefs.mk" .if !defined(PKG_HAVE_KQUEUE) -IGNORE+= "${PKGNAME} is not available for ${MACHINE_PLATFORM}, needs OS support for kqueue(2)" +PKG_FAIL_REASON+= "${PKGNAME} is not available for ${MACHINE_PLATFORM}, needs OS support for kqueue(2)" .endif .include "../../lang/python/extension.mk" diff --git a/fonts/mkfontscale/Makefile b/fonts/mkfontscale/Makefile index c5903a502fc..2e113b777b4 100644 --- a/fonts/mkfontscale/Makefile +++ b/fonts/mkfontscale/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2002/08/12 19:58:37 tron Exp $ +# $NetBSD: Makefile,v 1.5 2002/12/07 02:38:55 schmonz Exp $ DISTNAME= mkfontscale-20020524 CATEGORIES= fonts @@ -15,7 +15,7 @@ WRKSRC= ${WRKDIR}/mkfontscale .include "../../mk/bsd.prefs.mk" .if !exists(${X11BASE}/include/X11/fonts/fontenc.h) -IGNORE= "Needs the fontenc.h header file, which comes with newer XFree versions." +PKG_FAIL_REASON= "Needs the fontenc.h header file, which comes with newer XFree versions." .endif .include "../../mk/bsd.pkg.mk" diff --git a/games/quake6/Makefile b/games/quake6/Makefile index 375d4006a2a..147f4fc50f0 100644 --- a/games/quake6/Makefile +++ b/games/quake6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2002/09/23 10:26:22 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2002/12/07 02:38:55 schmonz Exp $ DISTNAME= quake-v6-bsd-kame PKGNAME= quake6-0.0 @@ -27,7 +27,7 @@ GNU_CONFIGURE= yes BUILD_DEFS+= USE_INET6 .include "../../mk/bsd.prefs.mk" .if !(defined(USE_INET6) && ${USE_INET6} == "YES") -IGNORE= "${PKGNAME} requires IPv6 support" +PKG_FAIL_REASON= "${PKGNAME} requires IPv6 support" .endif # "bindir" setting is very non-standard for GNU autoconf 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) diff --git a/inputmethod/kinput2/Makefile b/inputmethod/kinput2/Makefile index f32834e1414..72a2a8b1927 100644 --- a/inputmethod/kinput2/Makefile +++ b/inputmethod/kinput2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2002/10/13 12:40:07 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2002/12/07 02:39:09 schmonz Exp $ # FreeBSD Id: Makefile,v 1.4 1999/06/06 13:19:49 taoka Exp $ DISTNAME= kinput2-v3 @@ -19,7 +19,7 @@ PLIST_SRC= ${PKGDIR}/PLIST-common defined(USE_WNN4) && ${USE_WNN4} != YES && \ defined(USE_WNN6) && ${USE_WNN6} != YES && \ defined(USE_SJ3) && ${USE_SJ3} != YES -IGNORE= ${PKGNAME} is ignored. because USE_CANNA,USE_WNN4,USE_WNN6,USE_SJ3 are "NO" +PKG_FAIL_REASON= ${PKGNAME} is ignored. because USE_CANNA,USE_WNN4,USE_WNN6,USE_SJ3 are "NO" .endif .if !defined(USE_CANNA) || ${USE_CANNA} == YES diff --git a/lang/fort77/Makefile b/lang/fort77/Makefile index 2fe50cb0a10..170f496a0d7 100644 --- a/lang/fort77/Makefile +++ b/lang/fort77/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/09/27 23:18:16 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2002/12/07 02:38:57 schmonz Exp $ # DISTNAME= fort77-1.14a @@ -19,7 +19,7 @@ F2CPKGHASNOSHAREDLIB= .endif .if exists(/usr/bin/fort77) -IGNORE= "${PKGNAME} is part of your NetBSD distribution" +PKG_SKIP_REASON= "${PKGNAME} is part of your ${OPSYS} distribution" .endif ALL_TARGET= test diff --git a/lang/guavac/Makefile b/lang/guavac/Makefile index 1c9618bc3b4..d39b5527fe3 100644 --- a/lang/guavac/Makefile +++ b/lang/guavac/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2001/02/17 09:07:11 agc Exp $ +# $NetBSD: Makefile,v 1.13 2002/12/07 02:38:57 schmonz Exp $ # DISTNAME= guavac-1.2 @@ -33,5 +33,5 @@ post-install: HAVE_GCC27!= ${CXX} -v 2>&1 | ${GREP} '2\.7\.'; ${ECHO} .if !empty(HAVE_GCC27) -IGNORE= "${PKGNAME} requires gcc 2.8 or egcs or better for ANSI C++" +PKG_FAIL_REASON= "${PKGNAME} requires gcc 2.8 or egcs or better for ANSI C++" .endif diff --git a/lang/libperl/Makefile b/lang/libperl/Makefile index 250f5122e3d..d9b0ea7c484 100644 --- a/lang/libperl/Makefile +++ b/lang/libperl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2002/11/15 00:33:04 jlam Exp $ +# $NetBSD: Makefile,v 1.28 2002/12/07 02:38:57 schmonz Exp $ .include "../../lang/perl5/Makefile.common" @@ -27,7 +27,7 @@ MKPIC= no .endif .if ${MKPIC} == "no" -IGNORE= ${PKGNAME} needs shared objects. +PKG_FAIL_REASON= "${PKGNAME} needs shared objects" .endif do-build: diff --git a/lang/python/extension.mk b/lang/python/extension.mk index d8e5bd274a5..57eb658c474 100644 --- a/lang/python/extension.mk +++ b/lang/python/extension.mk @@ -1,4 +1,4 @@ -# $NetBSD: extension.mk,v 1.1 2002/09/21 23:47:03 jlam Exp $ +# $NetBSD: extension.mk,v 1.2 2002/12/07 02:38:58 schmonz Exp $ # derive a python version from the package name if possible .if defined(PKGNAME_REQD) @@ -9,7 +9,7 @@ PYTHON_VERSION_REQD?= ${PKGNAME_REQD:C/^py([^-]*)-.*/\1/} .if defined(PYBINMODULE) .if ${MACHINE_ARCH} == "mips" || ${MACHINE_ARCH} == "vax" -IGNORE="${PKGNAME} needs dynamic loading" +PKG_FAIL_REASON= "${PKGNAME} needs dynamic loading" .endif .endif diff --git a/lang/python20/Makefile.inc b/lang/python20/Makefile.inc index ad0f8819e74..79fdb8a9334 100644 --- a/lang/python20/Makefile.inc +++ b/lang/python20/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.1 2002/01/22 18:04:55 drochner Exp $ +# $NetBSD: Makefile.inc,v 1.2 2002/12/07 02:38:58 schmonz Exp $ # PY_VERSION= 2.0 @@ -24,7 +24,7 @@ DEPENDS+= python20-${PY_VERSION}*:../../lang/python20 ALL_TARGET?= default .if ${MACHINE_ARCH} == "sparc64" -IGNORE="${PKGNAME} needs dynamic loading" +PKG_FAIL_REASON= "${PKGNAME} needs dynamic loading" .endif # Set PY_SETUP_SUBST to substitute "${variable}" for "@value@" in Setup.in. diff --git a/lang/ruby-base/Makefile.common b/lang/ruby-base/Makefile.common index f915880564e..261849ff0fe 100644 --- a/lang/ruby-base/Makefile.common +++ b/lang/ruby-base/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.9 2002/10/20 00:39:52 wiz Exp $ +# $NetBSD: Makefile.common,v 1.10 2002/12/07 02:38:58 schmonz Exp $ # FreeBSD: ports/Mk/bsd.ruby.mk,v 1.11 2000/11/16 17:59:40 knu Exp # Makefile.common: ruby common makefile, based on FreeBSD's bsd.ruby.mk. @@ -242,7 +242,7 @@ _RUBY_PROVIDED!= case `expr ${_RUBY_VERMAJOR} ">" ${_RUBY_REQMAJOR}` in \ esac ;; \ esac; ${ECHO} "no" .if ${_RUBY_PROVIDED} == "no" -IGNORE+= "This package requires ruby ${RUBY_REQD} or later." +PKG_FAIL_REASON+= "This package requires ruby ${RUBY_REQD} or later." .endif .else RUBY_REQD?= ${RUBY_VERSION} diff --git a/mail/mailwrapper/Makefile b/mail/mailwrapper/Makefile index 7c750b732dd..cd8472f08d1 100644 --- a/mail/mailwrapper/Makefile +++ b/mail/mailwrapper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/02/25 04:17:58 hubertf Exp $ +# $NetBSD: Makefile,v 1.11 2002/12/07 02:38:59 schmonz Exp $ DISTNAME= mailwrapper-19990412 CATEGORIES= mail @@ -13,7 +13,7 @@ NO_CONFIGURE= yes MANCOMPRESSED_IF_MANZ= yes .if exists(/usr/sbin/mailwrapper) -IGNORE= "${PKGNAME} is part of your NetBSD distribution" +PKG_SKIP_REASON= "${PKGNAME} is part of your ${OPSYS} distribution" .endif WRKSRC= ${WRKDIR}/mailwrapper diff --git a/misc/dt/Makefile b/misc/dt/Makefile index 031fe0fa235..2f41989e47d 100644 --- a/misc/dt/Makefile +++ b/misc/dt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2002/02/11 18:30:21 fredb Exp $ +# $NetBSD: Makefile,v 1.15 2002/12/07 02:38:59 schmonz Exp $ # DISTNAME= dt-1.1.7 @@ -12,7 +12,7 @@ COMMENT= Virtual consoles for NetBSD/mac68k (and macppc?) NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL .if ${MACHINE} != "mac68k" -IGNORE= "${PKGNAME} is only useful for mac68k!" +PKG_FAIL_REASON= "${PKGNAME} is only useful for mac68k!" .endif ALL_TARGET= depend all diff --git a/net/arla/Makefile b/net/arla/Makefile index 5bbb330f839..b6c9c53de09 100644 --- a/net/arla/Makefile +++ b/net/arla/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2002/11/15 00:06:20 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2002/12/07 02:38:59 schmonz Exp $ DISTNAME= arla-0.35.9 PKGREVISION= 2 @@ -38,7 +38,7 @@ CONFIGURE_ARGS+= --with-roken-include=${BUILDLINK_PREFIX.kth-krb4}/include/kerbe . if exists(${BSDSRCDIR}/sys/lib/libkern/libkern.h) CONFIGURE_ARGS+= --with-sys=${BSDSRCDIR}/sys . else -IGNORE= "${PKGNAME} requires kernel sources available under \$$BSDSRCDIR/sys (or /sys)" +PKG_FAIL_REASON= "${PKGNAME} requires kernel sources available under \$$BSDSRCDIR/sys (or /sys)" . endif .endif diff --git a/net/bind4/Makefile b/net/bind4/Makefile index deb2f77d520..bb1941e28b3 100644 --- a/net/bind4/Makefile +++ b/net/bind4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2002/11/17 16:03:12 itojun Exp $ +# $NetBSD: Makefile,v 1.12 2002/12/07 02:39:00 schmonz Exp $ # DISTNAME= bind-4.9.11-REL @@ -13,7 +13,7 @@ COMMENT= The BIND name server, version 4, as an alternative to BIND 8 WRKSRC= ${WRKDIR} .if !exists(/usr/sbin/named-bootconf) -IGNORE= "${PKGNAME} is intended for NetBSD 1.4 or higher" +PKG_FAIL_REASON= "${PKGNAME} is intended for NetBSD 1.4 or higher" .endif post-extract: diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile index 320bb9cd9f2..a041c13baf6 100644 --- a/net/citrix_ica/Makefile +++ b/net/citrix_ica/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2002/11/26 21:43:49 cjep Exp $ +# $NetBSD: Makefile,v 1.13 2002/12/07 02:39:00 schmonz Exp $ # # A default so lintpkgsrc is happy @@ -46,7 +46,7 @@ BINDIR= ${PREFIX}/bin .if (${MACHINE_ARCH} == "sparc") .if !exists(/emul/svr4/usr/lib/ld.so) -IGNORE= "${PKGNAME} requires SVR4 compability - see compat_svr4(8)" +PKG_FAIL_REASON= "${PKGNAME} requires SVR4 compability - see compat_svr4(8)" .endif .endif diff --git a/net/hesiod/Makefile b/net/hesiod/Makefile index 59714840e8a..f9f9d0d422a 100644 --- a/net/hesiod/Makefile +++ b/net/hesiod/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2002/11/21 10:59:20 grant Exp $ +# $NetBSD: Makefile,v 1.5 2002/12/07 02:39:00 schmonz Exp $ DISTNAME= hesiod-3.0.2 CATEGORIES= net @@ -10,7 +10,7 @@ COMMENT= Hesiod network database client and library .include "../../mk/bsd.prefs.mk" .if exists(/usr/include/hesiod.h) && !defined(USE_HESIOD) -IGNORE= "${PKGNAME} is part of your ${OPSYS} distribution" +PKG_SKIP_REASON= "${PKGNAME} is part of your ${OPSYS} distribution" .endif USE_BUILDLINK2= YES diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile index 27303132db8..a6d745bd54a 100644 --- a/pkgtools/pkg_install/Makefile +++ b/pkgtools/pkg_install/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2002/11/23 22:49:47 jschauma Exp $ +# $NetBSD: Makefile,v 1.56 2002/12/07 02:39:01 schmonz Exp $ # Note to package maintainers: # To update the distfile of this pkg, cd to /usr/src/usr.sbin, @@ -35,7 +35,7 @@ LOCALBASE:= ${PKG_TOOLS_BIN:C|/[^/]?bin$||} PKG_DBDIR?= /var/db/pkg .if ${OPSYS} == "NetBSD" && !exists(/usr/share/tmac/tmac.andoc) -IGNORE+= "You need to have the 'text' set installed to build this package!" +PKG_FAIL_REASON+= "You need to have the 'text' set installed to build this package!" .endif .if ${OPSYS} == "SunOS" diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile index 927349a8a7d..9be6a639a54 100644 --- a/pkgtools/x11-links/Makefile +++ b/pkgtools/x11-links/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2002/11/26 08:33:18 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2002/12/07 02:39:01 schmonz Exp $ # # NOTE: If you update this package, then you'll likely need to also update # the x11-links dependency in mk/buildlink2/bsd.buildlink2.mk to the @@ -33,7 +33,7 @@ BUILDLINK_X11_SUBDIR= share/x11-links .include "../../mk/bsd.prefs.mk" .if !exists(${X11BASE}/include/X11/X.h) -IGNORE= "x11-links requires X headers to be installed" +PKG_FAIL_REASON= "${PKGNAME} requires X headers to be installed" .endif do-install: diff --git a/print/acroread/Makefile b/print/acroread/Makefile index e1325b841fb..5619220e4e2 100644 --- a/print/acroread/Makefile +++ b/print/acroread/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2002/11/19 07:44:39 schmonz Exp $ +# $NetBSD: Makefile,v 1.33 2002/12/07 02:39:02 schmonz Exp $ PKGNAME= acroread-4.05 CATEGORIES= print @@ -29,14 +29,14 @@ PLATFORM= intellinux WRKSRC= ${WRKDIR}/ILINXR.install . elif (${MACHINE_ARCH} == "alpha") . if !exists(/emul/osf1/sbin/loader) -IGNORE= '${PKGNAME} requires Digital UNIX libraries - see compat_osf1(8)' +PKG_FAIL_REASON= '${PKGNAME} requires Digital UNIX libraries - see compat_osf1(8)' . endif DISTNAME= fdec-rs-405 PLATFORM= alphaosf WRKSRC= ${WRKDIR}/AOSFRS.install . elif (${MACHINE_ARCH} == "sparc") . 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 DISTNAME= sunsparc-rs-405 WRKSRC= ${WRKDIR}/SSOLRS.install diff --git a/print/acroread3/Makefile b/print/acroread3/Makefile index 76d20d54972..093e65bd08f 100644 --- a/print/acroread3/Makefile +++ b/print/acroread3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2002/04/04 12:29:49 tron Exp $ +# $NetBSD: Makefile,v 1.20 2002/12/07 02:39:02 schmonz Exp $ PKGNAME= acroread3-3.01 CATEGORIES= print @@ -28,14 +28,14 @@ PLATFORM= intellinux CHECK_SHLIBS= no .elif (${MACHINE_ARCH} == "alpha") .if !exists(/emul/osf1/sbin/loader) -IGNORE= "${PKGNAME} requires Digital UNIX libraries - see compat_osf1(8)" +PKG_FAIL_REASON= "${PKGNAME} requires Digital UNIX libraries - see compat_osf1(8)" .endif DISTNAME= acroread_osf_301 PLATFORM= alphaosf LDD?= ${TRUE} .elif (${MACHINE_ARCH} == "sparc") .if !exists(/emul/sunos/usr/lib/ld.so) -IGNORE= "${PKGNAME} requires SunOS libraries - see compat_sunos(8)" +PKG_FAIL_REASON= "${PKGNAME} requires SunOS libraries - see compat_sunos(8)" .endif DISTNAME= acroread_sunos_301 PLATFORM= sparcsun diff --git a/print/acroread5/Makefile b/print/acroread5/Makefile index 57e7aba45b3..7f4ee8099aa 100644 --- a/print/acroread5/Makefile +++ b/print/acroread5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/11/19 07:42:45 schmonz Exp $ +# $NetBSD: Makefile,v 1.4 2002/12/07 02:39:02 schmonz Exp $ PKGNAME= acroread5-5.06 CATEGORIES= print @@ -32,7 +32,7 @@ DISTNAME= linux-506 PLATFORM= intellinux . elif (${MACHINE_ARCH} == "sparc") . 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 DISTNAME= solaris-506 PLATFORM= sparcsolaris diff --git a/security/isakmpd/Makefile b/security/isakmpd/Makefile index 53641b10190..096376f3be6 100644 --- a/security/isakmpd/Makefile +++ b/security/isakmpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2002/11/18 12:07:41 martti Exp $ +# $NetBSD: Makefile,v 1.24 2002/12/07 02:39:03 schmonz Exp $ # DISTNAME= isakmpd-20021118 @@ -10,7 +10,7 @@ COMMENT= OpenBSD IKE daemon # this is not compatible with cross build - there's no other way .if !exists(/usr/include/netinet6/ipsec.h) -IGNORE+= "${PKGNAME} requires ipsec-ready NetBSD" +PKG_FAIL_REASON+= "${PKGNAME} requires ipsec-ready ${OPSYS}" .endif ALL_TARGET= depend all diff --git a/security/openssh/Makefile.intree b/security/openssh/Makefile.intree index e22a53785c7..baa58d07bf1 100644 --- a/security/openssh/Makefile.intree +++ b/security/openssh/Makefile.intree @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.intree,v 1.6 2002/08/28 04:02:50 jlam Exp $ +# $NetBSD: Makefile.intree,v 1.7 2002/12/07 02:39:03 schmonz Exp $ .include "../../mk/bsd.prefs.mk" @@ -26,7 +26,7 @@ PKG_SYSCONFSUBDIR:= ssh .include "../../security/openssl/buildlink2.mk" .if ${_NEED_OPENSSL} == "YES" _UPDATE_INTREE_OPENSSH= NO -IGNORE= "OpenSSL>=0.9.6f in the base distribution is required." +PKG_FAIL_REASON= "OpenSSL>=0.9.6f in the base distribution is required." .endif .if ${_UPDATE_INTREE_OPENSSH} == "YES" @@ -39,7 +39,7 @@ PKG_SYSCONFBASE:= /etc MANDIR:= share/man RCD_SCRIPTS_EGDIR:= share/examples/openssh .else -IGNORE?= "Unable to update in-tree OpenSSH for ${OPSYS}-${OS_VERSION}." +PKG_FAIL_REASON?= "Unable to update in-tree OpenSSH for ${OPSYS}-${OS_VERSION}." .endif real-tarball: diff --git a/security/openssl/Makefile b/security/openssl/Makefile index d0efd1e5155..7c65b4073d8 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.62 2002/11/30 05:13:23 uebayasi Exp $ +# $NetBSD: Makefile,v 1.63 2002/12/07 02:39:03 schmonz Exp $ DISTNAME= openssl-0.9.6g SVR4_PKGNAME= ossl @@ -54,7 +54,7 @@ PATCHFILES= openssl-0.9.6g-20020810-netbsd.patch.gz PKG_SYSCONFDIR.${PKGBASE}?= /etc/openssl . if !exists(/usr/libexec/ld.elf_so) && !exists(/usr/libexec/ld.so) -IGNORE= ${PKGNAME} requires shared object support +PKG_FAIL_REASON= ${PKGNAME} requires shared object support . endif # This hack goes away, once we formally de-support NetBSD-1.4.x. diff --git a/security/racoon/Makefile b/security/racoon/Makefile index f36e7106d7f..e4ece291a12 100644 --- a/security/racoon/Makefile +++ b/security/racoon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2002/11/20 03:33:49 itojun Exp $ +# $NetBSD: Makefile,v 1.56 2002/12/07 02:39:04 schmonz Exp $ # DISTNAME= racoon-20021120a @@ -13,7 +13,7 @@ CRYPTO= yes # this is not compatible with cross build - there's no other way .if !exists(/usr/include/netinet6/ipsec.h) -IGNORE+= "${PKGNAME} requires ipsec-ready NetBSD" +PKG_FAIL_REASON+= "${PKGNAME} requires ipsec-ready ${OPSYS}" .endif BUILD_DEFS+= USE_INET6 diff --git a/sysutils/fdgw/Makefile b/sysutils/fdgw/Makefile index d26937b5e8f..09e8a3bb413 100644 --- a/sysutils/fdgw/Makefile +++ b/sysutils/fdgw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2002/04/19 10:34:21 wennmach Exp $ +# $NetBSD: Makefile,v 1.7 2002/12/07 02:39:06 schmonz Exp $ # DISTNAME= fdgw-20020130 @@ -50,13 +50,13 @@ post-install: .include "../../mk/bsd.prefs.mk" .if !exists(${X11BASE}/bin/lndir) -IGNORE= "${PKGNAME} requires the 'lndir' command, and hence X11" +PKG_FAIL_REASON= "${PKGNAME} requires the 'lndir' command, and hence X11" .endif # we need the NetBSD source tree. BSDSRCDIR?= /usr/src .if !exists(${BSDSRCDIR}) -IGNORE= "${PKGNAME} requires the NetBSD source tree in BSDSRCDIR (${BSDSRCDIR})" +PKG_FAIL_REASON+= "${PKGNAME} requires the NetBSD source tree in BSDSRCDIR (${BSDSRCDIR})" .endif .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/top/Makefile b/sysutils/top/Makefile index 5f7c75f6711..4a37305b1f0 100644 --- a/sysutils/top/Makefile +++ b/sysutils/top/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2002/05/29 14:33:35 yyamano Exp $ +# $NetBSD: Makefile,v 1.25 2002/12/07 02:39:05 schmonz Exp $ # FreeBSD Id: Makefile,v 1.14 1997/04/30 23:49:14 asami Exp # @@ -26,7 +26,7 @@ MAKE_ENV+= CPPFLAGS= CONFIGURE_ARGS+= ${CONF} .if exists(/usr/bin/top) -IGNORE= "${PKGNAME} is part of your NetBSD distribution" +PKG_SKIP_REASON= "${PKGNAME} is part of your ${OPSYS} distribution" .endif MAKE_ENV+= INSTALL_MAN="${INSTALL_MAN}" \ diff --git a/sysutils/user/Makefile b/sysutils/user/Makefile index 345a589bf73..63b418741fa 100644 --- a/sysutils/user/Makefile +++ b/sysutils/user/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/02/17 17:42:21 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2002/12/07 02:39:05 schmonz Exp $ # # Note to package maintainers: @@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/user ONLY_FOR_PLATFORM= NetBSD-*-* # already in Solaris base system .if exists(/usr/sbin/user) -IGNORE= "${PKGNAME} is part of your NetBSD distribution" +PKG_SKIP_REASON= "${PKGNAME} is part of your ${OPSYS} distribution" .endif NO_CONFIGURE= yes diff --git a/textproc/rman/Makefile b/textproc/rman/Makefile index 0292391b74e..3419310b4b6 100644 --- a/textproc/rman/Makefile +++ b/textproc/rman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2001/05/03 13:53:10 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2002/12/07 02:39:06 schmonz Exp $ # FreeBSD Id: Makefile,v 1.17 1997/12/08 15:45:27 tg Exp # @@ -17,7 +17,7 @@ WRKSRC= ${WRKDIR}/${PKGNAME} .include "../../mk/bsd.prefs.mk" .if exists(${X11BASE}/bin/rman) -IGNORE= "Rosetta Man is included in your X distribution." +PKG_SKIP_REASON= "${PKGNAME} is part of your X11 distribution" .endif post-install: diff --git a/www/apache6/Makefile b/www/apache6/Makefile index 9822614ce1b..62263e750f3 100644 --- a/www/apache6/Makefile +++ b/www/apache6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.63 2002/11/19 09:35:27 martti Exp $ +# $NetBSD: Makefile,v 1.64 2002/12/07 02:39:06 schmonz Exp $ # # This package does not compile in mod_ssl support hooks, as it conflicts # with IPv6-enable patch. @@ -49,7 +49,7 @@ BUILD_DEFS+= USE_INET6 .include "../../mk/bsd.prefs.mk" .if !defined(USE_INET6) || ${USE_INET6} != YES -IGNORE= "IPv6 only build" +PKG_FAIL_REASON= "IPv6 only build" .endif .if empty(STRIPFLAG) diff --git a/www/navigator/Makefile.common b/www/navigator/Makefile.common index 42c3c1482aa..0695c6dbd10 100644 --- a/www/navigator/Makefile.common +++ b/www/navigator/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.56 2002/11/25 17:45:03 wiz Exp $ +# $NetBSD: Makefile.common,v 1.57 2002/12/07 02:39:07 schmonz Exp $ # # Common include file for communicator and navigator packages @@ -46,7 +46,7 @@ DEPENDS+= ns-flash>4.0:../../graphics/ns-flash # .elif (${MACHINE_ARCH} == "alpha") .if !exists(/emul/osf1/sbin/loader) -IGNORE= "${PKGNAME} requires Digital UNIX libraries - see compat_osf1(8)" +PKG_FAIL_REASON= "${PKGNAME} requires Digital UNIX libraries - see compat_osf1(8)" .endif NS_VERS= 4.78 PKGNAME= ${BINNAME}-${NS_VERS} @@ -79,7 +79,7 @@ DEPENDS+= ns-flash>4.0:../../graphics/ns-flash # .elif (((${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "sparc64")) && defined(NS_USE_SUNOS)) .if !exists(/emul/sunos/usr/lib/ld.so) -IGNORE= "${PKGNAME} requires SunOS libraries - see compat_sunos(8)" +PKG_FAIL_REASON= "${PKGNAME} requires SunOS libraries - see compat_sunos(8)" .endif NS_VERS= 4.61 PKGNAME= ${BINNAME}-${NS_VERS} @@ -95,7 +95,7 @@ MASTER_SITES= ftp://archive.netscape.com/archive/communicator/${SUB}/ .elif (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "sparc64") PLIST_ARCH= solaris-sparc .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 NS_VERS= 4.79 PKGNAME= ${BINNAME}-${NS_VERS} @@ -106,9 +106,9 @@ VENDOR_NAME= Solaris 2.5.1 # .elif (${MACHINE_ARCH} == "powerpc") .if (${BINNAME} == "navigator") -IGNORE= "There is no navigator-only package for PowerPC" -IGNORE+= "platform. Please cd to ../communicator and" -IGNORE+= "install communicator package instead." +PKG_FAIL_REASON= "There is no navigator-only package for PowerPC" +PKG_FAIL_REASON+= "platform. Please cd to ../communicator and" +PKG_FAIL_REASON+= "install communicator package instead." .endif DEPENDS+= suse_compat>=6.4:../../emulators/${SUSE_DIR_PREFIX}_compat DEPENDS+= suse_x11>=6.4:../../emulators/${SUSE_DIR_PREFIX}_x11 diff --git a/x11/XF86Setup/Makefile b/x11/XF86Setup/Makefile index a02d422ab6d..819ada3497f 100644 --- a/x11/XF86Setup/Makefile +++ b/x11/XF86Setup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2001/07/22 21:26:40 agc Exp $ +# $NetBSD: Makefile,v 1.23 2002/12/07 02:39:07 schmonz Exp $ DISTNAME= XF86Setup-3.3.6 CATEGORIES= x11 @@ -26,7 +26,7 @@ USE_IMAKE= yes X11_RELEASE!= ${MAKE} CHECK_X11=YES print-x11-release MAKEFLAGS+= X11_RELEASE="${X11_RELEASE}" .if (${X11_RELEASE} == "6.4") -IGNORE= "This package doesn't work with your X11 distribution." +PKG_FAIL_REASON= "This package doesn't work with your X11 distribution." .endif .endif diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile index 1abf956d1a3..13b0b1122ec 100644 --- a/x11/gdkxft/Makefile +++ b/x11/gdkxft/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2002/09/23 22:41:56 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2002/12/07 02:39:08 schmonz Exp $ # DISTNAME= gdkxft-1.5 @@ -13,7 +13,7 @@ COMMENT= transparently add anti-aliased font support to gtk+ applications .include "../../mk/bsd.prefs.mk" .if !exists(${X11BASE}/lib/libXft.a) -IGNORE= "${PKGNAME} requires XFree86-4.0 or higher" +PKG_FAIL_REASON= "${PKGNAME} requires XFree86-4.0 or higher" .endif USE_BUILDLINK2= YES diff --git a/x11/xservers/Makefile b/x11/xservers/Makefile index 5da6fd64c9f..2f337229695 100644 --- a/x11/xservers/Makefile +++ b/x11/xservers/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2002/07/17 18:29:09 wiz Exp $# +# $NetBSD: Makefile,v 1.11 2002/12/07 02:39:08 schmonz Exp $# DISTNAME= xservers-3.3.6.3 CATEGORIES= x11 @@ -19,7 +19,7 @@ USE_X11BASE= YES X11_RELEASE!= ${MAKE} CHECK_X11=YES print-x11-release MAKEFLAGS+= X11_RELEASE="${X11_RELEASE}" .if (${X11_RELEASE} == "6.3") -IGNORE= "The X11 servers are included in your X11 distribution." +PKG_SKIP_REASON= "${PKGNAME} is part of your X11 distribution" .endif .endif diff --git a/x11/xvattr/Makefile b/x11/xvattr/Makefile index 97f9bf68372..def8206de28 100644 --- a/x11/xvattr/Makefile +++ b/x11/xvattr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2002/09/23 23:15:14 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2002/12/07 02:39:08 schmonz Exp $ DISTNAME= xvattr-1.3 CATEGORIES= x11 @@ -15,7 +15,7 @@ GNU_CONFIGURE= # defined .include "../../mk/bsd.prefs.mk" .if !exists(${X11BASE}/include/X11/extensions/Xvlib.h) -IGNORE= "${PKGNAME} requires libXv.a." +PKG_FAIL_REASON= "${PKGNAME} requires libXv.a" .endif .include "../../x11/gtk/buildlink2.mk" -- cgit v1.2.3