From jgh@FreeBSD.org  Fri Apr 26 04:13:15 2013
Return-Path: <jgh@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id CC8FFC52;
	Fri, 26 Apr 2013 04:13:15 +0000 (UTC)
	(envelope-from jgh@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87])
	by mx1.freebsd.org (Postfix) with ESMTP id 804DA1B86;
	Fri, 26 Apr 2013 04:13:15 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r3Q4DFhX083846;
	Fri, 26 Apr 2013 04:13:15 GMT
	(envelope-from jgh@freefall.freebsd.org)
Received: (from jgh@localhost)
	by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r3Q4DFoS083842;
	Fri, 26 Apr 2013 04:13:15 GMT
	(envelope-from jgh)
Message-Id: <201304260413.r3Q4DFoS083842@freefall.freebsd.org>
Date: Fri, 26 Apr 2013 04:13:15 GMT
From: Jason Helfman <jgh@FreeBSD.org>
Reply-To: Jason Helfman <jgh@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: bapt@FreeBSD.org, ak@FreeBSD.org
Subject: [patch][porters-handbook] update documentation for using gettext
X-Send-Pr-Version: 3.114
X-GNATS-Notify:

>Number:         178169
>Category:       docs
>Synopsis:       [patch][porters-handbook] update documentation for using gettext
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    jgh
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Apr 26 04:20:00 UTC 2013
>Closed-Date:    Fri Apr 26 23:32:10 UTC 2013
>Last-Modified:  Fri Apr 26 23:40:00 UTC 2013
>Originator:     Jason Helfman
>Release:        FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD freefall.freebsd.org 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r249172: Sat Apr 6 00:40:01 UTC 2013 peter@freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL amd64


	
>Description:
USE_GETTEXT is now under the USES framework

>How-To-Repeat:
	
>Fix:

Index: porters-handbook/book.xml
===================================================================
--- porters-handbook/book.xml	(revision 41499)
+++ porters-handbook/book.xml	(working copy)
@@ -5781,17 +5781,12 @@
       <sect2>
 	<title>Basic Usage</title>
 
-	<para>If your port requires <literal>gettext</literal>,
-	  just set <makevar>USE_GETTEXT</makevar> to
-	  <literal>yes</literal>, and your port will grow the
-	  dependency on <filename
-	    role="package">devel/gettext</filename>.  The value of
-	  <makevar>USE_GETTEXT</makevar> can also specify the required
-	  version of the <literal>libintl</literal> library, the basic
-	  part of <literal>gettext</literal>, but using this feature
-	  is <emphasis>strongly discouraged</emphasis>: Your port
-	  should work with just the current version of <filename
-	    role="package">devel/gettext</filename>.</para>
+	<para>If your port requires <literal>gettext</literal>, just
+	  set <literal>USES= gettext</literal>, and your
+	  port will inherit a dependency on <filename
+	    role="package">devel/gettext</filename>. Other values for
+	  <literal>gettext</literal> usage can be in <xref
+	  linkend="uses-values"/>.</para>
 
 	<para>A rather common case is a port using
 	  <literal>gettext</literal> and <command>configure</command>.
@@ -5802,7 +5797,7 @@
 	  <envar>CPPFLAGS</envar> and <envar>LDFLAGS</envar> as
 	  follows:</para>
 
-	<programlisting>USE_GETTEXT=	yes
+	<programlisting>USES=	gettext
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
@@ -5811,7 +5806,7 @@
 	<para>Of course, the code can be more compact if there are no
 	  more flags to pass to <command>configure</command>:</para>
 
-	<programlisting>USE_GETTEXT=	yes
+	<programlisting>USES=	gettext
 GNU_CONFIGURE=	yes</programlisting>
       </sect2>
 
@@ -5832,7 +5827,7 @@
 .include &lt;bsd.port.options.mk&gt;
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=		yes
+USES+=			gettext
 PLIST_SUB+=		NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
Index: porters-handbook/uses.xml
===================================================================
--- porters-handbook/uses.xml	(revision 41499)
+++ porters-handbook/uses.xml	(working copy)
@@ -63,6 +63,19 @@
 </row>
 
 <row>
+  <entry><literal>gettext</literal></entry>
+  <entry>none, <literal>lib</literal>, <literal>build</literal>,
+    <literal>run</literal></entry>
+  <entry>Implies that the port uses <filename
+      role="package">devel/gettext</filename> in one way or another.  By
+    default, with no arguments or with the <literal>lib</literal>
+    argument, implies <command>gettext</command> with build-time and 
+    run-time dependencies, <literal>build</literal> implies a build-time
+    dependency, and <literal>run</literal> implies a run-time
+    dependency.</entry>
+</row>
+
+<row>
   <entry><literal>pathfix</literal></entry>
   <entry>none</entry>
   <entry>Look for the <filename>Makefile.in</filename> and
>Release-Note:
>Audit-Trail:

From: Jason Helfman <jgh@FreeBSD.org>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: docs/178169: [patch][porters-handbook] update documentation for
 using gettext
Date: Thu, 25 Apr 2013 23:13:23 -0700

 --envbJBWh7q8WU6mo
 Content-Type: text/plain; charset=us-ascii; format=flowed
 Content-Disposition: inline
 
 Language correction.
 
 -jgh
 
 --
 Jason Helfman
 FreeBSD Committer | http://people.freebsd.org/~jgh | The Power To Serve
 
 --envbJBWh7q8WU6mo
 Content-Type: text/x-diff; charset=us-ascii
 Content-Disposition: attachment; filename="gettext.diff"
 
 Index: porters-handbook/book.xml
 ===================================================================
 --- porters-handbook/book.xml	(revision 41499)
 +++ porters-handbook/book.xml	(working copy)
 @@ -5781,17 +5781,12 @@
        <sect2>
  	<title>Basic Usage</title>
  
 -	<para>If your port requires <literal>gettext</literal>,
 -	  just set <makevar>USE_GETTEXT</makevar> to
 -	  <literal>yes</literal>, and your port will grow the
 -	  dependency on <filename
 -	    role="package">devel/gettext</filename>.  The value of
 -	  <makevar>USE_GETTEXT</makevar> can also specify the required
 -	  version of the <literal>libintl</literal> library, the basic
 -	  part of <literal>gettext</literal>, but using this feature
 -	  is <emphasis>strongly discouraged</emphasis>: Your port
 -	  should work with just the current version of <filename
 -	    role="package">devel/gettext</filename>.</para>
 +	<para>If your port requires <literal>gettext</literal>, just set
 +	  <literal>USES= gettext</literal>, and your
 +	  port will inherit a dependency on <filename
 +	    role="package">devel/gettext</filename>. Other values for
 +	  <literal>gettext</literal> usage are listed in <xref
 +	  linkend="uses-values"/>.</para>
  
  	<para>A rather common case is a port using
  	  <literal>gettext</literal> and <command>configure</command>.
 @@ -5802,7 +5797,7 @@
  	  <envar>CPPFLAGS</envar> and <envar>LDFLAGS</envar> as
  	  follows:</para>
  
 -	<programlisting>USE_GETTEXT=	yes
 +	<programlisting>USES=	gettext
  CPPFLAGS+=	-I${LOCALBASE}/include
  LDFLAGS+=	-L${LOCALBASE}/lib
  
 @@ -5811,7 +5806,7 @@
  	<para>Of course, the code can be more compact if there are no
  	  more flags to pass to <command>configure</command>:</para>
  
 -	<programlisting>USE_GETTEXT=	yes
 +	<programlisting>USES=	gettext
  GNU_CONFIGURE=	yes</programlisting>
        </sect2>
  
 @@ -5832,7 +5827,7 @@
  .include &lt;bsd.port.options.mk&gt;
  
  .if ${PORT_OPTIONS:MNLS}
 -USE_GETTEXT=		yes
 +USES+=			gettext
  PLIST_SUB+=		NLS=""
  .else
  CONFIGURE_ARGS+=	--disable-nls
 Index: porters-handbook/uses.xml
 ===================================================================
 --- porters-handbook/uses.xml	(revision 41499)
 +++ porters-handbook/uses.xml	(working copy)
 @@ -63,6 +63,19 @@
  </row>
  
  <row>
 +  <entry><literal>gettext</literal></entry>
 +  <entry>none, <literal>lib</literal>, <literal>build</literal>,
 +    <literal>run</literal></entry>
 +  <entry>Implies that the port uses <filename
 +      role="package">devel/gettext</filename> in one way or another.  By
 +    default, with no arguments or with the <literal>lib</literal>
 +    argument, implies <command>gettext</command> with build-time and 
 +    run-time dependencies, <literal>build</literal> implies a build-time
 +    dependency, and <literal>run</literal> implies a run-time
 +    dependency.</entry>
 +</row>
 +
 +<row>
    <entry><literal>pathfix</literal></entry>
    <entry>none</entry>
    <entry>Look for the <filename>Makefile.in</filename> and
 
 --envbJBWh7q8WU6mo--
Responsible-Changed-From-To: freebsd-doc->jgh 
Responsible-Changed-By: jgh 
Responsible-Changed-When: Fri Apr 26 23:31:47 UTC 2013 
Responsible-Changed-Why:  
Committed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=178169 
State-Changed-From-To: open->closed 
State-Changed-By: jgh 
State-Changed-When: Fri Apr 26 23:32:10 UTC 2013 
State-Changed-Why:  
Comitted 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: docs/178169: commit references a PR
Date: Fri, 26 Apr 2013 23:30:49 +0000 (UTC)

 Author: jgh (ports committer)
 Date: Fri Apr 26 23:30:36 2013
 New Revision: 41507
 URL: http://svnweb.freebsd.org/changeset/doc/41507
 
 Log:
   - document USES=gettext
   
   PR:		178169
   Reviewed by:	remko
 
 Modified:
   head/en_US.ISO8859-1/books/porters-handbook/book.xml
   head/en_US.ISO8859-1/books/porters-handbook/uses.xml
 
 Modified: head/en_US.ISO8859-1/books/porters-handbook/book.xml
 ==============================================================================
 --- head/en_US.ISO8859-1/books/porters-handbook/book.xml	Fri Apr 26 16:44:44 2013	(r41506)
 +++ head/en_US.ISO8859-1/books/porters-handbook/book.xml	Fri Apr 26 23:30:36 2013	(r41507)
 @@ -5781,17 +5781,12 @@ CMAKE_SOURCE_PATH=	&dollar;{WRKSRC}/subp
        <sect2>
  	<title>Basic Usage</title>
  
 -	<para>If your port requires <literal>gettext</literal>,
 -	  just set <makevar>USE_GETTEXT</makevar> to
 -	  <literal>yes</literal>, and your port will grow the
 -	  dependency on <filename
 -	    role="package">devel/gettext</filename>.  The value of
 -	  <makevar>USE_GETTEXT</makevar> can also specify the required
 -	  version of the <literal>libintl</literal> library, the basic
 -	  part of <literal>gettext</literal>, but using this feature
 -	  is <emphasis>strongly discouraged</emphasis>: Your port
 -	  should work with just the current version of <filename
 -	    role="package">devel/gettext</filename>.</para>
 +	<para>If your port requires <literal>gettext</literal>, set
 +	  <literal>USES= gettext</literal>, and your
 +	  port will inherit a dependency on <filename
 +	    role="package">devel/gettext</filename>. Other values for
 +	  <literal>gettext</literal> usage are listed in <xref
 +	  linkend="uses-values"/>.</para>
  
  	<para>A rather common case is a port using
  	  <literal>gettext</literal> and <command>configure</command>.
 @@ -5802,7 +5797,7 @@ CMAKE_SOURCE_PATH=	&dollar;{WRKSRC}/subp
  	  <envar>CPPFLAGS</envar> and <envar>LDFLAGS</envar> as
  	  follows:</para>
  
 -	<programlisting>USE_GETTEXT=	yes
 +	<programlisting>USES=	gettext
  CPPFLAGS+=	-I${LOCALBASE}/include
  LDFLAGS+=	-L${LOCALBASE}/lib
  
 @@ -5811,7 +5806,7 @@ GNU_CONFIGURE=	yes</programlisting>
  	<para>Of course, the code can be more compact if there are no
  	  more flags to pass to <command>configure</command>:</para>
  
 -	<programlisting>USE_GETTEXT=	yes
 +	<programlisting>USES=	gettext
  GNU_CONFIGURE=	yes</programlisting>
        </sect2>
  
 @@ -5832,7 +5827,7 @@ GNU_CONFIGURE=	yes</programlisting>
  .include &lt;bsd.port.options.mk&gt;
  
  .if ${PORT_OPTIONS:MNLS}
 -USE_GETTEXT=		yes
 +USES+=			gettext
  PLIST_SUB+=		NLS=""
  .else
  CONFIGURE_ARGS+=	--disable-nls
 
 Modified: head/en_US.ISO8859-1/books/porters-handbook/uses.xml
 ==============================================================================
 --- head/en_US.ISO8859-1/books/porters-handbook/uses.xml	Fri Apr 26 16:44:44 2013	(r41506)
 +++ head/en_US.ISO8859-1/books/porters-handbook/uses.xml	Fri Apr 26 23:30:36 2013	(r41507)
 @@ -63,6 +63,19 @@
  </row>
  
  <row>
 +  <entry><literal>gettext</literal></entry>
 +  <entry>none, <literal>lib</literal>, <literal>build</literal>,
 +    <literal>run</literal></entry>
 +  <entry>Implies that the port uses <filename
 +      role="package">devel/gettext</filename> in one way or another.  By
 +    default, with no arguments or with the <literal>lib</literal>
 +    argument, implies <command>gettext</command> with build-time and 
 +    run-time dependencies, <literal>build</literal> implies a build-time
 +    dependency, and <literal>run</literal> implies a run-time
 +    dependency.</entry>
 +</row>
 +
 +<row>
    <entry><literal>pathfix</literal></entry>
    <entry>none</entry>
    <entry>Look for the <filename>Makefile.in</filename> and
 _______________________________________________
 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:
