From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Apr 17 10:40:16 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2B43916A4CE for ; Sun, 17 Apr 2005 10:40:16 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DA0C543D49 for ; Sun, 17 Apr 2005 10:40:15 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j3HAeFiD006609 for ; Sun, 17 Apr 2005 10:40:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j3HAeF3l006608; Sun, 17 Apr 2005 10:40:15 GMT (envelope-from gnats) Resent-Date: Sun, 17 Apr 2005 10:40:15 GMT Resent-Message-Id: <200504171040.j3HAeF3l006608@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Clement Laforet Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9454C16A4CE for ; 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 ; 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 To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/80023: [bsd.port.mk]: make PORTDOCS= * work properly X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Clement Laforet List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Apr 2005 10:40:16 -0000 >Number: 80023 >Category: ports >Synopsis: [bsd.port.mk]: make PORTDOCS= * work properly >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Apr 17 10:40:15 GMT 2005 >Closed-Date: >Last-Modified: >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: >Unformatted: