From owner-freebsd-doc@FreeBSD.ORG Mon Nov 18 13:30:03 2013 Return-Path: Delivered-To: freebsd-doc@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DEDC3745 for ; Mon, 18 Nov 2013 13:30:02 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BF0A62A76 for ; Mon, 18 Nov 2013 13:30:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id rAIDU2JF047279 for ; Mon, 18 Nov 2013 13:30:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id rAIDU2xM047278; Mon, 18 Nov 2013 13:30:02 GMT (envelope-from gnats) Resent-Date: Mon, 18 Nov 2013 13:30:02 GMT Resent-Message-Id: <201311181330.rAIDU2xM047278@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-doc@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Alan Hicks Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3E5B13D5 for ; Mon, 18 Nov 2013 13:22:24 +0000 (UTC) Received: from avasout05.plus.net (avasout05.plus.net [84.93.230.250]) by mx1.freebsd.org (Postfix) with ESMTP id A12B62A0C for ; Mon, 18 Nov 2013 13:22:23 +0000 (UTC) Received: from mail.p-o.co.uk ([80.229.143.200]) by avasout05 with smtp id r1NL1m0014Ke75s011NMSi; Mon, 18 Nov 2013 13:22:21 +0000 Received: from alan by p-o.co.uk with local (Exim 4.80.1 (FreeBSD)) (envelope-from ) id 1ViOhG-000KXM-Ee for FreeBSD-gnats-submit@freebsd.org; Mon, 18 Nov 2013 13:16:58 +0000 Message-Id: Date: Mon, 18 Nov 2013 13:16:58 +0000 From: Alan Hicks To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.114 Subject: docs/184051: Update configuration example for staging X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list Reply-To: Alan Hicks List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Nov 2013 13:30:03 -0000 >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 root@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 @@ Beispiel aus einem Makefile: 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 Beispiel aus einer pkg-plist: 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 @@ Example of the Makefile part: 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 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 @@ ðÒÉÍÅÒ ÞÁÓÔÉ Makefile: 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 äÏÂÁ×ØÔÅ ÐÏ ÔÒÉ ÓÔÒÏËÉ × pkg-plist ÄÌÑ 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 @@ 示例的 Makefile 部分： 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 示例的 pkg-plist 部分： 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 @@ Example of the Makefile part: 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 Example of the pkg-plist part: --- freebsd-docs-stagingexample.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: