Date: Fri, 4 Apr 2014 02:02:41 +0000 (UTC) From: Warren Block <wblock@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r44437 - head/en_US.ISO8859-1/books/porters-handbook/special Message-ID: <201404040202.s3422fFx018617@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wblock Date: Fri Apr 4 02:02:41 2014 New Revision: 44437 URL: http://svnweb.freebsd.org/changeset/doc/44437 Log: Whitespace-only fixes, translators please ignore. Modified: head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml Modified: head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml Fri Apr 4 01:55:02 2014 (r44436) +++ head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml Fri Apr 4 02:02:41 2014 (r44437) @@ -1217,11 +1217,9 @@ USE_XORG= x11 xpm</programlisting> <title>Updating Desktop Database</title> <para>If a port has a MimeType entry in its - <filename>portname.desktop</filename>, - the desktop database must be updated after install and - deinstall. To do this, define <varname>USES</varname>= - desktop-file-utils.</para> - + <filename>portname.desktop</filename>, the desktop database + must be updated after install and deinstall. To do this, + define <varname>USES</varname>= desktop-file-utils.</para> </sect3> <sect3 xml:id="desktop-entries-macro"> @@ -1229,10 +1227,9 @@ USE_XORG= x11 xpm</programlisting> <varname>DESKTOP_ENTRIES</varname> Macro</title> <para>Desktop entries can be easily created for applications - by using the <varname>DESKTOP_ENTRIES</varname> variable. - A file named - <filename>name.desktop</filename> - will be created, installed, and added to the + by using the <varname>DESKTOP_ENTRIES</varname> variable. A + file named <filename>name.desktop</filename> will be + created, installed, and added to the <filename>pkg-plist</filename> automatically. Syntax is:</para> @@ -1282,14 +1279,18 @@ USE_XORG= x11 xpm</programlisting> <title>Ports That Require Qt</title> <para>The Ports Collection provides support for Qt 4 and Qt 5 - frameworks with the <varname>USE_QT<replaceable>x</replaceable></varname> variable, - where <replaceable>x</replaceable> is <literal>4</literal> or <literal>5</literal>. <varname>USE_QT<replaceable>x</replaceable></varname> should be - set to the list of required Qt components (libraries, - tools, plugins). The Qt 4 and Qt 5 frameworks are quite similar. - The main difference is the set of supported components.</para> + frameworks with the + <varname>USE_QT<replaceable>x</replaceable></varname> + variable, where <replaceable>x</replaceable> is + <literal>4</literal> or <literal>5</literal>. + <varname>USE_QT<replaceable>x</replaceable></varname> should + be set to the list of required Qt components (libraries, + tools, plugins). The Qt 4 and Qt 5 frameworks are quite + similar. The main difference is the set of supported + components.</para> - <para>The Qt framework exports a number of variables which can be used - by ports, some of them listed below:</para> + <para>The Qt framework exports a number of variables which can + be used by ports, some of them listed below:</para> <table frame="none"> <title>Variables Provided to Ports That Use Qt</title> @@ -1304,12 +1305,14 @@ USE_XORG= x11 xpm</programlisting> <row> <entry><varname>QMAKE</varname></entry> - <entry>Full path to <command>qmake</command> binary.</entry> + <entry>Full path to <command>qmake</command> + binary.</entry> </row> <row> <entry><varname>LRELEASE</varname></entry> - <entry>Full path to <command>lrelease</command> utility.</entry> + <entry>Full path to <command>lrelease</command> + utility.</entry> </row> <row> @@ -1362,30 +1365,30 @@ PLIST_SUB+= QT_INCDIR=${QT_INCDIR_REL} \ QT_PLUGINDIR=${QT_PLUGINDIR_REL}</programlisting> <para>Some configure scripts do not support the arguments above. - To suppress modification of<varname>CONFIGURE_ENV</varname> and - <varname>CONFIGURE_ARGS</varname>, set the + To suppress modification of<varname>CONFIGURE_ENV</varname> + and <varname>CONFIGURE_ARGS</varname>, set the <varname>QT_NONSTANDARD</varname> variable.</para> - </sect2> <sect2 xml:id="qt-components"> <title>Component Selection</title> <para>Individual Qt tool and library dependencies must be - specified in the <varname>USE_QT<replaceable>x</replaceable></varname> variable. Every - component can be suffixed with + specified in the + <varname>USE_QT<replaceable>x</replaceable></varname> + variable. Every component can be suffixed with <literal>_build</literal> or <literal>_run</literal>, the - suffix indicating whether the component should be depended - on at buildtime or runtime. If unsuffixed, - the component will be depended on at both build- and - runtime. Usually, library components should be specified - unsuffixed, tool components should be specified with the - <literal>_build</literal> suffix and plugin components - should be specified with the <literal>_run</literal> suffix. - The most commonly used components are listed below (all - available components are listed in - <varname>_USE_QT_ALL</varname>, <varname>_USE_QT4_ONLY</varname>, - and <varname>_USE_QT5_ONLY</varname> variables in + suffix indicating whether the component should be depended on + at buildtime or runtime. If unsuffixed, the component will be + depended on at both build- and runtime. Usually, library + components should be specified unsuffixed, tool components + should be specified with the <literal>_build</literal> suffix + and plugin components should be specified with the + <literal>_run</literal> suffix. The most commonly used + components are listed below (all available components are + listed in <varname>_USE_QT_ALL</varname>, + <varname>_USE_QT4_ONLY</varname>, and + <varname>_USE_QT5_ONLY</varname> variables in <filename>/usr/ports/Mk/bsd.qt.mk</filename>):</para> <table frame="none"> @@ -1587,7 +1590,7 @@ PLIST_SUB+= QT_INCDIR=${QT_INCDIR_REL} \ builds, which can be enabled by specifying the <literal>outsource</literal> argument (see <link linkend="using-qmake-example"><literal>USES= qmake</literal> - example</link>).</para> + example</link>).</para> <table frame="none"> <title>Variables for Ports That Use @@ -1636,13 +1639,11 @@ PLIST_SUB+= QT_INCDIR=${QT_INCDIR_REL} \ <application>qmake</application> for a Qt 4 port:</para> <programlisting>USES= qmake:outsource -USE_QT4= moc_build -</programlisting> +USE_QT4= moc_build</programlisting> <para>For a Qt 5 port:</para> <programlisting>USES= qmake:outsource -USE_QT5= buildtools_build -</programlisting> +USE_QT5= buildtools_build</programlisting> </example> <para>Qt applications are often written to be cross-platform @@ -1729,7 +1730,8 @@ USE_QT5= buildtools_build <row> <entry><literal>automoc4</literal></entry> - <entry>Build tool to automatically generate moc files</entry> + <entry>Build tool to automatically generate moc + files</entry> </row> <row> @@ -1739,7 +1741,8 @@ USE_QT5= buildtools_build <row> <entry><literal>soprano</literal></entry> - <entry>Library for Resource Description Framework (RDF)</entry> + <entry>Library for Resource Description Framework + (RDF)</entry> </row> <row> @@ -1847,8 +1850,7 @@ USE_QT5= buildtools_build environment variable and/or <command>make</command> arguments. Currently <varname>KDE4_PREFIX</varname> is identical to the default <varname>PREFIX</varname>, - <literal>${LOCALBASE}</literal>. - </para> + <literal>${LOCALBASE}</literal>.</para> <example xml:id="kde4-components-example"> <title><varname>USE_KDE4</varname> Example</title>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404040202.s3422fFx018617>