From owner-freebsd-doc@FreeBSD.ORG Sat Dec 8 21:19:39 2012 Return-Path: Delivered-To: freebsd-doc@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 27CA516F; Sat, 8 Dec 2012 21:19:39 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from winston.madpilot.net (winston.madpilot.net [78.47.75.155]) by mx1.freebsd.org (Postfix) with ESMTP id 23DB98FC0C; Sat, 8 Dec 2012 21:19:38 +0000 (UTC) Received: from winston.madpilot.net (localhost [127.0.0.1]) by winston.madpilot.net (Postfix) with ESMTP id 3YJk2b6PGWzFTsk; Sat, 8 Dec 2012 22:19:35 +0100 (CET) X-Virus-Scanned: amavisd-new at madpilot.net Received: from winston.madpilot.net ([127.0.0.1]) by winston.madpilot.net (winston.madpilot.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id d5LV4yQ7-3Oi; Sat, 8 Dec 2012 22:19:33 +0100 (CET) Received: from tommy.madpilot.net (host102-105-dynamic.30-79-r.retail.telecomitalia.it [79.30.105.102]) by winston.madpilot.net (Postfix) with ESMTPSA; Sat, 8 Dec 2012 22:19:33 +0100 (CET) Message-ID: <50C3AEE6.3020101@FreeBSD.org> Date: Sat, 08 Dec 2012 22:19:34 +0100 From: Guido Falsi User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: freebsd-doc@freebsd.org Subject: Patch for porter's handbook Content-Type: multipart/mixed; boundary="------------000104020607090608020802" Cc: bapt@FreeBSD.org X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Dec 2012 21:19:39 -0000 This is a multi-part message in MIME format. --------------000104020607090608020802 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Hi! Some time ago the maintainer of net-mgmt/mrtg noticed that the porter's handbook still reference NOPORTDOCS in place of the new DOCS option in optionsng. I have a patch(attached) which fixes this. bapt has already seen it and approved it, as suggested by him I added a tag around "DOCS". I'd like this patch to be revised by someone of the documentation team and approved for committing it. I'm obviously accepting any comment or correction. Please note that I'm not subscribed to docs@, so please reply also directly to me. Thanks in advance! -- Guido Falsi --------------000104020607090608020802 Content-Type: text/plain; charset=us-ascii; name="porthand.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="porthand.diff" Index: en_US.ISO8859-1/books/porters-handbook/book.xml =================================================================== --- en_US.ISO8859-1/books/porters-handbook/book.xml (revision 40306) +++ en_US.ISO8859-1/books/porters-handbook/book.xml (working copy) @@ -4921,12 +4921,12 @@ the same time, you can use the whole PKGNAME. - Make the installation dependent on the variable - NOPORTDOCS so that users can disable it + Make the installation dependent on the + DOCS option so that users can disable it in /etc/make.conf, like this: post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_MAN} ${WRKSRC}/docs/xvdocs.ps ${DOCSDIR} .endif @@ -4968,13 +4968,13 @@ - NOPORTDOCS only controls additional - documentation installed in DOCSDIR. It - does not apply to standard man pages and info pages. - Things installed in DATADIR and - EXAMPLESDIR are controlled by - NOPORTDATA and - NOPORTEXAMPLES, respectively. + The DOCS options only controls + additional documentation installed in DOCSDIR. + It does not apply to standard man pages and info pages. + Things installed in DATADIR and + EXAMPLESDIR are controlled by + DATA and EXAMPLES + options, respectively. These variables are exported to @@ -4997,25 +4997,24 @@ %%PORTDOCS%%%%DOCSDIR%%/CONTACT %%PORTDOCS%%@dirrm %%DOCSDIR%% - As an alternative to enumerating the documentation files - in pkg-plist, a port can set the - variable PORTDOCS to a list of file names - and shell glob patterns to add to the final packing list. - The names will be relative to DOCSDIR. - Therefore, a port that utilizes PORTDOCS - and uses a non-default location for its documentation should - set DOCSDIR accordingly. If a directory - is listed in PORTDOCS or matched by a - glob pattern from this variable, the entire subtree of - contained files and directories will be registered in the - final packing list. If NOPORTDOCS is - defined then files and directories listed in - PORTDOCS would not be installed and - neither would be added to port packing list. Installing the - documentation at PORTDOCS as shown above - remains up to the port itself. A typical example of - utilizing PORTDOCS looks as - follows: + As an alternative to enumerating the documentation + files in pkg-plist, a port can set the + variable PORTDOCS to a list of file names + and shell glob patterns to add to the final packing list. + The names will be relative to DOCSDIR. + Therefore, a port that utilizes PORTDOCS + and uses a non-default location for its documentation should + set DOCSDIR accordingly. If a directory + is listed in PORTDOCS or matched by a + glob pattern from this variable, the entire subtree of + contained files and directories will be registered in the + final packing list. If DOCS option has + beeen unset then files and directories listed in + PORTDOCS would not be installed and + neither would be added to port packing list. Installing + the documentation at PORTDOCS as shown + above remains up to the port itself. A typical example of + utilizing PORTDOCS looks as follows: PORTDOCS= README.* ChangeLog docs/* --------------000104020607090608020802--