diff options
| author | taca <taca@pkgsrc.org> | 2013-08-14 14:53:03 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2013-08-14 14:53:03 +0000 |
| commit | 8d17a8d01431c30a19d9db8810f429715cffe4f6 (patch) | |
| tree | 50511461cff9d405b543dbdb2a8c0ea87a0abf46 /lang | |
| parent | 0de5cac010c5db07dfc9bb3fc5b73f43d8cfe9d3 (diff) | |
| download | pkgsrc-8d17a8d01431c30a19d9db8810f429715cffe4f6.tar.gz | |
Correct checking condition of PHP_CHECK_INSTALLED.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/php/phpversion.mk | 4 | ||||
| -rw-r--r-- | lang/php55/Makefile | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lang/php/phpversion.mk b/lang/php/phpversion.mk index 167b57317bc..a0373c109d3 100644 --- a/lang/php/phpversion.mk +++ b/lang/php/phpversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: phpversion.mk,v 1.38 2013/07/29 16:38:12 taca Exp $ +# $NetBSD: phpversion.mk,v 1.39 2013/08/14 14:53:03 taca 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 @@ -166,7 +166,7 @@ PKG_PHP_MAJOR_VERS:= 5 PHP_CHECK_INSTALLED?= Yes # if installed PHP isn't compatible with required PHP, bail out -.if !empty(PHP_CHECK_INSTALLED:M[nN][oO]) +.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" .endif diff --git a/lang/php55/Makefile b/lang/php55/Makefile index 240f3b8061f..4c7f6cd573d 100644 --- a/lang/php55/Makefile +++ b/lang/php55/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2013/08/13 10:22:26 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2013/08/14 14:53:03 taca Exp $ # # We can't omit PKGNAME here to handle PKG_OPTIONS. @@ -14,7 +14,7 @@ TEST_TARGET= test USE_TOOLS+= gmake lex pkg-config LIBTOOL_OVERRIDE= # empty -PHP_CHECK_INSTALLED= Yes +PHP_CHECK_INSTALLED= No PHP_VERSIONS_ACCEPTED= 55 |