diff options
| -rw-r--r-- | mk/bsd.pkg.use.mk | 4 | ||||
| -rw-r--r-- | mk/compiler/gcc.mk | 4 | ||||
| -rw-r--r-- | mk/dlopen.buildlink3.mk | 4 | ||||
| -rw-r--r-- | mk/java-vm.mk | 4 | ||||
| -rw-r--r-- | mk/pgsql.buildlink3.mk | 4 | ||||
| -rw-r--r-- | mk/pthread.buildlink3.mk | 8 |
6 files changed, 14 insertions, 14 deletions
diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk index 3fd91c96d12..b260463b006 100644 --- a/mk/bsd.pkg.use.mk +++ b/mk/bsd.pkg.use.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.use.mk,v 1.40 2007/01/22 20:47:06 rillig Exp $ +# $NetBSD: bsd.pkg.use.mk,v 1.41 2007/02/10 08:59:07 rillig Exp $ # # Turn USE_* macros into proper depedency logic. Included near the top of # bsd.pkg.mk, after bsd.prefs.mk. @@ -63,7 +63,7 @@ PREFIX= ${LOCALBASE} .endif .if (${PKG_INSTALLATION_TYPE} == "pkgviews") && defined(INSTALLATION_PREFIX) -PKG_SKIP_REASON= "INSTALLATION_PREFIX can't be used in a pkgviews package" +PKG_FAIL_REASON= "INSTALLATION_PREFIX can't be used in a pkgviews package" .endif ############################################################################ diff --git a/mk/compiler/gcc.mk b/mk/compiler/gcc.mk index 0d7c8752010..6f3ef9e3b24 100644 --- a/mk/compiler/gcc.mk +++ b/mk/compiler/gcc.mk @@ -1,4 +1,4 @@ -# $NetBSD: gcc.mk,v 1.89 2007/01/08 19:29:45 gavan Exp $ +# $NetBSD: gcc.mk,v 1.90 2007/02/10 08:59:07 rillig Exp $ # # This is the compiler definition for the GNU Compiler Collection. # @@ -274,7 +274,7 @@ _NEED_NEWER_GCC!= \ .endif .if !empty(_USE_PKGSRC_GCC:M[yY][eE][sS]) && \ !empty(_NEED_NEWER_GCC:M[yY][eE][sS]) -PKG_SKIP_REASON= "Unable to satisfy dependency: ${_GCC_DEPENDS}" +PKG_FAIL_REASON= "Unable to satisfy dependency: ${_GCC_DEPENDS}" .endif # GNU ld option used to set the rpath diff --git a/mk/dlopen.buildlink3.mk b/mk/dlopen.buildlink3.mk index 4f9f3ce581c..dad2fcf5600 100644 --- a/mk/dlopen.buildlink3.mk +++ b/mk/dlopen.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: dlopen.buildlink3.mk,v 1.12 2006/07/08 23:11:17 jlam Exp $ +# $NetBSD: dlopen.buildlink3.mk,v 1.13 2007/02/10 08:59:07 rillig Exp $ # # This Makefile fragment is included by package Makefiles and # buildlink3.mk files for the packages that use dlopen(). @@ -25,7 +25,7 @@ BUILDLINK_AUTO_VARS.dl= ${DL_AUTO_VARS} . include "../../devel/dlcompat/buildlink3.mk" BUILDLINK_AUTO_VARS.dlcompat= ${DL_AUTO_VARS} .else -PKG_SKIP_REASON= "${PKGNAME} requires a working dlopen()." +PKG_FAIL_REASON= "${PKGNAME} requires a working dlopen()." .endif .if !empty(DLOPEN_BUILDLINK3_MK:M+) diff --git a/mk/java-vm.mk b/mk/java-vm.mk index 4952ba95a92..e9705165b7f 100644 --- a/mk/java-vm.mk +++ b/mk/java-vm.mk @@ -1,4 +1,4 @@ -# $NetBSD: java-vm.mk,v 1.52 2007/01/30 17:47:39 joerg Exp $ +# $NetBSD: java-vm.mk,v 1.53 2007/02/10 08:59:07 rillig Exp $ # # This Makefile fragment handles Java dependencies and make variables, # and is meant to be included by packages that require Java either at @@ -212,7 +212,7 @@ _PKG_JVM= ${_PKG_JVM_FIRSTACCEPTED} # .if !defined(_PKG_JVM) # force an error -PKG_SKIP_REASON= "no acceptable JVM found" +PKG_FAIL_REASON= "no acceptable JVM found" _PKG_JVM= "none" .endif diff --git a/mk/pgsql.buildlink3.mk b/mk/pgsql.buildlink3.mk index f462bbb84d0..0e169550e33 100644 --- a/mk/pgsql.buildlink3.mk +++ b/mk/pgsql.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: pgsql.buildlink3.mk,v 1.21 2006/12/28 12:12:57 joerg Exp $ +# $NetBSD: pgsql.buildlink3.mk,v 1.22 2007/02/10 08:59:07 rillig Exp $ # # User-settable variables: # @@ -118,7 +118,7 @@ PGPKGSRCDIR= ../../databases/postgresql80-client .else # force an error PGSQL_TYPE= none -PKG_SKIP_REASON+= "${_PGSQL_VERSION} is not a valid package" +PKG_FAIL_REASON+= "${_PGSQL_VERSION} is not a valid package" .endif .include "${PGPKGSRCDIR}/buildlink3.mk" diff --git a/mk/pthread.buildlink3.mk b/mk/pthread.buildlink3.mk index a7b53cc4de9..25c99aefbd2 100644 --- a/mk/pthread.buildlink3.mk +++ b/mk/pthread.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: pthread.buildlink3.mk,v 1.24 2006/07/08 23:11:17 jlam Exp $ +# $NetBSD: pthread.buildlink3.mk,v 1.25 2007/02/10 08:59:07 rillig Exp $ # # The pthreads strategy for pkgsrc is to "bless" a particular pthread # package as the Official Pthread Replacement (OPR). The following @@ -90,7 +90,7 @@ PTHREAD_TYPE= native . if !empty(PTHREAD_OPTS:Mnative) PTHREAD_TYPE= none . if !empty(PTHREAD_OPTS:Mrequire) && empty(PTHREAD_OPTS:Moptional) -PKG_SKIP_REASON= "${PKGNAME} requires a native pthreads implementation." +PKG_FAIL_REASON= "${PKGNAME} requires a native pthreads implementation." . endif . else PTHREAD_TYPE= none @@ -101,7 +101,7 @@ PTHREAD_TYPE= ${_PKG_PTHREAD} . endfor . if ${PTHREAD_TYPE} == "none" && \ !empty(PTHREAD_OPTS:Mrequire) && empty(PTHREAD_OPTS:Moptional) -PKG_SKIP_REASON= "${PKGNAME} requires a working pthreads implementation." +PKG_FAIL_REASON= "${PKGNAME} requires a working pthreads implementation." . endif . endif .endif @@ -130,7 +130,7 @@ BUILDLINK_LIBS.pthread= ${BUILDLINK_LIBS.${_PKG_PTHREAD}} BUILDLINK_AUTO_VARS.${_PKG_PTHREAD}?= ${PTHREAD_AUTO_VARS} BUILDLINK_AUTO_VARS.pthread= ${BUILDLINK_AUTO_VARS.${_PKG_PTHREAD}} . else -PKG_SKIP_REASON= ${PKGNAME:Q}" needs pthreads, but "${_PKG_PTHREAD_BUILDLINK3_MK:Q}" is missing." +PKG_FAIL_REASON= ${PKGNAME:Q}" needs pthreads, but "${_PKG_PTHREAD_BUILDLINK3_MK:Q}" is missing." . endif .endif |