ports/105108: cd /usr/ports; make TEMPLATES=/root/templates readmes doesn't respect TEMPLATES.

[Curtis Jewell]

>Number:         105108
>Category:       ports
>Synopsis:       cd /usr/ports; make TEMPLATES=/root/templates readmes doesn't respect TEMPLATES.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 03 12:20:20 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Curtis Jewell
>Release:        6.2-Prerelease
>Organization:
None
>Environment:
FreeBSD lap.curtisjewell.boldlygoingnowhere.org 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #1: Mon Oct 30 03:03:52 JST 2006     root at lap.curtisjewell.boldlygoingnowhere.org:/usr/obj/usr/src/sys/CURTIS  i386

>Description:
When

# cd /usr/ports
# make TEMPLATES=/root/templates readmes

is executed, the README.top and README.category templates in the /root/templates diretory are used, but the README.port template is not - the one from /usr/ports/Templates is used instead.
>How-To-Repeat:
Create template files in a non-default directory (specified below as /root/templates) and then:

# cd /usr/ports
# make TEMPLATES=/root/templates readmes
>Fix:
The two patch files attached will solve the problem. (One is attached now, one will be attached soon.)

Patch attached with submission follows:

--- /usr/ports/Tools/make_readmes.orig	Fri Nov  3 20:05:05 2006
+++ /usr/ports/Tools/make_readmes	Fri Nov  3 20:16:28 2006
@@ -2,7 +2,8 @@
 # $FreeBSD: ports/Tools/make_readmes,v 1.5 2005/03/13 08:49:38 krion Exp $
 
 $PORTSDIR="/usr/ports";
-$README=`cat ${PORTSDIR}/Templates/README.port`;
+$TEMPLATES=$ARGV[0] || "${PORTSDIR}/Templates";
+$README=`cat ${TEMPLATES}/README.port`;
 
 while(<>) {
 	split '\|';

>Release-Note:
>Audit-Trail:
>Unformatted: