Date: Mon, 29 Jun 2015 15:32:12 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r46894 - in head/en_US.ISO8859-1/books/porters-handbook: makefiles slow-porting special Message-ID: <201506291532.t5TFWCmF094448@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Mon Jun 29 15:32:11 2015 New Revision: 46894 URL: https://svnweb.freebsd.org/changeset/doc/46894 Log: Fixup a lot of <programlisting> Approved by: wblock (mentor) Differential Revision: https://reviews.freebsd.org/D2939 Modified: head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml head/en_US.ISO8859-1/books/porters-handbook/slow-porting/chapter.xml head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml Modified: head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml Mon Jun 29 15:17:22 2015 (r46893) +++ head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml Mon Jun 29 15:32:11 2015 (r46894) @@ -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}</programlisti <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</programlistin <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 Modified: head/en_US.ISO8859-1/books/porters-handbook/slow-porting/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/slow-porting/chapter.xml Mon Jun 29 15:17:22 2015 (r46893) +++ head/en_US.ISO8859-1/books/porters-handbook/slow-porting/chapter.xml Mon Jun 29 15:32:11 2015 (r46894) @@ -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 Modified: head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml Mon Jun 29 15:17:22 2015 (r46893) +++ head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml Mon Jun 29 15:32:11 2015 (r46894) @@ -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</programlistin 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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506291532.t5TFWCmF094448>