From owner-cvs-all Mon Nov 4 13:22:27 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 6796737B401; Mon, 4 Nov 2002 13:22:25 -0800 (PST) Received: from bast.unixathome.org (bast.unixathome.org [216.187.105.150]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4DE4A43E6E; Mon, 4 Nov 2002 13:22:24 -0800 (PST) (envelope-from dan@langille.org) Received: from wocker (wocker.unixathome.org [192.168.0.99]) by bast.unixathome.org (Postfix) with ESMTP id 64DCF3F4E; Mon, 4 Nov 2002 16:22:23 -0500 (EST) From: "Dan Langille" To: Mario Sergio Fujikawa Ferreira Date: Mon, 04 Nov 2002 16:22:23 -0500 MIME-Version: 1.0 Subject: Re: cvs commit: ports/games Makefile ports/games/tome Makefile distinfo pkg-descr pkg-plist ports/games/tome/files patch-aa Cc: Kris Kennaway , Kris Kennaway , cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Message-ID: <3DC69EBF.13616.67D8B872@localhost> In-reply-to: <20021104211418.81286.qmail@exxodus.fedaykin.here> References: <3DC690A9.2293.67A1B22C@localhost> X-mailer: Pegasus Mail for Windows (v4.02a) Content-type: text/plain; charset=US-ASCII Content-transfer-encoding: 7BIT Content-description: Mail message body 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 4 Nov 2002 at 19:13, Mario Sergio Fujikawa Ferreir wrote: > On Mon, Nov 04, 2002 at 03:21:55PM -0500, Dan Langille wrote: > > On 4 Nov 2002 at 12:18, Kris Kennaway wrote: > > > > > On Mon, Nov 04, 2002 at 02:07:10PM -0500, Dan Langille wrote: > > > > > > > > > Why is there no pkg-comment? > > > > > > > > > > The PORTCOMMENT variable in the makefile takes care of it. > > > ^^^^^^^^^^^ > > > > $ make -V COMMENT > > > > /usr/home/dan/ports/games/tome/pkg-comment > > > > > > > > That's not right is it? > > > > > > No :-) > > > > I've raised it on -ports, and FreshPorts has a fix to cater for > > PORTCOMMENT. I'm just running it in my test environment for a few > > more commits before putting it into production. > > What about the following patch? > > 1) PORTCOMMENT is always set, i.e. if there is a COMMENT > file, PORTCOMMENT is set with COMMENT file's content > > 2) Therefore, if there are both a COMMENT file AND a > PORTCOMMENT variable, COMMENT file takes precedence > > 3) PORTCOMMENT is now the standard to find out the comment > for a file since it will always be set > > 4) make read works again since it was not using the info > from PORTCOMMENT when there was no COMMENT file From a FreshPorts point of view, this patch is great. It simplifies things. > Caveat with this patch? Only two I can think of. > > $ cd ports/textproc/p5-xmltv > $ make describe > p5-xmltv-0.5.2|/usr/ports/textproc/p5-xmltv|/usr/local|"Set of programs to process TV (tvguide) listings in XML format"|/usr/ports/textproc/p5-xmltv/pkg-descr|lioux@FreeBSD.org|textproc perl5|/usr/ports/archivers/p5-Compress-Zlib /usr/ports/converters/p5-Unicode-String /usr/ports/devel/p5-Date- Manip /usr/ports/devel/p5-Memoize /usr/ports/textproc/p5-Lingua-Preferred /usr/ports/textproc/p5-XML-Simple /usr/ports/textproc/p5-XML-Twig /usr/ports/textproc/p5-XML-Writer /usr/ports/www/p5-CGI.pm /usr/ports/www/p5-HTML-Parser /usr/ports/www/p5-HTML-TableExtract /usr/ports/www/p5-libwww /usr/ports/x11-toolkits/p5-Tk-TableMatrix|/usr/ports/archivers/p5-Compress-Zlib /usr/ports/converters/p5-Unicode-String /usr/ports/devel/p5-Date-Manip /usr/ports/devel/p5-Memoize /usr/ports/textproc/p5-Lingua-Preferred /usr/ports/textproc/p5-XML-Simple /usr/ports/textproc/p5-XML-Twig /usr/ports/textproc/p5-XML-Writer /usr/ports/www/p5-CGI.pm /usr/ports/www/p5-HTML-Parser /usr/ports/www/p5-HTML-TableExtract /usr/ports/www/p5-libwww /usr/ports/x11-toolkits/p5-Tk-TableMatrix|http://xmltv.sourceforge.net/ > > There is a nagging "" in there. Unfortunaly the "" is > required due to the parentheses in the comment. Don't ask me why > but the port breaks when I try to 'make package'. Perhaps this point is related: Kris mentioned that he had to escape a ' contained within PORTCOMMENT otherwise an error would occur at install time. i.e. ToME is a roguelike dungeon exploration game based on JRR Tolkien\'s works > The second one, we can now use PORTCOMMENT in 'make readme'. > However, if there is neither PORTCOMMENT variable nor COMMENT file, > we get an empty extra line inside README.html That should never happen. It's like leaving out pkg-descr. -- Dan Langille To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message