Wed Aug 25 06:37:20 2010 UTC ()
Always install pear with `-n', or failed to install if extension is required
but not loaded in php.ini.


(obache)
diff -r1.18 -r1.19 pkgsrc/lang/php/pear.mk
cvs diff -r1.18 -r1.19 pkgsrc/lang/php/pear.mk (expand / switch to unified diff)

--- pkgsrc/lang/php/pear.mk 2010/03/16 15:34:01 1.18
+++ pkgsrc/lang/php/pear.mk 2010/08/25 06:37:20 1.19
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: pear.mk,v 1.18 2010/03/16 15:34:01 taca Exp $ 1# $NetBSD: pear.mk,v 1.19 2010/08/25 06:37:20 obache Exp $
2# 2#
3# This Makefile fragment is intended to be included by packages that build 3# This Makefile fragment is intended to be included by packages that build
4# and install pear packages. 4# and install pear packages.
5# 5#
6# If you don't know what pear is, you can visit: http://pear.php.net/ 6# If you don't know what pear is, you can visit: http://pear.php.net/
7# 7#
8# PEAR_CMD this is the actual script to execute to install the 8# PEAR_CMD this is the actual script to execute to install the
9# package. 9# package.
10# 10#
11# PEAR_LIB directory under ${PREFIX} where Pear modules are installed 11# PEAR_LIB directory under ${PREFIX} where Pear modules are installed
12# 12#
13 13
14.if !defined(_PEAR_PACKAGE_MK) 14.if !defined(_PEAR_PACKAGE_MK)
@@ -24,46 +24,46 @@ CATEGORIES+= www @@ -24,46 +24,46 @@ CATEGORIES+= www
24MASTER_SITE_PEAR_PACKAGE+= \ 24MASTER_SITE_PEAR_PACKAGE+= \
25 http://pear.php.net/get/ 25 http://pear.php.net/get/
26MASTER_SITES+= ${MASTER_SITE_PEAR_PACKAGE} 26MASTER_SITES+= ${MASTER_SITE_PEAR_PACKAGE}
27 27
28DIST_SUBDIR= pear 28DIST_SUBDIR= pear
29 29
30HOMEPAGE?= http://pear.php.net/package/${DISTNAME:C/-.*//} 30HOMEPAGE?= http://pear.php.net/package/${DISTNAME:C/-.*//}
31 31
32DEPENDS+= ${PHP_PKG_PREFIX}-pear-[0-9]*:../../lang/pear 32DEPENDS+= ${PHP_PKG_PREFIX}-pear-[0-9]*:../../lang/pear
33 33
34PEAR_CMD= ${PREFIX}/bin/pear 34PEAR_CMD= ${PREFIX}/bin/pear
35PEAR_LIB= lib/php 35PEAR_LIB= lib/php
36.if ${_USE_DESTDIR} != "no" 36.if ${_USE_DESTDIR} != "no"
37PEAR_DESTDIR= -P ${DESTDIR} -n -f 37PEAR_DESTDIR= -P ${DESTDIR} -f
38.endif 38.endif
39 39
40# Dynamic PLIST, generated via a helper PHP script, which parses the package 40# Dynamic PLIST, generated via a helper PHP script, which parses the package
41# XML config file. 41# XML config file.
42PEAR_GENERATE_PLIST= \ 42PEAR_GENERATE_PLIST= \
43 ${ECHO} "@comment The following lines are automatically generated"; \ 43 ${ECHO} "@comment The following lines are automatically generated"; \
44 PEAR_LIB="${PEAR_LIB}" WRKSRC="${WRKSRC}" \ 44 PEAR_LIB="${PEAR_LIB}" WRKSRC="${WRKSRC}" \
45 ${PREFIX}/bin/php -d include_path=".:${PREFIX}/lib/php" \ 45 ${PREFIX}/bin/php -d include_path=".:${PREFIX}/lib/php" \
46 -C -n ${PKGDIR}/../../lang/php/pear_plist.php; 46 -C -n ${PKGDIR}/../../lang/php/pear_plist.php;
47GENERATE_PLIST+= ${PEAR_GENERATE_PLIST} 47GENERATE_PLIST+= ${PEAR_GENERATE_PLIST}
48 48
49NO_BUILD= yes 49NO_BUILD= yes
50 50
51post-extract: 51post-extract:
52 @cd ${WRKSRC} && ${LN} -s ${WRKDIR}/package.xml package.xml 52 @cd ${WRKSRC} && ${LN} -s ${WRKDIR}/package.xml package.xml
53 53
54do-install: 54do-install:
55 cd ${WRKSRC} && ${SETENV} TZ=UTC \ 55 cd ${WRKSRC} && ${SETENV} TZ=UTC \
56 ${PEAR_CMD} "install" ${PEAR_DESTDIR} package.xml || exit 1 56 ${PEAR_CMD} "install" ${PEAR_DESTDIR} -n package.xml || exit 1
57 57
58.if ${_USE_DESTDIR} != "no" 58.if ${_USE_DESTDIR} != "no"
59CHECK_FILES_SKIP+= ${PREFIX}/lib/php/.channels/.alias/phpdocs.txt 59CHECK_FILES_SKIP+= ${PREFIX}/lib/php/.channels/.alias/phpdocs.txt
60CHECK_FILES_SKIP+= ${PREFIX}/lib/php/.channels/.alias/pear.txt 60CHECK_FILES_SKIP+= ${PREFIX}/lib/php/.channels/.alias/pear.txt
61CHECK_FILES_SKIP+= ${PREFIX}/lib/php/.channels/.alias/pecl.txt 61CHECK_FILES_SKIP+= ${PREFIX}/lib/php/.channels/.alias/pecl.txt
62CHECK_FILES_SKIP+= ${PREFIX}/lib/php/.channels/__uri.reg 62CHECK_FILES_SKIP+= ${PREFIX}/lib/php/.channels/__uri.reg
63CHECK_FILES_SKIP+= ${PREFIX}/lib/php/.channels/doc.php.net.reg 63CHECK_FILES_SKIP+= ${PREFIX}/lib/php/.channels/doc.php.net.reg
64CHECK_FILES_SKIP+= ${PREFIX}/lib/php/.channels/pear.php.net.reg 64CHECK_FILES_SKIP+= ${PREFIX}/lib/php/.channels/pear.php.net.reg
65CHECK_FILES_SKIP+= ${PREFIX}/lib/php/.channels/pecl.php.net.reg 65CHECK_FILES_SKIP+= ${PREFIX}/lib/php/.channels/pecl.php.net.reg
66CHECK_FILES_SKIP+= ${PREFIX}/lib/php/.depdb 66CHECK_FILES_SKIP+= ${PREFIX}/lib/php/.depdb
67CHECK_FILES_SKIP+= ${PREFIX}/lib/php/.depdblock 67CHECK_FILES_SKIP+= ${PREFIX}/lib/php/.depdblock
68CHECK_FILES_SKIP+= ${PREFIX}/lib/php/.filemap 68CHECK_FILES_SKIP+= ${PREFIX}/lib/php/.filemap
69CHECK_FILES_SKIP+= ${PREFIX}/lib/php/.lock 69CHECK_FILES_SKIP+= ${PREFIX}/lib/php/.lock