From eagle@srodberg-host149.dsl.visi.com Fri Oct 13 03:41:37 2000 Return-Path: Received: from srodberg-host149.dsl.visi.com (srodberg-host149.dsl.visi.com [208.42.48.149]) by hub.freebsd.org (Postfix) with ESMTP id 12E7C37B66C for ; Fri, 13 Oct 2000 03:41:37 -0700 (PDT) Received: (from eagle@localhost) by srodberg-host149.dsl.visi.com (8.11.1/8.11.0) id e9DAfai43666; Fri, 13 Oct 2000 05:41:36 -0500 (CDT) (envelope-from eagle) Message-Id: <200010131041.e9DAfai43666@srodberg-host149.dsl.visi.com> Date: Fri, 13 Oct 2000 05:41:36 -0500 (CDT) From: eagle@srodberg-host149.dsl.visi.com Reply-To: srodberg@visi.com To: FreeBSD-gnats-submit@freebsd.org Subject: make readmes in ports is broke X-Send-Pr-Version: 3.2 >Number: 21952 >Category: ports >Synopsis: make readmes in ports is broke >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: closed >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri Oct 13 03:50:00 PDT 2000 >Closed-Date: Sat Oct 14 03:58:31 PDT 2000 >Last-Modified: Sat Oct 14 07:20:00 PDT 2000 >Originator: Steve Rodberg >Release: FreeBSD 4.1.1-STABLE i386 >Organization: >Environment: FreeBSD 4.1.1-STABLE with current ports tree. >Description: Doing a 'make readmes' in the ports tree has all the descriptions in the README.html's as (no description) >How-To-Repeat: install the newest ports tree, and do a make readmes. >Fix: *** /usr/ports/Mk/bsd.port.subdir.mk.orig Fri Oct 13 05:29:09 2000 --- /usr/ports/Mk/bsd.port.subdir.mk Fri Oct 13 05:31:41 2000 *************** *** 210,217 **** .else @echo -n ''"`cd ${entry}; make package-name | ${HTMLIFY}`: " >> $@.tmp .endif ! .if exists(${entry}/pkg/COMMENT) ! @${HTMLIFY} ${entry}/pkg/COMMENT >> $@.tmp .else @echo "(no description)" >> $@.tmp .endif --- 210,217 ---- .else @echo -n ''"`cd ${entry}; make package-name | ${HTMLIFY}`: " >> $@.tmp .endif ! .if exists(${entry}/pkg-comment) ! @${HTMLIFY} ${entry}/pkg-comment >> $@.tmp .else @echo "(no description)" >> $@.tmp .endif >Release-Note: >Audit-Trail: State-Changed-From-To: open->feedback State-Changed-By: trevor State-Changed-When: Fri Oct 13 19:54:03 PDT 2000 State-Changed-Why: This same problem was reported by Dann Lunsford in PR 21851. Does his patch work for you? http://www.freebsd.org/cgi/query-pr.cgi?pr=21952 From: asami@FreeBSD.org (Satoshi - Ports Wraith - Asami) To: Cc: srodberg@visi.com, freebsd-gnats-submit@FreeBSD.org, Dann Lunsford Subject: Re: ports/21952: make readmes in ports is broke Date: 14 Oct 2000 00:40:01 -0700 * This same problem was reported by Dann Lunsford in PR 21851. * Does his patch work for you? Actually, bsd.port.subdir.mk was broken a long time ago -- the recent update just made the problem worse. Please try the following. It seems to work fine for ports that define MASTERDIR and/or COMMENT/DESCR. I've also added inclusion of the comment file in the category level. Satoshi ------- Index: Mk/bsd.port.subdir.mk =================================================================== RCS file: /usr/cvs/ports/Mk/bsd.port.subdir.mk,v retrieving revision 1.38 diff -u -r1.38 bsd.port.subdir.mk --- Mk/bsd.port.subdir.mk 2000/08/08 14:56:46 1.38 +++ Mk/bsd.port.subdir.mk 2000/10/14 03:49:18 @@ -195,6 +195,8 @@ .else README= ${TEMPLATES}/README.category .endif +COMMENT?= ${.CURDIR}/pkg/COMMENT +DESCR?= ${.CURDIR}/pkg/DESCR HTMLIFY= sed -e 's/&/\&/g' -e 's/>/\>/g' -e 's/'"`cd ${entry}; make package-name | ${HTMLIFY}`: " >> $@.tmp .endif -.if exists(${entry}/pkg/COMMENT) - @${HTMLIFY} ${entry}/pkg/COMMENT >> $@.tmp -.else - @echo "(no description)" >> $@.tmp -.endif + @cat `cd ${entry}; make -V COMMENT` | ${HTMLIFY} >> $@.tmp .endfor @sort -t '>' +1 -2 $@.tmp > $@.tmp2 -.if exists(${.CURDIR}/pkg/DESCR) - @${HTMLIFY} ${.CURDIR}/pkg/DESCR > $@.tmp3 +.if exists(${DESCR}) + @${HTMLIFY} ${DESCR} > $@.tmp3 .else @> $@.tmp3 .endif +.if exists(${COMMENT}) + @${HTMLIFY} ${COMMENT} > $@.tmp4 +.else + @> $@.tmp4 +.endif @cat ${README} | \ sed -e 's/%%CATEGORY%%/'"`basename ${.CURDIR}`"'/g' \ + -e '/%%COMMENT%%/r$@.tmp4' \ + -e '/%%COMMENT%%/d' \ -e '/%%DESCR%%/r$@.tmp3' \ -e '/%%DESCR%%/d' \ -e '/%%SUBDIR%%/r$@.tmp2' \ Index: Templates/README.category =================================================================== RCS file: /usr/cvs/ports/Templates/README.category,v retrieving revision 1.2 diff -u -r1.2 README.category --- Templates/README.category 2000/01/21 11:08:22 1.2 +++ Templates/README.category 2000/10/14 03:47:19 @@ -5,6 +5,12 @@

You are now in the directory "%%CATEGORY%%". +

This is the one-line description for this category: + +

+%%COMMENT%% +

+

%%DESCR%% State-Changed-From-To: feedback->closed State-Changed-By: asami State-Changed-When: Sat Oct 14 03:58:31 PDT 2000 State-Changed-Why: About to commit more complete fix. http://www.freebsd.org/cgi/query-pr.cgi?pr=21952 From: Steve Rodberg To: FreeBSD-gnats-submit@freebsd.org Cc: Subject: Re: ports/21952: make readmes in ports is broke Date: Sat, 14 Oct 2000 09:19:20 -0500 On Fri, Oct 13, 2000 at 07:57:14PM -0700, trevor@FreeBSD.org wrote: > Synopsis: make readmes in ports is broke > > State-Changed-From-To: open->feedback > State-Changed-By: trevor > State-Changed-When: Fri Oct 13 19:54:03 PDT 2000 > State-Changed-Why: > This same problem was reported by Dann Lunsford in PR 21851. > Does his patch work for you? > > http://www.freebsd.org/cgi/query-pr.cgi?pr=21952 It should work.. Looks like the same thing I did, but he also fixed the description part. I knew I should have looked harder for another PR before I submitted mine.. :) >Unformatted: