Re: cvs: php4 /pear Makefile.frag

Hi, don't know if HEAD should be fixed now, but I get /home/mfischer/isrc/cvs/php4/build/shtool install -c -m 0755 sapi/cli/php /home/mfischer/php/cvs/bin/php make[1]: Entering directory `/home/mfischer/isrc/cvs/php4' Archive_Tar 0.3: install ok Console_Getopt 0.9: install ok PEAR 0.10-dev: PEAR 0.10-dev: Relation 'has' with requirement '' is not supported PEAR 0.10-dev: Relation 'has' with requirement '' is not supported PEAR 0.10-dev: Dependencies failed make[1]: Leaving directory `/home/mfischer/isrc/cvs/php4' make[1]: Entering directory `/home/mfischer/isrc/cvs/php4' /bin/sh: /home/mfischer/php/cvs/bin/pear: No such file or directory DB 1.2: /bin/sh: /home/mfischer/php/cvs/bin/pear: No such file or directory /bin/sh: /home/mfischer/php/cvs/bin/pear: No such file or directory XML_Parser 1.0: /bin/sh: /home/mfischer/php/cvs/bin/pear: No such file or directory /bin/sh: /home/mfischer/php/cvs/bin/pear: No such file or directory XML_RPC 1.0.2: /bin/sh: /home/mfischer/php/cvs/bin/pear: No such file or directory make[1]: Leaving directory `/home/mfischer/isrc/cvs/php4' Installing build environment Installing header files Installing program: phpize Installing program: php-config Installing program: pear Installing program: pearize Installing program: phptar Installing program: phpextdist - Markus On Sat, May 11, 2002 at 01:35:23AM -0000, Stig Bakken wrote : > ssb Fri May 10 21:35:23 2002 EDT > > Modified files: > /php4/pear Makefile.frag > Log: > * install Archive_Tar and Console_Getopt too > > > Index: php4/pear/Makefile.frag > diff -u php4/pear/Makefile.frag:1.18 php4/pear/Makefile.frag:1.19 > --- php4/pear/Makefile.frag:1.18 Fri May 10 01:40:39 2002 > +++ php4/pear/Makefile.frag Fri May 10 21:35:23 2002 > @@ -98,18 +98,18 @@ > PEARCMD=$(top_builddir)/sapi/cli/php -d include_path=$(top_srcdir)/pear pear/scripts/pear.in > > install-pear-installer: $(top_builddir)/sapi/cli/php > - @if $(PEARCMD) shell-test PEAR; then \ > - version=grep '<version>' $(srcdir)/package-PEAR.xml|head > -1|cut -d\> -f2|cut -d\< -f1; \ > - if ! $(PEARCMD) shell-test PEAR $$version; then \ > - echo "Found an older version of the PEAR Installer, upgrading..."; \ > - $(PEARCMD) -q upgrade $(srcdir)/package-PEAR.xml; \ > + @for descfile in $(srcdir)/package-*.xml; do \ > + tmp="$${descfile%.xml}"; \ > + pkgname="$${tmp#*-}"; \ > + pkgver=grep '<version>' $$descfile|head -1|cut -d\> > -f2|cut -d\< -f1; \ > + if $(PEARCMD) shell-test $$pkgname; then \ > + if ! $(PEARCMD) shell-test $$pkgname $$pkgver; then \ > + $(PEARCMD) -q upgrade $$descfile | sed -e "s/^/$$pkgname $$pkgver: /"; \ > + fi; \ > else \ > - echo "No need to install or upgrade the PEAR Installer..."; \ > + $(PEARCMD) -q install $$descfile | sed -e "s/^/$$pkgname $$pkgver: /"; \ > fi; \ > - else \ > - echo "PEAR Installer not found, installing..."; \ > - $(PEARCMD) -q install $(srcdir)/package-PEAR.xml; \ > - fi > + done > > install-pear-packages: # requires cli installed > @/bin/ls -1 $(srcdir)/packages | while read package; do \ > > > > -- > PEAR CVS Mailing List (http://pear.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php -- Please always Cc to me when replying to me on the lists. GnuPG Key: http://guru.josefine.at/~mfischer/C2272BD0.asc "I'm not stupid, you know? :)" - Jani Taskinen