diff options
| author | dholland <dholland> | 2015-01-01 11:51:41 +0000 |
|---|---|---|
| committer | dholland <dholland> | 2015-01-01 11:51:41 +0000 |
| commit | 92251e304b289a04c7ce501595d20b41ae0f242a (patch) | |
| tree | 45c18f7a45a693169a4a202a3e913befec521a2f /lang/php | |
| parent | ba9c7e48c86c629afcd27685b01e7cb87443fb3e (diff) | |
| download | pkgsrc-92251e304b289a04c7ce501595d20b41ae0f242a.tar.gz | |
Use PKG_FAIL_REASON for errors.
Diffstat (limited to 'lang/php')
| -rw-r--r-- | lang/php/phpversion.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lang/php/phpversion.mk b/lang/php/phpversion.mk index 728992de279..85439f96f19 100644 --- a/lang/php/phpversion.mk +++ b/lang/php/phpversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: phpversion.mk,v 1.81 2014/12/19 16:12:48 taca Exp $ +# $NetBSD: phpversion.mk,v 1.82 2015/01/01 11:51:41 dholland Exp $ # # This file selects a PHP version, based on the user's preferences and # the installed packages. It does not add a dependency on the PHP @@ -173,7 +173,7 @@ PHP_CHECK_INSTALLED?= Yes # if installed PHP isn't compatible with required PHP, bail out .if empty(PHP_CHECK_INSTALLED:M[nN][oO]) .if defined(_PHP_INSTALLED) && !defined(_PHP_VERSION_${_PHP_VERSION}_INSTALLED) -PKG_SKIP_REASON+= "Package accepts ${PKG_PHP}, but different version is installed" +PKG_FAIL_REASON+= "Package accepts ${PKG_PHP}, but different version is installed" .endif .endif @@ -211,7 +211,7 @@ PHP_PKG_PREFIX= php56 PHP_EXTENSION_DIR= lib/php/${PHP56_RELDATE} .else # force an error -PKG_SKIP_REASON+= "${PKG_PHP} is not a valid package" +PKG_FAIL_REASON+= "${PKG_PHP} is not a valid package" .endif # @@ -219,7 +219,7 @@ PKG_SKIP_REASON+= "${PKG_PHP} is not a valid package" # .if !empty(PHP_CHECK_INSTALLED:M[nN][oO]) .if defined(_PHP_VERSION_INSTALLED) && ${_PHP_VERSION} != ${_PHP_VERSION_INSTALLED} -PKG_SKIP_REASON+= "${PKGBASE} requires ${PKG_PHP}, but php-${_PHP_VERSION_INSTALLED} is already installed." +PKG_FAIL_REASON+= "${PKGBASE} requires ${PKG_PHP}, but php-${_PHP_VERSION_INSTALLED} is already installed." .endif .endif |