From jgh@FreeBSD.org  Tue Feb 26 22:23:04 2013
Return-Path: <jgh@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id C2B4A543;
	Tue, 26 Feb 2013 22:23:04 +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 A5C9E62A;
	Tue, 26 Feb 2013 22:23:04 +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 r1QMN4e7088088;
	Tue, 26 Feb 2013 22:23:04 GMT
	(envelope-from jgh@freefall.freebsd.org)
Received: (from jgh@localhost)
	by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r1QMN4rx088087;
	Tue, 26 Feb 2013 22:23:04 GMT
	(envelope-from jgh)
Message-Id: <201302262223.r1QMN4rx088087@freefall.freebsd.org>
Date: Tue, 26 Feb 2013 22:23:04 GMT
From: Jason Helfman <jgh@FreeBSD.org>
Reply-To: Jason Helfman <jgh@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: bapt@FreeBSD.org
Subject: [patch][book/porters-handbook] convert to optionsNG for NLS, fix a closed literal tag
X-Send-Pr-Version: 3.114
X-GNATS-Notify:

>Number:         176455
>Category:       docs
>Synopsis:       [patch][porters-handbook] convert to optionsNG for NLS, fix a closed literal tag
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    eadler
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 26 22:30:00 UTC 2013
>Closed-Date:    Wed Feb 27 21:25:12 UTC 2013
>Last-Modified:  Wed Feb 27 21:30: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 #2 r245102: Sun Jan 6 15:01:33 UTC 2013 root@freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL amd64


	
>Description:
NLS section example wasn't converted to new options framework
Encountered a issue when building where a closed "literal" tag was never opened. line 7608

/usr/local/bin/openjade:/home/jgh/workspace/docs/en_US.ISO8859-1/books/porters-handbook/book.xml:7608:10:E: end tag for element "literal" which is not open

>How-To-Repeat:
	
>Fix:

Index: book.xml
===================================================================
--- book.xml	(revision 41051)
+++ book.xml	(working copy)
@@ -5749,14 +5749,18 @@
 
 	<programlisting>GNU_CONFIGURE=		yes
 
-.if !defined(WITHOUT_NLS)
+.include &lt;bsd.port.options.mk&gt;
+
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=		yes
 PLIST_SUB+=		NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=		NLS="@comment "
-.endif</programlisting>
+.endif
 
+.include &lt;bsd.port.mk&gt;</programlisting>
+
 	<para>The next item on your to-do list is to arrange so that
 	  the message catalog files are included in the packing list
 	  conditionally.  The <filename>Makefile</filename> part of
@@ -7599,6 +7603,12 @@
 
       <programlisting>PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}</programlisting>
 
+      <para>Generally, if <makevar>PKGNAMEPREFIX</makevar> is set, the
+	port should require a <literal>py-</literal> port origin prefix.
+	For example, <filename>
+	/usr/ports/<replaceable>sysutils/py-myport</replaceable>
+	</filename></para>
+
       <table frame="none">
 	<title>Most Useful Variables for Ports That Use Python</title>
 
>Release-Note:
>Audit-Trail:

From: Jason Helfman <jgh@FreeBSD.org>
To: freebsd-doc@freebsd.org, bug-followup@freebsd.org
Cc:  
Subject: Re: docs/176455: [patch][book/porters-handbook] convert to optionsNG
 for NLS, fix a closed literal tag
Date: Tue, 26 Feb 2013 14:33:14 -0800

 --089e01229cb64b2e1104d6a83eda
 Content-Type: text/plain; charset=ISO-8859-1
 
 Please forgive me.... This was something that I was working on that hasn't
 be committed, I believe at this time....
 
 The second blob does not need to be applied.
 
 -jgh
 
 --
 Jason Helfman          | FreeBSD Committer
 jgh@FreeBSD.org     | http://people.freebsd.org/~jgh  | The Power to Serve
 
 --089e01229cb64b2e1104d6a83eda--

From: Jason Helfman <jgh@FreeBSD.org>
To: bug-followup@freebsd.org
Cc: freebsd-doc@freebsd.org
Subject: Re: docs/176455: [patch][book/porters-handbook] convert to optionsNG
 for NLS, fix a closed literal tag
Date: Tue, 26 Feb 2013 16:25:02 -0800

 For completeness, here is the updated patch:
 
 Index: book.xml
 ===================================================================
 --- book.xml	(revision 41051)
 +++ book.xml	(working copy)
 @@ -5749,14 +5749,18 @@
   
   	<programlisting>GNU_CONFIGURE=		yes
   
 -.if !defined(WITHOUT_NLS)
 +.include &lt;bsd.port.options.mk&gt;
 +
 +.if ${PORT_OPTIONS:MNLS}
   USE_GETTEXT=		yes
   PLIST_SUB+=		NLS=""
   .else
   CONFIGURE_ARGS+=	--disable-nls
   PLIST_SUB+=		NLS="@comment "
 -.endif</programlisting>
 +.endif
   
 +.include &lt;bsd.port.mk&gt;</programlisting>
 +
   	<para>The next item on your to-do list is to arrange so that
   	  the message catalog files are included in the packing list
   	  conditionally.  The <filename>Makefile</filename> part of
 
 -- 
 Jason Helfman
 FreeBSD Committer | http://people.freebsd.org/~jgh | The Power To Serve
Responsible-Changed-From-To: freebsd-doc->eadler 
Responsible-Changed-By: eadler 
Responsible-Changed-When: Wed Feb 27 20:47:39 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=176455 
State-Changed-From-To: open->closed 
State-Changed-By: eadler 
State-Changed-When: Wed Feb 27 21:25:11 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: docs/176455: commit references a PR
Date: Wed, 27 Feb 2013 21:24:06 +0000 (UTC)

 Author: eadler
 Date: Wed Feb 27 21:23:54 2013
 New Revision: 41053
 URL: http://svnweb.freebsd.org/changeset/doc/41053
 
 Log:
   Update to OptionsNG
   
   PR:		docs/176455
   Submitted by:	jgh
   Approved by:	bcr (mentor)
 
 Modified:
   head/en_US.ISO8859-1/books/porters-handbook/book.xml
 
 Modified: head/en_US.ISO8859-1/books/porters-handbook/book.xml
 ==============================================================================
 --- head/en_US.ISO8859-1/books/porters-handbook/book.xml	Wed Feb 27 20:38:17 2013	(r41052)
 +++ head/en_US.ISO8859-1/books/porters-handbook/book.xml	Wed Feb 27 21:23:54 2013	(r41053)
 @@ -5749,13 +5749,17 @@ GNU_CONFIGURE=	yes</programlisting>
  
  	<programlisting>GNU_CONFIGURE=		yes
  
 -.if !defined(WITHOUT_NLS)
 +.include &lt;bsd.port.options.mk&gt;
 +
 +.if ${PORT_OPTIONS:MNLS}
  USE_GETTEXT=		yes
  PLIST_SUB+=		NLS=""
  .else
  CONFIGURE_ARGS+=	--disable-nls
  PLIST_SUB+=		NLS="@comment "
 -.endif</programlisting>
 +.endif
 +
 +.include &lt;bsd.port.mk&gt;</programlisting>
  
  	<para>The next item on your to-do list is to arrange so that
  	  the message catalog files are included in the packing list
 _______________________________________________
 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:
