docs/169864: [patch] porters-handbook various small changes

Sat Jul 14 22:20:06 UTC 2012

>Number:         169864
>Category:       docs
>Synopsis:       [patch] porters-handbook various small changes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-doc
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jul 14 22:20:06 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Olli Hauer <ohauer at FreeBSD.org>
>Release:        FreeBSD 8.3-RELEASE-p3 amd64
>Organization:
>Environment:


>Description:
I just recognized an mistake which slipped in by my PR docs/169708.

- remove third column from USE_APACHE and fix link to wiki.

- add missing </entry>


Additional the patch includes the following changes.

- remove major lib version numbers from the examples,
  portlint will already complain about them (removing the major number
  from portstree where it is possible is already in progress) [1]

- add PgSQL 92 to the mix [2]

- Additional example for MASTER_SITE_SUBDIR which is widely in use meanwhile for the SF site

 [1] http://www.freebsd.org/cgi/cvsweb.cgi/ports/ports-mgmt/portlint/src/portlint.pl.diff?r1=1.126;r2=1.127
     PR ports/165851

 [2] http://www.freebsd.org/cgi/cvsweb.cgi/ports/Mk/bsd.database.mk.diff?r1=1.73;r2=1.74

PS:
I have not renderd the book with the changes please do a test build before commit.

>How-To-Repeat:
Watch http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/using-php.html

>Fix:

--- en_porters-handbook.diff begins here ---
Index: en_US.ISO8859-1/books/porters-handbook/book.sgml
===================================================================
--- en_US.ISO8859-1/books/porters-handbook/book.sgml	(revision 39204)
+++ en_US.ISO8859-1/books/porters-handbook/book.sgml	(working copy)
@@ -2447,6 +2447,10 @@
 
 	<programlisting>MASTER_SITES=	SF/stardict/WyabdcRealPeopleTTS/${PORTVERSION}</programlisting>
 
+	<para>This can be also written as</para>
+	<programlisting>MASTER_SITES=	SF
+MASTER_SITE_SUBDIR=	stardict/WyabdcRealPeopleTTS/${PORTVERSION}</programlisting>
+
 	<table frame="none">
 	  <title>Popular Magic <makevar>MASTER_SITES</makevar>
 	    Macros</title>
@@ -3448,7 +3452,7 @@
 	  and <replaceable>target</replaceable> is the target to call
 	  in that directory.  For example,</para>
 
-	<programlisting>LIB_DEPENDS=   jpeg.9:${PORTSDIR}/graphics/jpeg</programlisting>
+	<programlisting>LIB_DEPENDS=   jpeg:${PORTSDIR}/graphics/jpeg</programlisting>
 
 	<para>will check for a shared jpeg library with major
 	  version 9, and descend into the
@@ -3466,7 +3470,7 @@
 	    are allowed.  The first pattern,
 	    <literal>intl.[5-7]</literal>, will match any of:
 	    <literal>intl.5</literal>, <literal>intl.6</literal> or
-	    <literal>intl.7</literal>.  The second pattern,
+	    <literal>intl.7</literal>.  The second (preferred) pattern,
 	    <literal>intl</literal>, will match any version of the
 	    <literal>intl</literal> library.</para>
 	</note>
@@ -3499,11 +3503,11 @@
 
 	<para>For example,</para>
 
-	<programlisting>RUN_DEPENDS=	${LOCALBASE}/etc/innd:${PORTSDIR}/news/inn \
+	<programlisting>RUN_DEPENDS=	${LOCALBASE}/bin/innd:${PORTSDIR}/news/inn \
 		xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr</programlisting>
 
 	<para>will check if the file or directory
-	  <filename>/usr/local/etc/innd</filename> exists, and build
+	  <filename>/usr/local/bin/innd</filename> exists, and build
 	  and install it from the <filename>news/inn</filename>
 	  subdirectory of the ports tree if it is not found.  It will
 	  also see if an executable called
@@ -4458,7 +4462,7 @@
 	  <title>Wrong Handling of an Option</title>
 
 	  <programlisting>.if ${PORT_OPTIONS:MFOO}
-LIB_DEPENDS+=		foo.0:${PORTSDIR}/devel/foo
+LIB_DEPENDS+=		foo:${PORTSDIR}/devel/foo
 CONFIGURE_ARGS+=	--enable-foo
 .endif</programlisting>
 	</example>
@@ -4477,7 +4481,7 @@
 	  <title>Correct Handling of an Option</title>
 
 	  <programlisting>.if ${PORT_OPTIONS:MFOO}
-LIB_DEPENDS+=		foo.0:${PORTSDIR}/devel/foo
+LIB_DEPENDS+=		foo:${PORTSDIR}/devel/foo
 CONFIGURE_ARGS+=	--enable-foo
 .else
 CONFIGURE_ARGS+=	--disable-foo
@@ -6990,11 +6994,11 @@
 		  <literal>20</literal>, <literal>22</literal>,
 		  <literal>20-22</literal>, <literal>20+</literal>,
 		  etc. The default APACHE version is
-		  <literal>22</literal>.</entry>
-		<entry>More details are available in
+		  <literal>22</literal>.  More details are available in
 		  <filename>ports/Mk/bsd.apache.mk</filename> and at
 		  <ulink
-		    url="http://wiki.freebsd.org/Apache/">.</ulink></entry>
+		    url="http://wiki.freebsd.org/Apache/">
+		  wiki.freebsd.org/Apache/</ulink>.</entry>
 	      </row>
 
 	      <row>
@@ -7022,7 +7026,7 @@
 		  available after inclusion of
 		  <filename>bsd.port.pre.mk</filename>.  Possible
 		  values: <literal>20</literal>,
-		  <literal>22</literal>.
+		  <literal>22</literal>.</entry>
 	      </row>
 
 	      <row>
@@ -9046,7 +9050,7 @@
 		  role="package">databases/postgresql90-client</filename>
 		port.  An associated variable,
 		<makevar>WANT_PGSQL_VER</makevar>, may be set to
-		values such as 83, 84, 90, or 91.  You can declare a
+		values such as 83, 84, 90, 91 or 92.  You can declare a
 		minimum or maximum value;
 		<makevar>WANT_PGSQL_VER</makevar>=
 		<literal> 90+</literal> will cause the
@@ -16235,7 +16239,7 @@
 
 [dependencies -- can be empty]
 RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript
-LIB_DEPENDS=	Xpm.5:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm:${PORTSDIR}/graphics/xpm
 
 [this section is for other standard bsd.port.mk variables that do not
  belong to any of the above]
--- en_porters-handbook.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:

