Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 23 Dec 2007 04:43:29 GMT
From:      John Birrell <jb@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 131457 for review
Message-ID:  <200712230443.lBN4hTH3091435@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=131457

Change 131457 by jb@jb_freebsd1 on 2007/12/23 04:42:41

	IFC

Affected files ...

.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/nanobsd/article.sgml#4 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/faq/book.sgml#13 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#13 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#12 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#9 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#50 integrate
.. //depot/projects/dtrace/doc/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#5 integrate
.. //depot/projects/dtrace/ports/MOVED#57 integrate
.. //depot/projects/dtrace/src/contrib/openpam/CREDITS#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/HISTORY#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/INSTALL#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/LICENSE#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/MANIFEST#4 delete
.. //depot/projects/dtrace/src/contrib/openpam/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/README#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/RELNOTES#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/aclocal.m4#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/autogen.sh#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/bin/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/bin/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/bin/su/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/bin/su/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/bin/su/su.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/compile#1 branch
.. //depot/projects/dtrace/src/contrib/openpam/config.h.in#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/configure#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/configure.ac#5 integrate
.. //depot/projects/dtrace/src/contrib/openpam/depcomp#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/openpam.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/openpam.man#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/openpam_borrow_cred.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/openpam_free_data.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/openpam_free_envlist.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/openpam_get_option.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/openpam_log.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/openpam_nullconv.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/openpam_readline.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/openpam_restore_cred.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/openpam_set_option.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/openpam_ttyconv.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/pam.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/pam.conf.5#5 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/pam.man#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/pam_acct_mgmt.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/pam_authenticate.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/pam_chauthtok.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/pam_close_session.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/pam_conv.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/pam_end.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/pam_error.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/pam_get_authtok.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/pam_get_data.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/pam_get_item.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/pam_get_user.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/pam_getenv.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/pam_getenvlist.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/pam_info.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/pam_open_session.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/pam_prompt.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/pam_putenv.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/pam_set_data.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/pam_set_item.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/pam_setcred.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/pam_setenv.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/pam_sm_authenticate.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/pam_sm_chauthtok.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/pam_sm_close_session.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/pam_sm_open_session.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/pam_sm_setcred.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/pam_start.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/pam_strerror.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/pam_verror.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/pam_vinfo.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/doc/man/pam_vprompt.3#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/include/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/include/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/include/security/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/include/security/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/include/security/openpam.h#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/include/security/openpam_attr.h#1 branch
.. //depot/projects/dtrace/src/contrib/openpam/include/security/openpam_version.h#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/include/security/pam_appl.h#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/include/security/pam_constants.h#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/include/security/pam_modules.h#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/include/security/pam_types.h#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/install-sh#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/openpam_borrow_cred.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/openpam_configure.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/openpam_dispatch.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/openpam_dynamic.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/openpam_findenv.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/openpam_free_data.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/openpam_free_envlist.c#5 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/openpam_get_option.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/openpam_impl.h#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/openpam_load.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/openpam_log.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/openpam_nullconv.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/openpam_readline.c#5 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/openpam_restore_cred.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/openpam_set_option.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/openpam_static.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/openpam_ttyconv.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/pam_acct_mgmt.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/pam_authenticate.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/pam_authenticate_secondary.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/pam_chauthtok.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/pam_close_session.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/pam_end.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/pam_error.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/pam_get_authtok.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/pam_get_data.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/pam_get_item.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/pam_get_mapped_authtok.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/pam_get_mapped_username.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/pam_get_user.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/pam_getenv.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/pam_getenvlist.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/pam_info.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/pam_open_session.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/pam_prompt.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/pam_putenv.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/pam_set_data.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/pam_set_item.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/pam_set_mapped_authtok.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/pam_set_mapped_username.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/pam_setcred.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/pam_setenv.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/pam_sm_acct_mgmt.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/pam_sm_authenticate.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/pam_sm_authenticate_secondary.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/pam_sm_chauthtok.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/pam_sm_close_session.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/pam_sm_get_mapped_username.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/pam_sm_open_session.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/pam_sm_set_mapped_username.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/pam_sm_setcred.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/pam_start.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/pam_strerror.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/pam_verror.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/pam_vinfo.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/lib/pam_vprompt.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/ltconfig#4 delete
.. //depot/projects/dtrace/src/contrib/openpam/ltmain.sh#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/misc/gendoc.pl#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/missing#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/mkinstalldirs#4 delete
.. //depot/projects/dtrace/src/contrib/openpam/modules/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/modules/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/modules/pam_deny/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/modules/pam_deny/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/modules/pam_deny/pam_deny.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/modules/pam_permit/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/modules/pam_permit/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/modules/pam_permit/pam_permit.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/modules/pam_unix/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/modules/pam_unix/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/modules/pam_unix/pam_unix.c#4 integrate
.. //depot/projects/dtrace/src/contrib/openpam/stamp-h.in#4 delete
.. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes#26 integrate
.. //depot/projects/dtrace/src/lib/libc/stdlib/grantpt.c#5 integrate
.. //depot/projects/dtrace/src/lib/libpam/libpam/Makefile#4 integrate
.. //depot/projects/dtrace/src/lib/libpam/modules/pam_krb5/pam_krb5.c#4 integrate
.. //depot/projects/dtrace/src/lib/libpam/modules/pam_ssh/pam_ssh.c#5 integrate
.. //depot/projects/dtrace/src/lib/libpam/modules/pam_unix/pam_unix.c#5 integrate
.. //depot/projects/dtrace/src/lib/libutil/pty.c#6 integrate
.. //depot/projects/dtrace/src/sbin/devd/devd.hh#4 integrate
.. //depot/projects/dtrace/src/share/man/man4/ng_car.4#4 integrate
.. //depot/projects/dtrace/src/share/man/man7/ports.7#9 integrate
.. //depot/projects/dtrace/src/sys/dev/aac/aac.c#10 integrate
.. //depot/projects/dtrace/src/sys/i386/pci/pci_pir.c#5 integrate
.. //depot/projects/dtrace/src/sys/kern/init_main.c#23 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_thread.c#19 integrate
.. //depot/projects/dtrace/src/sys/kern/sched_ule.c#21 integrate
.. //depot/projects/dtrace/src/sys/netinet/in_pcb.c#16 integrate
.. //depot/projects/dtrace/src/sys/powerpc/powermac/grackle.c#7 integrate
.. //depot/projects/dtrace/src/sys/powerpc/powermac/macio.c#6 integrate
.. //depot/projects/dtrace/src/sys/powerpc/powermac/uninorth.c#8 integrate
.. //depot/projects/dtrace/src/sys/powerpc/psim/iobus.c#6 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_page.c#28 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_phys.c#3 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_phys.h#2 integrate
.. //depot/projects/dtrace/src/usr.bin/usbhidctl/usbhid.c#5 integrate
.. //depot/projects/dtrace/src/usr.sbin/mergemaster/mergemaster.sh#5 integrate
.. //depot/projects/dtrace/src/usr.sbin/ppp/auth.c#4 integrate
.. //depot/projects/dtrace/www/de/java/index.sgml#2 integrate
.. //depot/projects/dtrace/www/de/platforms/amd64.sgml#7 integrate
.. //depot/projects/dtrace/www/de/projects/projects.sgml#3 integrate
.. //depot/projects/dtrace/www/de/share/sgml/news.xml#15 integrate
.. //depot/projects/dtrace/www/en/platforms/amd64/motherboards.sgml#21 integrate
.. //depot/projects/dtrace/www/en/projects/projects.sgml#12 integrate
.. //depot/projects/dtrace/www/share/sgml/commercial.consult.xml#11 integrate
.. //depot/projects/dtrace/www/share/sgml/commercial.hardware.xml#6 integrate

Differences ...

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/nanobsd/article.sgml#4 (text+ko) ====

@@ -15,7 +15,7 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/nanobsd/article.sgml,v 1.2 2007/12/10 21:44:19 blackend Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/nanobsd/article.sgml,v 1.3 2007/12/21 21:19:54 gabor Exp $</pubdate>
 
     <copyright>
       <year>2006</year>
@@ -326,6 +326,23 @@
       </sect3>
 
       <sect3>
+	<title>Adding packages</title>
+
+	<para>Packages can be added to a <application>NanoBSD</application>
+	  image using a custom function.  The following fuction will install
+	  all the packages located in
+	  <filename>/usr/src/tools/tools/nanobsd/packages</filename>:</para>
+
+	<programlisting>install_packages () (
+mkdir -p ${NANO_WORLDDIR}/packages
+cp /usr/src/tools/tools/nanobsd/packages/* ${NANO_WORLDDIR}/packages
+chroot ${NANO_WORLDDIR} sh -c 'cd packages; pkg_add -v *;cd ..;'
+rm -rf ${NANO_WORLDDIR}/packages
+)
+customize_cmd install_packages</programlisting>
+      </sect3>
+
+      <sect3>
 	<title>Configuration file example</title>
 
 	<para>A complete example of a configuration file for building a

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/faq/book.sgml#13 (text+ko) ====

@@ -10,7 +10,7 @@
 
     <corpauthor>The FreeBSD Documentation Project</corpauthor>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.805 2007/07/30 09:18:51 remko Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.807 2007/12/20 22:15:51 gabor Exp $</pubdate>
 
     <copyright>
       <year>1995</year>
@@ -1046,6 +1046,22 @@
                 <literal>#FreeBSD</literal> is.</para>
             </listitem>
 
+	    <listitem>
+              <para>Channel <literal>##FreeBSD</literal> on
+                <ulink url="http://freenode.net/">Freenode</ulink>;
+		is a general help channel with about 300 users at any time.
+		The conversations have been known to run off-topic for a while,
+		but priority is given to users with FreeBSD questions.  We are
+		good about helping you understand the basics, referring to the
+		Handbook whenever possible, and directing you where to learn
+		more about the topic you need help with.  We are a primarily
+		English speaking channel, though we have users from all over
+		the world.  If you would like to speak in your native language,
+		try to ask the question in English and then relocate to another
+		channel ##freebsd-<replaceable>lang</replaceable> as
+		appropriate.</para>
+	    </listitem>
+
             <listitem>
               <para>Channel <literal>#FreeBSD</literal> on
                 <ulink url="http://www.dal.net/">DALNET</ulink>;
@@ -2556,6 +2572,32 @@
         </answer>
       </qandaentry>
 
+      <qandaentry>
+        <question id="keyboard-delete-key">
+          <para>How do I use my delete key in <command>sh</command> and
+            <command>csh</command>?</para>
+        </question>
+
+        <answer>
+	  <para>For the <application>Bourne Shell</application>, add the
+	    following lines to your <filename>.shrc</filename>.  See &man.sh.1;
+	    and &man.editrc.5;.</para>
+
+	  <programlisting>bind ^? ed-delete-next-char # for console
+bind ^[[3~ ed-delete-next-char # for xterm</programlisting>
+
+	  <para>For the <application>C Shell</application>, add the following
+	    lines to your <filename>.cshrc</filename>.  See &man.csh.1;.</para>
+
+	  <programlisting>bindkey ^? delete-char # for console
+bindkey ^[[3~ delete-char # for xterm</programlisting>
+
+	  <para>For more information, see <ulink
+	      url="http://www.ibb.net/~anne/keyboard.html">this page</ulink>.
+          </para>
+        </answer>
+      </qandaentry>
+
 	</qandaset>
 
       </sect1>

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#13 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.403 2007/11/25 09:34:06 blackend Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.404 2007/12/20 22:21:44 gabor Exp $
 -->
 
 <chapter id="advanced-networking">
@@ -3072,6 +3072,21 @@
       </sect3>
 
       <sect3>
+	<title>Address limits</title>
+
+	<para>The number of unique source MAC addresses behind an
+	  interface can limited.  Once the limit is reached packets
+	  with unknown source addresses are dropped until an
+	  existing host cache entry expires or is removed.</para>
+
+	<para>The following example sets the maximum number of Ethernet
+	  devices for <hostid role="Hostname">CustomerA</hostid> on
+	  <literal>vlan100</literal> to 10.</para>
+
+	<screen>&prompt.root; <userinput>ifconfig bridge0 ifmaxaddr vlan100 10</userinput></screen>
+      </sect3>
+
+      <sect3>
 	<title>SNMP Monitoring</title>
 
 	<para>The bridge interface and STP parameters can be monitored

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#12 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.277 2007/08/23 08:48:34 blackend Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.278 2007/12/21 21:01:24 gabor Exp $
 -->
 
 <chapter id="disks">
@@ -4099,6 +4099,10 @@
 	a sectorsize of 4 kilobytes and the <quote>detach on last close</quote>
 	option set:</para>
 
+      <programlisting>geli_swap_flags="-e blowfish -l 128 -s 4096 -d"</programlisting>
+
+      <para>For systems prior to &os; 6.2-RELEASE, use the following line:</para>
+
       <programlisting>geli_swap_flags="-a blowfish -l 128 -s 4096 -d"</programlisting>
 
       <para>Please refer to the description of the <command>onetime</command> command

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#9 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.268 2007/09/03 01:59:22 keramida Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.269 2007/12/21 21:14:19 gabor Exp $
 -->
 
 <chapter id="ports">
@@ -1117,6 +1117,26 @@
 	  job.</para>
 
       </sect3>
+
+      <sect3>
+	<title>Reconfiguring Ports</title>
+
+	<para>When building certain ports, you may be presented with a
+	  ncurses-based menu from which you can select certain build options.
+	  It is not uncommon for users to wish to revisit this menu to add,
+	  remove, or change these options after a port has been built.  There
+	  are many ways to do this.  One option is to go into the directory
+	  containing the port and type <command>make</command>
+	  <maketarget>config</maketarget>, which will simply present the menu
+	  again with the same options selected.  Another option is to use
+	  <command>make</command> <maketarget>showconfig</maketarget> which
+	  will show you all the configuration options for the port.  Yet
+	  another option is to execute <command>make</command>
+	  <maketarget>rmconfig</maketarget> which will remove all selected
+	  options and allow you to start over.  All of these options, and
+	  others, are explained in great detail in in the man page for
+	  &man.ports.7;.</para>
+      </sect3>
     </sect2>
 
     <sect2 id="ports-removing">

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.891 2007/12/11 03:12:47 jkoshy Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.892 2007/12/22 14:04:39 kensmith Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -11619,6 +11619,11 @@
 		      required the ABI of the PCIOCGETCONF IOCTL to be
 		      broken again</entry>
 		    <entry>700055</entry>
+		  </row>
+		  <row>
+		    <entry>7.0-STABLE after 7.0-RELEASE</entry>
+		    <entry>700100</entry>
+		  </row>
 		  <row>
 		    <entry>8.0-CURRENT. Separating wide and single byte
 		      ctype.</entry>

==== //depot/projects/dtrace/doc/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#5 (text+ko) ====

@@ -1,9 +1,9 @@
 <!--
     Namen van FreeBSD mailinglijsten en gerelateerde software.
 
-    $FreeBSD: doc/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent,v 1.11 2006/08/25 10:57:22 remko Exp $
+    $FreeBSD: doc/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent,v 1.12 2007/12/22 19:18:33 remko Exp $
     $FreeBSDnl: doc/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent,v 1.21 2006/08/25 10:40:41 remko Exp $
-    Gebaseerd op: 1.51
+    Gebaseerd op: 1.57
     Vertaald door: Siebrand Mazeland
 -->
 
@@ -170,6 +170,10 @@
 <!ENTITY a.emulation "<ulink url='&a.emulation.url;'>FreeBSD-emulatie mailinglijst</ulink>">
 <!ENTITY a.emulation.name "<ulink url='&a.emulation.url;'>freebsd-emulatie</ulink>">
 
+<!ENTITY a.eol.url "&a.mailman.listinfo;/freebsd-eol">
+<!ENTITY a.eol "<ulink url='&a.eol.url;'>FreeBSD-eol mailinglijst</ulink>">
+<!ENTITY a.eol.name "<ulink url='&a.eol.url;'>freebsd-eol</ulink>">
+
 <!ENTITY a.firewire.url "&a.mailman.listinfo;/freebsd-firewire">
 <!ENTITY a.firewire "<ulink url='&a.firewire.url;'>FreeBSD FireWire (IEEE 1394) discussion mailinglijst</ulink>">
 <!ENTITY a.firewire.name "<ulink url='&a.firewire.url;'>freebsd-firewire</ulink>">
@@ -226,6 +230,10 @@
 <!ENTITY a.isp "<ulink url='&a.isp.url;'>FreeBSD Internet service provider mailinglijst</ulink>">
 <!ENTITY a.isp.name "<ulink url='&a.isp.url;'>freebsd-isp</ulink>">
 
+<!ENTITY a.jail.url "&a.mailman.listinfo;/freebsd-jail">
+<!ENTITY a.jail "<ulink url='&a.jail.url;'>FreeBSD jails mailinglijst</ulink>">
+<!ENTITY a.jail.name "<ulink url='&a.jail.url;'>freebsd-jail</ulink>">
+
 <!ENTITY a.java.url "&a.mailman.listinfo;/freebsd-java">
 <!ENTITY a.java "<ulink url='&a.java.url;'>FreeBSD Java Language mailinglijst</ulink>">
 <!ENTITY a.java.name "<ulink url='&a.java.url;'>freebsd-java</ulink>">
@@ -234,7 +242,7 @@
 <!ENTITY a.jobs "<ulink url='&a.jobs.url;'>FreeBSD gerelateerd werk mailinglijst</ulink>">
 <!ENTITY a.jobs.name "<ulink url='&a.jobs.url;'>freebsd-jobs</ulink>">
 
-<!ENTITY a.kde.url "http://freebsd.kde.org/mailman/listinfo/kde-freebsd">;
+<!ENTITY a.kde.url "https://mail.kde.org/mailman/listinfo/kde-freebsd">;
 <!ENTITY a.kde "<ulink url='&a.kde.url;'>FreeBSD KDE/Qt en KDE applicaties mailinglijst</ulink>">
 <!ENTITY a.kde.name "<ulink url='&a.kde.url;'>freebsd-kde</ulink>">
 
@@ -382,6 +390,10 @@
 <!ENTITY a.standards "<ulink url='&a.standards.url;'>FreeBSD C99 en POSIX compliance mailinglijst</ulink>">
 <!ENTITY a.standards.name "<ulink url='&a.standards.url;'>freebsd-standards</ulink>">
 
+<!ENTITY a.sun4v.url "&a.mailman.listinfo;/freebsd-sun4v">
+<!ENTITY a.sun4v "<ulink url='&a.sun4v.url;'>FreeBSD sun4v porting mailinglijst</ulink>">
+<!ENTITY a.sun4v.name "<ulink url='&a.sun4v.url;'>freebsd-sun4v</ulink>">
+
 <!ENTITY a.test.url "&a.mailman.listinfo;/freebsd-test">
 <!ENTITY a.test "<ulink url='&a.test.url;'>FreeBSD test mailinglijst</ulink>">
 <!ENTITY a.test.name "<ulink url='&a.test.url;'>freebsd-test</ulink>">

==== //depot/projects/dtrace/ports/MOVED#57 (text+ko) ====

@@ -1,7 +1,7 @@
 #
 # MOVED - a list of (recently) moved or removed ports
 #
-# $FreeBSD: ports/MOVED,v 1.1521 2007/12/17 01:43:56 araujo Exp $
+# $FreeBSD: ports/MOVED,v 1.1522 2007/12/21 15:31:17 garga Exp $
 #
 # Each entry consists of a single line containing the following four
 # fields in the order named, separated with the pipe (`|') character:
@@ -3343,3 +3343,4 @@
 java/linux-sun-jdk12|java/linux-sun-jdk16|2007-12-11|Obsolete version
 x11-wm/ion-3||2007-12-12|Removed by insistence of software author
 net/sipp|benchmarks/sipp|2007-12-16|new category
+sysutils/xdd|benchmarks/xdd|2007-12-21|Moved to a better category

==== //depot/projects/dtrace/src/contrib/openpam/CREDITS#4 (text) ====

@@ -14,6 +14,7 @@
 	Andrew Morgan <morgan@transmeta.com>
 	Brian Fundakowski Feldman <green@freebsd.org>
 	Christos Zoulas <christos@netbsd.org>
+	Daniel Richard G. <skunk@iskunk.org>
 	Darren J. Moffat <Darren.Moffat@sun.com>
 	Dmitry V. Levin <ldv@altlinux.org>
 	Emmanuel Dreyfus <manu@netbsd.org>
@@ -24,11 +25,13 @@
 	Hubert Feyrer <hubert@feyrer.de>
 	Mark Murray <markm@freebsd.org>
 	Mike Petullo <mike@flyn.org>
+	Mikhail Teterin <mi@aldan.algebra.com>
 	Mikko Työläjärvi <mbsd@pacbell.net>
 	Robert Watson <rwatson@freebsd.org>
 	Ruslan Ermilov <ru@freebsd.org>
 	Solar Designer <solar@openwall.com>
 	Takanori Saneto <sanewo@ba2.so-net.ne.jp>
+	Wojciech A. Koszek <wkoszek@freebsd.org>
 	Yar Tikhiy <yar@freebsd.org>
 
-$P4: //depot/projects/openpam/CREDITS#12 $
+$Id: CREDITS 400 2007-10-24 15:04:23Z des $

==== //depot/projects/dtrace/src/contrib/openpam/HISTORY#4 (text) ====

@@ -1,4 +1,27 @@
-OpenPAM Figwort							2005-06-16
+OpenPAM Hydrangea						2007-12-21
+
+ - ENHANCE: when compiling with GCC, mark up API functions with GCC
+   attributes where appropriate.
+
+ - BUGFIX: fixed numerous warnings uncovered by GCC 4.
+
+ - ENHANCE: building the documentation is now optional.
+
+ - ENHANCE: corrected a number of mistakes and style issues in the
+   build system.
+
+ - ENHANCE: API function arguments are now const where appropriate, to
+   match corresponding changes in the Solaris PAM and Linux-PAM APIs.
+
+ - ENHANCE: corrected a number of C namespace violations.
+
+ - ENHANCE: the module cache has been removed, allowing long-lived
+   applications to pick up module changes.  This also allows multiple
+   threads to use PAM simultaneously (as long as they use separate PAM
+   contexts), since the module cache was the only part of OpenPAM that
+   was not thread-safe.
+============================================================================
+OpenPAM Figwort 2005-06-16
 
  - BUGFIX: Correct several small signedness and initialization bugs
    discovered during review by the NetBSD team.
@@ -304,4 +327,4 @@
 
 First (beta) release.
 ============================================================================
-$P4: //depot/projects/openpam/HISTORY#24 $
+$Id: HISTORY 409 2007-12-21 11:38:50Z des $

==== //depot/projects/dtrace/src/contrib/openpam/INSTALL#4 (text) ====

@@ -16,23 +16,29 @@
   Use the "configure" shell script to configure OpenPAM for your
   system.  Options include:
 
+    --enable-debug
+	Turn debugging on by default.
+
     --with-modules-dir=DIR
 	Indicates the directory where PAM modules will be installed.
 	This option should not be used if you intend to install PAM
 	modules in the system library directory.
 
-    --with-pam-su
-	Builds the sample PAM application.
+    --without-doc
+	Skips the documentation.
 
     --with-pam-unix
 	Builds the sample PAM module.
 
+    --with-su
+	Builds the sample su(1) implementation.
+
   For more information about configuration options, use the --help
   option.
 
   A typical invocation might look like this:
 
-  # ./configure --with-pam-su --with-pam-unix
+  # ./configure --with-pam-unix --with-su
 
 3. COMPILATION
 
@@ -49,4 +55,4 @@
 
   # make install
 
-$P4: //depot/projects/openpam/INSTALL#4 $
+$Id: INSTALL 388 2006-04-12 10:31:52Z des $

==== //depot/projects/dtrace/src/contrib/openpam/LICENSE#4 (text) ====

@@ -1,5 +1,6 @@
 
 Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+Copyright (c) 2004-2007 Dag-Erling Smørgrav
 All rights reserved.
 
 This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,4 +32,4 @@
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
 
-$P4: //depot/projects/openpam/LICENSE#6 $
+$Id: LICENSE 408 2007-12-21 11:36:24Z des $

==== //depot/projects/dtrace/src/contrib/openpam/Makefile.am#4 (text) ====

@@ -1,5 +1,17 @@
-# $P4: //depot/projects/openpam/Makefile.am#3 $
+# $Id: Makefile.am 395 2007-06-03 20:26:18Z des $
+
+SUBDIRS = lib bin modules include
 
-SUBDIRS = lib bin modules doc include
+if WITH_DOC
+SUBDIRS += doc
+endif
 
-EXTRA_DIST = CREDITS HISTORY INSTALL LICENSE MANIFEST README RELNOTES
+EXTRA_DIST = \
+	CREDITS \
+	HISTORY \
+	INSTALL \
+	LICENSE \
+	README \
+	RELNOTES \
+	autogen.sh \
+	misc/gendoc.pl

==== //depot/projects/dtrace/src/contrib/openpam/Makefile.in#4 (text) ====

@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# $P4: //depot/projects/openpam/Makefile.am#3 $
+# $Id: Makefile.am 395 2007-06-03 20:26:18Z des $
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -38,6 +38,7 @@
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
+@WITH_DOC_TRUE@am__append_1 = doc
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/configure INSTALL compile config.guess \
@@ -49,7 +50,7 @@
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno configure.status.lineno
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 SOURCES =
@@ -62,7 +63,7 @@
 	uninstall-recursive
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
+DIST_SUBDIRS = lib bin modules include doc
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -105,6 +106,7 @@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
+GREP = @GREP@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -127,20 +129,20 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-WITH_PAM_SU_FALSE = @WITH_PAM_SU_FALSE@
-WITH_PAM_SU_TRUE = @WITH_PAM_SU_TRUE@
+WITH_DOC_FALSE = @WITH_DOC_FALSE@
+WITH_DOC_TRUE = @WITH_DOC_TRUE@
 WITH_PAM_UNIX_FALSE = @WITH_PAM_UNIX_FALSE@
 WITH_PAM_UNIX_TRUE = @WITH_PAM_UNIX_TRUE@
-ac_ct_AR = @ac_ct_AR@
+WITH_SU_FALSE = @WITH_SU_FALSE@
+WITH_SU_TRUE = @WITH_SU_TRUE@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -148,6 +150,8 @@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -155,23 +159,30 @@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@@ -180,8 +191,17 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-SUBDIRS = lib bin modules doc include
-EXTRA_DIST = CREDITS HISTORY INSTALL LICENSE MANIFEST README RELNOTES
+SUBDIRS = lib bin modules include $(am__append_1)
+EXTRA_DIST = \
+	CREDITS \
+	HISTORY \
+	INSTALL \
+	LICENSE \
+	README \
+	RELNOTES \
+	autogen.sh \
+	misc/gendoc.pl
+
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -254,7 +274,13 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -266,7 +292,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
@@ -274,7 +300,13 @@
 
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -295,7 +327,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -370,6 +402,7 @@
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
+	$(mkdir_p) $(distdir)/misc
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -396,15 +429,17 @@
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || mkdir "$(distdir)/$$subdir" \
+	    || $(mkdir_p) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="../$(top_distdir)" \
-	        distdir="../$(distdir)/$$subdir" \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -415,15 +450,15 @@
 	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r $(distdir)
 dist-gzip: distdir
-	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__remove_distdir)
 
 dist-bzip2: distdir
-	$(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
 
 dist-tarZ: distdir
-	$(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z
+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__remove_distdir)
 
 dist-shar: distdir
@@ -436,7 +471,7 @@
 	$(am__remove_distdir)
 
 dist dist-all: distdir
-	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
@@ -445,11 +480,11 @@
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\
+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\
+	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
+	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
@@ -530,7 +565,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"

==== //depot/projects/dtrace/src/contrib/openpam/README#4 (text) ====

@@ -24,4 +24,4 @@
 
 Please direct bug reports and inquiries to des@freebsd.org.
 
-$P4: //depot/projects/openpam/README#5 $
+$Id: README 320 2006-02-16 20:33:19Z des $

==== //depot/projects/dtrace/src/contrib/openpam/RELNOTES#4 (text) ====

@@ -1,6 +1,6 @@
 
-		  Release notes for OpenPAM Figwort
-		  =================================
+		 Release notes for OpenPAM Hydrangea
+		 ===================================
 
 This release corresponds to the code used in FreeBSD-CURRENT as of the
 release date.  It has also been tested on several other platforms, and
@@ -26,4 +26,4 @@
 
 Please direct bug reports and inquiries to <des@freebsd.org>.
 
-$P4: //depot/projects/openpam/RELNOTES#22 $
+$Id: RELNOTES 404 2007-11-28 12:31:04Z des $

==== //depot/projects/dtrace/src/contrib/openpam/aclocal.m4#4 (text) ====

@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.8.5 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,7 +13,7 @@
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
-# serial 47 AC_PROG_LIBTOOL
+# serial 51 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -123,7 +123,7 @@
 
 # Sed substitution that helps us do robust quoting.  It backslashifies
 # metacharacters that are still active within double-quoted strings.
-Xsed='sed -e s/^X//'
+Xsed='sed -e 1s/^X//'
 [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
 
 # Same as above, but do not quote variable references.
@@ -143,7 +143,7 @@
 default_ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a `.a' archive for static linking (except M$VC,
+# All known linkers require a `.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
 ltmain="$ac_aux_dir/ltmain.sh"
@@ -163,6 +163,7 @@
 test -z "$AS" && AS=as
 test -z "$CC" && CC=cc
 test -z "$LTCC" && LTCC=$CC

>>> TRUNCATED FOR MAIL (1000 lines) <<<



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200712230443.lBN4hTH3091435>