From owner-cvs-all Mon Nov 18 23:20:59 2002 Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DE9DB37B401; Mon, 18 Nov 2002 23:20:57 -0800 (PST) Received: from topaz.mdcc.cx (topaz.mdcc.cx [212.204.230.141]) by mx1.FreeBSD.org (Postfix) with ESMTP id E5B5643E75; Mon, 18 Nov 2002 23:20:56 -0800 (PST) (envelope-from edwin@mavetju.org) Received: from k7.mavetju (topaz.mdcc.cx [212.204.230.141]) by topaz.mdcc.cx (Postfix) with ESMTP id 01CAE2B680; Tue, 19 Nov 2002 08:20:53 +0100 (CET) Received: by k7.mavetju (Postfix, from userid 1001) id 3499C6A7133; Tue, 19 Nov 2002 18:20:48 +1100 (EST) Date: Tue, 19 Nov 2002 18:20:47 +1100 From: Edwin Groothuis To: Thierry Thomas Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org, SADA Kenji Subject: Re: cvs commit: ports/devel/pear Makefile Message-ID: <20021119072047.GB75727@k7.mavetju> References: <200211190020.gAJ0KeUM032003@repoman.freebsd.org> <20021119064933.GA86662@graf.pompo.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20021119064933.GA86662@graf.pompo.net> User-Agent: Mutt/1.4i Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG 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