[pkgsrc/trunk]: pkgsrc/lang/php5 * Remove duplicate definition of PHP_EXTENSI...

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f2620f8f6361
branches:  trunk
changeset: 603804:f2620f8f6361
user:      taca <taca%pkgsrc.org@localhost>
date:      Sun May 13 16:08:37 2012 +0000

description:
* Remove duplicate definition of PHP_EXTENSION_DIR from Makefile.php.
* Simplify comparsion of PHP_BASE_VERS and SUHOSIN_PHPVER.

diffstat:

 lang/php5/Makefile.php |  7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diffs (28 lines):

diff -r 2e457eb1883b -r f2620f8f6361 lang/php5/Makefile.php
--- a/lang/php5/Makefile.php    Sun May 13 15:59:33 2012 +0000
+++ b/lang/php5/Makefile.php    Sun May 13 16:08:37 2012 +0000
@@ -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 @@
 
 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 @@
 
 .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"