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.

5 files changed, 14 insertions, 14 deletions

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})
diff --git a/mk/emulator/emulator.mk b/mk/emulator/emulator.mk
index 588d1ca65e2..953b7a0c222 100644
--- a/mk/emulator/emulator.mk
+++ b/mk/emulator/emulator.mk
@@ -1,4 +1,4 @@
-# $NetBSD: emulator.mk,v 1.11 2009/04/04 12:16:45 rillig Exp $
+# $NetBSD: emulator.mk,v 1.12 2015/01/01 07:51:47 dholland Exp $
 #
 # This file is included by bsd.pkg.mk.
 #
@@ -59,7 +59,7 @@
 #
 
 .if empty(EMUL_PLATFORMS:M${EMUL_PLATFORM})
-PKG_FAIL_REASON+=	"${PKGNAME} is not available for ${MACHINE_PLATFORM}"
+PKG_SKIP_REASON+=	"${PKGNAME} requires emulation that is not available for ${MACHINE_PLATFORM}"
 .endif
 
 .if ${EMUL_PLATFORM} == "none"
diff --git a/mk/features/features.mk b/mk/features/features.mk
index f6ebf70b7f2..7822d793e51 100644
--- a/mk/features/features.mk
+++ b/mk/features/features.mk
@@ -1,4 +1,4 @@
-# $NetBSD: features.mk,v 1.7 2012/03/02 16:19:17 hans Exp $
+# $NetBSD: features.mk,v 1.8 2015/01/01 07:51:47 dholland Exp $
 #
 # This file is included by bsd.pkg.mk.
 #
@@ -21,7 +21,7 @@
 #
 .  if !empty(USE_FEATURES:Minet6)
 .    if !empty(MISSING_FEATURES:Minet6)
-PKG_FAIL_REASON+=	"${PKGNAME} requires IPv6 support"
+PKG_SKIP_REASON+=	"${PKGNAME} requires IPv6 support"
 .    endif
 .  endif
 
diff --git a/mk/mysql.buildlink3.mk b/mk/mysql.buildlink3.mk
index 7480eae884a..8c3aa86d9f6 100644
--- a/mk/mysql.buildlink3.mk
+++ b/mk/mysql.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mysql.buildlink3.mk,v 1.18 2013/09/13 11:53:24 obache Exp $
+# $NetBSD: mysql.buildlink3.mk,v 1.19 2015/01/01 07:51:47 dholland Exp $
 #
 # This file is included by packages that require some version of the
 # MySQL database client.
@@ -123,7 +123,7 @@ PKG_FAIL_REASON+=	"[mysql.buildlink3.mk] ${_MYSQL_VERSION} is not a valid mysql
 #
 .if defined(_MYSQL_VERSION_INSTALLED)
 .  if ${_MYSQL_VERSION} != ${_MYSQL_VERSION_INSTALLED}
-PKG_SKIP_REASON+=	"${PKGBASE} requires mysql-${_MYSQL_VERSION}, but mysql-${_MYSQL_VERSION_INSTALLED} is already installed."
+PKG_FAIL_REASON+=	"${PKGBASE} requires mysql-${_MYSQL_VERSION}, but mysql-${_MYSQL_VERSION_INSTALLED} is already installed."
 .  endif
 .endif
 
diff --git a/mk/pthread.buildlink3.mk b/mk/pthread.buildlink3.mk
index 2a95e918ffb..30b5d90ea5b 100644
--- a/mk/pthread.buildlink3.mk
+++ b/mk/pthread.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pthread.buildlink3.mk,v 1.30 2013/11/01 12:19:29 jperkin Exp $
+# $NetBSD: pthread.buildlink3.mk,v 1.31 2015/01/01 07:51:47 dholland Exp $
 #
 # The pthreads strategy for pkgsrc is to "bless" a particular pthread
 # package as the Official Pthread Replacement (OPR).  The following
@@ -100,7 +100,7 @@ PTHREAD_TYPE=	native
 .  if !empty(PTHREAD_OPTS:Mnative)
 PTHREAD_TYPE=	none
 .    if !empty(PTHREAD_OPTS:Mrequire) && empty(PTHREAD_OPTS:Moptional)
-PKG_FAIL_REASON= "${PKGNAME} requires a native pthreads implementation."
+PKG_SKIP_REASON= "${PKGNAME} requires a native pthreads implementation."
 .    endif
 .  else
 PTHREAD_TYPE=	none
@@ -111,7 +111,7 @@ PTHREAD_TYPE=	${_PKG_PTHREAD}
 .    endfor
 .    if ${PTHREAD_TYPE} == "none" && \
 	!empty(PTHREAD_OPTS:Mrequire) && empty(PTHREAD_OPTS:Moptional)
-PKG_FAIL_REASON= "${PKGNAME} requires a working pthreads implementation."
+PKG_SKIP_REASON= "${PKGNAME} requires a working pthreads implementation."
 .    endif
 .  endif
 .endif