From clement@cultdeadsheep.org  Sun Apr 17 10:31:08 2005
Return-Path: <clement@cultdeadsheep.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9454C16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 17 Apr 2005 10:31:08 +0000 (GMT)
Received: from goofy.cultdeadsheep.org (charon.cultdeadsheep.org [80.65.226.72])
	by mx1.FreeBSD.org (Postfix) with SMTP id A349B43D2F
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 17 Apr 2005 10:31:06 +0000 (GMT)
	(envelope-from clement@cultdeadsheep.org)
Received: (qmail 46249 invoked by uid 1000); 17 Apr 2005 12:31:05 +0200
Message-Id: <20050417103105.46248.qmail@goofy.cultdeadsheep.org>
Date: 17 Apr 2005 10:31:05 -0000
From: Clement Laforet <clement@FreeBSD.org>
Reply-To: Clement Laforet <clement@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [bsd.port.mk]: make PORTDOCS= * work properly
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         80023
>Category:       ports
>Synopsis:       [bsd.port.mk]: make PORTDOCS= * work properly
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    portmgr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 17 10:40:15 GMT 2005
>Closed-Date:    Thu Jun 09 20:46:13 GMT 2005
>Last-Modified:  Thu Jun 09 20:46:13 GMT 2005
>Originator:     Clement Laforet
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
FreeBSD
>Environment:
System: FreeBSD goofy.cultdeadsheep.org 5.2-CURRENT FreeBSD 5.2-CURRENT #2: Wed Jul 21 08:16:17 CEST 2004 root@goofy.cultdeadsheep.org:/usr/obj/usr/src/sys/GOOFY i386


	
>Description:
When using PORTDOCS= *, add-plist-doc target print error due to '*' shell
wildcard.
Example:
[: /usr/local/share/doc/apache2/LICENSE: unexpected operator

>How-To-Repeat:
# cd ${PORTSDIR}/www/apache2
# make install


>Fix:

	

--- bsd.port.mk.diff begins here ---
Index: Mk/bsd.port.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.511
diff -u -r1.511 bsd.port.mk
--- Mk/bsd.port.mk	17 Mar 2005 23:22:07 -0000	1.511
+++ Mk/bsd.port.mk	17 Apr 2005 10:14:51 -0000
@@ -4803,12 +4803,14 @@
 		[ "`${SED} -En -e '/^@cw?d[ 	]*/s,,,p' ${TMPPLIST} | ${TAIL} -n 1`" != "${PREFIX}" ]; then \
 		${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}; \
 	fi
+.if ${PORTDOCS} != *
 .for x in ${PORTDOCS}
 	@if [ ! -e ${DOCSDIR}/${x} ]; then \
 		@${ECHO_CMD} ${DOCSDIR}/${x} | \
 			${SED} -e 's,^${PREFIX}/,,' >> ${TMPPLIST}; \
 	fi
 .endfor
+.endif
 	@${FIND} -P ${PORTDOCS:S/^/${DOCSDIR}\//} ! -type d 2>/dev/null | \
 		${SED} -ne 's,^${PREFIX}/,,p' >> ${TMPPLIST}
 	@${FIND} -P -d ${PORTDOCS:S/^/${DOCSDIR}\//} -type d 2>/dev/null | \
--- bsd.port.mk.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->portmgr 
Responsible-Changed-By: clement 
Responsible-Changed-When: Sun Apr 17 10:40:54 GMT 2005 
Responsible-Changed-Why:  
Over to maintainer(s). 


http://www.freebsd.org/cgi/query-pr.cgi?pr=80023 
State-Changed-From-To: open->analyzed 
State-Changed-By: kris 
State-Changed-When: Wed Jun 1 19:37:28 GMT 2005 
State-Changed-Why:  
This overlaps with 77820, so someone needs to determine what the 
consensus from that discussion was and how it relates to this proposed 
patch.  I nominate clement :-)  

http://www.freebsd.org/cgi/query-pr.cgi?pr=80023 
State-Changed-From-To: analyzed->closed 
State-Changed-By: krion 
State-Changed-When: Thu Jun 9 20:46:07 GMT 2005 
State-Changed-Why:  
Committed, thanks! 

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