Date: Sun, 24 Oct 2004 19:49:44 +0300 From: Ion-Mihai Tetcu <itetcu@people.tecnik93.com> To: Matthew Seaman <m.seaman@infracaninophile.co.uk> Cc: freebsd-ports@freebsd.org Subject: Re: portindex -- the second coming. Message-ID: <20041024194944.34de541f@it.buh.cameradicommercio.ro> In-Reply-To: <20041023163650.GA26254@happy-idiot-talk.infracaninophile.co.uk> References: <20041022153854.GA88362@happy-idiot-talk.infracaninophile.co.uk> <20041023111251.GA21742@happy-idiot-talk.infracaninophile.co.uk> <20041023164359.500eb4ff@it.buh.cameradicommercio.ro> <20041023163650.GA26254@happy-idiot-talk.infracaninophile.co.uk>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, 23 Oct 2004 17:36:50 +0100 Matthew Seaman <m.seaman@infracaninophile.co.uk> wrote: > On Sat, Oct 23, 2004 at 04:43:59PM +0300, Ion-Mihai Tetcu wrote: > > > I've did a comparison between the INDEX generated by your portindex and the old one: > > (run old portindex and ./cache-init, cvsup -L2, run portindex and > > ./cache-update using cvsup output) > > > > - your chache-update is faster. > > That is quite gratifying if it is. I think this is because it doesn't scan for mtime changes but it gets the list of ports. > > - picks up also changes in the WWW line, while the old one doesn't seems to do. > > - the old one is removing more than one blank (space) characters from COMMENT > > Yes -- 'make index' does that as well. See the 'BUGS' section in > perldoc portindex. As this is just a cosmetic difference I thought it > wasn't worth the CPU cycles to change it. Another thing it does is > trim trailing slashes '/' from dependencies, since that does make > quite an important difference. I should probably send-pr a fix for > the ports affected by that. I've noticed this when diff-ing. I agree that patching the ports is the right thing to do. > > - there are also some differences in depends, for example for > > pips-sc65_66s-2.6.2 (print/pips-sc60s) the old portindex gives also > > autoconf-2.53_3 and m4-1.4.1 > > I get those included in the BUILD_DEPENDS -- like so: > > % make search name=pips-sc65_66s > Port: pips-sc65_66s-2.6.2 > Path: /usr/ports/print/pips-sc65_66s > Info: Photo Image Print System for Linux --- EPSON Stylus C65/C66 Series > Maint: ume@FreeBSD.org > B-deps: autoconf-2.53_3 cups-base-1.1.20.0 expat-1.95.8 fontconfig-2.2.3,1 freetype2-2.1.7_3 gettext-0.13.1_1 glib-1.2.10_11 gmake-3.80_2 gtk-1.2.10_12 imake-6.7.0_2 jpeg-6b_3 libgnugetopt-1.2 libiconv-1.9.2_1 linuxthreads-2.2.3_15 m4-1.4.1 perl-5.8.5 pkgconfig-0.15.0_1 png-1.2.7 tiff-3.7.0 xorg-libraries-6.7.0_2 > R-deps: cups-base-1.1.20.0 expat-1.95.8 fontconfig-2.2.3,1 freetype2-2.1.7_3 gettext-0.13.1_1 ghostscript-gnu-7.07_11 glib-1.2.10_11 gsfonts-8.11_2 gtk-1.2.10_12 imake-6.7.0_2 jpeg-6b_3 libgnugetopt-1.2 libiconv-1.9.2_1 linux-flashplugin-6.0r79_1 linux_base-7.1_7 linuxpluginwrapper-20041017 linuxthreads-2.2.3_15 open-motif-2.2.3 perl-5.8.5 pkgconfig-0.15.0_1 png-1.2.7 psutils-a4-1.17_1 rc_subr-1.31 tiff-3.7.0 xorg-libraries-6.7.0_2 > > As far as I can tell, that's correct: autoconf-2.53_3 is a > BUILD_DEPENDS of pips-sc65_66s, and that pulls in m4-1.4.1 as a > RUN_DEPENDS of autoconf-2.53_3. Did a ./cache-update for it and now I have both autoconf and m4. Don't know why :) > > - your portindex seems it dosn't see (which wasn't touch by the cvsup): > > ashe-1.3|/usr/ports/www/ashe|/usr/X11R6|A simple HTML editor|/usr/ports/www/ashe/pkg-descr|ports@F > > reeBSD.org|www|expat-1.95.8 fontconfig-2.2.3,1 freetype2-2.1.7_3 imake-6.7.0_2 open-motif-2.2.3 per > > l-5.8.5 pkgconfig-0.15.0_1 xorg-libraries-6.7.0_2|expat-1.95.8 fontconfig-2.2.3,1 freetype2-2.1.7_3 > > imake-6.7.0_2 open-motif-2.2.3 perl-5.8.5 pkgconfig-0.15.0_1 xorg-libraries-6.7.0_2|http://www.cs. > > rpi.edu/~puninj/TALK/head.html||| > > Yes, this is a definite bug. Good catch. It's because there's a > comment on the 'ashe' line in /usr/ports/www/Makefile. Here's a fix: > > Index: FreeBSD/Ports/Tree.pm > =================================================================== > RCS file: /home/matthew/cvsroot/portindex/FreeBSD/Ports/Tree.pm,v > retrieving revision 1.22 > diff -u -r1.22 Tree.pm > --- FreeBSD/Ports/Tree.pm 23 Oct 2004 11:01:09 -0000 1.22 > +++ FreeBSD/Ports/Tree.pm 23 Oct 2004 16:25:20 -0000 > @@ -239,7 +239,7 @@ > }; > while (<MAKEFILE>) { > push @subdirs, "${path}/${1}" > - if (m/^\s*SUBDIR\s+\+=\s+(\S+)\s*$/); > + if (m/^\s*SUBDIR\s+\+=\s+(\S+)\s*(#.*)?$/); > } > close MAKEFILE > or do { That fix it, thanks. > To fix up the cache without having to do a complete rebuild, just: > > % echo /usr/ports/www/ashe | ./cache-update -f plain Aha, so this is how one do it. (I was missing the -f plain). > > > I'll do a test with a canonically generated INDEX-5. > > Excellent. Thank you very much. I'll do it tonight. -- IOnut Unregistered ;) FreeBSD "user"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041024194944.34de541f>