PERFORCE change 172482 for review

Rene Ladan rene at FreeBSD.org
Sat Jan 2 17:46:45 UTC 2010


http://p4web.freebsd.org/chv.cgi?CH=172482

Change 172482 by rene at rene_self on 2010/01/02 17:46:13

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#25 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#64 integrate
.. //depot/projects/docproj_nl/www/en/cgi/cgi-style.pl#5 integrate
.. //depot/projects/docproj_nl/www/en/cgi/mid.cgi#3 integrate
.. //depot/projects/docproj_nl/www/en/cgi/missing_handler.cgi#2 integrate
.. //depot/projects/docproj_nl/www/en/cgi/pds.cgi#2 integrate
.. //depot/projects/docproj_nl/www/en/cgi/ports.cgi#3 integrate
.. //depot/projects/docproj_nl/www/en/java/dists/16.sgml#2 integrate
.. //depot/projects/docproj_nl/www/en/java/news.xml#4 integrate
.. //depot/projects/docproj_nl/www/en/releases/8.0R/schedule.sgml#3 integrate
.. //depot/projects/docproj_nl/www/en/releng/index.sgml#30 integrate
.. //depot/projects/docproj_nl/www/share/sgml/commercial.consult.xml#16 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#25 (text+ko) ====

@@ -12,7 +12,7 @@
 
     <corpauthor>The &os; Documentation Project</corpauthor>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1118 2009/12/14 16:01:39 pav Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1119 2009/12/31 18:32:33 manolis Exp $</pubdate>
 
     <copyright>
       <year>1995</year>
@@ -277,7 +277,7 @@
 	  <para>James Howard wrote a good explanation of the history and
 	    differences between the various projects,
 	    called <ulink
-	      url="http://www-personal.si.umich.edu/~dhogan/documentation/unix/bsd-family.html">The BSD Family Tree</ulink>
+	      url="http://www.freebsdworld.gr/freebsd/bsd-family-tree.html">The BSD Family Tree</ulink>
 	    which goes a fair way to answering this question.</para>
 	</answer>
       </qandaentry>

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1041 2009/12/20 19:26:07 pav Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1043 2009/12/31 21:14:16 dougb Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -30,6 +30,7 @@
       <year>2007</year>
       <year>2008</year>
       <year>2009</year>
+      <year>2010</year>
       <holder role="mailto:doc at FreeBSD.org">The FreeBSD Documentation
 	Project</holder>
     </copyright>
@@ -3607,7 +3608,7 @@
 	<filename>pkg-plist</filename>&mdash;see <link
 	  linkend="plist-sub">generating PLIST</link> for more).  It also
 	makes the install stage automatically compress or uncompress manpages
-	depending on the setting of <makevar>NOMANCOMPRESS</makevar> in
+	depending on the setting of <makevar>NO_MANCOMPRESS</makevar> in
 	<filename>/etc/make.conf</filename>.</para>
 
       <para>If your port tries to install multiple names for manpages using
@@ -3624,7 +3625,7 @@
 	<literal>maybe</literal>. <literal>yes</literal> means manpages are
 	already installed compressed, <literal>no</literal> means they are
 	not, and <literal>maybe</literal> means the software already respects
-	the value of <makevar>NOMANCOMPRESS</makevar> so
+	the value of <makevar>NO_MANCOMPRESS</makevar> so
 	<filename>bsd.port.mk</filename> does not have to do anything
 	special.</para>
 
@@ -8446,9 +8447,11 @@
       <para>Example simple <filename>rc.d</filename> script:</para>
 
       <programlisting>#!/bin/sh
-
+# $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1043 2009/12/31 21:14:16 dougb Exp $
+#
 # PROVIDE: doormand
 # REQUIRE: LOGIN
+# KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf.local or /etc/rc.conf
 # to enable this service:
@@ -8459,7 +8462,7 @@
 #				by default.
 #
 
-. %%RC_SUBR%%
+. /etc/rc.subr
 
 name="doormand"
 rcvar=${name}_enable
@@ -8476,6 +8479,16 @@
 
 run_rc_command "$1"</programlisting>
 
+      <para> Unless there is a good reason to start the service
+	earlier all ports scripts should use
+	<programlisting>REQUIRE: LOGIN</programlisting>. If the service
+	runs as a particular user (other than root) this is mandatory.
+	The <programlisting>KEYWORD: shutdown</programlisting>
+	included in the script above is there because the mythical port
+	we are using as an example starts a service, and should be shut
+	down cleanly when the system shuts down. If the script is not
+	starting a persistent service this is not necessary.</para>
+
       <para>The &quot;=&quot; style of default variable assignment
 	is preferable to the &quot;:=&quot; style here, since the
 	former sets a default value only if the variable is unset,

==== //depot/projects/docproj_nl/www/en/cgi/cgi-style.pl#5 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/cgi/cgi-style.pl,v 1.39 2009/07/08 08:22:51 danger Exp $
+# $FreeBSD: www/en/cgi/cgi-style.pl,v 1.40 2009/12/31 16:32:32 wosch Exp $
 #
 # Perl routines to encapsulate various elements of HTML page style.
 
@@ -236,7 +236,7 @@
     return qq`
 	</div>
         <div id="footer">
-          <a href="$hsty_base/copyright/">Legal Notices</a> | &copy; 1995-2009
+          <a href="$hsty_base/copyright/">Legal Notices</a> | &copy; 1995-2010
           The FreeBSD Project. All rights reserved.<br />
 	  <address>$hsty_author<br />$hsty_date</address>
         </div>

==== //depot/projects/docproj_nl/www/en/cgi/mid.cgi#3 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/usr/bin/perl -T
 #
-# Copyright (c) March 1998-2000 Wolfram Schneider <wosch at FreeBSD.org>. Berlin.
+# Copyright (c) March 1998-2010 Wolfram Schneider <wosch at FreeBSD.org>. Berlin.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -26,7 +26,7 @@
 #
 # Search a mail by Message-ID, References or In-Reply-To field
 #
-# $FreeBSD: www/en/cgi/mid.cgi,v 1.17 2008/09/23 12:42:17 wosch Exp $
+# $FreeBSD: www/en/cgi/mid.cgi,v 1.18 2009/12/31 16:37:18 wosch Exp $
 
 require "./cgi-lib.pl";
 require "./cgi-style.pl";

==== //depot/projects/docproj_nl/www/en/cgi/missing_handler.cgi#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #!/usr/bin/perl -T
-# Copyright (c) July 1997-2007. Wolfram Schneider <wosch at FreeBSD.org>
+# Copyright (c) July 1997-2010. Wolfram Schneider <wosch at FreeBSD.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -52,7 +52,7 @@
 #
 #     _________________________________________________________________
 #
-# $FreeBSD: www/en/cgi/missing_handler.cgi,v 1.19 2007/07/08 12:28:11 wosch Exp $
+# $FreeBSD: www/en/cgi/missing_handler.cgi,v 1.20 2009/12/31 16:37:18 wosch Exp $
 # ----------------------------------------------------------------------
 
 sub escape($) { $_ = $_[0]; s/&/&amp;/g; s/</&lt;/g; s/>/&gt;/g; $_; }

==== //depot/projects/docproj_nl/www/en/cgi/pds.cgi#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #!/usr/bin/perl -T
-# Copyright (c) 1997-2000 Wolfram Schneider <wosch at FreeBSD.ORG>, Berlin.
+# Copyright (c) 1997-2010 Wolfram Schneider <wosch at FreeBSD.ORG>, Berlin.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -26,7 +26,7 @@
 # pds.cgi - FreeBSD Ports download sources cgi script
 #	    print a list of source files for a port
 #
-# $FreeBSD: www/en/cgi/pds.cgi,v 1.12 2006/08/19 21:18:18 simon Exp $
+# $FreeBSD: www/en/cgi/pds.cgi,v 1.13 2009/12/31 16:37:18 wosch Exp $
 
 sub escape($) { $_ = $_[0]; s/&/&amp;/g; s/</&lt;/g; s/>/&gt;/g; $_; }
 

==== //depot/projects/docproj_nl/www/en/cgi/ports.cgi#3 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/usr/bin/perl -T
 #
-# Copyright (c) 1996-2008 Wolfram Schneider <wosch at FreeBSD.ORG>
+# Copyright (c) 1996-2010 Wolfram Schneider <wosch at FreeBSD.ORG>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: www/en/cgi/ports.cgi,v 1.97 2008/09/22 19:13:42 wosch Exp $
+# $FreeBSD: www/en/cgi/ports.cgi,v 1.98 2009/12/31 16:37:18 wosch Exp $
 #
 # ports.cgi - search engine for FreeBSD ports
 #             	o search for a port by name or description
@@ -515,10 +515,10 @@
 
     print qq{
 <img align="right" src="$hsty_base/gifs/powerlogo.gif" alt="Powered by FreeBSD" />
-&copy; 1996-2008 by Wolfram Schneider. All rights reserved.<br />
+&copy; 1996-2010 by Wolfram Schneider. All rights reserved.<br />
 };
 
-#print q{$FreeBSD: www/en/cgi/ports.cgi,v 1.97 2008/09/22 19:13:42 wosch Exp $} . "<br />\n";
+#print q{$FreeBSD: www/en/cgi/ports.cgi,v 1.98 2009/12/31 16:37:18 wosch Exp $} . "<br />\n";
     print qq{Please direct questions about this service to
 <i><a href="$mailtoURL">$mailto</a></i><br />\n};
     print qq{General questions about FreeBSD ports should be sent to }

==== //depot/projects/docproj_nl/www/en/java/dists/16.sgml#2 (text+ko) ====

@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/en/java/dists/16.sgml,v 1.3 2008/06/24 02:56:50 glewis Exp $">
-<!ENTITY title "FreeBSD &java; Project: &jdk; 1.6">
+<!ENTITY date "$FreeBSD: www/en/java/dists/16.sgml,v 1.4 2009/12/28 05:58:29 glewis Exp $">
+<!ENTITY title "&os; &java; Project: &jdk; 1.6">
 <!ENTITY % navinclude.developers "INCLUDE">
 ]>
 <html>
@@ -9,7 +9,29 @@
 
 <table border="0">
       <tr>
-	<td>
+        <td>
+
+<p>
+<b>May 5, 2009:</b> <a href="mailto:openjdk at getsnappy.com">Brian
+Gardner</a>'s update to Build 16 of the
+<a href="http://openjdk.java.net/">OpenJDK</a> 6 port is committed.
+This update also fixes a problem with the port using the HotSpot JVM
+from the bootstrap JDK rather building and installing it's version of HotSpot.
+</p>
+
+<p>
+<b>February 23, 2009:</b> <a href="mailto:openjdk at getsnappy.com">Brian
+Gardner</a>'s port of <a href="http://openjdk.java.net/">OpenJDK</a> 6 is
+committed to the &os; Ports Collection.
+</p>
+
+<p>
+<b>February 6, 2009:</b> <a href="mailto:openjdk at getsnappy.com">Brian
+Gardner</a> has announced a port of
+<a href="http://openjdk.java.net/">OpenJDK</a> 6 to &os; 7.0.  The patch
+can be found at
+<a href="http://beta.experts-exchange.com/articles/OS/Unix/BSD/Patch-for-OpenJDK6-on-BSD.html">http://beta.experts-exchange.com/articles/OS/Unix/BSD/Patch-for-OpenJDK6-on-BSD.html</a>.
+</p>
 
 <p>
 <b>February 14, 2008:</b> <a href="mailto:glewis at FreeBSD.org">Greg
@@ -44,7 +66,7 @@
 <b>August 2, 2007:</b> <a href="mailto:glewis at FreeBSD.org">Greg
 Lewis</a> has released the first patchset (patchlevel 1, "Brumby")
 for the &jdk;&nbsp;1.6.0 software.  This first release supports both
-FreeBSD and OpenBSD on the i386 and amd64 architectures.  Information
+&os; and OpenBSD on the i386 and amd64 architectures.  Information
 on downloading the patchset can be found at
 <a href="http://www.eyesbeyond.com/freebsddom/java/jdk16.html">http://www.eyesbeyond.com/freebsddom/java/jdk16.html</a>.
 </p>

==== //depot/projects/docproj_nl/www/en/java/news.xml#4 (text+ko) ====

@@ -20,7 +20,7 @@
 <news>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/en/java/news.xml,v 1.8 2009/07/12 22:53:00 glewis Exp $
+      $FreeBSD: www/en/java/news.xml,v 1.9 2009/12/28 05:58:29 glewis Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -28,6 +28,25 @@
     <name>2009</name>
 
     <month>
+      <name>May</name>
+
+      <day>
+        <name>5</name>
+
+        <event>
+          <title><a href="http://openjdk.java.net/">OpenJDK</a> 6 updated
+            to Build 16.</title>
+
+          <p><a href="mailto:openjdk at getsnappy.com">Brian Gardner</a> has
+            released an update of the
+            <a href="http://openjdk.java.net/">OpenJDK</a> 6 port to Build 16.
+            See the <a href="dists/16.html">JDK 1.6.x page</a>
+            for more details.</p>
+        </event>
+      </day>
+    </month>
+
+    <month>
       <name>March</name>
 
       <day>
@@ -44,6 +63,40 @@
         </event>
       </day>
     </month>
+
+    <month>
+      <name>February</name>
+
+      <day>
+        <name>23</name>
+
+        <event>
+          <title>Port of <a href="http://openjdk.java.net/">OpenJDK</a> 6
+            committed</title>
+
+          <p><a href="mailto:openjdk at getsnappy.com">Brian Gardner</a>'s
+            port of <a href="http://openjdk.java.net/">OpenJDK</a> 6 is
+            committed to the Ports Collection as java/openjdk6.
+            See the <a href="dists/16.html">JDK 1.6.x page</a> for more
+            details.</p>
+        </event>
+      </day>
+
+      <day>
+        <name>6</name>
+
+        <event>
+          <title>Port of <a href="http://openjdk.java.net/">OpenJDK</a> 6
+            announced</title>
+
+          <p><a href="mailto:openjdk at getsnappy.com">Brian Gardner</a> has
+            announced a port of <a href="http://openjdk.java.net/">OpenJDK</a>
+            6 to FreeBSD 7.x.
+            See the <a href="dists/16.html">JDK 1.6.x page</a> for more
+            details.</p>
+        </event>
+      </day>
+    </month>
   </year>
 
   <year>
@@ -55,7 +108,7 @@
       <day>
         <name>18</name>
 
-	<event>
+        <event>
           <title>The FreeBSD Foundation has announced binary releases
             of the JDK 1.6 and JRE 1.6</title>
 
@@ -157,7 +210,7 @@
 
       <day>
         <name>2</name>
-   
+
         <event>
           <title>Patchset 1 for &jdk;&nbsp;1.6 released</title>
 
@@ -179,7 +232,7 @@
         <event>
           <title>Patchset 6 for &jdk;&nbsp;1.5 released</title>
 
-	  <p><a href="mailto:glewis at FreeBSD.org">Greg Lewis</a> has
+          <p><a href="mailto:glewis at FreeBSD.org">Greg Lewis</a> has
             released the sixth patchset (patchset 6) in the
             &jdk;&nbsp;1.5 series.  See the <a
             href="dists/15.html">JDK 1.5.x page</a> for more
@@ -242,13 +295,13 @@
             &jdk;&nbsp;1.5 series.  See the <a
             href="dists/15.html">JDK 1.5.x page</a> for more
             details.</p>
-	</event>
+        </event>
       </day>
 
       <day>
         <name>5</name>
 
-	<event>
+        <event>
           <title>The FreeBSD Foundation has announced binary releases
           of the JDK 1.5 and JRE 1.5</title>
 
@@ -461,7 +514,7 @@
         </event>
       </day>
     </month>
-	
+
     <month>
       <name>March</name>
 
@@ -755,7 +808,7 @@
             1.2.x</a> for more details.</p>
 
           <p>All the issues noted below are still in place,
-	    however.</p>
+            however.</p>
 
           <p>So anyone who has a Java2 port you've been waiting on
             submitting, now is your chance.</p>

==== //depot/projects/docproj_nl/www/en/releases/8.0R/schedule.sgml#3 (text+ko) ====

@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
 <!ENTITY email 'freebsd-qa'>
-<!ENTITY date "$FreeBSD: www/en/releases/8.0R/schedule.sgml,v 1.2 2009/09/23 20:21:38 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/en/releases/8.0R/schedule.sgml,v 1.5 2010/01/01 00:47:54 obrien Exp $">
 <!ENTITY local.rel "8.0">
 <!ENTITY local.rel.tag "8_0">
 <!ENTITY title "FreeBSD &local.rel; Release Process">
@@ -101,7 +101,7 @@
     </tr>
 
     <tr>
-      <td><tt>BETA4</tt> builds</td>
+      <td>BETA4</td>
       <td>5&nbsp;September&nbsp;2009</td>
       <td>7&nbsp;September&nbsp;2009</td>
       <td>Begin BETA4 builds.</td>
@@ -117,34 +117,46 @@
     <tr>
       <td>RC2</td>
       <td>21&nbsp;September&nbsp;2009</td>
+      <td>28&nbsp;October&nbsp;2009</td>
+      <td>Second release candidate.</td>
+    </tr>
+
+    <tr>
+      <td>RC3</td>
       <td>-</td>
-      <td>Second release candidate.</td>
+      <td>12&nbsp;November&nbsp;2009</td>
+      <td>Third release candidate.</td>
     </tr>
 
     <tr>
       <td>RELEASE build</td>
       <td>28&nbsp;September&nbsp;2009</td>
-      <td>-</td>
+      <td>22&nbsp;November&nbsp;2009</td>
       <td>8.0-RELEASE built.</td>
     </tr>
 
     <tr>
       <td>RELEASE announcement</td>
       <td>TBD</td>
-      <td>-</td>
-      <td>8.0-RELEASE announced.</td>
+      <td>25&nbsp;November&nbsp;2009</td>
+      <td>8.0-RELEASE press release.</td>
     </tr>
 
     <tr>
       <td>Turn over to the secteam</td>
       <td>TBD</td>
-      <td>--</td>
+      <td>01&nbsp;December&nbsp;2009</td>
       <td>RELENG_&local.rel.tag; branch is handed over to
 	the FreeBSD Security Officer Team in one or two weeks after the
 	announcement.</td>
     </tr>
   </table>
 
+  <p>
+  <h1>Status / TODO</h1>
+  <a href="http://wiki.freebsd.org/8.0TODO">http://wiki.freebsd.org/8.0TODO</a>
+
+  <p>
   <h1>Additional Information</h1>
 
   <ul>

==== //depot/projects/docproj_nl/www/en/releng/index.sgml#30 (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/releng/index.sgml,v 1.276 2009/12/02 06:39:08 maxim Exp $">
+<!ENTITY date "$FreeBSD: www/en/releng/index.sgml,v 1.278 2010/01/01 07:44:51 lwhsu Exp $">
 <!ENTITY email 're'>
 <!ENTITY title "Release Engineering Information">
 <!ENTITY % navinclude.developers "INCLUDE">
@@ -54,11 +54,9 @@
     </tr>
 
     <tr>
-      <td>September 2009</td>
-      <td>FreeBSD 8.0</td>
-      <td>Code Freeze since June 26th.  A TODO list and a Release
-	status are available on the <a
-	href="http://wiki.freebsd.org/8.0TODO">Wiki</a>.</td>
+      <td>November 2009</td>
+      <td><a href="../releases/8.0R/schedule.html">FreeBSD 8.0</a></td>
+      <td>Released.</td>
     </tr>
   </table>
 

==== //depot/projects/docproj_nl/www/share/sgml/commercial.consult.xml#16 (text+ko) ====

@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <!DOCTYPE entries PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Commercial Gallery//EN"
                          "http://www.FreeBSD.org/XML/www/share/sgml/gallery.dtd">
-<!-- $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.68 2009/12/21 21:00:37 jkois Exp $ -->
+<!-- $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.69 2009/12/29 20:35:42 jkois Exp $ -->
 
 <entries>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.68 2009/12/21 21:00:37 jkois Exp $
+      $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.69 2009/12/29 20:35:42 jkois Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -584,6 +584,19 @@
     </description>
   </entry>
 
+  <entry id="hntsolutions" category="namerica">
+    <name>HNT Solutions</name>
+    <url>http://www.hntsolutions.com</url>
+    <description>
+      HNT Solutions provides complete &os; support services and
+      consulting.  Please contact us at <a
+      href="mailto:unix at hntsolutions.com">unix at hntsolutions.com</a> or
+      visit our <a
+      href="http://www.hntsolutions.com/unixpractice">website</a>
+      for more information.
+    </description>
+  </entry>
+  
   <entry id="GregLehey" category="australia">
     <name>Greg Lehey</name>
     <url>http://www.lemis.com/~grog/</url>


More information about the p4-projects mailing list