svn commit: r43055 - head/en_US.ISO8859-1/books/porters-handbook

[Benjamin Kaduk]

On Mon, 28 Oct 2013, Eitan Adler wrote:

> Author: eadler
> Date: Mon Oct 28 19:17:08 2013
> New Revision: 43055
> URL: http://svnweb.freebsd.org/changeset/doc/43055
>
> Log:
>  Add STAGEDIR where needed (in some cases)
>
> 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	Mon Oct 28 19:13:05 2013	(r43054)
> +++ head/en_US.ISO8859-1/books/porters-handbook/book.xml	Mon Oct 28 19:17:08 2013	(r43055)
> @@ -5036,7 +5036,7 @@ PORTVERSION=	1.0</programlisting>
> 	  example:</para>
>
> 	<programlisting>post-install:
> -	${STRIP_CMD} ${PREFIX}/bin/xdl</programlisting>
> +	  ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/xdl</programlisting>
>
> 	<para>Use the &man.file.1; command on the installed executable
> 	  to check whether the binary is stripped or not.  If it does
> @@ -5068,8 +5068,8 @@ PORTVERSION=	1.0</programlisting>
> 	  target.</para>
>
> 	<programlisting>post-install:
> -	${MKDIR} ${EXAMPLESDIR}
> -	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${EXAMPLESDIR})</programlisting>
> +	  ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
> +	  (cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})</programlisting>
>
> 	<para>This example will install the contents of
> 	  <filename>examples</filename> directory in the vendor
> @@ -5077,8 +5077,8 @@ PORTVERSION=	1.0</programlisting>
> 	  port.</para>
>
> 	<programlisting>post-install:
> -	${MKDIR} ${DATADIR}/summer
> -	(cd ${WRKSRC}/temperatures && ${COPYTREE_SHARE} "June July August" ${DATADIR}/summer)</programlisting>
> +	  ${MKDIR} ${STAGEDIR}${DATADIR}/summer
> +	  (cd ${WRKSRC}/temperatures && ${COPYTREE_SHARE} "June July August" ${STAGEDIR}${DATADIR}/summer)</programlisting>
>
> 	<para>And this example will install the data of summer months
> 	  to the <filename>summer</filename> subdirectory of a
> @@ -5091,9 +5091,9 @@ PORTVERSION=	1.0</programlisting>
> 	  one can use the following command.</para>
>
> 	<programlisting>post-install:
> -	${MKDIR} ${EXAMPLESDIR}
> +	  ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
> 	(cd ${WRKSRC}/examples && \
> -		${COPYTREE_SHARE} . ${EXAMPLESDIR} "! -name Makefile")</programlisting>
> +	${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} "! -name Makefile")</programlisting>
>
> 	<para>Note that these macros does not add the installed files
> 	  to <filename>pkg-plist</filename>.  You still need to list
> @@ -10008,7 +10008,7 @@ lib/X11/oneko/sounds/cat.au
>
>       <programlisting>post-install:
> 	@if [ ! -f ${PREFIX}/etc/orbit.conf ]; then \
> -		${CP} -p ${PREFIX}/etc/orbit.conf.sample ${PREFIX}/etc/orbit.conf ; \
> +	${CP} -p ${PREFIX}/etc/orbit.conf.sample ${STAGEDIR}${PREFIX}/etc/orbit.conf ; \
> 	fi</programlisting>
>
>       <para>For each configuration file, create the following three

The loss of internal indentation within the programlisting for the normal 
indentation with nested control flow is unfortunate.  That is, the body of 
if statements is normally indented another level, as are continuation 
lines in a subshell.

-Ben