diff options
| author | tron <tron> | 2010-08-25 09:06:10 +0000 |
|---|---|---|
| committer | tron <tron> | 2010-08-25 09:06:10 +0000 |
| commit | 71fa1ef66ae37a02b58bdfaa96610aba81880886 (patch) | |
| tree | 02a06a66e47a4486d9f7b5cc81f37b971fec5a7e | |
| parent | 652c3aa413122516418f7dac0b12d5cf521ffafb (diff) | |
| download | pkgsrc-71fa1ef66ae37a02b58bdfaa96610aba81880886.tar.gz | |
Pullup ticket #3213 - requested by obache
graphics/pear-Image_Color: build fix
Revisions pulled up:
- lang/php/pear.mk 1.19
---
Module Name: pkgsrc
Committed By: obache
Date: Wed Aug 25 06:37:20 UTC 2010
Modified Files:
pkgsrc/lang/php: pear.mk
Log Message:
Always install pear with `-n', or failed to install if extension is required
but not loaded in php.ini.
| -rw-r--r-- | lang/php/pear.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lang/php/pear.mk b/lang/php/pear.mk index 450d3191b14..ee49d8e1efd 100644 --- a/lang/php/pear.mk +++ b/lang/php/pear.mk @@ -1,4 +1,4 @@ -# $NetBSD: pear.mk,v 1.18 2010/03/16 15:34:01 taca Exp $ +# $NetBSD: pear.mk,v 1.18.4.1 2010/08/25 09:06:10 tron Exp $ # # This Makefile fragment is intended to be included by packages that build # and install pear packages. @@ -34,7 +34,7 @@ DEPENDS+= ${PHP_PKG_PREFIX}-pear-[0-9]*:../../lang/pear PEAR_CMD= ${PREFIX}/bin/pear PEAR_LIB= lib/php .if ${_USE_DESTDIR} != "no" -PEAR_DESTDIR= -P ${DESTDIR} -n -f +PEAR_DESTDIR= -P ${DESTDIR} -f .endif # Dynamic PLIST, generated via a helper PHP script, which parses the package @@ -53,7 +53,7 @@ post-extract: do-install: cd ${WRKSRC} && ${SETENV} TZ=UTC \ - ${PEAR_CMD} "install" ${PEAR_DESTDIR} package.xml || exit 1 + ${PEAR_CMD} "install" ${PEAR_DESTDIR} -n package.xml || exit 1 .if ${_USE_DESTDIR} != "no" CHECK_FILES_SKIP+= ${PREFIX}/lib/php/.channels/.alias/phpdocs.txt |