Date: Tue, 19 Nov 2002 18:20:47 +1100 From: Edwin Groothuis <edwin@mavetju.org> To: Thierry Thomas <thierry@pompo.net> Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org, SADA Kenji <sada@FreeBSD.org> Subject: Re: cvs commit: ports/devel/pear Makefile Message-ID: <20021119072047.GB75727@k7.mavetju> In-Reply-To: <20021119064933.GA86662@graf.pompo.net> References: <200211190020.gAJ0KeUM032003@repoman.freebsd.org> <20021119064933.GA86662@graf.pompo.net>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Nov 19, 2002 at 07:49:33AM +0100, Thierry Thomas wrote:
> > edwin 2002/11/18 16:20:40 PST
> >
> > Modified files:
> > devel/pear Makefile
> > Log:
> > Fix run_depends to check for the right file.
> > Noticed on: bento
> >
> > Revision Changes Path
> > 1.7 +1 -1 ports/devel/pear/Makefile
>
> The following diff was submitted:
>
> --- Makefile.orig Sun Nov 17 06:03:52 2002
> +++ Makefile Tue Nov 19 07:43:48 2002
> @@ -15,7 +15,7 @@
> MAINTAINER= thierry@pompo.net
>
> BUILD_DEPENDS= ${LOCALBASE}/bin/php-config:${PORTSDIR}/www/mod_php4
> -RUN_DEPENDS= ${PEARDIR}/PEAR.php.dist:${PORTSDIR}/devel/pear-PEAR \
> +RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR \
> ${PEARDIR}/Console/Getopt.php.dist:${PORTSDIR}/devel/pear-Console_Getopt \
> ${PEARDIR}/File.php:${PORTSDIR}/sysutils/pear-File \
> ${PEARDIR}/Log.php:${PORTSDIR}/sysutils/pear-Log \
>
> but it sould not be: if you have installed mod_php4, you'll have a
> ${PEARDIR}/PEAR.php, but we actually want a ${PEARDIR}/PEAR.php.dist,
> and this one is installed (i.e. copyed) by devel/pear-install, and
> devel/pear-PEAR depends on devel/pear-install.
I see what you mean, but then there is something wrong in the
pkg-plist of the devel/pear-PEAR with the package.
Adding %%PEARDIR%%/PEAR.php.dist to the pkg-plist (which you don't
want because it has to take the one from a previous installed port
but have to do because it's this port which is creating this file)
so that pkg_create will add the file to its list of files and next
time installs it so that the port itself will not try to install
devel/pear-PEAR anymore.
See http://bento.freebsd.org/errorlogs/5-latest/pear-4.2.3.log
(hurry, it might be gone in a couple of hours) for why I changed
it.
Edwin
--
Edwin Groothuis | Personal website: http://www.MavEtJu.org
edwin@mavetju.org | Weblog: http://www.mavetju.org/weblog/weblog.php
bash$ :(){ :|:&};: | Interested in MUDs? http://www.FatalDimensions.org/
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20021119072047.GB75727>