From owner-svn-doc-head@FreeBSD.ORG Sat Dec 8 22:47:15 2012 Return-Path: Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 834642A2; Sat, 8 Dec 2012 22:47:15 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 676AC8FC08; Sat, 8 Dec 2012 22:47:15 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB8MlFEJ032996; Sat, 8 Dec 2012 22:47:15 GMT (envelope-from madpilot@svn.freebsd.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB8MlFGv032995; Sat, 8 Dec 2012 22:47:15 GMT (envelope-from madpilot@svn.freebsd.org) Message-Id: <201212082247.qB8MlFGv032995@svn.freebsd.org> From: Guido Falsi Date: Sat, 8 Dec 2012 22:47:15 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r40308 - head/en_US.ISO8859-1/books/porters-handbook X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Dec 2012 22:47:15 -0000 Author: madpilot (ports committer) Date: Sat Dec 8 22:47:14 2012 New Revision: 40308 URL: http://svnweb.freebsd.org/changeset/doc/40308 Log: Fix references to NOPORTDOCS, NOPORTDATA and NOPORTEXAMPLES to the new options framework DOCS, DATA, EXAMPLES options. Noticed by: Alexey V. Panfilov Approved by: bapt, gjb Modified: head/en_US.ISO8859-1/books/porters-handbook/book.xml Modified: head/en_US.ISO8859-1/books/porters-handbook/book.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/book.xml Sat Dec 8 19:03:24 2012 (r40307) +++ head/en_US.ISO8859-1/books/porters-handbook/book.xml Sat Dec 8 22:47:14 2012 (r40308) @@ -4922,11 +4922,11 @@ PORTVERSION= 1.0 PKGNAME. Make the installation dependent on the variable - NOPORTDOCS so that users can disable it + 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 @@ PORTVERSION= 1.0 - NOPORTDOCS only controls additional + The DOCS option 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. + DATA and + EXAMPLES options, respectively. These variables are exported to @@ -5008,10 +5008,10 @@ PORTVERSION= 1.0 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 + final packing list. If the DOCS option has + been unset then files and directories listed in + PORTDOCS would not be installed + or 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