Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 8 Dec 2012 22:47:15 +0000 (UTC)
From:      Guido Falsi <madpilot@FreeBSD.org>
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
Message-ID:  <201212082247.qB8MlFGv032995@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <ports@subnets.ru>
  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</programlisting>
 	  <makevar>PKGNAME</makevar>.</para>
 
 	<para>Make the installation dependent on the variable
-	  <makevar>NOPORTDOCS</makevar> so that users can disable it
+	  <literal>DOCS</literal> option so that users can disable it
 	  in <filename>/etc/make.conf</filename>, like this:</para>
 
 	<programlisting>post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/docs/xvdocs.ps ${DOCSDIR}
 .endif</programlisting>
@@ -4968,13 +4968,13 @@ PORTVERSION=	1.0</programlisting>
 	</itemizedlist>
 
 	<note>
-	  <para><makevar>NOPORTDOCS</makevar> only controls additional
+	  <para>The <literal>DOCS</literal> option only controls additional
 	    documentation installed in <makevar>DOCSDIR</makevar>.  It
 	    does not apply to standard man pages and info pages.
 	    Things installed in <makevar>DATADIR</makevar> and
 	    <makevar>EXAMPLESDIR</makevar> are controlled by
-	    <makevar>NOPORTDATA</makevar> and
-	    <makevar>NOPORTEXAMPLES</makevar>, respectively.</para>
+	    <literal>DATA</literal> and
+	    <literal>EXAMPLES</literal> options, respectively.</para>
 	</note>
 
 	<para>These variables are exported to
@@ -5008,10 +5008,10 @@ PORTVERSION=	1.0</programlisting>
 	  is listed in <makevar>PORTDOCS</makevar> 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 <makevar>NOPORTDOCS</makevar> is
-	  defined then files and directories listed in
-	  <makevar>PORTDOCS</makevar> would not be installed and
-	  neither would be added to port packing list.  Installing the
+	  final packing list.  If the <literal>DOCS</literal> option has
+	  been unset then files and directories listed in
+	  <makevar>PORTDOCS</makevar> would not be installed
+	  or added to port packing list.  Installing the
 	  documentation at <makevar>PORTDOCS</makevar> as shown above
 	  remains up to the port itself.  A typical example of
 	  utilizing <makevar>PORTDOCS</makevar> looks as



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212082247.qB8MlFGv032995>