Date: Mon, 22 Nov 2004 09:15:27 -0200 From: =?ISO-8859-1?Q?Ant=F4nio_Carlos_Ven=E2ncio_J=FAnior?= <antonio@php.net> To: Thierry Thomas <thierry@FreeBSD.org> Cc: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/73995: Update port: devel/pear-PEAR to 1.3.3.1 Message-ID: <41A1CA4F.5080706@php.net> In-Reply-To: <200411192024.iAJKOWEm029191@freefall.freebsd.org> References: <200411192024.iAJKOWEm029191@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------000108090407020502070609 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Thierry, attached. Thierry Thomas wrote: > Could you please check it and re-send a complete diff -urN > including the shar file? > > > > Responsible-Changed-From-To: freebsd-ports-bugs->thierry > Responsible-Changed-By: thierry > Responsible-Changed-When: Fri Nov 19 20:19:53 GMT 2004 > Responsible-Changed-Why: > > Take it. > > > http://www.freebsd.org/cgi/query-pr.cgi?pr=73995 > -- Ate' Antonio echo antonio php net | sed 's/ /@/;s/ /./g' FreeBSD/OpenBSD | PHP/MySQL | PGP Key ID 0x5BBEB073 "Can't buy what I want because its FREE!" - Pearl Jam --------------000108090407020502070609 Content-Type: text/plain; name="Makefile.common.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="Makefile.common.diff" --- Makefile.common.old Tue Nov 16 09:36:49 2004 +++ Makefile.common Tue Nov 16 09:44:05 2004 @@ -7,6 +7,8 @@ EXTRACT_SUFX= .tgz DIST_SUBDIR= PEAR +USE_REINPLACE= yes + .if !defined(USE_PHPIZE) NO_BUILD= yes .endif @@ -210,6 +212,8 @@ . for file in ${SCRIPTFILES} @${CP} ${WRKSRC}/pear-${file} ${WRKSRC}/${file} @${REINPLACE_CMD} -e "s|@php_bin@|${SCRIPTFILESDIR}/php|g" ${WRKSRC}/${file} + @${REINPLACE_CMD} -e "s|@php_dir@|${PREFIX}/lib/php|g" ${WRKSRC}/${file} + @${REINPLACE_CMD} -e "s|@include_path@|${PREFIX}/${LPEARDIR}|g" ${WRKSRC}/${file} @${INSTALL_SCRIPT} ${WRKSRC}/${file} ${SCRIPTFILESDIR}/${file} . endfor . endif --------------000108090407020502070609 Content-Type: text/plain; name="Makefile.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="Makefile.diff" --- Makefile.old Mon Nov 22 08:33:24 2004 +++ Makefile Mon Nov 22 08:36:26 2004 @@ -6,7 +6,7 @@ # PORTNAME= PEAR -PORTVERSION= 1.3.3 +PORTVERSION= 1.3.3.1 CATEGORIES= devel www pear MAINTAINER= antonio@php.net @@ -25,8 +25,14 @@ PEAR/Autoloader.php PEAR/Command.php PEAR/Common.php PEAR/Config.php \ PEAR/Dependency.php PEAR/Downloader.php PEAR/Exception.php \ PEAR/ErrorStack.php PEAR/Builder.php PEAR/Installer.php \ - PEAR/Packager.php PEAR/Registry.php PEAR/Remote.php + PEAR/Packager.php PEAR/Registry.php PEAR/Remote.php PEAR/RunTest.php +SCRIPTFILES= pear2 .include <bsd.port.pre.mk> + +post-patch: + @${SED} "s|@pear_version@|${PORTVERSION}|g" \ + ${WRKSRC}/scripts/pearcmd.php > ${WRKSRC}/pear-${SCRIPTFILES} + .include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" .include <bsd.port.post.mk> --------------000108090407020502070609 Content-Type: text/plain; name="distinfo.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="distinfo.diff" --- distinfo.old Tue Nov 16 09:28:52 2004 +++ distinfo Tue Nov 16 09:29:51 2004 @@ -1,2 +1,2 @@ -MD5 (PEAR/PEAR-1.3.3.tgz) = da8794961ff5649734928a8816fb2c66 -SIZE (PEAR/PEAR-1.3.3.tgz) = 103320 +MD5 (PEAR/PEAR-1.3.3.1.tgz) = 02a82aebb5df17c0e5e8bc0e23013b54 +SIZE (PEAR/PEAR-1.3.3.1.tgz) = 106079 --------------000108090407020502070609 Content-Type: text/plain; name="pkg-deinstall.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="pkg-deinstall.diff" --- pkg-deinstall.old Mon Nov 22 08:37:36 2004 +++ pkg-deinstall Mon Nov 22 08:43:13 2004 @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: ports/devel/pear-PEAR/pkg-deinstall,v 1.1 2003/06/07 23:00:39 nork Exp $ +# $FreeBSD: /repoman/r/pcvs/ports/devel/pear-PEAR/pkg-deinstall,v 1.1 2003/06/07 23:00:39 nork Exp $ # # Remove package declaration from PEAR's registry. @@ -10,4 +10,13 @@ PKG_NAME=${1%%-[0-9._]*} PACKAGE=$(echo $PKG_NAME | sed 's/pear-//') -${PKG_PREFIX}/bin/pear uninstall -r -n ${PACKAGE} || true +PEAR=${PKG_PREFIX}/bin/pear +PEAR2=${PKG_PREFIX}/bin/pear2 + +if [ ${PKG_NAME} = "pear-PEAR" ]; then + PEAR_INSTALLER=${PEAR} +else + PEAR_INSTALLER=${PEAR2} +fi + +${PEAR_INSTALLER} uninstall -r -n ${PACKAGE} || true --------------000108090407020502070609 Content-Type: text/plain; name="pkg-install.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="pkg-install.diff" --- pkg-install.old Mon Nov 22 08:44:44 2004 +++ pkg-install Mon Nov 22 08:46:01 2004 @@ -6,9 +6,16 @@ PREFIX=${PKG_PREFIX:-/usr/local} PEAR=${PREFIX}/bin/pear +PEAR2=${PREFIX}/bin/pear2 PKGREGDIR=${PREFIX}/share/pear/packages/$1 +if [ -f "${PEAR2}" ]; then + PEAR_INSTALLER=${PEAR2} +else + PEAR_INSTALLER=${PEAR} +fi + [ "x$1" = "x" ] && exit 1 if [ "x$2" = "xPOST-INSTALL" ]; then - ${PEAR} install -r -f ${PKGREGDIR}/package.xml + ${PEAR_INSTALLER} install -r -f ${PKGREGDIR}/package.xml fi --------------000108090407020502070609 Content-Type: text/plain; name="devel.pear-PEAR.files.shar" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="devel.pear-PEAR.files.shar" # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # files # files/patch-scripts::pearcmd.php # echo c - files mkdir -p files > /dev/null 2>&1 echo x - files/patch-scripts::pearcmd.php sed 's/^X//' >files/patch-scripts::pearcmd.php << 'END-of-files/patch-scripts::pearcmd.php' X--- scripts/pearcmd.php.orig Thu Oct 28 14:37:56 2004 X+++ scripts/pearcmd.php Thu Nov 11 11:21:39 2004 X@@ -1,3 +1,4 @@ X+#!@php_bin@ -n -q -dsafe_mode=0 -doutput_buffering=1 X <?php X // X // +----------------------------------------------------------------------+ X@@ -24,8 +25,10 @@ X /** X * @nodep Gtk X */ X+dl('pcre.so'); X+dl('xml.so'); X if ('@include_path@' != '@'.'include_path'.'@') { X- ini_set('include_path', '@include_path@'); X+ ini_set('include_path', '@include_path@:@include_path@/bootstrap'); X } X ini_set('allow_url_fopen', true); X if (!ini_get('safe_mode')) { END-of-files/patch-scripts::pearcmd.php exit --------------000108090407020502070609--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?41A1CA4F.5080706>