[pkgsrc/trunk]: pkgsrc/lang/php Including pear.mk will now pull in lang/pear ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/073cb4f9db88
branches:  trunk
changeset: 528495:073cb4f9db88
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Sat May 05 21:32:12 2007 +0000

description:
Including pear.mk will now pull in lang/pear as a dependency
Fix the PHP call to include the default include path for PEAR

diffstat:

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

diffs (28 lines):

diff -r 09d055384c9f -r 073cb4f9db88 lang/php/pear.mk
--- a/lang/php/pear.mk  Sat May 05 21:31:09 2007 +0000
+++ b/lang/php/pear.mk  Sat May 05 21:32:12 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: pear.mk,v 1.9 2006/06/02 18:27:56 joerg Exp $
+# $NetBSD: pear.mk,v 1.10 2007/05/05 21:32:12 adrianp Exp $
 #
 # This Makefile fragment is intended to be included by packages that build
 # and install pear packages.
@@ -29,6 +29,8 @@
 
 HOMEPAGE?=     http://pear.php.net/package/${DISTNAME:C/-.*//}
 
+DEPENDS+=      ${PHP_PKG_PREFIX}-pear-[0-9]*:../../lang/pear
+
 PEAR_CMD=      ${PREFIX}/bin/pear
 PEAR_LIB=      lib/php
 
@@ -41,7 +43,8 @@
        ${ECHO} "@comment The following lines are automatically generated"; \
        PEAR_LIB="${PEAR_LIB}" WRKSRC="${WRKSRC}" \
        PEAR_DIRRM_BASEDIR="${PEAR_DIRRM_BASEDIR}" \
-       ${PREFIX}/bin/php -C -n ${PKGDIR}/../../lang/php/pear_plist.php;
+       ${PREFIX}/bin/php -d include_path=".:${PREFIX}/lib/php" \
+               -C -n ${PKGDIR}/../../lang/php/pear_plist.php;
 GENERATE_PLIST+=       ${PEAR_GENERATE_PLIST}
 
 NO_BUILD=      yes