Bug 176455

Summary: [patch][porters-handbook] convert to optionsNG for NLS, fix a closed literal tag
Product: Documentation Reporter: Jason Helfman <jgh>
Component: Books & ArticlesAssignee: Eitan Adler <eadler>
Status: Closed FIXED    
Severity: Affects Only Me CC: bapt
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff none

Description Jason Helfman freebsd_committer freebsd_triage 2013-02-26 22:30:00 UTC 
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
Comment 1 Jason Helfman freebsd_committer freebsd_triage 2013-02-26 22:33:14 UTC 
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
Comment 2 Jason Helfman freebsd_committer freebsd_triage 2013-02-27 00:25:02 UTC 
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
Comment 3 Eitan Adler freebsd_committer freebsd_triage 2013-02-27 20:47:39 UTC 
Responsible Changed
From-To: freebsd-doc->eadler

I'll take it.
Comment 4 dfilter service freebsd_committer freebsd_triage 2013-02-27 21:24:06 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"
Comment 5 Eitan Adler freebsd_committer freebsd_triage 2013-02-27 21:25:11 UTC 
State Changed
From-To: open->closed

Committed. Thanks!