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)

en_US.ISO8859-1/books/porters-handbook/book.sgml

@@ -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
+	<para>will check for a shared jpeg library with any version,
-	  version 9, and descend into the
+	  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.7</literal>.</para>
-	    <literal>intl</literal>, will match any version of the
-	    <literal>intl</literal> library.</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_build uic_build</programlisting>
 		  <literal>20</literal>, <literal>22</literal>,
 		  <literal>20-22</literal>, <literal>20+</literal>,
 		  etc. The default APACHE version is
-		  <literal>22</literal>.</entry>
+		  <literal>22</literal>.  More details are available in
-		<entry>More details are available in
 		  <filename>ports/Mk/bsd.apache.mk</filename> and at
-		  <ulink
+		  <ulink url="http://wiki.freebsd.org/Apache/">
-		    url="http://wiki.freebsd.org/Apache/">.</ulink></entry>
+		  wiki.freebsd.org/Apache/</ulink>.</entry>
 	      </row>
 
 	      <row>
@@ -7022,7 +7025,7 @@ QT_COMPONENTS=	moc_build qmake_build rcc_build uic_build</programlisting>
 		  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 Window System
 
 [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]