
--- /etc/mail/mailer.conf       Tue Oct 29 12:23:33 2002
+++ /var/tmp/temproot.1102.15.31.50/etc/mail/mailer.conf        Sat Nov  2 15:31:53 2002
@@ -1,7 +1,10 @@
+# $FreeBSD: src/etc/mail/mailer.conf,v 1.3 2002/04/05 04:25:12 gshapiro Exp $
 #
-# Execute the Postfix sendmail program, named /usr/local/sbin/sendmail
+# Execute the "real" sendmail program, named /usr/libexec/sendmail/sendmail
 #
-sendmail       /usr/local/sbin/sendmail
-send-mail      /usr/local/sbin/sendmail
-mailq          /usr/local/sbin/sendmail
-newaliases     /usr/local/sbin/sendmail
+sendmail       /usr/libexec/sendmail/sendmail
+send-mail      /usr/libexec/sendmail/sendmail
+mailq          /usr/libexec/sendmail/sendmail
+newaliases     /usr/libexec/sendmail/sendmail
+hoststat       /usr/libexec/sendmail/sendmail
+purgestat      /usr/libexec/sendmail/sendmail


--- /etc/inetd.conf     Sun Sep 22 14:40:43 2002
+++ /var/tmp/temproot.1102.15.31.50/etc/inetd.conf      Sat Nov  2 15:31:51 2002
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/inetd.conf,v 1.58 2002/08/09 17:34:13 gordon Exp $
+# $FreeBSD: src/etc/inetd.conf,v 1.59 2002/10/24 15:46:10 rwatson Exp $
 #
 # Internet server configuration database
 #
@@ -6,16 +6,21 @@
 # To disable a service, comment it out by prefixing the line with '#'.
 # To enable a service, remove the '#' at the beginning of the line.
 #
+# WARNING: lukemftpd does not support PAM, MAC, per-class nologin files,
+# or any login.conf resource limits or features; use it only if this is
+# appropriate for your environment.  If you require these features, use
+# the regular FreeBSD ftpd below.
 #ftp   stream  tcp     nowait  root    /usr/libexec/lukemftpd  ftpd -l -r
-ftp    stream  tcp     nowait  root    /usr/libexec/ftpd       ftpd -l
+#
+#ftp   stream  tcp     nowait  root    /usr/libexec/ftpd       ftpd -l
 #ftp   stream  tcp6    nowait  root    /usr/libexec/ftpd       ftpd -l
-telnet stream  tcp     nowait  root    /usr/libexec/telnetd    telnetd
+#telnet        stream  tcp     nowait  root    /usr/libexec/telnetd    telnetd
 #telnet        stream  tcp6    nowait  root    /usr/libexec/telnetd    telnetd
-shell  stream  tcp     nowait  root    /usr/libexec/rshd       rshd
+#shell stream  tcp     nowait  root    /usr/libexec/rshd       rshd
 #shell stream  tcp6    nowait  root    /usr/libexec/rshd       rshd
-login  stream  tcp     nowait  root    /usr/libexec/rlogind    rlogind
+#login stream  tcp     nowait  root    /usr/libexec/rlogind    rlogind
 #login stream  tcp6    nowait  root    /usr/libexec/rlogind    rlogind
-finger stream  tcp     nowait/3/10 nobody /usr/libexec/fingerd fingerd -s
+#finger        stream  tcp     nowait/3/10 nobody /usr/libexec/fingerd fingerd -s
 #finger        stream  tcp6    nowait/3/10 nobody /usr/libexec/fingerd fingerd -s
 #exec  stream  tcp     nowait  root    /usr/libexec/rexecd     rexecd
 #nntp  stream  tcp     nowait  usenet  /usr/libexec/nntpd      nntpd
@@ -80,7 +85,7 @@
 #
 # example entry for the optional pop3 server
 #
-pop3   stream  tcp     nowait  root    /usr/local/libexec/popper       popper
+#pop3  stream  tcp     nowait  root    /usr/local/libexec/popper       popper
 #
 # example entry for the optional imap4 server
 #
@@ -91,7 +96,7 @@
 #
 # Return error for all "ident" requests
 #
-auth   stream  tcp     nowait  root    internal
+#auth  stream  tcp     nowait  root    internal
 #auth  stream  tcp6    nowait  root    internal
 #
 # Provide internally a real "ident" service which provides ~/.fakeid support,



This is only one example, of course; there are 20 other files to compare.  It's
possible that you'll have to complete the merge manually.
