Page MenuHomeFreeBSD
Files F148025456

D12700.1785141213.diff
No OneTemporary
Actions

Size
6 KB
Referenced Files
None
Subscribers
None

D12700.1785141213.diff
View Options

Index: head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
===================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
+++ head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
@@ -4167,35 +4167,20 @@
<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 @@
<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 @@
<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 @@
<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 @@
.include &lt;bsd.port.pre.mk&gt;
-.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 @@
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 &lt;bsd.port.pre.mk&gt;
@@ -4573,12 +4484,6 @@
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 @@
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 &lt;bsd.port.pre.mk&gt;

File Metadata

Mime Type
text/plain
Expires
Mon, Jul 27, 8:33 AM (2 h, 21 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29276841
Default Alt Text
D12700.1785141213.diff (6 KB)

Event Timeline