From ohauer@FreeBSD.org  Sat Jul 14 22:19:45 2012
Return-Path: <ohauer@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 0E007106564A
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 14 Jul 2012 22:19:45 +0000 (UTC)
	(envelope-from ohauer@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id E2A418FC12
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 14 Jul 2012 22:19:44 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q6EMJiXx069251
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 14 Jul 2012 22:19:44 GMT
	(envelope-from ohauer@freefall.freebsd.org)
Received: (from ohauer@localhost)
	by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q6EMJiro069250;
	Sat, 14 Jul 2012 22:19:44 GMT
	(envelope-from ohauer)
Message-Id: <201207142219.q6EMJiro069250@freefall.freebsd.org>
Date: Sat, 14 Jul 2012 22:19:44 GMT
From: Olli Hauer <ohauer@freebsd.org>
Reply-To: Olli Hauer <ohauer@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] porters-handbook various small changes
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         169864
>Category:       docs
>Synopsis:       [patch] porters-handbook various small changes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    zeising
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jul 14 22:20:06 UTC 2012
>Closed-Date:    Wed Jul 18 09:40:01 UTC 2012
>Last-Modified:  Wed Jul 18 09:40:14 UTC 2012
>Originator:     Olli Hauer <ohauer@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

- fix innd location in RUN_DEPENDS example [3]

 [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

 [3] ETCDIR of news/inn is ${LOCALBASE}/etc/inn, but the binary is will be installed to 
     ${LOCALBASE}/news/bin/innd.

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}/news/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/news/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:
Responsible-Changed-From-To: freebsd-doc->zeising 
Responsible-Changed-By: zeising 
Responsible-Changed-When: Tue Jul 17 13:22:20 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=169864 
State-Changed-From-To: open->closed 
State-Changed-By: zeising 
State-Changed-When: Wed Jul 18 09:40:00 UTC 2012 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=169864 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: docs/169864: commit references a PR
Date: Wed, 18 Jul 2012 09:39:27 +0000 (UTC)

 Author: zeising
 Date: Wed Jul 18 09:39:18 2012
 New Revision: 39231
 URL: http://svn.freebsd.org/changeset/doc/39231
 
 Log:
   Small fixes to the porters handbook.
   
   - Add MASTER_SITE_SUBDIR example
   - Remove third column from USE_APACHE table and fix link to wiki
   - Add missing </entry>
   - Remove major shlib version number from examples
   - Add PgSQL 92 version number
   - Change location of innd to the right one in example
   
   PR:		doc/169864 (with minor fixes from me)
   Submitted by:	ohauer
   Approved by:	joel (mentor)
 
 Modified:
   head/en_US.ISO8859-1/books/porters-handbook/book.sgml
 
 Modified: head/en_US.ISO8859-1/books/porters-handbook/book.sgml
 ==============================================================================
 --- head/en_US.ISO8859-1/books/porters-handbook/book.sgml	Wed Jul 18 08:54:09 2012	(r39230)
 +++ head/en_US.ISO8859-1/books/porters-handbook/book.sgml	Wed Jul 18 09:39:18 2012	(r39231)
 @@ -2447,6 +2447,10 @@ MASTER_SITE_SUBDIR=	make</programlisting
  
  	<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,10 +3452,10 @@ ALWAYS_KEEP_DISTFILES=	yes
  	  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
 +	<para>will check for a shared jpeg library with any version,
 +	  and descend into the
  	  <filename>graphics/jpeg</filename> subdirectory of your
  	  ports tree to build and install it if it is not found.  The
  	  <replaceable>target</replaceable> part can be omitted if it
 @@ -3462,13 +3466,13 @@ ALWAYS_KEEP_DISTFILES=	yes
  	  <para>The <replaceable>lib</replaceable> part is a regular
  	    expression which is being looked up in the
  	    <command>ldconfig -r</command> output.  Values such as
 -	    <literal>intl.[5-7]</literal> and <literal>intl</literal>
 +	    <literal>intl.9</literal> and <literal>intl.[5-7]</literal>
  	    are allowed.  The first pattern,
 +	    <literal>intl.9</literal>, will match only version 9 of
 +	    intl, while
  	    <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</literal>, will match any version of the
 -	    <literal>intl</literal> library.</para>
 +	    <literal>intl.7</literal>.</para>
  	</note>
  
  	<para>The dependency is checked twice, once from within the
 @@ -3499,11 +3503,11 @@ ALWAYS_KEEP_DISTFILES=	yes
  
  	<para>For example,</para>
  
 -	<programlisting>RUN_DEPENDS=	${LOCALBASE}/etc/innd:${PORTSDIR}/news/inn \
 +	<programlisting>RUN_DEPENDS=	${LOCALBASE}/news/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/news/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 @@ CONFIGURE_ARGS+=	--with-foo
  	  <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 @@ CONFIGURE_ARGS+=	--enable-foo
  	  <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,10 @@ QT_COMPONENTS=	moc_build qmake_build rcc
  		  <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>
 +		  <ulink url="http://wiki.freebsd.org/Apache/">
 +		  wiki.freebsd.org/Apache/</ulink>.</entry>
  	      </row>
  
  	      <row>
 @@ -7022,7 +7025,7 @@ QT_COMPONENTS=	moc_build qmake_build rcc
  		  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 +9049,7 @@ CFLAGS+=	-DLUA_VERSION_STRING="${VER_STR
  		  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
 @@ -16219,7 +16222,7 @@ COMMENT=	A DVI Previewer for the X Windo
  
  [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]
 _______________________________________________
 svn-doc-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-doc-all
 To unsubscribe, send any mail to "svn-doc-all-unsubscribe@freebsd.org"
 
>Unformatted:
