From owner-p4-projects@FreeBSD.ORG  Mon May 14 19:43:04 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DE5821065674; Mon, 14 May 2012 19:43:03 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A025F106566C
	for <perforce@FreeBSD.org>; Mon, 14 May 2012 19:43:03 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 87E438FC14
	for <perforce@FreeBSD.org>; Mon, 14 May 2012 19:43:03 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q4EJh3RJ090546
	for <perforce@FreeBSD.org>; Mon, 14 May 2012 19:43:03 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q4EJh3i8090543
	for perforce@freebsd.org; Mon, 14 May 2012 19:43:03 GMT
	(envelope-from rene@FreeBSD.org)
Date: Mon, 14 May 2012 19:43:03 GMT
Message-Id: <201205141943.q4EJh3i8090543@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan <rene@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 211152 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 14 May 2012 19:43:04 -0000

http://p4web.freebsd.org/@@211152?ac=10

Change 211152 by rene@rene_acer on 2012/05/14 19:42:34

	IFC	

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#141 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/hubs/article.sgml#7 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mail/chapter.sgml#25 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#56 integrate
.. //depot/projects/docproj_nl/www/en/news/2009/Makefile#2 integrate
.. //depot/projects/docproj_nl/www/en/news/2009/press.xml#1 branch
.. //depot/projects/docproj_nl/www/en/news/status/Makefile#17 integrate
.. //depot/projects/docproj_nl/www/en/news/status/report-2012-01-2012-03.xml#2 integrate
.. //depot/projects/docproj_nl/www/en/news/status/status.sgml#18 integrate
.. //depot/projects/docproj_nl/www/share/sgml/libcommon.xsl#11 integrate
.. //depot/projects/docproj_nl/www/share/sgml/news.xml#142 integrate
.. //depot/projects/docproj_nl/www/share/sgml/press.xml#26 integrate
.. //depot/projects/docproj_nl/www/share/sgml/templates.oldpress.xsl#4 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#141 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.1087 2012/05/06 10:02:34 madpilot Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.1090 2012/05/11 22:27:36 eadler Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -5557,6 +5557,11 @@
     </listitem>
 
     <listitem>
+      <para>Kevin Zheng
+	<email>kevinz5000@gmail.com</email></para>
+    </listitem>
+
+    <listitem>
       <para>Key-Teck SIN
 	<email>ktsin@acm.org</email></para>
     </listitem>
@@ -10676,6 +10681,11 @@
     </listitem>
 
     <listitem>
+      <para>William Grzybowski
+	<email>william88@gmail.com</email></para>
+    </listitem>
+
+    <listitem>
       <para>William Jolitz
 	<email>withheld</email></para>
     </listitem>

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/hubs/article.sgml#7 (text+ko) ====

@@ -7,7 +7,7 @@
 <article>
   <articleinfo>
     <title>Mirroring FreeBSD</title>
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/hubs/article.sgml,v 1.73 2011/12/18 01:42:31 kuriyama Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/hubs/article.sgml,v 1.74 2012/05/13 02:20:09 brd Exp $</pubdate>
     <authorgroup>
       <author>
         <firstname>Jun</firstname>
@@ -51,6 +51,10 @@
     </abstract>
   </articleinfo>
 
+  <note>
+		<para>We are not accepting new mirrors at this time.</para>
+  </note>
+
   <sect1 id="mirror-contact">
     <title>Contact Information</title>
 
@@ -962,6 +966,7 @@
     </sect2>
     <sect2 id="mirror-official-become">
       <title>How to become official then?</title>
+		<!--
       <para>
         An interesting question, especially, since the state
         of being official comes with some benefits, like a much
@@ -1015,6 +1020,10 @@
         </step>
       </procedure>
       <para>That is it.</para>
+		-->
+		<para>
+			 We are not accepting any new mirrors at this time.
+		</para>
     </sect2>
   </sect1>
   <sect1 id="mirror-statpages">

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mail/chapter.sgml#25 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Dutch Documentation Project
 
-     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/mail/chapter.sgml,v 1.10 2012/02/21 22:15:17 rene Exp $
+     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/mail/chapter.sgml,v 1.11 2012/05/07 19:35:03 rene Exp $
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/mail/chapter.sgml
      %SRCID%	1.147

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#56 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Dutch Documentation Project
 
-     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.36 2012/02/19 14:10:40 rene Exp $
+     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.37 2012/05/07 19:35:03 rene Exp $
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml
      %SRCID%	1.144

==== //depot/projects/docproj_nl/www/en/news/2009/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/news/2009/Makefile,v 1.1 2010/03/05 00:17:57 danger Exp $
+# $FreeBSD: www/en/news/2009/Makefile,v 1.2 2012/05/12 11:08:37 ryusuke Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -10,4 +10,7 @@
 XMLDOCS+=	index:${XSL_NEWS_NEWSFLASH_OLD}:news.xml:
 DEPENDSET.index=transtable news
 
+XMLDOCS+=	press:${XSL_NEWS_PRESS_OLD}::
+DEPENDSET.press=transtable press
+
 .include "${WEB_PREFIX}/share/mk/web.site.mk"

==== //depot/projects/docproj_nl/www/en/news/status/Makefile#17 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/news/status/Makefile,v 1.57 2012/01/27 10:00:58 danger Exp $
+# $FreeBSD: www/en/news/status/Makefile,v 1.58 2012/05/12 21:31:30 danger Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -54,6 +54,7 @@
 XMLDOCS+=	report-2011-04-2011-06
 XMLDOCS+=	report-2011-07-2011-09
 XMLDOCS+=	report-2011-10-2011-12
+XMLDOCS+=	report-2012-01-2012-03
 
 XSLT.DEFAULT=	report.xsl
 

==== //depot/projects/docproj_nl/www/en/news/status/report-2012-01-2012-03.xml#2 (text+ko) ====

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE report PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Status
 Report//EN" "http://www.FreeBSD.org/XML/www/share/sgml/statusreport.dtd">
-<!-- $FreeBSD: www/en/news/status/report-2012-01-2012-03.xml,v 1.1 2012/05/07 11:16:47 danger Exp $ -->
+<!-- $FreeBSD: www/en/news/status/report-2012-01-2012-03.xml,v 1.6 2012/05/12 21:29:23 danger Exp $ -->
 <report>
   <date>
     <month>January-March</month>
@@ -15,12 +15,15 @@
     <p>This report covers &os;-related projects between January and March
       2012.  It is the first of the four reports planned for 2012.  This
       quarter was highlighted by releasing the next major version of &os;,
-      9.0, which was finally released in the beginning of January 2012.  Our
-      release engineering team has been also busy with preparation of the
-      8.3-RELEASE, which was publicly announced in April.</p>
+      9.0, which was finally released in the beginning of January
+      2012.  The FreeBSD Project dedicates the FreeBSD 9.0-RELEASE to
+      the memory of Dennis M. Ritchie, one of the founding fathers of
+      the &unix; operating system.  Our release engineering team has
+      been also busy with preparation of the 8.3-RELEASE, which was
+      publicly announced in April.</p>
 
     <p>Thanks to all the reporters for the excellent work! This report
-      contains 25 entries and we hope you enjoy reading it.</p>
+      contains 27 entries and we hope you enjoy reading it.</p>
 
     <p>Please note that the deadline for submissions covering the period
       between April and June 2012 is July 15th, 2012.</p>
@@ -105,10 +108,10 @@
       <p>The same as before, the outdated contents in the www/ja subtree
 	were updated to the latest versions in the English counterpart.  The
 	updating work of the outdated translations in the www/ja subtree is
-	almost completed while the release documents for each release are
-	remaining.</p>
+	almost complete. Only the translations of the release documents
+	for old releases may be outdated.</p>
 
-      <p>During this period, we translated the 9.0R announcement and
+      <p>During this period, we translated the 9.0-RELEASE announcement and
 	published it in a timely manner.  It seems that the Japanese version
 	of the release announcement is important for Japanese people as
 	this page has frequently been referenced.</p>
@@ -192,14 +195,10 @@
     </body>
 
     <help>
-      <task>Looking for help getting
-      <url link="http://wiki.FreeBSD.org/PortsAndClang">ports to build
+      <task>Looking for help getting <url
+	link="http://wiki.FreeBSD.org/PortsAndClang">ports to build
 	with clang</url>.</task>
 
-      <task>Looking for help fixing <url
-	  link="http://wiki.FreeBSD.org/PortsBrokenOnCurrent">ports
-	  broken on CURRENT</url>. (List needs updating, too.)</task>
-
       <task>Looking for help with <url
 	  link="http://wiki.FreeBSD.org/PortsBrokenOnTier2Architectures">
 	  Tier-2 architectures</url>.</task>
@@ -311,13 +310,13 @@
 
     <body>
       <p>IPv6 performance numbers were often seen (significantly) lower
-	on &os; when comparing to IPv4.  Continuing last years IPv6-only
+	on &os; when compared to IPv4.  Continuing last years IPv6-only
 	kernel efforts this project looked at various reasons for this and
 	started fixing some.</p>
 
       <p>As part of the project a benchmark framework was created that
 	could carry out various tests including reboots in between runs and
-	gather results reproducibly and without user intervention.  It
+	gather results reproducibly without user intervention.  It
 	allows regular benchmarking with minimal configuration and easy
 	future extension for more benchmarks.</p>
 
@@ -330,7 +329,7 @@
 	carried out.  Some of the changes were equally applied to IPv4.</p>
 
       <p>Performance numbers on physical and loopback interfaces are
-	basically on par with IPv4 when using offload support with
+	on par with IPv4 when using offload support with
 	TCP/IPv6, which is a huge improvement.  UDP and non-offload numbers
 	on IPv6 have generally improved but are still lower than on IPv4
 	and will need future work to catch up with a decade of IPv4
@@ -338,7 +337,7 @@
 	send path packets per second (pps) numbers however have increased
 	beating IPv4 when sending to a local discard device.</p>
 
-      <p>This gets us really close to be able to prefer IPv6 by default
+      <p>This gets us really close to being able to prefer IPv6 by default
 	without causing loopback performance regressions.  For physical
 	interfaces, cxgb(4) in HEAD already supports IPv6 TCP offload and
 	LRO/v6 support was added.  To be able to get more test results on
@@ -438,9 +437,8 @@
     <body>
       <p>Recently DTrace in the kernel was improved to be able to load
 	kernel modules with static dtrace providers after the dtrace
-	modules.  This allows now to commit my already useable work in
-	progress with linuxulator specific static providers to
-	-current.</p>
+	modules.  This allows me to commit my linuxulator specific
+	static provider work to -CURRENT.</p>
 
       <p>Together with the linuxulator DTrace probes I developed some D
 	scripts to check various code paths in the linuxulator.  Those
@@ -473,9 +471,15 @@
 	linuxulator provides.</p>
 
       <p>As of this writing, I'm in the process of preparing a commit of
-	this port (TODO: repocopy by portmgr, add conflicts in other
-	linux_base ports, commit the CentOS based one, some cleanup).</p>
+	this port.</p>
     </body>
+
+    <help>
+      <task>Repocopy by portmgr.</task>
+      <task>Add conflicts in other linux_base ports.</task>
+      <task>Commit the CentOS based one.</task>
+      <task>Some cleanup.</task>
+    </help>
   </project>
 
   <project cat='kern'>
@@ -734,7 +738,7 @@
 	utilities and documentation.</p>
 
       <ul>
-	<li>NAND FS support merged into "nand" project brach</li>
+	<li>NAND FS support merged into "nand" project branch</li>
 
 	<ul>
 	  <li>NAND FS filesystem</li>
@@ -1202,7 +1206,7 @@
 	after 3.0, so as soon as a 3.1 version is imported, we will need to
 	look at ways to get the &os; world and kernels to cross-compile.
 	This is mainly of use for ARM and MIPS, which are architectures you
-	usually don not want to build natively on.</task>
+	usually do not want to build natively on.</task>
 
       <task>Help to make unwilling ports build with Clang is always
 	needed, and greatly appreciated.  Please mail the maintainer of your
@@ -1400,12 +1404,87 @@
 
     <body>
       <p>On behalf of the FreeBSD Project the Release Engineering Team
-	was pleased to announce the release of FreeBSD-8.3 on April 18th,
-	2012.</p>
+	was are pleased to announce the release of the &os;
+	8.3-RELEASE on April 18th, 2012.</p>
 
-      <p>With the FreeBSD-8.3 release cycle completed our focus shifts to
-	preparing for the FreeBSD-9.1 release.  A schedule will be posted
+      <p>With the &os; 8.3 release cycle completed our focus shifts to
+	preparing for the &os; 9.1-RELEASE.  A schedule will be posted
 	shortly, with the release target date set for mid-July 2012.</p>
     </body>
   </project>
+
+  <project cat='proj'>
+    <title>&os; Services Control</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>Tom</given>
+	  <common>Rhodes</common>
+	</name>
+	<email>trhodes@FreeBSD.org</email>
+      </person>
+    </contact>
+
+    <links>
+      <url href="http://people.FreeBSD.org/~trhodes/fsc/" />
+    </links>
+
+    <body>
+      <p>After a while of moving and getting a new job, I finally got
+	back to this project (also thanks to several submissions by
+	Julian Fagir), a new version has been uploaded along with a short
+	description page.  The current version supports more options, a
+	configuration file, and updated rc.d script.  It also includes
+	manual page updates and an optional debugging mode.</p>
+    </body>
+  </project>
+
+  <project cat='bin'>
+    <title>The bsdconfig(8) utility</title>
+
+    <contact>
+      <person>
+        <name>
+          <given>Devin</given>
+          <common>Teske</common>
+        </name>
+        <email>dteske@FreeBSD.org</email>
+      </person>
+      <person>
+       <name>
+         <given>Ron</given>
+         <common>McDowell</common>
+        </name>
+        <email>rcm@fuzzwad.org</email>
+      </person>
+    </contact>
+
+    <links>
+      <url href="http://druidbsd.cvs.sf.net/viewvc/druidbsd/bsdconfig/">
+	  OpenSource Development Tree</url>
+      <url href="http://druidbsd.sf.net/download/bsdconfig/bsdconfig-20120512-1.svg">
+	  Menu Map w/ Includes</url>
+      <url href="http://druidbsd.sf.net/download/bsdconfig/bsdconfig-20120512-1i.svg">
+	  Menu Map w/o Includes</url>
+    </links>
+
+    <body>
+      <p>Approaching 20,000 lines of sh(1) code, the bsdconfig(8) tool is
+	approximately 70% complete.  Upon completion of this project,
+	bsdconfig(8) will represent (in conjunction with
+	already-existing bsdinstall(8)) a complete set of utilities
+	capable of purposefully deprecating sysinstall(8) in &os; 9 and
+	higher.  This project has been a labor of love for Ron McDowell
+	and I for over 90 days now and we are approaching the completion
+	of this wonderful tool.</p>
+    </body>
+
+    <help>
+      <task>
+	The "installer suite" modules for acquiring/installing binary
+	packages and additional distribution sets. Startup services module.
+      </task>
+    </help>
+  </project>
 </report>

==== //depot/projects/docproj_nl/www/en/news/status/status.sgml#18 (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/news/status/status.sgml,v 1.67 2012/01/27 10:00:58 danger Exp $">
+<!ENTITY date "$FreeBSD: www/en/news/status/status.sgml,v 1.68 2012/05/12 21:31:30 danger Exp $">
 <!ENTITY title "FreeBSD Quarterly Status Reports">
 <!ENTITY % navinclude.about "INCLUDE">
 ]>
@@ -8,7 +8,7 @@
 <html>
   &header;
 
-  <h2>Next submissions due: April 15th, 2012</h2>
+  <h2>Next submissions due: July 15th, 2012</h2>
 
   <p>Use the <a href="http://www.FreeBSD.org/cgi/monthly.cgi">xml
       generator</a> or download and edit the <a href="report-sample.xml">
@@ -39,6 +39,13 @@
   <p>These status reports may be reproduced in whole or in part, as long as the
     source is clearly identified and appropriate credit given.</p>
 
+  <h2>2012</h2>
+
+  <ul>
+    <li><a href="report-2012-01-2012-03.html">January, 2012 -
+      March, 2012</a></li>
+  </ul>
+
   <h2>2011</h2>
 
   <ul>

==== //depot/projects/docproj_nl/www/share/sgml/libcommon.xsl#11 (text+ko) ====

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
 				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd">
-<!-- $FreeBSD: www/share/sgml/libcommon.xsl,v 1.33 2011/12/11 13:56:45 ryusuke Exp $ -->
+<!-- $FreeBSD: www/share/sgml/libcommon.xsl,v 1.34 2012/05/12 11:08:37 ryusuke Exp $ -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   version="1.0"
@@ -412,6 +412,7 @@
   <!-- template: "html-press-make-olditems-list" -->
   <xsl:template name="html-press-make-olditems-list">
     <p>Old press publications:
+      <a href="2009/press.html">2009</a>,
       <a href="2008/press.html">2008</a>,
       <a href="2007/press.html">2007</a>,
       <a href="2006/press.html">2006</a>,

==== //depot/projects/docproj_nl/www/share/sgml/news.xml#142 (text+ko) ====

@@ -25,12 +25,29 @@
 <news>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/share/sgml/news.xml,v 1.436 2012/04/30 17:34:57 issyl0 Exp $
+      $FreeBSD: www/share/sgml/news.xml,v 1.437 2012/05/12 21:35:24 danger Exp $
     </cvs:keyword>
   </cvs:keywords>
 
   <year>
     <name>2012</name>
+
+    <month>
+      <name>5</name>
+
+      <day>
+	<name>12</name>
+
+	<event>
+	  <title>January-March, 2012 Status Report</title>
+
+	  <p>The January-March, 2012 Status Report is <a
+	      href="&enbase;/news/status/report-2012-01-2012-03.html">now
+	      available</a> with 27 entries.</p>
+	</event>
+      </day>
+    </month>
+
     <month>
       <name>4</name>
       <day>

==== //depot/projects/docproj_nl/www/share/sgml/press.xml#26 (text+ko) ====

@@ -9,7 +9,7 @@
 <press>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/share/sgml/press.xml,v 1.101 2012/05/07 02:22:32 gjb Exp $
+      $FreeBSD: www/share/sgml/press.xml,v 1.102 2012/05/12 11:08:37 ryusuke Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -195,204 +195,4 @@
     </month>
   </year>
 
-  <year>
-    <name>2009</name>
-
-    <month>
-      <name>11</name>
-
-      <story>
-	<name>FreeNAS 0.7 adds ZFS support</name>
-	<url>http://www.h-online.com/open/news/item/FreeNAS-0-7-adds-ZFS-support-853475.html</url>
-	<site-name>The H</site-name>
-	<site-url>http://www.h-online.com/</site-url>
-	<date>09 November 2009</date>
-	<author>crve</author>
-	<p>A description of the new features in version 0.7 of the FreeBSD-based FreeNAS project.</p>
-      </story>
-
-      <story>
-	<name>Update your FreeBSD software with care</name>
-	<url>http://blogs.techrepublic.com.com/security/?p=2615</url>
-	<site-name>Tech Republic</site-name>
-	<site-url>http://www.techrepublic.com/</site-url>
-	<date>09 November 2009</date>
-	<author>Chad Perrin</author>
-	<p>Chad Perrin describes how he keeps his FreeBSD system up to date.</p>
-      </story>
-    </month>
-
-    <month>
-      <name>8</name>
-
-      <story>
-	<name>&os; 8 Getting New Routing Architecture</name>
-	<url>http://www.internetnews.com/dev-news/article.php/3835746</url>
-	<site-name>InternetNews.com &dash; WebMediaBrands Inc.</site-name>
-	<site-url>http://www.internetnews.com/</site-url>
-	<date>21 August 2009</date>
-	<author>Sean Michael Kerner</author>
-	<p>This article introduces recent work on &os; network routing
-	  architecture done by senior network architect from Blue Coat
-	  &dash; Qing Li.  Its main goal is to optimize &os; routing
-	  code to better utilize parallel processing CPUs.</p>
-      </story>
-
-      <story>
-	<name>FreeNAS: A Simple Data Storage Solution</name>
-	<url>http://www.radioworld.com/article/85170</url>
-	<site-name>Radio World</site-name>
-	<site-url>http://www.radioworld.com/</site-url>
-	<date>11 August 2009</date>
-	<author>Todd Dixon</author>
-	<p>The author is impressed by the speed and low resource usage of
-	  FreeBSD-based FreeNAS.</p>
-      </story>
-    </month>
-
-    <month>
-      <name>7</name>
-
-      <story>
-	<name>Why &os; 8 Won't Rewrite the Book</name>
-	<url>http://www.internetnews.com/dev-news/article.php/3830041</url>
-	<site-name>InternetNews.com &dash; WebMediaBrands Inc.</site-name>
-	<site-url>http://www.internetnews.com/</site-url>
-	<date>15 July 2009</date>
-	<author>Sean Michael Kerner</author>
-	<p>An article about the upcoming &os; 8.0 release, which
-	  includes interviews with Michael Lucas, author of the Absolute
-	  &os; book, Matt Olander of iXsystems, and Kris Moore of
-	  PC-BSD.  The primary focus of the article is how &os;, even
-	  across major releases, still keeps the disruption for users
-	  to a minimum, and introduces new features and improvements
-	  without forcing a paradigm shift on the users.</p>
-      </story>
-    </month>
-
-    <month>
-      <name>6</name>
-
-      <story>
-	<name>Most Reliable Hosting Company Sites in May 2009</name>
-	<url>http://news.netcraft.com/archives/2009/06/02/most_reliable_hosting_company_sites_in_may_2009.html</url>
-	<site-name>Netcraft Ltd.</site-name>
-	<site-url>http://www.netcraft.com/</site-url>
-	<date>02 June 2009</date>
-	<author>Paul Mutton</author>
-	<p>Three of the top five hosting providers in Netcraft's list
-	  run FreeBSD.</p>
-      </story>
-
-      <story>
-	<name>Securing Network Services with FreeBSD Jails</name>
-	<url>http://www.packtpub.com/article/securing-network-services-with-freebsd-jails</url>
-	<site-name>Packt Publishing</site-name>
-	<site-url>http://www.packtpub.com/</site-url>
-	<date>June 2009</date>
-	<author>Christer Edwards</author>
-	<p>An article on using FreeBSD's jails to safely run network services.</p>
-      </story>
-    </month>
-
-    <month>
-      <name>5</name>
-
-      <story>
-	<name>FreeBSD 7.2 released, now with Superpages</name>
-	<url>http://www.h-online.com/open/FreeBSD-7-2-released-now-with-Superpages--/news/113204</url>
-	<site-name>The H</site-name>
-	<site-url>http://www.h-online.com/</site-url>
-	<date>04 May 2009</date>
-	<author>djwm</author>
-	<p>An brief article on FreeBSD 7.2.</p>
-      </story>
-
-      <story>
-	<name>FreeBSD 7.2 Review: Improved Virtualization</name>
-	<url>http://www.cyberciti.biz/tips/freebsd-72-review-improved-virtualization.html</url>
-	<site-name>nixCraft</site-name>
-	<site-url>http://www.cyberciti.biz/</site-url>
-	<date>02 May 2009</date>
-	<author>Vivek Gite</author>
-	<p>Coverage of the new jail features in FreeBSD 7.2.</p>
-      </story>
-    </month>
-
-    <month>
-      <name>4</name>
-      
-      <story>
-	<name>Great Bay Software Switches to BSD from Linux</name>
-	<url>http://www.marketwire.com/press-release/Great-Bay-Software-975478.html</url>
-	<site-name>Great Bay Software</site-name>
-	<site-url>http://www.greatbaysoftware.com/</site-url>
-	<date>16 April 2009</date>
-	<author>Bob Durkee</author>
-	<p>Great Bay Software, the innovator of Endpoint Profiling for enterprise networks,
-	  has switched to &os; from Linux for all of its appliances including the
-	  Beacon Endpoint Profiler 3.0.</p>
-      </story>
-      
-      <story>
-	<name>First look at PC-BSD 7.1</name>
-	<url>http://distrowatch.com/weekly.php?issue=20090413#feature</url>
-	<site-name>Distro Watch</site-name>
-	<site-url>http://www.distrowatch.com/</site-url>
-	<date>13 April 2009</date>
-	<p>A reviewer takes PC-BSD 7.1 out for a spin.</p>
-      </story>
-
-      <story>
-	<name>Combining Debian and FreeBSD; Pushing the Envelope of FOSS</name>
-	<url>http://www.linux-mag.com/id/7295</url>
-	<site-name>Linux Magazine</site-name>
-	<site-url>http://www.linux-mag.com/</site-url>
-	<date>9 April 2009</date>
-	<author>Nathan Willis</author>
-	<p>Coverage of Debian GNU/kFreeBSD, a GNU operating system that
-	  uses the FreeBSD kernel.</p>
-      </story>
-    </month>
-
-    <month>
-      <name>3</name>
-      <story>
-	<name>Tomahawk Desktop Switches to BSD from Linux</name>
-	<url>http://www.tomahawkcomputers.com/fund-raising/phase-one.html</url>
-	<site-name>Tomahawk Computers</site-name>
-	<site-url>http://www.tomahawkcomputers.com/</site-url>
-	<date>10 March 2009</date>
-	<author>Sagara Wijetunga</author>
-	<p>Tomahawk Computers Pte Ltd. has switched to &os; from
-	  Linux to make the next version of the Tomahawk Desktop operating
-	  system.</p>
-      </story>
-    </month>
-
-    <month>
-      <name>1</name>
-      <story>
-	<name>Coyote Point Builds on FreeBSD to Accelerate</name>
-	<url>http://www.internetnews.com/infra/article.php/3795791</url>
-	<site-name>Internet News</site-name>
-	<site-url>http://www.internetnews.com/</site-url>
-	<date>13 January 2009</date>
-	<author>Sean Michael Kerner</author>
-	<p>FreeBSD is at the core of Coyote Point's appliance.</p>
-      </story>
-
-      <story>
-	<name>FreeBSD 7.1 Gets a Little Help from Sun</name>
-	<url>http://www.internetnews.com/dev-news/article.php/3794561</url>
-	<site-name>Internet News</site-name>
-	<site-url>http://www.internetnews.com/</site-url>
-	<date>06 January 2009</date>
-	<author>Sean Michael Kerner</author>
-	<p>An article covering technology sharing between Sun and the FreeBSD
-	  project and other new features in FreeBSD 7.1.</p>
-      </story>
-    </month>
-  </year>
-
 </press>

==== //depot/projects/docproj_nl/www/share/sgml/templates.oldpress.xsl#4 (text+ko) ====

@@ -6,7 +6,7 @@
 <!ENTITY % navinclude.about "INCLUDE">
 ]>
 
-<!-- $FreeBSD: www/share/sgml/templates.oldpress.xsl,v 1.7 2009/02/15 09:53:50 jkois Exp $ -->
+<!-- $FreeBSD: www/share/sgml/templates.oldpress.xsl,v 1.8 2012/05/12 11:08:37 ryusuke Exp $ -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
   xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
@@ -47,6 +47,7 @@
 	<xsl:apply-templates select="//month"/>
 	
 	<p>Other press publications:
+	  <a href="../2009/press.html">2009</a>,
 	  <a href="../2008/press.html">2008</a>,
 	  <a href="../2007/press.html">2007</a>,
 	  <a href="../2006/press.html">2006</a>,

From owner-p4-projects@FreeBSD.ORG  Mon May 14 19:50:47 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CF0A61065674; Mon, 14 May 2012 19:50:46 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 924CA106566B
	for <perforce@FreeBSD.org>; Mon, 14 May 2012 19:50:46 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 7BE138FC12
	for <perforce@FreeBSD.org>; Mon, 14 May 2012 19:50:46 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q4EJokOu091234
	for <perforce@FreeBSD.org>; Mon, 14 May 2012 19:50:46 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q4EJokD5091229
	for perforce@freebsd.org; Mon, 14 May 2012 19:50:46 GMT
	(envelope-from rene@FreeBSD.org)
Date: Mon, 14 May 2012 19:50:46 GMT
Message-Id: <201205141950.q4EJokD5091229@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan <rene@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 211153 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 14 May 2012 19:50:47 -0000

http://p4web.freebsd.org/@@211153?ac=10

Change 211153 by rene@rene_acer on 2012/05/14 19:50:12

	[www] share/sgml/libcommon.xsl 1.33 -> 1.34

Affected files ...

.. //depot/projects/docproj_nl/www/nl/share/sgml/libcommon.xsl#18 edit

Differences ...

==== //depot/projects/docproj_nl/www/nl/share/sgml/libcommon.xsl#18 (text+ko) ====

@@ -3,7 +3,7 @@
 				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd">
 <!-- $FreeBSD: www/nl/share/sgml/libcommon.xsl,v 1.6 2011/12/18 20:02:22 rene Exp $
      %SOURCE%	share/sgml/libcommon.xsl
-     %SRCID%	1.33
+     %SRCID%	1.34
  -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
   <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/libcommon.xsl"/>
@@ -67,6 +67,7 @@
   <!-- template: "html-press-make-olditems-list" -->
   <xsl:template name="html-press-make-olditems-list">
     <p>Oude persberichten:
+      <a href="&enbase;/news/2009/press.html">2009</a>,
       <a href="&enbase;/news/2008/press.html">2008</a>,
       <a href="&enbase;/news/2007/press.html">2007</a>,
       <a href="&enbase;/news/2006/press.html">2006</a>,

From owner-p4-projects@FreeBSD.ORG  Fri May 18 08:20:58 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3A4CB106566C; Fri, 18 May 2012 08:20:58 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id E7164106564A
	for <perforce@freebsd.org>; Fri, 18 May 2012 08:20:57 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id C8E3E8FC16
	for <perforce@freebsd.org>; Fri, 18 May 2012 08:20:57 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q4I8KvxB011632
	for <perforce@freebsd.org>; Fri, 18 May 2012 08:20:57 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q4I8KvRH011627
	for perforce@freebsd.org; Fri, 18 May 2012 08:20:57 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Fri, 18 May 2012 08:20:57 GMT
Message-Id: <201205180820.q4I8KvRH011627@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 211312 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 May 2012 08:20:58 -0000

http://p4web.freebsd.org/@@211312?ac=10

Change 211312 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/05/18 08:19:58

	Checkpoint initial version of the avgen(4) driver -- a generic
	device driver that can be attached to memory-mapped devices on the
	Avalon bus, exporting them to userspace for I/O via traditional
	read(2)/write(2), or for memory mapping via mmap(4).
	
	device.hints(5) entries specify the location and size of the
	mapping, which must be both page-aligned and an even multiple of
	page size.  An initial entry is installed for the DE4 flash device
	so that we can directly program the flash from userspace, via
	/dev/de4flash.  
	
	Refinement (and fixing) of this driver will likely be required
	before it can be used.
	
	There is some argument that this should really be named socgen,
	or similar, because it likely will work unmodified with other
	System-on-Chip buses such as AXI, as well.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/avgen/altera_avgen.c#1 add
.. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/avgen/altera_avgen.h#1 add
.. //depot/projects/ctsrd/beribsd/src/sys/mips/beri/files.beri#13 edit
.. //depot/projects/ctsrd/beribsd/src/sys/mips/beri/std.beri#2 edit
.. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI.hints#11 edit
.. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_MDROOT#9 edit
.. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_SDROOT#9 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/mips/beri/files.beri#13 (text+ko) ====

@@ -1,4 +1,5 @@
 # $FreeBSD$
+dev/altera/avgen/altera_avgen.c		optional altera_avgen
 dev/altera/jtag_uart/altera_jtag_uart.c		optional altera_jtag_uart
 dev/altera/sdcard/altera_sdcard.c	optional altera_sdcard
 dev/altera/sdcard/altera_sdcard_disk.c	optional altera_sdcard

==== //depot/projects/ctsrd/beribsd/src/sys/mips/beri/std.beri#2 (text+ko) ====


==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI.hints#11 (text+ko) ====

@@ -31,3 +31,14 @@
 hint.terasic_mtl.0.pixel_msize=0x177000
 hint.terasic_mtl.0.text_maddr=0x70177000
 hint.terasic_mtl.0.text_msize=0x2000
+
+#
+# Expose the DE4 flash via an Avalon "generic" device.
+#
+hint.altera_avgen.0.at="nexus0"
+hint.altera_avgen.0.maddr=0x74000000
+hint.altera_avgen.0.msize=0x4000000
+hint.altera_avgen.0.width=2
+hint.altera_avgen.0.fileio="rw"
+hint.altera_avgen.0.memio="rwx"
+hint.altera_avgen.0.devname="de4flash"

==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_MDROOT#9 (text+ko) ====

@@ -54,6 +54,7 @@
 makeoptions	MFS_IMAGE=/local/scratch/rnw24/mdroot.img
 options 	ROOTDEVNAME=\"ufs:md0\"
 
+device		altera_avgen
 device		altera_jtag_uart
 device		altera_sdcard
 device		terasic_de4led

==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_SDROOT#9 (text+ko) ====

@@ -46,6 +46,7 @@
 
 options 	ROOTDEVNAME=\"ufs:altera_sdcard0\"
 
+device		altera_avgen
 device		altera_jtag_uart
 device		altera_sdcard
 device		terasic_de4led

From owner-p4-projects@FreeBSD.ORG  Fri May 18 09:53:41 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2DFB81065674; Fri, 18 May 2012 09:53:41 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id DAFD6106566C
	for <perforce@freebsd.org>; Fri, 18 May 2012 09:53:40 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id AA1658FC0C
	for <perforce@freebsd.org>; Fri, 18 May 2012 09:53:40 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q4I9reYJ030638
	for <perforce@freebsd.org>; Fri, 18 May 2012 09:53:40 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q4I9re8C030635
	for perforce@freebsd.org; Fri, 18 May 2012 09:53:40 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Fri, 18 May 2012 09:53:40 GMT
Message-Id: <201205180953.q4I9re8C030635@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 211317 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 May 2012 09:53:41 -0000

http://p4web.freebsd.org/@@211317?ac=10

Change 211317 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/05/18 09:52:58

	Clean up several nits in the avgen(4) driver:
	
	- Properly check access permissions on read(2)/write(2), they were
	  inverted.
	
	- Use the right hint name in device.hints for memory mapped I/O
	  permission.
	
	- Clean up make_dev(9) use when no unit is requested.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/avgen/altera_avgen.c#2 edit
.. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI.hints#12 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/dev/altera/avgen/altera_avgen.c#2 (text+ko) ====

@@ -87,7 +87,7 @@
 	int error;
 
 	sc = dev->si_drv1;
-	if ((sc->avg_flags & ALTERA_AVALON_FLAG_READ) != 0)
+	if ((sc->avg_flags & ALTERA_AVALON_FLAG_READ) == 0)
 		return (EACCES);
 	width = sc->avg_width;
 	if (uio->uio_offset < 0 || uio->uio_offset % width != 0 ||
@@ -149,7 +149,7 @@
 	int error;
 
 	sc = dev->si_drv1;
-	if ((sc->avg_flags & ALTERA_AVALON_FLAG_WRITE) != 0)
+	if ((sc->avg_flags & ALTERA_AVALON_FLAG_WRITE) == 0)
 		return (EACCES);
 	width = sc->avg_width;
 	if (uio->uio_offset < 0 || uio->uio_offset % width != 0 ||
@@ -399,8 +399,12 @@
 		str_devname = "altera_avgen%d";
 		devunit = sc->avg_unit;
 	}
-	sc->avg_cdev = make_dev(&avg_cdevsw, sc->avg_unit, UID_ROOT,
-	    GID_WHEEL, S_IRUSR | S_IWUSR, str_devname, devunit);
+	if (devunit != -1)
+		sc->avg_cdev = make_dev(&avg_cdevsw, sc->avg_unit, UID_ROOT,
+		    GID_WHEEL, S_IRUSR | S_IWUSR, str_devname, devunit);
+	else
+		sc->avg_cdev = make_dev(&avg_cdevsw, sc->avg_unit, UID_ROOT,
+		    GID_WHEEL, S_IRUSR | S_IWUSR, str_devname);
 	if (sc->avg_cdev == NULL) {
 		device_printf(sc->avg_dev, "%s: make_dev failed\n", __func__);
 		error = ENXIO;

==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI.hints#12 (text+ko) ====

@@ -40,5 +40,5 @@
 hint.altera_avgen.0.msize=0x4000000
 hint.altera_avgen.0.width=2
 hint.altera_avgen.0.fileio="rw"
-hint.altera_avgen.0.memio="rwx"
+hint.altera_avgen.0.mmapio="rwx"
 hint.altera_avgen.0.devname="de4flash"

From owner-p4-projects@FreeBSD.ORG  Fri May 18 10:47:04 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7B486106566C; Fri, 18 May 2012 10:47:04 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 35DD9106564A
	for <perforce@freebsd.org>; Fri, 18 May 2012 10:47:04 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 1E6738FC1C
	for <perforce@freebsd.org>; Fri, 18 May 2012 10:47:04 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q4IAl3ui040789
	for <perforce@freebsd.org>; Fri, 18 May 2012 10:47:03 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q4IAl3HP040786
	for perforce@freebsd.org; Fri, 18 May 2012 10:47:03 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Fri, 18 May 2012 10:47:03 GMT
Message-Id: <201205181047.q4IAl3HP040786@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 211320 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 May 2012 10:47:04 -0000

http://p4web.freebsd.org/@@211320?ac=10

Change 211320 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/05/18 10:46:31

	Correct copy-and-paste-o: don't reuse a driver name in the
	driver definition or the collision may prevent one of the
	colliding drivers from registering properly.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/avgen/altera_avgen.c#3 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/dev/altera/avgen/altera_avgen.c#3 (text+ko) ====

@@ -445,5 +445,5 @@
 
 static devclass_t altera_avgen_devclass;
 
-DRIVER_MODULE(mtl, nexus, altera_avgen_nexus_driver, altera_avgen_devclass,
+DRIVER_MODULE(avgen, nexus, altera_avgen_nexus_driver, altera_avgen_devclass,
     0, 0);

From owner-p4-projects@FreeBSD.ORG  Fri May 18 16:07:48 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6D2DA1065672; Fri, 18 May 2012 16:07:48 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2F479106564A
	for <perforce@freebsd.org>; Fri, 18 May 2012 16:07:48 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 1577F8FC0A
	for <perforce@freebsd.org>; Fri, 18 May 2012 16:07:48 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q4IG7lX1007175
	for <perforce@freebsd.org>; Fri, 18 May 2012 16:07:47 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q4IG7l8b007172
	for perforce@freebsd.org; Fri, 18 May 2012 16:07:47 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Fri, 18 May 2012 16:07:47 GMT
Message-Id: <201205181607.q4IG7l8b007172@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 211334 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 May 2012 16:07:48 -0000

http://p4web.freebsd.org/@@211334?ac=10

Change 211334 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/05/18 16:07:29

	Integrate the CheriBSD branch to pick up the last few week of work
	on BeriBSD: syscons text console, new video and touch screen
	drivers, MIPS fixes, support for multi-user mode, Avalon generic
	driver, and much general fixery to use FreeBSD on BERI MIPS.

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/etc/etc.mips/ttys#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/conf/NOTES#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/conf/files.mips#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/conf/options#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/conf/options.mips#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/altera/avgen/altera_avgen.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/altera/avgen/altera_avgen.h#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/altera/jtag_uart/altera_jtag_uart.c#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/fb/fbreg.h#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/gxemul/cons/gxemul_cons.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/syscons/schistory.c#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/syscons/scterm-teken.c#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/syscons/syscons.c#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/terasic/mtl/terasic_mtl.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/terasic/mtl/terasic_mtl.h#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/terasic/mtl/terasic_mtl_nexus.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/terasic/mtl/terasic_mtl_pixel.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/terasic/mtl/terasic_mtl_reg.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/terasic/mtl/terasic_mtl_syscons.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/terasic/mtl/terasic_mtl_text.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/terasic/mtllcd/terasic_mtllcd.c#2 delete
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/terasic/mtllcd/terasic_mtllcd.h#2 delete
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/terasic/mtllcd/terasic_mtllcd_nexus.c#2 delete
.. //depot/projects/ctsrd/cheribsd/src/sys/kern/init_main.c#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/mips/beri/files.beri#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/mips/beri/gxemul_cons.c#2 delete
.. //depot/projects/ctsrd/cheribsd/src/sys/mips/beri/std.beri#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI.hints#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_MDROOT#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_SDROOT#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/GXEMUL#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/GXEMUL.hints#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/mips/gxemul/files.gxemul#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/mips/gxemul/gxemul_machdep.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/mips/gxemul/std.gxemul#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/mips/include/sc_machdep.h#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/bus_space_generic.c#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/sc_machdep.c#1 branch

Differences ...

==== //depot/projects/ctsrd/cheribsd/src/etc/etc.mips/ttys#2 (text+ko) ====

@@ -28,6 +28,17 @@
 # If console is marked "insecure", then init will ask for the root password
 # when going to single-user mode.
 console	none				unknown	off secure
+#
+ttyv0	"/usr/libexec/getty Pc"		xterm	on  secure
+# Virtual terminals
+ttyv1	"/usr/libexec/getty Pc"		xterm	off secure
+ttyv2	"/usr/libexec/getty Pc"		xterm	off secure
+ttyv3	"/usr/libexec/getty Pc"		xterm	off secure
+ttyv4	"/usr/libexec/getty Pc"		xterm	off secure
+ttyv5	"/usr/libexec/getty Pc"		xterm	off secure
+ttyv6	"/usr/libexec/getty Pc"		xterm	off secure
+ttyv7	"/usr/libexec/getty Pc"		xterm	off secure
+ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	off secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.
 ttyu0	"/usr/libexec/getty std.115200"	dialup	on  secure

==== //depot/projects/ctsrd/cheribsd/src/sys/conf/NOTES#2 (text+ko) ====

@@ -139,6 +139,12 @@
 #
 options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
 
+#
+# Compile-time defaults for various boot parameters
+#
+options 	BOOTVERBOSE=1
+options 	BOOTHOWTO=RB_MULTIPLE
+
 options 	GEOM_AES		# Don't use, use GEOM_BDE
 options 	GEOM_BDE		# Disk encryption.
 options 	GEOM_BSD		# BSD disklabels

==== //depot/projects/ctsrd/cheribsd/src/sys/conf/files.mips#2 (text+ko) ====

@@ -126,3 +126,9 @@
 
 dev/fdt/fdt_mips.c		optional	fdt
 
+dev/fb/fb.c			optional	sc
+dev/kbd/kbd.c			optional	sc
+dev/syscons/scgfbrndr.c		optional	sc
+dev/syscons/scterm-teken.c	optional	sc
+dev/syscons/scvtb.c		optional	sc
+mips/mips/sc_machdep.c		optional	sc

==== //depot/projects/ctsrd/cheribsd/src/sys/conf/options#2 (text+ko) ====

@@ -66,6 +66,8 @@
 ADAPTIVE_LOCKMGRS
 ALQ
 AUDIT		opt_global.h
+BOOTHOWTO	opt_global.h
+BOOTVERBOSE	opt_global.h
 CAPABILITIES	opt_capsicum.h
 CAPABILITY_MODE	opt_capsicum.h
 CODA_COMPAT_5	opt_coda.h

==== //depot/projects/ctsrd/cheribsd/src/sys/conf/options.mips#2 (text+ko) ====

@@ -55,6 +55,10 @@
 CFE_ENV		opt_global.h
 CFE_ENV_SIZE	opt_global.h
 
+GFB_DEBUG		opt_gfb.h
+GFB_NO_FONT_LOADING	opt_gfb.h
+GFB_NO_MODE_CHANGE	opt_gfb.h
+
 NOFPU		opt_global.h
 
 TICK_USE_YAMON_FREQ	opt_global.h

==== //depot/projects/ctsrd/cheribsd/src/sys/dev/altera/jtag_uart/altera_jtag_uart.c#2 (text+ko) ====

@@ -37,6 +37,7 @@
 #include <sys/kdb.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/reboot.h>
 #include <sys/tty.h>
 
 #include <ddb/ddb.h>
@@ -297,7 +298,7 @@
 {
 
 	sprintf(cp->cn_name, "ttyu0");
-	cp->cn_pri = CN_NORMAL;
+	cp->cn_pri = (boothowto & RB_SERIAL) ? CN_REMOTE : CN_NORMAL;
 }
 
 static void

==== //depot/projects/ctsrd/cheribsd/src/sys/dev/fb/fbreg.h#2 (text+ko) ====

@@ -84,6 +84,29 @@
 u_int16_t ofwfb_readw(u_int16_t *addr);
 void ofwfb_writew(u_int16_t *addr, u_int16_t val);
 
+#elif defined(__mips__)
+
+/*
+ * Use amd64/i386-like settings under the assumption that MIPS-based display
+ * drivers will have to add a level of indirection between a syscons-managed
+ * frame buffer and the actual video hardware.  We are forced to do this
+ * because syscons doesn't carry around required busspace handles and tags to
+ * use here.  This is only really a problem for true VGA devices hooked up to
+ * MIPS, as others will be performing a translation anyway.
+ */
+#define bcopy_io(s, d, c)	memcpy((void *)(d), (void *)(s), (c))
+#define bcopy_toio(s, d, c)	memcpy((void *)(d), (void *)(s), (c))
+#define bcopy_fromio(s, d, c)	memcpy((void *)(d), (void *)(s), (c))
+#define bzero_io(d, c)		memset((void *)(d), 0, (c))
+#define fill_io(p, d, c)	memset((void *)(d), (p), (c))
+static __inline void
+fillw(int val, uint16_t *buf, size_t size)
+{
+	while (size--)
+		*buf++ = val;
+}
+#define fillw_io(p, d, c)	fillw((p), (void *)(d), (c))
+
 #else /* !__i386__ && !__amd64__ && !__ia64__ && !__sparc64__ && !__powerpc__ */
 #define bcopy_io(s, d, c)	memcpy_io((d), (s), (c))
 #define bcopy_toio(s, d, c)	memcpy_toio((d), (void *)(s), (c))

==== //depot/projects/ctsrd/cheribsd/src/sys/dev/syscons/schistory.c#2 (text+ko) ====

@@ -42,7 +42,7 @@
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 
-#if defined(__sparc64__) || defined(__powerpc__)
+#if defined(__sparc64__) || defined(__powerpc__) || defined(__mips__)
 #include <machine/sc_machdep.h>
 #else
 #include <machine/pc/display.h>

==== //depot/projects/ctsrd/cheribsd/src/sys/dev/syscons/scterm-teken.c#2 (text+ko) ====

@@ -40,7 +40,7 @@
 #include <sys/consio.h>
 #include <sys/kbio.h>
 
-#if defined(__sparc64__) || defined(__powerpc__)
+#if defined(__sparc64__) || defined(__powerpc__) || defined(__mips__)
 #include <machine/sc_machdep.h>
 #else
 #include <machine/pc/display.h>

==== //depot/projects/ctsrd/cheribsd/src/sys/dev/syscons/syscons.c#2 (text+ko) ====

@@ -62,7 +62,7 @@
 #include <sys/power.h>
 
 #include <machine/clock.h>
-#if defined(__sparc64__) || defined(__powerpc__)
+#if defined(__sparc64__) || defined(__powerpc__) || defined(__mips__)
 #include <machine/sc_machdep.h>
 #else
 #include <machine/pc/display.h>

==== //depot/projects/ctsrd/cheribsd/src/sys/kern/init_main.c#2 (text+ko) ====

@@ -101,10 +101,17 @@
 struct	vmspace vmspace0;
 struct	proc *initproc;
 
-int	boothowto = 0;		/* initialized so that it can be patched */
+#ifndef BOOTHOWTO
+#define	BOOTHOWTO	0
+#endif
+int	boothowto = BOOTHOWTO;	/* initialized so that it can be patched */
 SYSCTL_INT(_debug, OID_AUTO, boothowto, CTLFLAG_RD, &boothowto, 0,
 	"Boot control flags, passed from loader");
-int	bootverbose;
+
+#ifndef BOOTVERBOSE
+#define	BOOTVERBOSE	0
+#endif
+int	bootverbose = BOOTVERBOSE;
 SYSCTL_INT(_debug, OID_AUTO, bootverbose, CTLFLAG_RW, &bootverbose, 0,
 	"Control the output of verbose kernel messages");
 

==== //depot/projects/ctsrd/cheribsd/src/sys/mips/beri/files.beri#2 (text+ko) ====

@@ -1,4 +1,5 @@
 # $FreeBSD$
+dev/altera/avgen/altera_avgen.c		optional altera_avgen
 dev/altera/jtag_uart/altera_jtag_uart.c		optional altera_jtag_uart
 dev/altera/sdcard/altera_sdcard.c	optional altera_sdcard
 dev/altera/sdcard/altera_sdcard_disk.c	optional altera_sdcard
@@ -6,9 +7,12 @@
 dev/altera/sdcard/altera_sdcard_nexus.c	optional altera_sdcard
 dev/terasic/de4led/terasic_de4led.c	optional terasic_de4led
 dev/terasic/de4led/terasic_de4led_nexus.c	optional terasic_de4led
-dev/terasic/mtllcd/terasic_mtllcd.c	optional terasic_mtllcd
-dev/terasic/mtllcd/terasic_mtllcd_nexus.c	optional terasic_mtllcd
+dev/terasic/mtl/terasic_mtl.c		optional terasic_mtl
+dev/terasic/mtl/terasic_mtl_nexus.c	optional terasic_mtl
+dev/terasic/mtl/terasic_mtl_pixel.c	optional terasic_mtl
+dev/terasic/mtl/terasic_mtl_reg.c	optional terasic_mtl
+dev/terasic/mtl/terasic_mtl_syscons.c	optional terasic_mtl
+dev/terasic/mtl/terasic_mtl_text.c	optional terasic_mtl
 mips/beri/beri_machdep.c		standard
-mips/beri/gxemul_cons.c			optional gxemul_cons
 mips/mips/intr_machdep.c		standard
 mips/mips/tick.c			standard

==== //depot/projects/ctsrd/cheribsd/src/sys/mips/beri/std.beri#2 (text+ko) ====


==== //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI.hints#2 (text+ko) ====

@@ -24,6 +24,21 @@
 #
 # Terasic Multi-touch LCD (MTL), an optional feature in DE-4 configurations
 #
-hint.terasic_mtllcd.0.at="nexus0"
-hint.terasic_mtllcd.0.maddr=0x7f800000
-hint.terasic_mtllcd.0.msize=0x800000
+hint.terasic_mtl.0.at="nexus0"
+hint.terasic_mtl.0.reg_maddr=0x70400000
+hint.terasic_mtl.0.reg_msize=0x1000
+hint.terasic_mtl.0.pixel_maddr=0x70000000
+hint.terasic_mtl.0.pixel_msize=0x177000
+hint.terasic_mtl.0.text_maddr=0x70177000
+hint.terasic_mtl.0.text_msize=0x2000
+
+#
+# Expose the DE4 flash via an Avalon "generic" device.
+#
+hint.altera_avgen.0.at="nexus0"
+hint.altera_avgen.0.maddr=0x74000000
+hint.altera_avgen.0.msize=0x4000000
+hint.altera_avgen.0.width=2
+hint.altera_avgen.0.fileio="rw"
+hint.altera_avgen.0.mmapio="rwx"
+hint.altera_avgen.0.devname="de4flash"

==== //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_MDROOT#2 (text+ko) ====

@@ -33,6 +33,11 @@
 
 options 	FFS			#Berkeley Fast Filesystem
 
+options 	INET
+options 	INET6
+options 	NFSCL
+options 	NFS_ROOT
+
 # Debugging for use in -current
 #options 	DEADLKRES		#Enable the deadlock resolver
 options 	INVARIANTS		#Enable calls of extra sanity checking
@@ -49,11 +54,15 @@
 makeoptions	MFS_IMAGE=/local/scratch/rnw24/mdroot.img
 options 	ROOTDEVNAME=\"ufs:md0\"
 
+device		altera_avgen
 device		altera_jtag_uart
 device		altera_sdcard
 device		terasic_de4led
-device		terasic_mtllcd
+device		terasic_mtl
 
 device		md
+device		ether
 device		loop
 device		random
+device		sc
+device		snp

==== //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_SDROOT#2 (text+ko) ====

@@ -32,6 +32,11 @@
 
 options 	FFS			#Berkeley Fast Filesystem
 
+options 	INET
+options 	INET6
+options 	NFSCL
+options 	NFS_ROOT
+
 # Debugging for use in -current
 #options 	DEADLKRES		#Enable the deadlock resolver
 options 	INVARIANTS		#Enable calls of extra sanity checking
@@ -41,11 +46,15 @@
 
 options 	ROOTDEVNAME=\"ufs:altera_sdcard0\"
 
+device		altera_avgen
 device		altera_jtag_uart
 device		altera_sdcard
 device		terasic_de4led
-device		terasic_mtllcd
+device		terasic_mtl
 
 device		md
+device		ether
 device		loop
 device		random
+device		sc
+device		snp

==== //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/GXEMUL#2 (text+ko) ====

@@ -1,5 +1,52 @@
-include BERI
-ident GXEMUL
+#
+# GXEMUL "oldtestmips" sample kernel configuration.
+#
+# $FreeBSD$
+#
+
+ident		GXEMUL
+
+machine		mips mips64eb
+cpu		CPU_MIPS4KC
+
+options 	HZ=100
+
+makeoptions	ARCH_FLAGS="-march=mips64 -mabi=64"
+
+makeoptions 	KERNLOADADDR=0xffffffff80100000
+
+include		"../gxemul/std.gxemul"
+
+hints		"GXEMUL.hints"		#Default places to look for devices.
+
+makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
+
+makeoptions	MODULES_OVERRIDE=""
+
+options 	DDB
+options 	KDB
+
+options 	SCHED_ULE
+
+options 	FFS			#Berkeley Fast Filesystem
+
+# Debugging for use in -current
+#options 	DEADLKRES		#Enable the deadlock resolver
+options 	INVARIANTS		#Enable calls of extra sanity checking
+options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
+#options 	WITNESS			#Enable checks to detect deadlocks and cycles
+#options 	WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
+
+#
+# This kernel configuration uses an embedded 8MB memory root file system.
+# Adjust the following path based on local requirements.
+#
+options 	MD_ROOT			# MD is a potential root device
+options 	MD_ROOT_SIZE=8192
+#makeoptions	MFS_IMAGE=/local/scratch/rnw24/mdroot.img
+options 	ROOTDEVNAME=\"ufs:md0\"
 
-nodevice	altera_jtag_uart
 device		gxemul_cons
+device		md
+device		loop
+device		random

==== //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/bus_space_generic.c#2 (text+ko) ====

@@ -99,8 +99,8 @@
 	generic_bs_subregion,
 
 	/* allocation/deallocation */
-	NULL,
-	NULL,
+	generic_bs_alloc,
+	generic_bs_free,
 
 	/* barrier */
 	generic_bs_barrier,
@@ -109,91 +109,91 @@
 	generic_bs_r_1,
 	generic_bs_r_2,
 	generic_bs_r_4,
-	NULL,
+	generic_bs_r_8,
 
 	/* read multiple */
 	generic_bs_rm_1,
 	generic_bs_rm_2,
 	generic_bs_rm_4,
-	NULL,
+	generic_bs_rm_8,
 
 	/* read region */
 	generic_bs_rr_1,
 	generic_bs_rr_2,
 	generic_bs_rr_4,
-	NULL,
+	generic_bs_rr_8,
 
 	/* write (single) */
 	generic_bs_w_1,
 	generic_bs_w_2,
 	generic_bs_w_4,
-	NULL,
+	generic_bs_w_8,
 
 	/* write multiple */
 	generic_bs_wm_1,
 	generic_bs_wm_2,
 	generic_bs_wm_4,
-	NULL,
+	generic_bs_wm_8,
 
 	/* write region */
 	generic_bs_wr_1,
 	generic_bs_wr_2,
 	generic_bs_wr_4,
-	NULL,
+	generic_bs_wr_8,
 
 	/* set multiple */
-	NULL,
-	NULL,
-	NULL,
-	NULL,
+	generic_bs_sm_1,
+	generic_bs_sm_2,
+	generic_bs_sm_4,
+	generic_bs_sm_8,
 
 	/* set region */
 	generic_bs_sr_1,
 	generic_bs_sr_2,
 	generic_bs_sr_4,
-	NULL,
+	generic_bs_sr_8,
 
 	/* copy */
 	generic_bs_c_1,
 	generic_bs_c_2,
 	generic_bs_c_4,
-	NULL,
+	generic_bs_c_8,
 
 	/* read (single) stream */
 	generic_bs_r_1,
 	generic_bs_r_2,
 	generic_bs_r_4,
-	NULL,
+	generic_bs_r_8,
 
 	/* read multiple stream */
 	generic_bs_rm_1,
 	generic_bs_rm_2,
 	generic_bs_rm_4,
-	NULL,
+	generic_bs_rm_8,
 
 	/* read region stream */
 	generic_bs_rr_1,
 	generic_bs_rr_2,
 	generic_bs_rr_4,
-	NULL,
+	generic_bs_rr_8,
 
 	/* write (single) stream */
 	generic_bs_w_1,
 	generic_bs_w_2,
 	generic_bs_w_4,
-	NULL,
+	generic_bs_w_8,
 
 	/* write multiple stream */
 	generic_bs_wm_1,
 	generic_bs_wm_2,
 	generic_bs_wm_4,
-	NULL,
+	generic_bs_wm_8,
 
 	/* write region stream */
 	generic_bs_wr_1,
 	generic_bs_wr_2,
 	generic_bs_wr_4,
-	NULL,
+	generic_bs_wr_8,
 };
 
 /* Ultra-gross kludge */
@@ -254,6 +254,22 @@
 	return (0);
 }
 
+int
+generic_bs_alloc(void *t, bus_addr_t rstart, bus_addr_t rend,
+    bus_size_t size, bus_size_t alignment, bus_size_t boundary, int flags,
+    bus_addr_t *bpap, bus_space_handle_t *bshp)
+{
+
+	panic("%s: not implemented", __func__);
+}
+
+void    
+generic_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size)
+{
+
+	panic("%s: not implemented", __func__);
+}
+
 uint8_t
 generic_bs_r_1(void *t, bus_space_handle_t handle,
     bus_size_t offset)
@@ -278,7 +294,13 @@
 	return (rd32(handle + offset));
 }
 
+uint64_t
+generic_bs_r_8(void *t, bus_space_handle_t handle, bus_size_t offset)
+{
 
+	panic("%s: not implemented", __func__);
+}
+
 void
 generic_bs_rm_1(void *t, bus_space_handle_t bsh,
     bus_size_t offset, uint8_t *addr, size_t count)
@@ -308,6 +330,13 @@
 		*addr++ = rd32(baddr);
 }
 
+void
+generic_bs_rm_8(void *t, bus_space_handle_t bsh, bus_size_t offset,
+    uint64_t *addr, size_t count)
+{
+
+	panic("%s: not implemented", __func__);
+}
 
 /*
  * Read `count' 1, 2, 4, or 8 byte quantities from bus space
@@ -350,6 +379,14 @@
 	}
 }
 
+void
+generic_bs_rr_8(void *t, bus_space_handle_t bsh, bus_size_t offset,
+    uint64_t *addr, size_t count)
+{
+
+	panic("%s: not implemented", __func__);
+}
+
 /*
  * Write the 1, 2, 4, or 8 byte value `value' to bus space
  * described by tag/handle/offset.
@@ -378,6 +415,14 @@
 	wr32(bsh + offset, value);
 }
 
+void
+generic_bs_w_8(void *t, bus_space_handle_t bsh, bus_size_t offset,
+    uint64_t value)
+{
+
+	panic("%s: not implemented", __func__);
+}
+
 /*
  * Write `count' 1, 2, 4, or 8 byte quantities from the buffer
  * provided to bus space described by tag/handle/offset.
@@ -412,6 +457,14 @@
 		wr32(baddr, *addr++);
 }
 
+void
+generic_bs_wm_8(void *t, bus_space_handle_t bsh, bus_size_t offset,
+    const uint64_t *addr, size_t count)
+{
+
+	panic("%s: not implemented", __func__);
+}
+
 /*
  * Write `count' 1, 2, 4, or 8 byte quantities from the buffer provided
  * to bus space described by tag/handle starting at `offset'.
@@ -452,6 +505,14 @@
 	}
 }
 
+void
+generic_bs_wr_8(void *t, bus_space_handle_t bsh, bus_size_t offset,
+    const uint64_t *addr, size_t count)
+{
+
+	panic("%s: not implemented", __func__);
+}
+
 /*
  * Write the 1, 2, 4, or 8 byte value `val' to bus space described
  * by tag/handle/offset `count' times.
@@ -486,6 +547,14 @@
 		wr32(addr, value);
 }
 
+void
+generic_bs_sm_8(void *t, bus_space_handle_t bsh, bus_size_t offset,
+    uint64_t value, size_t count)
+{
+
+	panic("%s: not implemented", __func__);
+}
+
 /*
  * Write `count' 1, 2, 4, or 8 byte value `val' to bus space described
  * by tag/handle starting at `offset'.
@@ -520,6 +589,14 @@
 		wr32(addr, value);
 }
 
+void
+generic_bs_sr_8(void *t, bus_space_handle_t bsh, bus_size_t offset,
+    uint64_t value, size_t count)
+{
+
+	panic("%s: not implemented", __func__);
+}
+
 /*
  * Copy `count' 1, 2, 4, or 8 byte values from bus space starting
  * at tag/bsh1/off1 to bus space starting at tag/bsh2/off2.
@@ -585,6 +662,14 @@
 }
 
 void
+generic_bs_c_8(void *t, bus_space_handle_t bsh1, bus_size_t off1,
+    bus_space_handle_t bsh2, bus_size_t off2, size_t count)
+{
+
+	panic("%s: not implemented", __func__);
+}
+
+void
 generic_bs_barrier(void *t __unused, 
 		bus_space_handle_t bsh __unused,
 		bus_size_t offset __unused, bus_size_t len __unused, 

From owner-p4-projects@FreeBSD.ORG  Sat May 19 17:34:17 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 36AF01065670; Sat, 19 May 2012 17:34:17 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id ECB7E106566B
	for <perforce@FreeBSD.org>; Sat, 19 May 2012 17:34:16 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id D3F118FC0C
	for <perforce@FreeBSD.org>; Sat, 19 May 2012 17:34:16 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q4JHYGOQ013914
	for <perforce@FreeBSD.org>; Sat, 19 May 2012 17:34:16 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q4JHYGHc013911
	for perforce@freebsd.org; Sat, 19 May 2012 17:34:16 GMT
	(envelope-from rene@FreeBSD.org)
Date: Sat, 19 May 2012 17:34:16 GMT
Message-Id: <201205191734.q4JHYGHc013911@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan <rene@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 211377 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 May 2012 17:34:17 -0000

http://p4web.freebsd.org/@@211377?ac=10

Change 211377 by rene@rene_acer on 2012/05/19 17:33:29

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#142 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#24 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#142 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/vsevolod.key#3 integrate
.. //depot/projects/docproj_nl/www/nl/share/sgml/libcommon.xsl#19 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#142 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.1090 2012/05/11 22:27:36 eadler Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.1091 2012/05/15 20:18:26 pawel Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -5827,6 +5827,11 @@
     </listitem>
 
     <listitem>
+      <para>Leo Vandewoestijne
+	<email>freebsd@dns-lab.com</email></para>
+    </listitem>
+
+    <listitem>
       <para>Leonardo Silveira de A. Martins
 	<email>lmartins@nepe.eee.ufg.br</email></para>
     </listitem>

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#24 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.212 2012/02/16 05:06:57 eadler Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.213 2012/05/16 16:25:55 gjb Exp $
 -->
 
 <chapter id="x11">
@@ -1323,9 +1323,9 @@
 
 	<para>Several replacements for the default
 	  <application>XDM</application> program exist.  One of them,
-	  <application>kdm</application> (bundled with
+	  <application>KDM</application> (bundled with
 	  <application>KDE</application>) is described later in this
-	  chapter.  The <application>kdm</application> display manager offers many visual
+	  chapter.  The <application>KDM</application> display manager offers many visual
 	  improvements and cosmetic frills, as well as the
 	  functionality to allow users to choose their window manager
 	  of choice at login time.</para>
@@ -1460,7 +1460,7 @@
 	<para>Yet another option is to configure the display manager to
 	  allow choosing the window manager at login time; the section on
 	  <link linkend="x11-wm-kde-details">KDE details</link>
-	  explains how to do this for <application>kdm</application>, the
+	  explains how to do this for <application>KDM</application>, the
 	  display manager of <application>KDE</application>.</para>
       </sect3>
     </sect2>
@@ -1504,7 +1504,7 @@
 
 	  <listitem>
 	    <para>Internationalization: <application>KDE</application>
-	      is available in more than 40 languages</para>
+	      is available in more than 55 languages</para>
 	  </listitem>
 
 	  <listitem>
@@ -1525,13 +1525,16 @@
 	  can be found on the <ulink url="http://www.kde.org/">KDE
 	  website</ulink>.  For FreeBSD specific information and
 	  resources on <application>KDE</application>, consult
-	  the <ulink url="http://freebsd.kde.org/">KDE on FreeBSD
-	  team</ulink>'s website.</para>
+	  the <ulink url="http://freebsd.kde.org/">KDE/FreeBSD
+	    initiative</ulink>'s website.</para>
 
-	<para>There are two versions of <application>KDE</application> available on FreeBSD.  Version 3
-	  has been around for a long time, and is very mature.  Version 4,
-	  the next generation, is also available in the Ports Collection.
-	  They can even be installed side by side.</para>
+	<para>There are two versions of <application>KDE</application>
+	  available on FreeBSD.  Version 3 has been around for a long
+	  time, and is still available in the Ports Collection though
+	  it's now unmaintained and partially broken.  Version 4 is
+	  punctually updated and is the default choice for
+	  <application>KDE</application> users.  They can even be
+	  installed side by side.</para>
       </sect3>
 
       <sect3 id="x11-wm-kde-install">
@@ -1541,26 +1544,26 @@
 	  other desktop environment, the software can be easily installed
 	  from a package or the Ports Collection:</para>
 
-	<para>To install the <application>KDE3</application> package
-	  from the network, simply type:</para>
+	<para>To install the <application>KDE 3</application> package
+	  from the network, type:</para>
 
 	<screen>&prompt.root; <userinput>pkg_add -r kde</userinput></screen>
 
-	<para>To install the <application>KDE4</application> package
-	  from the network, simply type:</para>
+	<para>To install the <application>KDE 4</application> package
+	  from the network, type:</para>
 
 	<screen>&prompt.root; <userinput>pkg_add -r kde4</userinput></screen>
 
 	<para>&man.pkg.add.1; will automatically fetch the latest version
 	  of the application.</para>
 
-	<para>To build <application>KDE3</application> from source,
+	<para>To build <application>KDE 3</application> from source,
 	  use the ports tree:</para>
 
 	<screen>&prompt.root; <userinput>cd /usr/ports/x11/kde3</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
-	<para>To build <application>KDE4</application> from source,
+	<para>To build <application>KDE 4</application> from source,
 	  use the ports tree:</para>
 
 	<screen>&prompt.root; <userinput>cd /usr/ports/x11/kde4</userinput>
@@ -1571,12 +1574,12 @@
 	  instead of the default window manager.  This is accomplished
 	  by editing the <filename>.xinitrc</filename> file:</para>
 
-	<para>For <application>KDE3</application>:</para>
-	
+	<para>For <application>KDE 3</application>:</para>
+
 	<screen>&prompt.user; <userinput>echo "exec startkde" &gt; ~/.xinitrc</userinput></screen>
 
-	<para>For <application>KDE4</application>:</para>
-	
+	<para>For <application>KDE 4</application>:</para>
+
 	<screen>&prompt.user; <userinput>echo "exec /usr/local/kde4/bin/startkde" &gt; ~/.xinitrc</userinput></screen>
 
 	<para>Now, whenever the X Window System is invoked with
@@ -1587,7 +1590,7 @@
 	  <application>XDM</application> is being used, the
 	  configuration is slightly different.  Edit the
 	  <filename>.xsession</filename> file instead.  Instructions
-	  for <application>kdm</application> are described later in
+	  for <application>KDM</application> are described later in
 	  this chapter.</para>
       </sect3>
     </sect2>
@@ -1618,28 +1621,28 @@
 	  <link linkend="x-xdm">XDM</link> can be
 	  used, as described earlier.  However,
 	  <application>KDE</application> includes an
-	  alternative, <application>kdm</application>, which is designed
+	  alternative, <application>KDM</application>, which is designed
 	  to look more attractive and include more login-time options.
 	  In particular, users can easily choose (via a menu) which
 	  desktop environment (<application>KDE</application>,
 	  <application>GNOME</application>, or something else) to run
 	  after logging on.</para>
 
-	<para>To enable <application>kdm</application>, different files
+	<para>To enable <application>KDM</application>, different files
 	  need to be edited depending on the version of
 	  <application>KDE</application>.</para>
 
-	<para>For <application>KDE3</application>, the <literal>ttyv8</literal>
+	<para>For <application>KDE 3</application>, the <literal>ttyv8</literal>
 	  entry in <filename>/etc/ttys</filename> has to be adapted as
 	  follows:</para>
 
 	 <programlisting>ttyv8 "/usr/local/bin/kdm -nodaemon" xterm on secure</programlisting>
 
-	<para>For <application>KDE4</application>, you have to add the
-	  following lines to <filename>/etc/rc.conf</filename>:</para>
+	<para>For <application>KDE 4</application>, you have to mount
+	  &man.procfs.5; and add the following line to
+	  <filename>/etc/rc.conf</filename>:</para>
 
-	<programlisting>local_startup="${local_startup} /usr/local/kde4/etc/rc.d"
-kdm4_enable="YES"</programlisting>
+	<programlisting>kdm4_enable="YES"</programlisting>
       </sect3>
 
      </sect2>

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#142 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1186 2012/05/02 10:21:37 jasone Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1187 2012/05/16 16:25:56 gjb Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -1742,8 +1742,8 @@
 	      <row>
 		<entry><filename>kde*</filename></entry>
 		<entry>Ports from the <ulink
-		    url="http://www.kde.org">K Desktop Environment
-		    (KDE)</ulink> Project.</entry>
+		    url="http://www.kde.org">KDE</ulink>
+		  Project.</entry>
 		<entry></entry>
 	      </row>
 
@@ -6004,7 +6004,8 @@
 		<entry><makevar>QTNONSTANDARD</makevar></entry>
 		<entry>Suppress modification of
 		  <makevar>CONFIGURE_ENV</makevar>,
-		  <makevar>CONFIGURE_ARGS</makevar>, and
+		  <makevar>CONFIGURE_ARGS</makevar>,
+		  <makevar>CPPFLAGS</makevar> and
 		  <makevar>MAKE_ENV</makevar>.</entry>
 	      </row>
 	    </tbody>
@@ -6019,30 +6020,26 @@
 	    <tbody>
 	      <row>
 		<entry><makevar>QT_COMPONENTS</makevar></entry>
-		<entry>Specify tool and library dependencies for Qt4.
+		<entry>Specify tool and library dependencies for Qt 4.
 		  See below for details.</entry>
 	      </row>
 
 	      <row>
 		<entry><makevar>UIC</makevar></entry>
 		<entry>Set to the path of <command>uic</command>
-		  (read-only variable).  Default set according to
-		  <makevar>USE_QT_VER</makevar> value.</entry>
+		  (read-only variable).</entry>
 	      </row>
 
 	      <row>
 		<entry><makevar>QMAKE</makevar></entry>
 		<entry>Set to the path of <command>qmake</command>
-		  (read-only variable).  Default set according to
-		  <makevar>USE_QT_VER</makevar> value.</entry>
+		  (read-only variable).</entry>
 	      </row>
 
 	      <row>
 		<entry><makevar>QMAKESPEC</makevar></entry>
 		<entry>Set to the path of configuration file for
-		  <command>qmake</command> (read-only variable).
-		  Default set according to
-		  <makevar>USE_QT_VER</makevar> value.</entry>
+		  <command>qmake</command> (read-only variable).</entry>
 	      </row>
 	    </tbody>
 	  </tgroup>
@@ -6056,8 +6053,9 @@
 			--with-qt-libraries=${QT_PREFIX}/lib \
 			--with-extra-libs=${LOCALBASE}/lib \
 			--with-extra-includes=${LOCALBASE}/include
-CONFIGURE_ENV+=	MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \
-		QTDIR="${QT_PREFIX}" KDEDIR="${KDE_PREFIX}"</programlisting>
+CONFIGURE_ENV+=	MOC="${MOC}" LIBS="${QTCFGLIBS}" \
+		QTDIR="${QT_PREFIX}" KDEDIR="${KDE_PREFIX}"
+CPPFLAGS+=	${QTCPPFLAGS}</programlisting>
 
 	<para>If <makevar>USE_QT_VER</makevar> is set to
 	  <literal>4</literal>, the following settings are also
@@ -6070,8 +6068,8 @@
       <sect2 id="qt4-components">
 	<title>Component Selection (Qt 4.x Only)</title>
 
-	<para>When <makevar>USE_QT_VER</makevar> is set to 4,
-	  individual Qt4 tool and library dependencies can be
+	<para>When <makevar>USE_QT_VER</makevar> is set to <literal>4</literal>,
+	  individual Qt 4 tool and library dependencies can be
 	  specified in the <makevar>QT_COMPONENTS</makevar> variable.
 	  Every component can be suffixed by either
 	  <literal>_build</literal> or <literal>_run</literal>, the
@@ -6088,7 +6086,7 @@
 	  <filename>/usr/ports/Mk/bsd.qt.mk</filename>):</para>
 
 	<table frame="none">
-	  <title>Available Qt4 Library Components</title>
+	  <title>Available Qt 4 Library Components</title>
 
 	  <tgroup cols="2">
 	    <thead>
@@ -6122,7 +6120,7 @@
 
 	      <row>
 		<entry><literal>qt3support</literal></entry>
-		<entry>Qt3 compatibility library</entry>
+		<entry>Qt 3 compatibility library</entry>
 	      </row>
 
 	      <row>
@@ -6154,7 +6152,7 @@
 	  executable after a successful compilation.</para>
 
 	<table frame="none">
-	  <title>Available Qt4 Tool Components</title>
+	  <title>Available Qt 4 Tool Components</title>
 
 	  <tgroup cols="2">
 	    <thead>
@@ -6178,7 +6176,7 @@
 
 	      <row>
 		<entry><literal>rcc</literal></entry>
-		<entry>resource compiler (need if the application
+		<entry>resource compiler (needed if the application
 		  comes with <filename>*.rc</filename> or
 		  <filename>*.qrc</filename> files)</entry>
 	      </row>
@@ -6195,7 +6193,7 @@
 	</table>
 
 	<table frame="none">
-	  <title>Available Qt4 Plugin Components</title>
+	  <title>Available Qt 4 Plugin Components</title>
 
 	  <tgroup cols="2">
 	    <thead>
@@ -6223,15 +6221,17 @@
 	</table>
 
 	<example id="qt4-components-example">
-	  <title>Selecting Qt4 Components</title>
+	  <title>Selecting Qt 4 Components</title>
 
-	  <para>In this example, the ported application uses the Qt4
-	    graphical user interface library, the Qt4 core library,
-	    all of the Qt4 code generation tools and Qt4's Makefile
-	    generator.  Since the gui library implies a dependency on
-	    the core library, corelib does not need to be specified.
-	    The Qt4 code generation tools moc, uic and rcc, as well as
-	    the Makefile generator qmake are only needed at buildtime,
+	  <para>In this example, the ported application uses the Qt 4
+	    graphical user interface library, the Qt 4 core library,
+	    all of the Qt 4 code generation tools and Qt 4's Makefile
+	    generator.  Since the <literal>gui</literal> library implies
+	    a dependency on the core library, <literal>corelib</literal>
+	    does not need to be specified.  The Qt 4 code generation tools
+	    <literal>moc</literal>, <literal>uic</literal> and
+	    <literal>rcc</literal>, as well as the Makefile generator
+	    <literal>qmake</literal> are only needed at buildtime,
 	    thus they are specified with the <literal>_build</literal>
 	    suffix:</para>
 
@@ -6252,7 +6252,7 @@
 
 do-configure:
 	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} -unix PREFIX=${PREFIX} texmaker.pro</programlisting>
+		${QMAKE} PREFIX=${PREFIX} texmaker.pro</programlisting>
 
 	<para>Note the similarity to the <command>qmake</command> line
 	  from the provided <filename>BUILD.sh</filename> script.
@@ -6271,14 +6271,14 @@
 	<itemizedlist>
 	  <listitem>
 	    <para><emphasis>Missing additional
-		includepaths.</emphasis>  Many applications come with
+	      include paths.</emphasis>  Many applications come with
 	      system tray icon support, but neglect to look for
 	      includes and/or libraries in the X11 directories.  You
 	      can tell <command>qmake</command> to add directories to
-	      the include and library searchpaths via the command
+	      the include and library search paths via the command
 	      line, for example:</para>
 
-	    <programlisting>${QMAKE} -unix PREFIX=${PREFIX} INCLUDEPATH+=${LOCALBASE}/include \
+	    <programlisting>${QMAKE} PREFIX=${PREFIX} INCLUDEPATH+=${LOCALBASE}/include \
 	LIBS+=-L${LOCALBASE}/lib sillyapp.pro</programlisting>
 	  </listitem>
 
@@ -6291,8 +6291,8 @@
 	      example for this - look at
 	      <filename>patch-texmaker.pro</filename> in the
 	      <filename>files</filename> directory of that port for a
-	      template on how to remedy this directly in the Qmake
-	      project file.</para>
+	      template on how to remedy this directly in the
+	      <command>qmake</command> project file.</para>
 	  </listitem>
 	</itemizedlist>
       </sect2>
@@ -6336,13 +6336,19 @@
 
 	<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
+	  components.  <literal>_build</literal> and
+	  <literal>_run</literal> suffixes can be used to force
+	  components dependency type (e.g.,
+	  <literal>baseapps_run</literal>). If no suffix is set, a
+	  default dependency type will be used. If you want to force
+	  both types, add the component twice with both suffixes
+	  (e.g., <literal>automoc4_build automoc4_run</literal>).  The
+	  most commonly used components are listed below (up-to-date
+	  components are documented at the top of
 	  <filename>/usr/ports/Mk/bsd.kde4.mk</filename>):</para>
 
 	<table frame="none">
-	  <title>Available KDE4 Components</title>
+	  <title>Available KDE 4 Components</title>
 
 	  <tgroup cols="2">
 	    <thead>
@@ -6354,36 +6360,18 @@
 
 	    <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>
+		<entry><literal>baseapps</literal></entry>
+		<entry>Basic applications for KDE Desktop</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>
+		<entry>Hierarchy of common KDE directories</entry>
 	      </row>
 
 	      <row>
 		<entry><literal>kdelibs</literal></entry>
-		<entry>The base set of KDE libraries</entry>
+		<entry>KDE Developer Platform</entry>
 	      </row>
 
 	      <row>
@@ -6395,60 +6383,58 @@
 
 	      <row>
 		<entry><literal>pimlibs</literal></entry>
-		<entry>PIM libraries</entry>
+		<entry>KDE-Pim libraries</entry>
 	      </row>
 
 	      <row>
 		<entry><literal>workspace</literal></entry>
-		<entry>Applications and libraries which form desktop
-		  (Plasma, KWin)</entry>
+		<entry>KDE user environments</entry>
+	      </row>
+
+	      <row>
+		<entry><literal>akonadi</literal></entry>
+		<entry>Storage server for KDE-Pim</entry>
+	      </row>
+
+	      <row>
+		<entry><literal>automoc4</literal></entry>
+		<entry>Automatic moc for Qt 4 packages</entry>
 	      </row>
 	    </tbody>
 	  </tgroup>
 	</table>
 
 	<para>KDE 4.x ports are installed into
-	  <literal>&dollar;{KDE4_PREFIX}</literal>, which is
+	  <makevar>KDE4_PREFIX</makevar>, which is
 	  <filename>/usr/local/kde4</filename> currently, to avoid
 	  conflicts with KDE 3.x ports.  This is achieved by
 	  specifying the <literal>kdeprefix</literal> component, which
 	  overrides the default <makevar>PREFIX</makevar>.  The ports
 	  however respect any <makevar>PREFIX</makevar> set via
 	  <envar>MAKEFLAGS</envar> environment variable and/or
-	  <application>make</application> arguments.</para>
-
-	<para>KDE 4.x ports may conflict with KDE 3.x ports, so when
-	  the <literal>kdeprefix</literal> component is enabled, they
-	  are installed in <literal>&dollar;{KDE4_PREFIX}</literal>.
-	  The default value of <literal>KDE4_PREFIX</literal> is
-	  currently <filename>/usr/local/kde4</filename>.  Installing
-	  the KDE 4.x ports into a custom <literal>PREFIX</literal> is
-	  also possible.  When <literal>PREFIX</literal> is set via
-	  the <envar>MAKEFLAGS</envar> environment variable or via
-	  <application>make</application> options it overrides the
-	  value configured by <literal>kdeprefix</literal>.</para>
+	  <command>make</command> 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
+	  <para>This is a simple example for a KDE 4 port.
+	    <makevar>USE_CMAKE</makevar> instructs the port to utilize
 	    <application>CMake</application> &mdash; 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.
+	    <command>automoc4</command> 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 a port requires some
-	    Qt4 components, <makevar>USE_QT_VER</makevar> should be
+	    Qt 4 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_KDE4=	kdelibs kdeprefix automoc4
 USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build</programlisting>
+QT_COMPONENTS=	moc_build qmake_build rcc_build uic_build</programlisting>
 	</example>
       </sect2>
     </sect1>

==== //depot/projects/docproj_nl/share/pgpkeys/vsevolod.key#3 (text+ko) ====

@@ -1,49 +1,60 @@
-<!-- $FreeBSD: doc/share/pgpkeys/vsevolod.key,v 1.1 2005/07/22 09:12:20 vsevolod Exp $ -->
-<!--
-sh addkey.sh vsevolod 213D0033;
--->
+<!-- $FreeBSD: doc/share/pgpkeys/vsevolod.key,v 1.4 2012/05/16 14:14:20 vsevolod Exp $ -->
 <programlisting role="pgpfingerprint"><![CDATA[
-pub   1024D/213D0033 2005-03-14 [expires: 2008-03-13]
-      Key fingerprint = B852 0010 761E 944A C76D  D447 A25D C12C 213D 0033
+pub   4096R/90081437 2012-05-16 [expires: 2017-05-15]
+      Key fingerprint = DD9A 126C E675 1EA5 2A97  04A3 0764 7B67 9008 1437
 uid                  Vsevolod Stakhov <vsevolod@FreeBSD.org>
-uid                  Vsevolod Stakhov <cebka@jet.msk.su>
-uid                  Vsevolod Stakhov <vsevolod@highsecure.ru>
-sub   2048g/786F2187 2005-03-14 [expires: 2008-03-13]
+sub   4096R/4A5A0B54 2012-05-16 [expires: 2017-05-15]
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mQGiBEI1ezcRBADE9OSKYo4FwkV9/HZCsEuq3afu/4cEiRlaS/pod5b5/tv1DGAl
-QQdQeNxW8nzDLrODbyCtmJDxvOib4Z2qz2NZOgjTujnlHeKecJJKkXg7bYIgMWy+
-JQNX613fcsgQicUQDyi0nMKcvd8BcKuzDUCGEuyMxEE5UyBPXOKDuPLZNwCgznDP
-rjh6cffp737SBR1ViasIresD/RYo8N+aMdwIQwqWXYXuSj6sCDutU2MUsRe9RxaP
-iDE+XvLuxRa5BTAitMWrDJqKdCjysADTXl6Owic6+Y9ppk35+VHDq7vsow3v4HrI
-znJVb5ZOl7nyaBtsd7v/nRFjQEcko11PxbmAAY8UevbGSmUsOmyT2ZMgYkNgGrvl
-jsGZA/9UtsG0IaR9+EGAuvOGey3Rh5AfNVontxJ+FXpCyHgKXWFrJIzbFPJ+iaYN
-xd2uUnEcAeGkY6UsK3z6MAvAorJC383tcRyfZQ7nAYhR2tmPVjFCNU/wPLT6MiZQ
-LgPbYh+SBWTpofpnAcVmVRk18tqtAXuH3kb+m+JG1EppxT4WMrQjVnNldm9sb2Qg
-U3Rha2hvdiA8Y2Via2FAamV0Lm1zay5zdT6IZAQTEQIAJAUCQjV7lAIbAwUJBaOa
-gAYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRCiXcEsIT0AMwPVAJ4z7YKxK+3XB8ic
-Ml40/9QdnfzA8QCcDbtrLjTHVfMsLZls+CpS7SVOZLK0KVZzZXZvbG9kIFN0YWto
-b3YgPHZzZXZvbG9kQGhpZ2hzZWN1cmUucnU+iGQEExECACQFAkI1ezcCGwMFCQWj
-moAGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQol3BLCE9ADOu+wCgvhaDI/qqW88t
-h1qkpZiSoj1QGhAAn0aH/9Ln20qZlzOzflE+RMNroro2tCdWc2V2b2xvZCBTdGFr
-aG92IDx2c2V2b2xvZEBGcmVlQlNELm9yZz6IZAQTEQIAJAUCQt/YkgIbAwUJBaOa
-gAYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRCiXcEsIT0AM18MAKCYLPaRezw9CggX
-0WGxZ4V2AO/H4QCfe9H8leQkgkf81O3xijejFh4yo225Ag0EQjV7RBAIAPegYMuM
-CjkzEiNYAWZNa+IgCrfWTZWuiCkvfvbYlnx2CLCMhtCi6kDIGm8k8ub0MrgI7JnR
-z3dVaKUi/ky7lbTCkl5lqLdJCX7lAOmbXrtV8Z/w4ke/9aoA5mRcA5U6IDKemkr3
-2mfEEDY6ZOYltLaOh0oPcX1M3v2NIeJhITi6QeDLOpprcCB2fBaZLNC7elgExxaf
-4Ij/Y+QYvZ8ejdOG+AOYHm4DOhWXPyfhhHLRG/U8QY40mYY1BhXZnm8ki/n6ATNn
-5/iUzVZVYYOFuuOhl0B4TG01TlDuhvzm3nBblXx4TkXmlJGY+jy9pzyqyI8OpwpF
-b5/+Q68f2OBltX8AAwUH/iaq0BjgK3Rk6Z/0Efw0ZVk4oO/RhQWcY0f5QDzPnoBk
-DgQcsraDpK+fMRAbNXNjRA7qnTDzyVSjURHEJluNGpXQVXkrO1j5+N5yJXZy7Y+8
-nlUm31UKp8bgzCSck5LcluV9dOQKSD4FvgRmyrt7Zf1Ge824/KkoQaw8MqXGd3hL
-vWta5S3YRJZ1xKKYdld9P7GI9PkOSsD1f4fYQpaHiHTQB+/LIsLiiEWzEnVvWnqN
-CJoatLuznMB4uTjAmKMrOAjVw85+x98Iz/tgIjA/eFO1OlOx1+3UpwdpAibKXDf3
-dIxbuhsp6xy2G7xbYr+ErgZcpOePy+vvnOxc1gwS4q+ITwQYEQIADwUCQjV7RAIb
-DAUJBaOagAAKCRCiXcEsIT0AM/LDAJ900L1+vJyKrr3hP0al12mE3cy+9wCcDeQp
-6wzJCGiOCfCGViOv+39ADh4=
-=gaWL
+mQINBE+zi7oBEADSVzrn0+T2LBXDUHA+NvgRGwGPoYQ/FqnDDE9GlYVPH1xAsUIU
+9d+YHC50qiAs8HoDyH2k286VHKqfkB3WOv5Ruw/SIwt0deTLadJbuO2vGim5KKK6
+hW64jQxwYREcwqW70RYaokmHfJrrwlOWNRj+PW+bolqLQLJSYJY3CdKsFa2AkmGH
+wy8lbIX40uCJrL7Out8o5uMwUgdvjUm+U5xqcF43eKTKm7b3D7p5UYhZxr5vySKH
+OHOqO/vzZHKU495dzoRTuUy0gmhztzbnSURdkLaXdjSGOxziMjfrbU0bzmGv92iP
+BA9sMxQtxUm3RZ5SLISmfbJX8/P8SvWW5dOkNKYicL502YLjv8DPeHbnwqqOLKmv
+4JLNPWjbpYjH6Hxt1AdomFH1AYw0UxDreWfBKpNrpyKm0dYzBYyt3PMfEMcdmIDf
+TE6M975wz5j23SecAb2H6snEgcIDE63/yMstskl1tDS0PwjuDLiNxHRv4QweV3Aw
+iszxNxqB5N/A5RdrBta88lI+HmMSL9YbwBRyKmsMqadcgUnJP/HP7cn1cBV2t5RI
+tGW85fPpHl3NNQ4lSzlj0cYI07mqPCpRxLwU+3pqc6qOe+lEU/DKoufIoH5C4cq6
+UjjnQtIqRJBOTyOV2WCIcF/SwYhb+GZq2MOx+TdugSoBRiobz4RpweF28wARAQAB
+tCdWc2V2b2xvZCBTdGFraG92IDx2c2V2b2xvZEBGcmVlQlNELm9yZz6JAj4EEwEC
+ACgFAk+zi7oCGwMFCQlmAYAGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEAdk
+e2eQCBQ3SloP/18wYAAZHQ1dBRapE3bYOtrDx1P0Vx34+6ZkeM7W41bIZTEaURH3
+sF7Dkz99HYHh7E6SAazTqze7Y4CwT8KNeR+J60hYLJOpDfRXphaL01lke5kMOh7A
+C2OxlWtttN7gOrGzLVsdJmJDRHPvIs9hAku+FWdbjXTcTp8ZbGpzMgQ0455p2TRk
+8RPziWZYW48DXeB1lIc76b5A+6yvloaGDTkZujttwzWMhqcM4+v2B43g4MJ+CMnw
+z5ve8jNRmPtdWhoIQreQk/ahibjmi/T83bvEIBkeOZpDcDZoTmjgvUbDxJgyh8uJ
+wjkFAiUg/lKn37H/3JhXV0gteLG8Rg7Aa4JdozVth5qRsMqECBz4K7EE4cPmN7St
+/1may13JI4AIALYxS8ZF7lNEBI1K0TeNlx0rDui48ZPM3vsu3NcxWucGWoxCvPlr
+UhNLRa7ftHcd2wPW5n/GVa3OzLsYCfJ4a6o4lwM4hDxWuFINfq/zuDoOJZLzcvw5
+Htv5tYbi0MjQqibQPOVKQiRwUr1nWv7fUpu4OhRDbdJA+srfmQorBKkU/q0E8E+Z
+eO5kM8m606+LfjvcU64Kt2f8i0PIZNv7+tvPym1GPjKzF0eAGFEcaItlXGy8fOSe
+E/EmzfQO9O7S0PLihgWROnoVw9OQ0wshDYKUX3qteCZQ3/CU64FMGJT2uQINBE+z
+i7oBEADrRY3nyIHRwWIyCIALje4U5useU9BmEkKCcMJglfD+DGC0PPK1JOsOBpZu
+WaBSFo6V2cmbz+19YghogjYkxNDQdrlQ/P9smye70BczdAYcQ8CmzNIE0I4JjbNb
+U2FsZ3q+T6rvINcU00H+86bnoVPCmxXbpqwET+0c+Z9uK9Xrs8aZlEq19XdUH2pj
+60/Xieb+Js5MEhI37BsXpR8DoTpl0rCF1VRMnloDxA9fHeTjUsOBb2TeXJPYPN4H
+IhNlCye6EScOJQ2u4VNBIOSOOmG2H/UgyLhVL4sVeRqDVfvGYGoGO8uyhJfAosge
+n1QcFm6qpsuUjSSQZnwiSR694vHZo/P/7eRFxwFp0WXcIy5AJEd0hn7Gr4sYLOZl
+VNc1mWMS8YJH6kr58h5iymcdMQo6dge2HrgE6qVvPf9OozeNes6bFtYjw+1AQ6ut
+OJ+7qHplFvjLI5Nz6wK15fooeGK3s0r2suLPTQO4bHywTahYiUB0page9IJmrCTl
+rTcPtDj9wuSE1Hj+IlQy8OIAr/Fu4TRIbUezJBTdq/aJTC/zDtaXRjCxqhAfCqu5
+q1qDi+K1ezXvbzCwuLn85qSwbCmTX9p7MKmlAk2ldAxB26x6g7CWRupRZgnU+AUw
+3IA7lxysOJxyqcKqoLwz804Mb/8UTTXU/tbi7e9u8Klou4S/lwARAQABiQIlBBgB
+AgAPBQJPs4u6AhsMBQkJZgGAAAoJEAdke2eQCBQ3/hAP/3LWc9/s5rgHFKiBjlRs
+ELVKgLpcoNvyEEETdDvkluQZ2kL4XteyiKgyya+6AX70X1uRn08PwGO4sgvEEj4L
+vRJhPORNegy3v0CZ5wH0bOeDQF+DA2yNFOFHSjKVeEnKWTHE7NdB6bBlH9n5R5ZY
+nBhvajXTsi94vXBnZtTQMpzjhdZNxQHhKOC0Y9on5JIMnMBeCOT4PRyGoDm6XBjl
+hfZYt3mJ1Hy4QrsLVA5dNhhbK2dKaYm3APvpJBl3aFCUzH4eyLOx5YSOoeJLxUTQ
+shrn/D2BClKOCC1nx7T3qs8Svf9R/vO2T1EOWn4f6J/fqUl5LT5xi62OvdbfDxaw
+tjW1q2HDwS15xoXkEyrYXCEMCD9Fi8PmuY0HMLlldngNDVNI/JlIq+CTX/84Of4m
+toMd48Vw71TDmIsfdo2Fn+MkOva0LTb2/TtvvDmvRf9mGZL1jv67m2J/lNTFGd3i
+f1b9xv49lPYg5ZbsStHsn923azxpgvrPeE5CxqHCjWjrfEMG1xYwWdGMvLfunj9m
+5qkfns3r8YIDAwSRGKinf/THjZWyfNA1+It5UdTiilfJ6iMNQPxOl/TMDjEOUIEe
+VZEeXRSqCwfwq78hD+I0f+ityKiQWZpnSTTrXLLXJVcd0P0HJwiz3fLuBkjRdKJ1
+XCbWVeYyJqaMXExTQIx+F+uj
+=EHpi
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>

==== //depot/projects/docproj_nl/www/nl/share/sgml/libcommon.xsl#19 (text+ko) ====

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
 				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd">
-<!-- $FreeBSD: www/nl/share/sgml/libcommon.xsl,v 1.6 2011/12/18 20:02:22 rene Exp $
+<!-- $FreeBSD: www/nl/share/sgml/libcommon.xsl,v 1.7 2012/05/14 20:13:53 rene Exp $
      %SOURCE%	share/sgml/libcommon.xsl
      %SRCID%	1.34
  -->
@@ -116,7 +116,7 @@
 
   <!-- template: "html-news-list-newsflash-homelink" -->
   <xsl:template name="html-news-list-newsflash-homelink">
-    <a href="&base;/news/news.html">Beginpagina nieuws</a>
+    <a href="&enbase;/news/news.html">Beginpagina nieuws</a>
   </xsl:template>
 
   <!-- template: "html-news-list-press-preface" -->
@@ -136,7 +136,7 @@
 
     <p>Gebruikers met organisatiesoftware dat het iCalendar-formaat
       begrijpt kunnen zich abonneren op de <a
-	href="&base;/events/events.ics">&os; evenementenkalender</a>
+	href="&enbase;/events/events.ics">&os; evenementenkalender</a>
       dat alle evenementen bevat die hier genoemd zijn.</p>
   </xsl:template>
 
@@ -415,5 +415,4 @@
       <xsl:otherwise>Ongeldige maand</xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-
 </xsl:stylesheet>