Date: Wed, 18 May 2005 12:30:06 +0400 From: Sergey Matveychuk <sem@fog.mbrd.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/81189: bsd.port.mk: add-plist-docs target don't respect NOPORTDOCS Message-ID: <E1DYJwM-000N59-QW@fog.mbrd.ru> Resent-Message-ID: <200505180840.j4I8e1fn068400@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 81189
>Category: ports
>Synopsis: bsd.port.mk: add-plist-docs target don't respect NOPORTDOCS
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Wed May 18 08:40:01 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Sergey Matveychuk
>Release: FreeBSD 5.4-RELEASE i386
>Organization:
>Environment:
System: FreeBSD fog.mbrd.ru 5.4-RELEASE FreeBSD 5.4-RELEASE #5: Wed May 11 14:22:55 MSD 2005 root@fog.mbrd.ru:/usr/obj/usr/src/sys/FOG i386
>Description:
add-plist-docs target don't respect NOPORTDOCS
so docs list from PORTDOCS being added in plist even
when they really not installed
>How-To-Repeat:
cd port_used_PORTDOCS
make install deinstall
make NOPORTDOCS=yes install deinstall
>Fix:
--- bsd.port.mk.diff begins here ---
Index: bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.511
diff -u -r1.511 bsd.port.mk
--- bsd.port.mk 17 Mar 2005 23:22:07 -0000 1.511
+++ bsd.port.mk 18 May 2005 08:24:37 -0000
@@ -4798,7 +4798,7 @@
.if !target(add-plist-docs)
add-plist-docs:
-.if defined(PORTDOCS)
+.if defined(PORTDOCS) && !defined(NOPORTDOCS)
@if ${EGREP} -qe '^@cw?d' ${TMPPLIST} && \
[ "`${SED} -En -e '/^@cw?d[ ]*/s,,,p' ${TMPPLIST} | ${TAIL} -n 1`" != "${PREFIX}" ]; then \
${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}; \
--- 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?E1DYJwM-000N59-QW>