From owner-freebsd-ports-bugs@FreeBSD.ORG Sat May 14 21:00:21 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 68ABC16A4CE for ; Sat, 14 May 2005 21:00:21 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2562F43D1F for ; Sat, 14 May 2005 21:00:21 +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 j4EL0LOn077799 for ; Sat, 14 May 2005 21:00:21 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j4EL0Kfb077794; Sat, 14 May 2005 21:00:20 GMT (envelope-from gnats) Resent-Date: Sat, 14 May 2005 21:00:20 GMT Resent-Message-Id: <200505142100.j4EL0Kfb077794@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, Sergey Matveychuk Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A09D916A4CE for ; Sat, 14 May 2005 20:59:57 +0000 (GMT) Received: from mail.ciam.ru (mail.ciam.ru [213.147.57.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id A638443D48 for ; Sat, 14 May 2005 20:59:55 +0000 (GMT) (envelope-from sem@ciam.ru) Received: from sem by mail.ciam.ru with local (Exim 4.x) id 1DX3jm-0005zF-DD for FreeBSD-gnats-submit@freebsd.org; Sun, 15 May 2005 00:59:54 +0400 Message-Id: Date: Sun, 15 May 2005 00:59:54 +0400 From: Sergey Matveychuk To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/81036: bsd.port.mk: fix a few issues in add-plist-docs target X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Sergey Matveychuk List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 May 2005 21:00:21 -0000 >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@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: