docs/184051: Update configuration example for staging

[Alan Hicks]

>Number:         184051
>Category:       docs
>Synopsis:       Update configuration example for staging
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-doc
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 18 13:30:02 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Alan Hicks
>Release:        FreeBSD 9.2-RELEASE i386
>Organization:
>Environment:
System: FreeBSD schnittke.p-o.co.uk 9.2-RELEASE FreeBSD 9.2-RELEASE #0 r255898: 
Fri Sep 27 03:52:52 UTC 2013 
r...@bake.isc.freebsd.org:/usr/obj/usr/src/sys/GENERIC i386


        
>Description:
Add staging support to post install example, en_US example misses ${STAGEDIR} 
from test and source
        
>How-To-Repeat:
        
>Fix:
Apply patche
        

--- freebsd-docs-stagingexample.diff begins here ---
Index: de_DE.ISO8859-1/books/porters-handbook/book.xml
===================================================================
--- de_DE.ISO8859-1/books/porters-handbook/book.xml     (revision 43202)
+++ de_DE.ISO8859-1/books/porters-handbook/book.xml     (working copy)
@@ -9852,8 +9852,8 @@
       <para>Beispiel aus einem <filename>Makefile</filename>:</para>
 
       <programlisting>post-install:
-    @if [ ! -f ${PREFIX}/etc/orbit.conf ]; then \
-       ${CP} -p ${PREFIX}/etc/orbit.conf.sample ${PREFIX}/etc/orbit.conf ; \
+    @if [ ! -f ${STAGEDIR}${PREFIX}/etc/orbit.conf ]; then \
+       ${CP} -p ${STAGEDIR}${PREFIX}/etc/orbit.conf.sample 
${STAGEDIR}${PREFIX}/etc/orbit.conf ; \
     fi</programlisting>
 
       <para>Beispiel aus einer <filename>pkg-plist</filename>:</para>
Index: en_US.ISO8859-1/books/porters-handbook/book.xml
===================================================================
--- en_US.ISO8859-1/books/porters-handbook/book.xml     (revision 43202)
+++ en_US.ISO8859-1/books/porters-handbook/book.xml     (working copy)
@@ -10269,8 +10269,8 @@
       <para>Example of the <filename>Makefile</filename> part:</para>
 
       <programlisting>post-install:
-       @if [ ! -f ${PREFIX}/etc/orbit.conf ]; then \
-       ${CP} -p ${PREFIX}/etc/orbit.conf.sample 
${STAGEDIR}${PREFIX}/etc/orbit.conf ; \
+       @if [ ! -f ${STAGEDIR}${PREFIX}/etc/orbit.conf ]; then \
+       ${CP} -p ${STAGEDIR}${PREFIX}/etc/orbit.conf.sample 
${STAGEDIR}${PREFIX}/etc/orbit.conf ; \
        fi</programlisting>
 
       <para>For each configuration file, create the following three
Index: ru_RU.KOI8-R/books/porters-handbook/book.xml
===================================================================
--- ru_RU.KOI8-R/books/porters-handbook/book.xml        (revision 43202)
+++ ru_RU.KOI8-R/books/porters-handbook/book.xml        (working copy)
@@ -10035,8 +10035,8 @@
       <para>ðÒÉÍÅÒ ÞÁÓÔÉ <filename>Makefile</filename>:</para>
 
       <programlisting>post-install:
-       @if [ ! -f ${PREFIX}/etc/orbit.conf ]; then \
-               ${CP} -p ${PREFIX}/etc/orbit.conf.sample 
${PREFIX}/etc/orbit.conf ; \
+       @if [ ! -f ${STAGEDIR}${PREFIX}/etc/orbit.conf ]; then \
+               ${CP} -p ${STAGEDIR}${PREFIX}/etc/orbit.conf.sample 
${STAGEDIR}${PREFIX}/etc/orbit.conf ; \
        fi</programlisting>
 
       <para>äÏÂÁ×ØÔÅ ÐÏ ÔÒÉ ÓÔÒÏËÉ × <filename>pkg-plist</filename> ÄÌÑ
Index: zh_CN.UTF-8/books/porters-handbook/book.xml
===================================================================
--- zh_CN.UTF-8/books/porters-handbook/book.xml (revision 43202)
+++ zh_CN.UTF-8/books/porters-handbook/book.xml (working copy)
@@ -8533,8 +8533,8 @@
        <para>示例的 <filename>Makefile</filename> 部分：</para>
 
        <programlisting>post-install:
-       @if [ ! -f ${PREFIX}/etc/orbit.conf ]; then \
-               ${CP} -p ${PREFIX}/etc/orbit.conf.sample 
${PREFIX}/etc/orbit.conf ; \
+       @if [ ! -f ${STAGEDIR}${PREFIX}/etc/orbit.conf ]; then \
+               ${CP} -p ${STAGEDIR}${PREFIX}/etc/orbit.conf.sample 
${STAGEDIR}${PREFIX}/etc/orbit.conf ; \
        fi</programlisting>
 
        <para>示例的 <filename>pkg-plist</filename> 部分：</para>
Index: zh_TW.Big5/books/porters-handbook/book.xml
===================================================================
--- zh_TW.Big5/books/porters-handbook/book.xml  (revision 43202)
+++ zh_TW.Big5/books/porters-handbook/book.xml  (working copy)
@@ -8287,8 +8287,8 @@
        <para>Example of the <filename>Makefile</filename> part:</para>
 
        <programlisting>post-install:
-       @if [ ! -f ${PREFIX}/etc/orbit.conf ]; then \
-               ${CP} -p ${PREFIX}/etc/orbit.conf.sample 
${PREFIX}/etc/orbit.conf ; \
+       @if [ ! -f ${STAGEDIR}${PREFIX}/etc/orbit.conf ]; then \
+               ${CP} -p ${STAGEDIR}${PREFIX}/etc/orbit.conf.sample 
${STAGEDIR}${PREFIX}/etc/orbit.conf ; \
        fi</programlisting>
 
        <para>Example of the <filename>pkg-plist</filename> part:</para>
--- freebsd-docs-stagingexample.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:

_______________________________________________
freebsd-doc@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-doc
To unsubscribe, send any mail to "freebsd-doc-unsubscr...@freebsd.org"