[pkgsrc/trunk]: pkgsrc/lang/php5 Fix PEAR installs where PKG_SYSCONFDIR is no...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bdf8bfa6aaad
branches:  trunk
changeset: 544069:bdf8bfa6aaad
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Tue Jul 08 20:28:55 2008 +0000

description:
Fix PEAR installs where PKG_SYSCONFDIR is not the default.
Fixes PR 39081
PKGREVISION++

diffstat:

 lang/php5/Makefile        |  4 ++--
 lang/php5/Makefile.common |  3 ++-
 lang/php5/Makefile.php    |  5 ++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diffs (50 lines):

diff -r caebd612e2e9 -r bdf8bfa6aaad lang/php5/Makefile
--- a/lang/php5/Makefile        Tue Jul 08 15:44:36 2008 +0000
+++ b/lang/php5/Makefile        Tue Jul 08 20:28:55 2008 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.64 2008/05/04 16:50:44 adrianp Exp $
+# $NetBSD: Makefile,v 1.65 2008/07/08 20:28:55 adrianp Exp $
 
 PKGNAME=               php-${PHP_BASE_VERS}
 CATEGORIES=            lang
-
+PKGREVISION=           1
 HOMEPAGE=              http://www.php.net/
 COMMENT=               PHP Hypertext Preprocessor version 5
 
diff -r caebd612e2e9 -r bdf8bfa6aaad lang/php5/Makefile.common
--- a/lang/php5/Makefile.common Tue Jul 08 15:44:36 2008 +0000
+++ b/lang/php5/Makefile.common Tue Jul 08 20:28:55 2008 +0000
@@ -1,4 +1,5 @@
-# $NetBSD: Makefile.common,v 1.29 2008/05/04 16:50:44 adrianp Exp $
+# $NetBSD: Makefile.common,v 1.30 2008/07/08 20:28:55 adrianp Exp $
+# used by lang/php5/Makefile.php
 
 .if !defined(DISTNAME)
 DISTNAME=              php-${PHP_BASE_VERS}
diff -r caebd612e2e9 -r bdf8bfa6aaad lang/php5/Makefile.php
--- a/lang/php5/Makefile.php    Tue Jul 08 15:44:36 2008 +0000
+++ b/lang/php5/Makefile.php    Tue Jul 08 20:28:55 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.26 2007/09/07 22:12:13 jlam Exp $
+# $NetBSD: Makefile.php,v 1.27 2008/07/08 20:28:55 adrianp Exp $
 #
 
 .include "../../lang/php5/Makefile.common"
@@ -9,6 +9,7 @@
 USE_LIBTOOL=           YES
 USE_LANGUAGES=         c c++
 GNU_CONFIGURE=         YES
+BUILD_DEFS+=           VARBASE
 
 CONFIGURE_ENV+=                EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}"
 
@@ -18,6 +19,8 @@
 .include "../../mk/bsd.prefs.mk"
 
 CONFIGURE_ARGS+=       --with-config-file-path=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
 
 CONFIGURE_ARGS+=       --with-regex=system