Attachment 126140 Details for Bug 169864 – en_porters-handbook.diff

[patch] en_porters-handbook.diff

en_porters-handbook.diff (text/plain), 4.00 KB, created by Olli Hauer on 2012-07-14 23:20:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olli Hauer

Created: 2012-07-14 23:20:06 UTC

Size: 4.00 KB

patch

obsolete

>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]

Actions: View | Diff

Attachments on bug 169864: 126140