From 83bc9a98f1994c0b10f910aea5be13a51e74af13 Mon Sep 17 00:00:00 2001 From: dholland Date: Thu, 1 Jan 2015 07:51:47 +0000 Subject: Use PKG_SKIP_REASON instead of PKG_FAIL_REASON for some cases where the problem is either situational (e.g. the various RESTRICTED-like cases) or unfixable in pkgsrc (no pthreads, ipv6, etc. on platform). Conversely, if the wrong version of mysql is installed, that's a PKG_FAIL_REASON. --- mk/bsd.pkg.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'mk/bsd.pkg.mk') diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 7a6038d4447..5603a63d66e 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.2008 2015/01/01 06:06:06 dholland Exp $ +# $NetBSD: bsd.pkg.mk,v 1.2009 2015/01/01 07:51:47 dholland Exp $ # # This file is in the public domain. # @@ -463,20 +463,20 @@ X11BASE:= /usr .if !defined(NO_SKIP) . if (defined(NO_BIN_ON_CDROM) && defined(FOR_CDROM)) -PKG_FAIL_REASON+= "${PKGNAME} may not be placed in binary form on a CDROM:" \ +PKG_SKIP_REASON+= "${PKGNAME} may not be placed in binary form on a CDROM:" \ " "${NO_BIN_ON_CDROM:Q} . endif . if (defined(NO_SRC_ON_CDROM) && defined(FOR_CDROM)) -PKG_FAIL_REASON+= "${PKGNAME} may not be placed in source form on a CDROM:" \ +PKG_SKIP_REASON+= "${PKGNAME} may not be placed in source form on a CDROM:" \ " "${NO_SRC_ON_CDROM:Q} . endif . if (defined(RESTRICTED) && defined(NO_RESTRICTED)) -PKG_FAIL_REASON+= "${PKGNAME} is restricted:" \ +PKG_SKIP_REASON+= "${PKGNAME} is restricted:" \ " "${RESTRICTED:Q} . endif . if !(${MKCRYPTO} == "YES" || ${MKCRYPTO} == yes) . if defined(CRYPTO) -PKG_FAIL_REASON+= "${PKGNAME} may not be built, because it utilizes strong cryptography" +PKG_SKIP_REASON+= "${PKGNAME} may not be built, because it utilizes strong cryptography" . endif . endif . if defined(USE_X11) && (${X11_TYPE} == "native") && !exists(${X11BASE}) -- cgit v1.2.3