From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jan 26 21:50:32 2004 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 0A8D516A4D1 for ; Mon, 26 Jan 2004 21:50:32 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3160543D3F for ; Mon, 26 Jan 2004 21:50:11 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i0R5oBFR028778 for ; Mon, 26 Jan 2004 21:50:11 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i0R5oB7t028777; Mon, 26 Jan 2004 21:50:11 -0800 (PST) (envelope-from gnats) Resent-Date: Mon, 26 Jan 2004 21:50:11 -0800 (PST) Resent-Message-Id: <200401270550.i0R5oB7t028777@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, Trevor Johnson Received: by hub.freebsd.org (Postfix, from userid 855) id 949AC16A699; Mon, 26 Jan 2004 21:37:10 -0800 (PST) Message-Id: <20040127053710.949AC16A699@hub.freebsd.org> Date: Mon, 26 Jan 2004 21:37:10 -0800 (PST) From: Trevor Johnson To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/61976: PLIST_DOCDIRS and PLIST_DOCFILES X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Trevor Johnson List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Jan 2004 05:50:32 -0000 >Number: 61976 >Category: ports >Synopsis: PLIST_DOCDIRS and PLIST_DOCFILES >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: Mon Jan 26 21:50:10 PST 2004 >Closed-Date: >Last-Modified: >Originator: Trevor Johnson >Release: FreeBSD 5.2-RELEASE i386 >Organization: N/A >Environment: bsd.port.mk 1.483 >Description: These are two new macros to complement PLIST_DIRS and PLIST_FILES (PR 59909) and slightly simplify their use. PLIST_DOCDIRS is a list of directories, and PLIST_DOCFILES a list of files, to be included in the packing list unless NOPORTDOCS is set. They are meant to replace the use of %%PORTDOCS%% in the PLIST file. Here is an example of their use: ALL_TARGET= nogger PLIST_FILES= bin/nogger .for ii in COPYING README Thanks PLIST_DOCFILES+= share/doc/nogger/${ii} .endfor PLIST_DOCDIRS= share/doc/nogger USE_GMAKE= y Here is the same thing without the proposed new macros: ALL_TARGET= nogger PLIST_FILES= bin/nogger .ifndef(NOPORTDOCS) .for ii in COPYING README Thanks PLIST_FILES+= share/doc/nogger/${ii} .endfor PLIST_DIRS= share/doc/nogger .endif USE_GMAKE= y They would move the check for NOPORTDOCS into bsd.port.mk, adding 12 lines to it. >How-To-Repeat: Use PLIST_DIRS or PLIST_FILES in a port which respects NOPORTDOCS. >Fix: This patch is also at . Index: /usr/ports/Mk/bsd.port.mk =================================================================== RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v retrieving revision 1.483 diff -u -r1.483 bsd.port.mk --- /usr/ports/Mk/bsd.port.mk 24 Jan 2004 01:26:30 -0000 1.483 +++ /usr/ports/Mk/bsd.port.mk 27 Jan 2004 05:07:10 -0000 @@ -789,7 +789,9 @@ # if USE_X_PREFIX is set, /etc/mtree/BSD.local.dist # otherwise.) # PLIST_DIRS - Directories to be added to packing list +# PLIST_DOCDIRS - as above, but not added when NOPORTDOCS is set # PLIST_FILES - Files and symbolic links to be added to packing list +# PLIST_DOCFILES - as above, but not added when NOPORTDOCS is set # # PLIST - Name of the `packing list' file (default: ${PKGDIR}/pkg-plist). # Change this to ${WRKDIR}/PLIST or something if you @@ -4687,6 +4689,11 @@ @${MKDIR} `dirname ${TMPPLIST}` @if [ ! -f ${DESCR} ]; then ${ECHO_CMD} "** Missing pkg-descr for ${PKGNAME}."; exit 1; fi @>${TMPPLIST} +.if !defined(NOPORTDOCS) + @for file in ${PLIST_DOCFILES}; do \ + ${ECHO_CMD} $${file} >> ${TMPPLIST}; \ + done +.endif @for file in ${PLIST_FILES}; do \ ${ECHO_CMD} $${file} >> ${TMPPLIST}; \ done @@ -4728,6 +4735,11 @@ @if [ -f ${PLIST} ]; then \ ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${PLIST} >> ${TMPPLIST}; \ fi +.if !defined(NOPORTDOCS) +.for dir in ${PLIST_DOCDIRS} + @${ECHO_CMD} ${dir} | ${SED} -e 's,^,@dirrm ,' >> ${TMPPLIST} +.endfor +.endif .for dir in ${PLIST_DIRS} @${ECHO_CMD} ${dir} | ${SED} -e 's,^,@dirrm ,' >> ${TMPPLIST} .endfor >Release-Note: >Audit-Trail: >Unformatted: