PERFORCE change 169123 for review
Rene Ladan
rene at FreeBSD.org
Fri Oct 2 11:12:51 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=169123
Change 169123 by rene at rene_self on 2009/10/02 11:12:25
IFC
Affected files ...
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#9 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#45 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mac/chapter.sgml#14 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.sgml#14 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/csjp.key#1 branch
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#26 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#23 integrate
.. //depot/projects/docproj_nl/www/en/donations/donors.sgml#21 integrate
.. //depot/projects/docproj_nl/www/share/sgml/usergroups.xml#7 integrate
Differences ...
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#9 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.194 2009/08/26 21:04:35 blackend Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.195 2009/10/02 08:32:07 manolis Exp $
-->
<chapter id="x11">
@@ -1162,8 +1162,12 @@
<sect2>
<title>Using XDM</title>
- <para>The <application>XDM</application> daemon program is
- located in <filename>/usr/local/bin/xdm</filename>. This program
+ <para>To start using <application>XDM</application>, install the
+ <filename role="package">x11/xdm</filename> port (it is not
+ installed by default in recent versions of
+ <application>&xorg;</application>).
+ The <application>XDM</application> daemon program may then be
+ found in <filename>/usr/local/bin/xdm</filename>. This program
can be run at any time as <username>root</username> and it will
start managing the X display on the local machine. If
<application>XDM</application> is to be run every
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#45 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1029 2009/09/23 12:40:13 stas Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1030 2009/09/30 15:06:38 tabthorpe Exp $
-->
<!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -5427,42 +5427,10 @@
</sect1>
- <sect1 id="using-kde">
- <title>Using KDE</title>
+ <sect1 id="using-qt">
+ <title>Using Qt</title>
- <sect2 id="kde-variables">
- <title>Variable definitions</title>
-
- <table frame="none">
- <title>Variables for ports that use KDE</title>
-
- <tgroup cols="2">
- <tbody>
- <row>
- <entry><makevar>USE_KDELIBS_VER</makevar></entry>
-
- <entry>The port uses KDE libraries. It specifies the
- major version of KDE to use and implies
- <makevar>USE_QT_VER</makevar> of the appropriate
- version. The only possible value is
- <literal>3</literal>.</entry>
- </row>
-
- <row>
- <entry><makevar>USE_KDEBASE_VER</makevar></entry>
-
- <entry>The port uses KDE base. It specifies the major
- version of KDE to use and implies
- <makevar>USE_QT_VER</makevar> of the appropriate version.
- The only possible value is <literal>3</literal>.</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
-
- </sect2>
-
- <sect2 id="kde-qt">
+ <sect2 id="qt-common">
<title>Ports that require Qt</title>
<table frame="none">
@@ -5809,6 +5777,141 @@
</sect1>
+ <sect1 id="using-kde">
+ <title>Using KDE</title>
+
+ <sect2 id="kde-variables">
+ <title>Variable definitions (KDE 3.x only)</title>
+
+ <table frame="none">
+ <title>Variables for ports that use KDE 3.x</title>
+
+ <tgroup cols="2">
+ <tbody>
+ <row>
+ <entry><makevar>USE_KDELIBS_VER</makevar></entry>
+
+ <entry>The port uses KDE libraries. It specifies the
+ major version of KDE to use and implies
+ <makevar>USE_QT_VER</makevar> of the appropriate
+ version. The only possible value is
+ <literal>3</literal>.</entry>
+ </row>
+
+ <row>
+ <entry><makevar>USE_KDEBASE_VER</makevar></entry>
+
+ <entry>The port uses KDE base. It specifies the major
+ version of KDE to use and implies
+ <makevar>USE_QT_VER</makevar> of the appropriate version.
+ The only possible value is <literal>3</literal>.</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ </sect2>
+
+ <sect2 id="kde4-variables">
+ <title>KDE 4 variable definitions</title>
+
+ <para>If your application depends on KDE 4.x, set <makevar>USE_KDE4</makevar>
+ to the list of required components. The most commonly used components are listed below
+ (up-to-date components are listed in <makevar>_USE_KDE4_ALL</makevar> in
+ <filename>/usr/ports/Mk/bsd.kde4.mk</filename>):</para>
+
+ <table frame="none">
+ <title>Available KDE4 components</title>
+
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Name</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+
+ <tbody>
+ <row>
+ <entry><literal>akonadi</literal></entry>
+ <entry>Personal information management (PIM) storage service</entry>
+ </row>
+
+ <row>
+ <entry><literal>automoc4</literal></entry>
+ <entry>Makes port use automoc4 build tool</entry>
+ </row>
+
+ <row>
+ <entry><literal>kdebase</literal></entry>
+ <entry>Basic KDE applications (Konqueror, Dolphin, Konsole)</entry>
+ </row>
+
+ <row>
+ <entry><literal>kdeexp</literal></entry>
+ <entry>Experimental KDE libraries (with non-stable API)</entry>
+ </row>
+
+ <row>
+ <entry><literal>kdehier</literal></entry>
+ <entry>Provides common KDE directories</entry>
+ </row>
+
+ <row>
+ <entry><literal>kdelibs</literal></entry>
+ <entry>The base set of KDE libraries</entry>
+ </row>
+
+ <row>
+ <entry><literal>kdeprefix</literal></entry>
+ <entry>If set, port will be installed into
+ <literal>${KDE4_PREFIX}</literal>
+ instead of <literal>${LOCALBASE}</literal></entry>
+ </row>
+
+ <row>
+ <entry><literal>pimlibs</literal></entry>
+ <entry>PIM libraries</entry>
+ </row>
+
+ <row>
+ <entry><literal>workspace</literal></entry>
+ <entry>Applications and libraries which form desktop (Plasma, KWin)</entry>
+ </row>
+
+ </tbody>
+ </tgroup>
+ </table>
+
+ <para>KDE 4.x ports are installed into <literal>${KDE4_PREFIX}</literal>,
+ which is <filename>/usr/local/kde4</filename> currently, to avoid conflicts
+ with KDE 3.x ports. This is achieved by specifying <literal>kdeprefix</literal>
+ component, which overrides default <makevar>PREFIX</makevar>. The ports however
+ respect <makevar>PREFIX</makevar> set via <envar>MAKEFLAGS</envar> environment
+ variable and/or <application>make</application> arguments.</para>
+
+ <example id="kde4-components-example">
+ <title><makevar>USE_KDE4</makevar> example</title>
+
+ <para>This is a simple example for KDE 4 port. <makevar>USE_CMAKE</makevar>
+ instructs port to utilize <application>CMake</application> —
+ configuration tool widely spread among KDE 4 projects.
+ <makevar>USE_KDE4</makevar> brings dependency on KDE libraries and makes port using
+ <application>automoc4</application> at build stage. Required KDE components
+ and other dependencies can be determined through configure log.
+ <makevar>USE_KDE4</makevar> does not imply <makevar>USE_QT_VER</makevar>.
+ If port requires some of Qt4 components, <makevar>USE_QT_VER</makevar> should be set
+ and then needed components can be specified.</para>
+
+ <programlisting>USE_CMAKE= yes
+USE_KDE4= automoc4 kdelibs kdeprefix
+USE_QT_VER= 4
+QT_COMPONENTS= qmake_build moc_build rcc_build uic_build</programlisting>
+ </example>
+ </sect2>
+
+ </sect1>
+
<sect1 id="using-java">
<title>Using Java</title>
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mac/chapter.sgml#14 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Dutch Documentation Project
- $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/mac/chapter.sgml,v 1.5 2008/11/24 22:43:28 rene Exp $
+ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/mac/chapter.sgml,v 1.6 2009/09/29 21:55:11 rene Exp $
%SOURCE% en_US.ISO8859-1/books/handbook/mac/chapter.sgml
%SRCID% 1.75
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.sgml#14 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Dutch Documentation Project
- $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.sgml,v 1.17 2009/08/26 06:04:10 rene Exp $
+ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.sgml,v 1.18 2009/09/29 21:55:11 rene Exp $
%SOURCE% en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml
%SRCID% 1.135
==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#26 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.108 2009/08/10 16:55:15 fluffy Exp $
+ $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.109 2009/09/30 22:43:26 csjp Exp $
-->
<sect2 id="pgpkey-ariff">
@@ -1011,6 +1011,11 @@
&pgpkey.cperciva;
</sect2>
+ <sect2 id="pgpkey-csjp">
+ <title>&a.csjp;</title>
+ &pgpkey.csjp;
+ </sect2>
+
<sect2 id="pgpkey-gerald">
<title>&a.gerald;</title>
&pgpkey.gerald;
==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#23 (text+ko) ====
@@ -1,5 +1,5 @@
-<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.201 2009/08/10 16:55:15 fluffy Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.202 2009/09/30 22:43:26 csjp Exp $ -->
<!-- PGP keyblocks -->
<!ENTITY pgpkey.aaron SYSTEM "aaron.key">
<!ENTITY pgpkey.ache SYSTEM "ache.key">
@@ -60,6 +60,7 @@
<!ENTITY pgpkey.core-secretary SYSTEM "core-secretary.key">
<!ENTITY pgpkey.cperciva SYSTEM "cperciva.key">
<!ENTITY pgpkey.cshumway SYSTEM "cshumway.key">
+<!ENTITY pgpkey.csjp SYSTEM "csjp.key">
<!ENTITY pgpkey.daichi SYSTEM "daichi.key">
<!ENTITY pgpkey.damien SYSTEM "damien.key">
<!ENTITY pgpkey.danfe SYSTEM "danfe.key">
==== //depot/projects/docproj_nl/www/en/donations/donors.sgml#21 (text+ko) ====
@@ -1,6 +1,6 @@
<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
<!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/donations/donors.sgml,v 1.395 2009/08/27 15:51:47 tabthorpe Exp $">
+<!ENTITY date "$FreeBSD: www/en/donations/donors.sgml,v 1.397 2009/10/01 20:37:57 gahr Exp $">
<!ENTITY title "Hardware Donors Page">
<!ENTITY % navinclude.about "INCLUDE">
<!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
@@ -2635,6 +2635,21 @@
<td> lstewart </td>
<td> Received </td>
</tr>
+
+ <tr>
+ <td> gavin </td>
+ <td> 3 Zip 100 drives<br>
+ 3 3ware cards</td>
+ <td> mav </td>
+ <td> Received </td>
+ </tr>
+
+ <tr>
+ <td> Gareth Randall </td>
+ <td> HP C1636-00100 SCSI tape drive </td>
+ <td> cracauer </td>
+ <td> Received </td>
+ </tr>
</table>
&footer;
==== //depot/projects/docproj_nl/www/share/sgml/usergroups.xml#7 (text+ko) ====
@@ -5,7 +5,7 @@
<usergroups>
<cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
<cvs:keyword name="freebsd">
- $FreeBSD: www/share/sgml/usergroups.xml,v 1.80 2009/06/09 20:45:27 marius Exp $
+ $FreeBSD: www/share/sgml/usergroups.xml,v 1.81 2009/10/02 00:40:43 delphij Exp $
</cvs:keyword>
</cvs:keywords>
@@ -325,7 +325,7 @@
<country code="RS" name="Serbia">
<entry id="bsd-srbija">
<name>The Serbian BSD User Group</name>
- <url>http://www.bsd-srbija.org/</url>
+ <url>http://www.bsdserbia.org/</url>
<description>The Serbian BSD Users Group provides an open forum
for all things BSD-related in the Serbian language. Located
More information about the p4-projects
mailing list