From dann@mach.greycat.com  Sun Oct  8 23:45:05 2000
Return-Path: <dann@mach.greycat.com>
Received: from mach.greycat.com (mach.greycat.com [207.173.133.5])
	by hub.freebsd.org (Postfix) with ESMTP id 2BBE237B66C
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  8 Oct 2000 23:45:04 -0700 (PDT)
Received: (from dann@localhost)
	by mach.greycat.com (8.11.0/8.11.0) id e996jBV01329;
	Sun, 8 Oct 2000 23:45:11 -0700 (PDT)
	(envelope-from dann)
Message-Id: <200010090645.e996jBV01329@mach.greycat.com>
Date: Sun, 8 Oct 2000 23:45:11 -0700 (PDT)
From: Dann Lunsford <dann@greycat.com>
Sender: dann@mach.greycat.com
Reply-To: Dann Lunsford <dann@greycat.com>
To: FreeBSD-gnats-submit@freebsd.org
Subject: 'make readmes' broken in new ports structure 
X-Send-Pr-Version: 3.2

>Number:         21851
>Category:       ports
>Synopsis:       'make readmes' broken in new ports structure
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Oct 08 23:50:01 PDT 2000
>Closed-Date:    Sat Oct 14 03:59:41 PDT 2000
>Last-Modified:  Sat Oct 14 03:59:57 PDT 2000
>Originator:     Dann Lunsford
>Release:        FreeBSD 4.1.1-STABLE i386
>Organization:
Very little
>Environment:
 
 4.1.1-STABLE, as of 7-OCT-2000

>Description:
bsd.ports.subdir.mk was not updated for the new port structure.  Causes
'make readmes' (at least) to fail, generating files with incorrect 
information


>How-To-Repeat:
cd /usr/ports
make readmes

In the category directories, README.html will contain only "(no description)"
lines.

>Fix:

apply this patch to bsd.ports.subdir.mk


--- bsd.port.subdir.mk.orig	Sun Oct  8 23:14:01 2000
+++ bsd.port.subdir.mk	Sun Oct  8 23:22:59 2000
@@ -210,15 +210,15 @@
 .else
 	@echo -n '<a href="'${entry}/README.html'">'"`cd ${entry}; make package-name | ${HTMLIFY}`</a>: " >> $@.tmp
 .endif
-.if exists(${entry}/pkg/COMMENT)
-	@${HTMLIFY} ${entry}/pkg/COMMENT >> $@.tmp
+.if exists(${entry}/pkg-comment)
+	@${HTMLIFY} ${entry}/pkg-comment >> $@.tmp
 .else
 	@echo "(no description)" >> $@.tmp
 .endif
 .endfor
 	@sort -t '>' +1 -2 $@.tmp > $@.tmp2
-.if exists(${.CURDIR}/pkg/DESCR)
-	@${HTMLIFY} ${.CURDIR}/pkg/DESCR > $@.tmp3
+.if exists(${.CURDIR}/pkg-descr)
+	@${HTMLIFY} ${.CURDIR}/pkg-descr > $@.tmp3
 .else
 	@> $@.tmp3
 .endif

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: asami 
State-Changed-When: Sat Oct 14 03:59:41 PDT 2000 
State-Changed-Why:  
About to commit more complete fix. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=21851 
>Unformatted:
