Wed Aug 14 14:53:03 2013 UTC ()
Correct checking condition of PHP_CHECK_INSTALLED.


(taca)
diff -r1.38 -r1.39 pkgsrc/lang/php/phpversion.mk
diff -r1.2 -r1.3 pkgsrc/lang/php55/Makefile
cvs diff -r1.38 -r1.39 pkgsrc/lang/php/phpversion.mk (expand / switch to unified diff)

--- pkgsrc/lang/php/phpversion.mk 2013/07/29 16:38:12 1.38
+++ pkgsrc/lang/php/phpversion.mk 2013/08/14 14:53:03 1.39
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: phpversion.mk,v 1.38 2013/07/29 16:38:12 taca Exp $ 1# $NetBSD: phpversion.mk,v 1.39 2013/08/14 14:53:03 taca Exp $
2# 2#
3# This file selects a PHP version, based on the user's preferences and 3# This file selects a PHP version, based on the user's preferences and
4# the installed packages. It does not add a dependency on the PHP 4# the installed packages. It does not add a dependency on the PHP
5# package. 5# package.
6# 6#
7# === User-settable variables === 7# === User-settable variables ===
8# 8#
9# PHP_VERSION_DEFAULT 9# PHP_VERSION_DEFAULT
10# The PHP version to choose when more than one is acceptable to 10# The PHP version to choose when more than one is acceptable to
11# the package. 11# the package.
12# 12#
13# Possible: 53 54 55 13# Possible: 53 54 55
14# Default: 54 14# Default: 54
@@ -156,27 +156,27 @@ _PHP_VERSION= ${_PHP_VERSION_FIRSTACCEPT @@ -156,27 +156,27 @@ _PHP_VERSION= ${_PHP_VERSION_FIRSTACCEPT
156# Variable assignment for multi-PHP packages 156# Variable assignment for multi-PHP packages
157MULTI+= PHP_VERSION_REQD=${_PHP_VERSION} 157MULTI+= PHP_VERSION_REQD=${_PHP_VERSION}
158 158
159# export some of internal variables 159# export some of internal variables
160PKG_PHP_VERSION:= ${_PHP_VERSION:C/\.[0-9]//} 160PKG_PHP_VERSION:= ${_PHP_VERSION:C/\.[0-9]//}
161PKG_PHP:= PHP${_PHP_VERSION:C/([0-9])([0-9])/\1.\2/} 161PKG_PHP:= PHP${_PHP_VERSION:C/([0-9])([0-9])/\1.\2/}
162 162
163# currently we have only PHP 5.x packages. 163# currently we have only PHP 5.x packages.
164PKG_PHP_MAJOR_VERS:= 5 164PKG_PHP_MAJOR_VERS:= 5
165 165
166PHP_CHECK_INSTALLED?= Yes 166PHP_CHECK_INSTALLED?= Yes
167 167
168# if installed PHP isn't compatible with required PHP, bail out 168# if installed PHP isn't compatible with required PHP, bail out
169.if !empty(PHP_CHECK_INSTALLED:M[nN][oO]) 169.if empty(PHP_CHECK_INSTALLED:M[nN][oO])
170.if defined(_PHP_INSTALLED) && !defined(_PHP_VERSION_${_PHP_VERSION}_INSTALLED) 170.if defined(_PHP_INSTALLED) && !defined(_PHP_VERSION_${_PHP_VERSION}_INSTALLED)
171PKG_SKIP_REASON+= "Package accepts ${PKG_PHP}, but different version is installed" 171PKG_SKIP_REASON+= "Package accepts ${PKG_PHP}, but different version is installed"
172.endif 172.endif
173.endif 173.endif
174 174
175MESSAGE_SUBST+= PKG_PHP_VERSION=${PKG_PHP_VERSION} \ 175MESSAGE_SUBST+= PKG_PHP_VERSION=${PKG_PHP_VERSION} \
176 PKG_PHP=${PKG_PHP} 176 PKG_PHP=${PKG_PHP}
177PLIST_SUBST+= PKG_PHP_VERSION=${PKG_PHP_VERSION} \ 177PLIST_SUBST+= PKG_PHP_VERSION=${PKG_PHP_VERSION} \
178 PKG_PHP_MAJOR_VERS=${PKG_PHP_MAJOR_VERS} \ 178 PKG_PHP_MAJOR_VERS=${PKG_PHP_MAJOR_VERS} \
179 PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR} 179 PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
180 180
181# force the selected PHP version for recursive builds 181# force the selected PHP version for recursive builds
182PHP_VERSION_REQD:= ${PKG_PHP_VERSION} 182PHP_VERSION_REQD:= ${PKG_PHP_VERSION}
cvs diff -r1.2 -r1.3 pkgsrc/lang/php55/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/php55/Attic/Makefile 2013/08/13 10:22:26 1.2
+++ pkgsrc/lang/php55/Attic/Makefile 2013/08/14 14:53:03 1.3
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1# $NetBSD: Makefile,v 1.2 2013/08/13 10:22:26 joerg Exp $ 1# $NetBSD: Makefile,v 1.3 2013/08/14 14:53:03 taca Exp $
2 2
3# 3#
4# We can't omit PKGNAME here to handle PKG_OPTIONS. 4# We can't omit PKGNAME here to handle PKG_OPTIONS.
5# 5#
6PKGNAME= php-${PHP_BASE_VERS} 6PKGNAME= php-${PHP_BASE_VERS}
7CATEGORIES= lang 7CATEGORIES= lang
8 8
9HOMEPAGE= http://www.php.net/ 9HOMEPAGE= http://www.php.net/
10COMMENT= PHP Hypertext Preprocessor version 5.5 10COMMENT= PHP Hypertext Preprocessor version 5.5
11LICENSE= php 11LICENSE= php
12 12
13TEST_TARGET= test 13TEST_TARGET= test
14 14
15USE_TOOLS+= gmake lex pkg-config 15USE_TOOLS+= gmake lex pkg-config
16LIBTOOL_OVERRIDE= # empty 16LIBTOOL_OVERRIDE= # empty
17PHP_CHECK_INSTALLED= Yes 17PHP_CHECK_INSTALLED= No
18 18
19PHP_VERSIONS_ACCEPTED= 55 19PHP_VERSIONS_ACCEPTED= 55
20 20
21.include "Makefile.php" 21.include "Makefile.php"
22 22
23CGIDIR= ${PREFIX}/libexec/cgi-bin 23CGIDIR= ${PREFIX}/libexec/cgi-bin
24EGDIR= ${PREFIX}/share/examples/php 24EGDIR= ${PREFIX}/share/examples/php
25MESSAGE_SUBST+= CGIDIR=${CGIDIR} 25MESSAGE_SUBST+= CGIDIR=${CGIDIR}
26 26
27CONFIGURE_ENV+= lt_cv_path_SED=${SED:Q} 27CONFIGURE_ENV+= lt_cv_path_SED=${SED:Q}
28MAKE_ENV+= INSTALL_ROOT=${DESTDIR} 28MAKE_ENV+= INSTALL_ROOT=${DESTDIR}
29 29
30CONF_FILES= ${EGDIR}/php.ini-production ${PKG_SYSCONFDIR}/php.ini 30CONF_FILES= ${EGDIR}/php.ini-production ${PKG_SYSCONFDIR}/php.ini