diff options
| author | taca <taca@pkgsrc.org> | 2012-05-13 16:08:37 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2012-05-13 16:08:37 +0000 |
| commit | 666d02e1133ed0ccfa9ced849ce0a1b3e7a4f834 (patch) | |
| tree | 06fc243bc2a7be97a6e4ca5e425fd366cb7272c7 | |
| parent | 4a048b6437a908f2b698cac081872dacaad6a777 (diff) | |
| download | pkgsrc-666d02e1133ed0ccfa9ced849ce0a1b3e7a4f834.tar.gz | |
* Remove duplicate definition of PHP_EXTENSION_DIR from Makefile.php.
* Simplify comparsion of PHP_BASE_VERS and SUHOSIN_PHPVER.
| -rw-r--r-- | lang/php5/Makefile.php | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lang/php5/Makefile.php b/lang/php5/Makefile.php index 837dde5362a..bc0da60bfcb 100644 --- a/lang/php5/Makefile.php +++ b/lang/php5/Makefile.php @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.php,v 1.44 2011/02/21 16:21:17 taca Exp $ +# $NetBSD: Makefile.php,v 1.45 2012/05/13 16:08:37 taca Exp $ # .include "../../lang/php5/Makefile.common" @@ -14,9 +14,6 @@ PLIST_VARS+= suhosin CONFIGURE_ENV+= EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}" -PHP_EXTENSION_DIR= lib/php/20040412 -PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR:Q} - .include "../../mk/bsd.prefs.mk" CONFIGURE_ARGS+= --with-config-file-path=${PKG_SYSCONFDIR:Q} @@ -57,7 +54,7 @@ SUBST_MESSAGE.ini= Fixing default ini files. .if !empty(PKG_OPTIONS:Msuhosin) SUHOSIN_PHPVER= 5.2.16 -. if ${SUHOSIN_PHPVER} != ${PHP_BASE_VERS} && (${SUHOSIN_PHPVER} != "5.2.16" || ${PHP_BASE_VERS} != "5.2.17") +. if ${SUHOSIN_PHPVER} != ${PHP_BASE_VERS} && ${PHP_BASE_VERS} != "5.2.17" PKG_FAIL_REASON+= "The suhosin patch is currently not available for" PKG_FAIL_REASON+= "this version of PHP. You may have to wait until" PKG_FAIL_REASON+= "an updated patch is released or temporarily" |