Date: 17 Apr 2005 10:31:05 -0000 From: Clement Laforet <clement@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/80023: [bsd.port.mk]: make PORTDOCS= * work properly Message-ID: <20050417103105.46248.qmail@goofy.cultdeadsheep.org> Resent-Message-ID: <200504171040.j3HAeF3l006608@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050417103105.46248.qmail>