pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/php5 patch pear to use -n post-install - it canno...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6f58b489ea24
branches:  trunk
changeset: 504119:6f58b489ea24
user:      jdolecek <jdolecek%pkgsrc.org@localhost>
date:      Sun Dec 04 21:28:07 2005 +0000

description:
patch pear to use -n post-install - it cannot be done using normal
patch framework, the file is part of binary .phar archive and is
created during installation

this has been submitted as PHP bug #35544, so this may be adressed
upstream hopefully

diffstat:

 lang/php5/Makefile |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r 25b2b44ec843 -r 6f58b489ea24 lang/php5/Makefile
--- a/lang/php5/Makefile        Sun Dec 04 20:09:44 2005 +0000
+++ b/lang/php5/Makefile        Sun Dec 04 21:28:07 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2005/12/03 18:53:57 jdolecek Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/04 21:28:07 jdolecek Exp $
 #
 
 PKGNAME=               php-${PHP_BASE_VERS}
-PKGREVISION=           # empty
+PKGREVISION=           1
 CATEGORIES=            lang
 
 HOMEPAGE=              http://www.php.net/
@@ -33,7 +33,11 @@
 CONF_FILES=            ${EGDIR}/php.ini-recommended ${PKG_SYSCONFDIR}/php.ini
 OWN_DIRS=              ${PREFIX}/${PHP_EXTENSION_DIR}
 
+# pear must be patched using post-install, it's extracted from binary .phar
+# file during installation; this replaces former patches/patch-al
 post-install:
+       ${SED} -e 's,\(-d output_buffering=1\) \(\$$INCDIR/pearcmd.php\),\1 -n \2,' ${PREFIX}/bin/pear > ${PREFIX}/bin/pear.new && \
+               ${MV} ${PREFIX}/bin/pear.new ${PREFIX}/bin/pear
        ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${PREFIX}/bin/php
        ${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 ${PREFIX}/man/man1/php.1
        ${INSTALL_DATA_DIR} ${CGIDIR}



Home | Main Index | Thread Index | Old Index