[src/trunk]: src sync better with 8.10.1.

[itojun <itojun%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b80dee191b03
branches:  trunk
changeset: 485729:b80dee191b03
user:      itojun <itojun%NetBSD.org@localhost>
date:      Thu May 04 00:52:58 2000 +0000

description:
sync better with 8.10.1.

diffstat:

 distrib/sets/lists/misc/mi                |  15 ++++++++++-----
 distrib/sets/lists/misc/obsolete.mi       |   3 +--
 gnu/usr.sbin/sendmail/cf/cf/Makefile      |   6 +++---
 gnu/usr.sbin/sendmail/cf/feature/Makefile |  18 ++++++++++--------
 gnu/usr.sbin/sendmail/cf/mailer/Makefile  |   4 ++--
 5 files changed, 26 insertions(+), 20 deletions(-)

diffs (159 lines):

diff -r d6467a7af115 -r b80dee191b03 distrib/sets/lists/misc/mi
--- a/distrib/sets/lists/misc/mi        Wed May 03 23:30:35 2000 +0000
+++ b/distrib/sets/lists/misc/mi        Thu May 04 00:52:58 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.32 2000/05/03 10:57:30 itojun Exp $
+# $NetBSD: mi,v 1.33 2000/05/04 00:52:58 itojun Exp $
 ./usr/share/dict/README
 ./usr/share/dict/eign
 ./usr/share/dict/propernames
@@ -383,12 +383,10 @@
 ./usr/share/sendmail/cf/Makefile
 ./usr/share/sendmail/cf/boat-anchor.mc
 ./usr/share/sendmail/cf/chimera.mc
-./usr/share/sendmail/cf/clientproto.mc
 ./usr/share/sendmail/cf/ihack.net.mc
+./usr/share/sendmail/cf/minbar.mc
 ./usr/share/sendmail/cf/netbsd-proto.mc
 ./usr/share/sendmail/cf/sun-lamp.mc
-./usr/share/sendmail/cf/tcpproto.mc
-./usr/share/sendmail/cf/uucpproto.mc
 ./usr/share/sendmail/cf/zhadum.mc
 ./usr/share/sendmail/domain/Berkeley.EDU.m4
 ./usr/share/sendmail/domain/CS.Berkeley.EDU.m4
@@ -406,8 +404,12 @@
 ./usr/share/sendmail/feature/bestmx_is_local.m4
 ./usr/share/sendmail/feature/bitdomain.m4
 ./usr/share/sendmail/feature/blacklist_recipients.m4
+./usr/share/sendmail/feature/delay_checks.m4
+./usr/share/sendmail/feature/dnsbl.m4
 ./usr/share/sendmail/feature/domaintable.m4
+./usr/share/sendmail/feature/generics_entire_domain.m4
 ./usr/share/sendmail/feature/genericstable.m4
+./usr/share/sendmail/feature/ldap_routing.m4
 ./usr/share/sendmail/feature/limited_masquerade.m4
 ./usr/share/sendmail/feature/local_lmtp.m4
 ./usr/share/sendmail/feature/local_procmail.m4
@@ -415,6 +417,7 @@
 ./usr/share/sendmail/feature/mailertable.m4
 ./usr/share/sendmail/feature/masquerade_entire_domain.m4
 ./usr/share/sendmail/feature/masquerade_envelope.m4
+./usr/share/sendmail/feature/no_default_msa.m4
 ./usr/share/sendmail/feature/nocanonify.m4
 ./usr/share/sendmail/feature/nodns.m4
 ./usr/share/sendmail/feature/notsticky.m4
@@ -427,16 +430,17 @@
 ./usr/share/sendmail/feature/relay_entire_domain.m4
 ./usr/share/sendmail/feature/relay_hosts_only.m4
 ./usr/share/sendmail/feature/relay_local_from.m4
+./usr/share/sendmail/feature/relay_mail_from.m4
 ./usr/share/sendmail/feature/smrsh.m4
 ./usr/share/sendmail/feature/stickyhost.m4
 ./usr/share/sendmail/feature/use_ct_file.m4
 ./usr/share/sendmail/feature/use_cw_file.m4
 ./usr/share/sendmail/feature/uucpdomain.m4
+./usr/share/sendmail/feature/virtuser_entire_domain.m4
 ./usr/share/sendmail/feature/virtusertable.m4
 ./usr/share/sendmail/hack/cssubdomain.m4
 ./usr/share/sendmail/m4/cf.m4
 ./usr/share/sendmail/m4/cfhead.m4
-./usr/share/sendmail/m4/nullrelay.m4
 ./usr/share/sendmail/m4/proto.m4
 ./usr/share/sendmail/m4/version.m4
 ./usr/share/sendmail/mailer/cyrus.m4
@@ -446,6 +450,7 @@
 ./usr/share/sendmail/mailer/phquery.m4
 ./usr/share/sendmail/mailer/pop.m4
 ./usr/share/sendmail/mailer/procmail.m4
+./usr/share/sendmail/mailer/qpage.m4
 ./usr/share/sendmail/mailer/smtp.m4
 ./usr/share/sendmail/mailer/usenet.m4
 ./usr/share/sendmail/mailer/uucp.m4
diff -r d6467a7af115 -r b80dee191b03 distrib/sets/lists/misc/obsolete.mi
--- a/distrib/sets/lists/misc/obsolete.mi       Wed May 03 23:30:35 2000 +0000
+++ b/distrib/sets/lists/misc/obsolete.mi       Thu May 04 00:52:58 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: obsolete.mi,v 1.3 2000/05/03 10:57:31 itojun Exp $
+# $NetBSD: obsolete.mi,v 1.4 2000/05/04 00:52:59 itojun Exp $
 /usr/share/doc/smm/03.fsck/0.t
 /usr/share/doc/smm/03.fsck/1.t
 /usr/share/doc/smm/03.fsck/2.t
@@ -17,7 +17,6 @@
 /usr/share/doc/smm/09.sendmail/Makefile
 /usr/share/doc/smm/09.sendmail/intro.me
 /usr/share/sendmail/cf/clientproto.mc
-/usr/share/sendmail/cf/sun-lamp.mc
 /usr/share/sendmail/cf/tcpproto.mc
 /usr/share/sendmail/cf/uucpproto.mc
 /usr/share/sendmail/m4/nullrelay.m4
diff -r d6467a7af115 -r b80dee191b03 gnu/usr.sbin/sendmail/cf/cf/Makefile
--- a/gnu/usr.sbin/sendmail/cf/cf/Makefile      Wed May 03 23:30:35 2000 +0000
+++ b/gnu/usr.sbin/sendmail/cf/cf/Makefile      Thu May 04 00:52:58 2000 +0000
@@ -1,12 +1,12 @@
-#      $NetBSD: Makefile,v 1.4 2000/05/03 10:50:56 itojun Exp $
+#      $NetBSD: Makefile,v 1.5 2000/05/04 00:52:58 itojun Exp $
 #      install these sources in /usr/share/sendmail/cf
 
 DIST=          ${.CURDIR}/../../../../dist
 .PATH: ${DIST}/sendmail/cf/cf
 
 FILESDIR=      /usr/share/sendmail/cf
-FILES=         boat-anchor.mc chimera.mc ihack.net.mc netbsd-proto.mc \
-               zhadum.mc Makefile
+FILES=         boat-anchor.mc chimera.mc ihack.net.mc minbar.mc \
+               netbsd-proto.mc sun-lamp.mc zhadum.mc Makefile
 
 .if (${.CURDIR} == ${FILESDIR})
 CFDIR=         ${.CURDIR}/..
diff -r d6467a7af115 -r b80dee191b03 gnu/usr.sbin/sendmail/cf/feature/Makefile
--- a/gnu/usr.sbin/sendmail/cf/feature/Makefile Wed May 03 23:30:35 2000 +0000
+++ b/gnu/usr.sbin/sendmail/cf/feature/Makefile Thu May 04 00:52:58 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.1.1 2000/02/08 13:45:37 tron Exp $
+#      $NetBSD: Makefile,v 1.2 2000/05/04 00:52:58 itojun Exp $
 #      install these sources in /usr/share/sendmail/feature
 
 DIST=          ${.CURDIR}/../../../../dist
@@ -8,15 +8,17 @@
 FILES=         accept_unqualified_senders.m4 accept_unresolvable_domains.m4 \
                access_db.m4 allmasquerade.m4 always_add_domain.m4 \
                bestmx_is_local.m4 bitdomain.m4 blacklist_recipients.m4 \
-               domaintable.m4 genericstable.m4 limited_masquerade.m4 \
-               local_lmtp.m4 local_procmail.m4 loose_relay_check.m4 \
-               mailertable.m4 masquerade_entire_domain.m4 \
-               masquerade_envelope.m4 nocanonify.m4 nodns.m4 notsticky.m4 \
+               delay_checks.m4 dnsbl.m4 domaintable.m4 \
+               generics_entire_domain.m4 genericstable.m4 \
+               ldap_routing.m4 limited_masquerade.m4 local_lmtp.m4 \
+               local_procmail.m4 loose_relay_check.m4 mailertable.m4 \
+               masquerade_entire_domain.m4 masquerade_envelope.m4 \
+               no_default_msa.m4 nocanonify.m4 nodns.m4 notsticky.m4 \
                nouucp.m4 nullclient.m4 promiscuous_relay.m4 rbl.m4 \
                redirect.m4 relay_based_on_MX.m4 relay_entire_domain.m4 \
-               relay_hosts_only.m4 relay_local_from.m4 smrsh.m4 \
-               stickyhost.m4 use_ct_file.m4 use_cw_file.m4 uucpdomain.m4 \
-               virtusertable.m4
+               relay_hosts_only.m4 relay_local_from.m4 relay_mail_from.m4 \
+               smrsh.m4 stickyhost.m4 use_ct_file.m4 use_cw_file.m4 \
+               uucpdomain.m4 virtuser_entire_domain.m4 virtusertable.m4
 
 all:
 
diff -r d6467a7af115 -r b80dee191b03 gnu/usr.sbin/sendmail/cf/mailer/Makefile
--- a/gnu/usr.sbin/sendmail/cf/mailer/Makefile  Wed May 03 23:30:35 2000 +0000
+++ b/gnu/usr.sbin/sendmail/cf/mailer/Makefile  Thu May 04 00:52:58 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.1.1 2000/02/08 13:45:40 tron Exp $
+#      $NetBSD: Makefile,v 1.2 2000/05/04 00:52:58 itojun Exp $
 #      install these sources in /usr/share/sendmail/mailer
 
 DIST=          ${.CURDIR}/../../../../dist
@@ -6,7 +6,7 @@
 
 FILESDIR=      /usr/share/sendmail/mailer
 FILES=         cyrus.m4 fax.m4 local.m4 mail11.m4 phquery.m4 pop.m4 \
-               procmail.m4 smtp.m4 usenet.m4 uucp.m4
+               procmail.m4 qpage.m4 smtp.m4 usenet.m4 uucp.m4
 
 all: