ports/81036: bsd.port.mk: fix a few issues in add-plist-docs target

[Sergey Matveychuk]

>Number:         81036
>Category:       ports
>Synopsis:       bsd.port.mk: fix a few issues in add-plist-docs target
>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:   Sat May 14 21:00:20 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Sergey Matveychuk
>Release:        FreeBSD 4.8-RELEASE-p18 i386
>Organization:
>Environment:
System: FreeBSD sprite.ciam.ru 4.8-RELEASE-p18 FreeBSD 4.8-RELEASE-p18 #3: Thu Apr 22 23:30:55 MSD 2004 root at orion.ciam.ru:/usr/src/sys/compile/PROXY i386


	
>Description:
	
	add-plist-docs target has a few issues should be fixed:
        1) stray '@' symbol before ${ECHO_CMD}
        2) don't respect NOPORTDOCS
        3) remove useless PORTDOCS macro in PLIST_SUB
>How-To-Repeat:
	
>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	14 May 2005 20:47:41 -0000
@@ -1389,12 +1389,6 @@
 .endif
 .endif
 
-.if defined(NOPORTDOCS)
-PLIST_SUB+=	        PORTDOCS="@comment "
-.else
-PLIST_SUB+=	        PORTDOCS=""
-.endif
-
 CONFIGURE_SHELL?=	${SH}
 MAKE_SHELL?=	${SH}
 
@@ -4798,14 +4792,14 @@
 
 .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}; \
 	fi
 .for x in ${PORTDOCS}
 	@if [ ! -e ${DOCSDIR}/${x} ]; then \
-		@${ECHO_CMD} ${DOCSDIR}/${x} | \
+		${ECHO_CMD} ${DOCSDIR}/${x} | \
 			${SED} -e 's,^${PREFIX}/,,' >> ${TMPPLIST}; \
 	fi
 .endfor
--- bsd.port.mk.diff ends here ---


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