Date: Wed, 25 Oct 2017 15:10:20 +0000 (UTC) From: Alex Kozlov <ak@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r51145 - head/en_US.ISO8859-1/books/porters-handbook/special Message-ID: <201710251510.v9PFAKF2009353@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ak (ports committer) Date: Wed Oct 25 15:10:19 2017 New Revision: 51145 URL: https://svnweb.freebsd.org/changeset/doc/51145 Log: - Update wxWidgets section Differential Revision: https://reviews.freebsd.org/D12700 Approved by: portmgr (mat) 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 Wed Oct 25 15:06:14 2017 (r51144) +++ head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml Wed Oct 25 15:10:19 2017 (r51145) @@ -4167,35 +4167,20 @@ USE_PYTHON= autoplist distutils <tbody> <row> - <entry><literal>2.4</literal></entry> + <entry><literal>2.8</literal></entry> <entry><package - role="port">x11-toolkits/wxgtk24</package></entry> + role="port">x11-toolkits/wxgtk28</package></entry> </row> <row> - <entry><literal>2.6</literal></entry> + <entry><literal>3.0</literal></entry> <entry><package - role="port">x11-toolkits/wxgtk26</package></entry> + role="port">x11-toolkits/wxgtk30</package></entry> </row> - - <row> - <entry><literal>2.8</literal></entry> - <entry><package - role="port">x11-toolkits/wxgtk28</package></entry> - </row> </tbody> </tgroup> </table> - <note> - <para>The versions starting from <literal>2.5</literal> also - come in Unicode version and are installed by a slave port - named like the normal one plus a - <literal>-unicode</literal> suffix, but this can be - handled with variables (see - <xref linkend="wx-unicode"/>).</para> - </note> - <para>The variables in <xref linkend="wx-ver-sel-table"/> can be set to one or more of these combinations separated by spaces:</para> @@ -4215,22 +4200,22 @@ USE_PYTHON= autoplist distutils <tbody> <row> <entry>Single version</entry> - <entry><literal>2.4</literal></entry> + <entry><literal>2.8</literal></entry> </row> <row> <entry>Ascending range</entry> - <entry><literal>2.4+</literal></entry> + <entry><literal>2.8+</literal></entry> </row> <row> <entry>Descending range</entry> - <entry><literal>2.6-</literal></entry> + <entry><literal>3.0-</literal></entry> </row> <row> <entry>Full range (must be ascending)</entry> - <entry><literal>2.4-2.6</literal></entry> + <entry><literal>2.8-3.0</literal></entry> </row> </tbody> </tgroup> @@ -4307,20 +4292,8 @@ USE_PYTHON= autoplist distutils <entry><literal>python</literal></entry> <entry><application>wxPython</application> (<application>Python</application> bindings)</entry> - <entry><literal>2.4-2.6</literal></entry> + <entry><literal>2.8-3.0</literal></entry> </row> - - <row> - <entry><literal>mozilla</literal></entry> - <entry><application>wxMozilla</application></entry> - <entry><literal>2.4</literal></entry> - </row> - - <row> - <entry><literal>svg</literal></entry> - <entry><application>wxSVG</application></entry> - <entry><literal>2.6</literal></entry> - </row> </tbody> </tgroup> </table> @@ -4418,73 +4391,11 @@ USE_PYTHON= autoplist distutils <literal>2.4</literal> and its contributed libraries.</para> - <programlisting>USE_WX= 2.4 + <programlisting>USE_WX= 2.8 WX_COMPS= wx contrib</programlisting> </example> </sect2> - <sect2 xml:id="wx-unicode"> - <title>Unicode</title> - - <para>The <application>wxWidgets</application> library - supports Unicode since version <literal>2.5</literal>. In - the ports tree both versions are available and can be - selected with these variables:</para> - - <table xml:id="wx-unicode-var-table" frame="none"> - <title>Variables to Select Unicode in - <application>wxWidgets</application> - Versions</title> - - <tgroup cols="3"> - <thead> - <row> - <entry>Variable</entry> - <entry>Description</entry> - <entry>Designed for</entry> - </row> - </thead> - - <tbody> - <row> - <entry><varname>WX_UNICODE</varname></entry> - <entry>The port works <emphasis>only</emphasis> with - the Unicode version</entry> - <entry>the port</entry> - </row> - - <row> - <entry><varname>WANT_UNICODE</varname></entry> - <entry>The port works with both versions but prefers - the Unicode one</entry> - <entry>the port</entry> - </row> - - <row> - <entry><varname>WITH_UNICODE</varname></entry> - <entry>The port will use the Unicode version</entry> - <entry>the user</entry> - </row> - - <row> - <entry><varname>WITHOUT_UNICODE</varname></entry> - <entry>The port will use the normal version if - supported (when <varname>WX_UNICODE</varname> is not - defined)</entry> - <entry>the user</entry> - </row> - </tbody> - </tgroup> - </table> - - <warning> - <para>Do not use <varname>WX_UNICODE</varname> for ports - that can use both Unicode and normal versions. If - the port needs to use Unicode by default, define - <varname>WANT_UNICODE</varname> instead.</para> - </warning> - </sect2> - <sect2 xml:id="wx-version-detection"> <title>Detecting Installed Versions</title> @@ -4507,8 +4418,8 @@ WX_COMPS= wx contrib</programlisting> .include <bsd.port.pre.mk> -.if defined(WITH_WX) || !empty(PORT_OPTIONS:MWX) || !empty(HAVE_WX:Mwx-2.4) -USE_WX= 2.4 +.if defined(WITH_WX) || !empty(PORT_OPTIONS:MWX) || !empty(HAVE_WX:Mwx-2.8) +USE_WX= 2.8 CONFIGURE_ARGS+= --enable-wx .endif</programlisting> @@ -4516,11 +4427,11 @@ CONFIGURE_ARGS+= --enable-wx enables <application>wxPython</application> support if it is installed or if an option is selected, in addition to <application>wxWidgets</application>, both version - <literal>2.6</literal>.</para> + <literal>2.8</literal>.</para> - <programlisting>USE_WX= 2.6 + <programlisting>USE_WX= 2.8 WX_COMPS= wx -WANT_WX= 2.6 +WANT_WX= 2.8 .include <bsd.port.pre.mk> @@ -4573,12 +4484,6 @@ CONFIGURE_ARGS+= --enable-wxpython version that is going to be used (for example, <literal>2.6</literal>)</entry> </row> - - <row> - <entry><varname>WX_UNICODE</varname></entry> - <entry>If not defined but Unicode is going to be used - then it will be defined</entry> - </row> </tbody> </tgroup> </table> @@ -4611,7 +4516,7 @@ CONFIGURE_ARGS+= --enable-wxpython version string, assign it to a variable and pass it to the program.</para> - <programlisting>USE_WX= 2.4 + <programlisting>USE_WX= 2.8 WX_PREMK= yes .include <bsd.port.pre.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710251510.v9PFAKF2009353>