diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2015-06-29 15:32:11 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2015-06-29 15:32:11 +0000 |
| commit | dc4bd73da1277cd32b442c1caccdad8261d3b994 (patch) | |
| tree | a7b67611dcb81f0133a2a49565dffc3866f32e99 | |
| parent | 0adc182340d9ce81b79825a9b9f6fe0dec92c094 (diff) | |
Fixup a lot of <programlisting>
Approved by: wblock (mentor)
Differential Revision: https://reviews.freebsd.org/D2939
Notes
svn path=/head/; revision=46894
3 files changed, 23 insertions, 20 deletions
diff --git a/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml b/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml index 24850e53ee..f350074e07 100644 --- a/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml +++ b/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml @@ -3146,7 +3146,7 @@ ALWAYS_KEEP_DISTFILES= yes <para>For example,</para> <programlisting>RUN_DEPENDS= ${LOCALBASE}/news/bin/innd:${PORTSDIR}/news/inn \ -xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr</programlisting> + xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr</programlisting> <para>will check if the file or directory <filename>/usr/local/news/bin/innd</filename> exists, and @@ -3502,9 +3502,9 @@ RUN_DEPENDS= ${MY_DEPENDS}</programlisting> <programlisting>.include <bsd.port.pre.mk> - .if exists(${LOCALBASE}/bin/foo) - LIB_DEPENDS= libbar.so:${PORTSDIR}/foo/bar - .endif</programlisting> +.if exists(${LOCALBASE}/bin/foo) +LIB_DEPENDS= libbar.so:${PORTSDIR}/foo/bar +.endif</programlisting> </example> <para>The problem with trying to automatically add dependencies @@ -3601,10 +3601,11 @@ PKGNAMESUFFIX= ${RESOLUTION} # default RESOLUTION?= 300 .if ${RESOLUTION} != 118 && ${RESOLUTION} != 240 && \ -${RESOLUTION} != 300 && ${RESOLUTION} != 400 -@${ECHO_MSG} "Error: invalid value for RESOLUTION: \"${RESOLUTION}\"" -@${ECHO_MSG} "Possible values are: 118, 240, 300 (default) and 400." -@${FALSE} + ${RESOLUTION} != 300 && ${RESOLUTION} != 400 +pre-everything:: + @${ECHO_MSG} "Error: invalid value for RESOLUTION: \"${RESOLUTION}\"" + @${ECHO_MSG} "Possible values are: 118, 240, 300 (default) and 400." + @${FALSE} .endif</programlisting> <para><package role="port">japanese/xdvi300</package> also has all @@ -3972,9 +3973,11 @@ FOO_CONFIGURE_ENABLE= foo</programlisting> <literal>Malformed conditional</literal>, an alternative syntax can be used.</para> - <programlisting>.if !empty(VARIABLE:MVALUE) -# as an alternative to -.if ${VARIABLE:MVALUE}</programlisting> + <programlisting>.if !empty(VARIABLE:MVALUE)</programlisting> + + <para>as an alternative to</para> + + <programlisting>.if ${VARIABLE:MVALUE}</programlisting> </note> </sect2> @@ -4775,14 +4778,14 @@ PORTVERSION= 1.0</programlisting> example:</para> <programlisting>post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/xdl</programlisting> + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/xdl</programlisting> <para>When multiple files need to be stripped:</para> <programlisting>post-install: - .for l in geometry media body track world - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}-${l}.so.0 - .endfor</programlisting> +.for l in geometry media body track world + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}-${l}.so.0 +.endfor</programlisting> <para>Use &man.file.1; on a file to determine if it has been stripped. Binaries are reported by &man.file.1; as diff --git a/en_US.ISO8859-1/books/porters-handbook/slow-porting/chapter.xml b/en_US.ISO8859-1/books/porters-handbook/slow-porting/chapter.xml index 942fb7510a..26cc7fc9e0 100644 --- a/en_US.ISO8859-1/books/porters-handbook/slow-porting/chapter.xml +++ b/en_US.ISO8859-1/books/porters-handbook/slow-porting/chapter.xml @@ -408,7 +408,7 @@ variable:</para> <programlisting>post-patch: - @${REINPLACE_CMD} -e 's|for Linux|for FreeBSD|g' ${WRKSRC}/README</programlisting> + @${REINPLACE_CMD} -e 's|for Linux|for FreeBSD|g' ${WRKSRC}/README</programlisting> <para>Quite often, software being ported uses the CR/LF convention in source files. This may cause problems with diff --git a/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml b/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml index aa3fcf4a42..4ef04bc20a 100644 --- a/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml +++ b/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml @@ -1772,11 +1772,11 @@ PLIST_SUB+= QT_INCDIR=${QT_INCDIR_REL} \ <para>This snippet demonstrates the use of <application>qmake</application> for a Qt 4 port:</para> - <programlisting>USES= qmake:outsource + <programlisting>USES= qmake:outsource USE_QT4= moc_build</programlisting> <para>For a Qt 5 port:</para> - <programlisting>USES= qmake:outsource + <programlisting>USES= qmake:outsource USE_QT5= buildtools_build</programlisting> </example> @@ -1795,8 +1795,8 @@ USE_QT5= buildtools_build</programlisting> include and library search paths via the command line, use:</para> - <programlisting>QMAKE_ARGS+= INCLUDEPATH+=${LOCALBASE}/include \ - LIBS+=-L${LOCALBASE}/lib</programlisting> + <programlisting>QMAKE_ARGS+= INCLUDEPATH+=${LOCALBASE}/include \ + LIBS+=-L${LOCALBASE}/lib</programlisting> </listitem> <listitem> |