From 1169f343ab7ad127ce94f0528a904c9a74ca6e6b Mon Sep 17 00:00:00 2001 From: delphij Date: Tue, 29 Jun 2010 23:08:33 +0000 Subject: [PATCH] MFC r203584,r203711,r203733,r204379: Teach obsolete NO_MAIL* friends. git-svn-id: svn://svn.freebsd.org/base/stable/8@209601 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- tools/build/mk/OptionalObsoleteFiles.inc | 247 ++++++++++++++++++++++- 1 file changed, 241 insertions(+), 6 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 2ac84a74d..5688a5fac 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -889,9 +889,33 @@ OLD_FILES+=usr/share/man/man8/lpd.8.gz OLD_FILES+=usr/share/man/man8/pac.8.gz .endif -#.if ${MK_MAILWRAPPER} == no -# to be filled in -#.endif +.if ${MK_MAIL} == no +OLD_FILES+=usr/bin/Mail +OLD_FILES+=usr/bin/biff +OLD_FILES+=usr/bin/from +OLD_FILES+=usr/bin/mail +OLD_FILES+=usr/bin/mailx +OLD_FILES+=usr/bin/msgs +OLD_FILES+=usr/libexec/comsat +OLD_FILES+=usr/share/examples/etc/mail.rc +OLD_FILES+=usr/share/man/man1/Mail.1.gz +OLD_FILES+=usr/share/man/man1/biff.1.gz +OLD_FILES+=usr/share/man/man1/from.1.gz +OLD_FILES+=usr/share/man/man1/mail.1.gz +OLD_FILES+=usr/share/man/man1/mailx.1.gz +OLD_FILES+=usr/share/man/man1/msgs.1.gz +OLD_FILES+=usr/share/man/man8/comsat.8.gz +OLD_FILES+=usr/share/misc/mail.help +OLD_FILES+=usr/share/misc/mail.tildehelp +.endif + +.if ${MK_MAILWRAPPER} == no +OLD_FILES+=etc/mail/mailer.conf +.if ${MK_SENDMAIL} == no +OLD_FILES+=usr/sbin/mailwrapper +.endif +OLD_FILES+=usr/share/man/man8/mailwrapper.8.gz +.endif #.if ${MK_MAN} == no # This should add a dependency to a special target which removes all man pages. @@ -1103,9 +1127,220 @@ OLD_FILES+=usr/share/man/man8/rshd.8.gz # to be filled in or replaced with a special target #.endif -#.if ${MK_SENDMAIL} == no -# to be filled in -#.endif +.if ${MK_SENDMAIL} == no +OLD_FILES+=bin/rmail +OLD_FILES+=usr/bin/vacation +OLD_FILES+=usr/include/libmilter/mfapi.h +OLD_FILES+=usr/include/libmilter/mfdef.h +OLD_FILES+=usr/lib/libmilter.a +OLD_LIBS+=usr/lib/libmilter.so.5 +OLD_FILES+=usr/lib/libmilter_p.a +.if ${TARGET_ARCH} == "amd64" +OLD_FILES+=usr/lib32/libmilter.a +OLD_LIBS+=usr/lib32/libmilter.so.5 +OLD_FILES+=usr/lib32/libmilter_p.a +.endif +OLD_FILES+=usr/libexec/mail.local +OLD_FILES+=usr/libexec/sendmail/sendmail +OLD_FILES+=usr/libexec/smrsh +OLD_FILES+=usr/sbin/editmap +OLD_FILES+=usr/sbin/mailstats +OLD_FILES+=usr/sbin/makemap +OLD_FILES+=usr/sbin/praliases +OLD_FILES+=usr/share/doc/smm/08.sendmailop/paper.ascii.gz +OLD_FILES+=usr/share/man/man1/mailq.1.gz +OLD_FILES+=usr/share/man/man1/newaliases.1.gz +OLD_FILES+=usr/share/man/man1/vacation.1.gz +OLD_FILES+=usr/share/man/man5/aliases.5.gz +OLD_FILES+=usr/share/man/man8/editmap.8.gz +OLD_FILES+=usr/share/man/man8/hoststat.8.gz +OLD_FILES+=usr/share/man/man8/mail.local.8.gz +OLD_FILES+=usr/share/man/man8/mailstats.8.gz +OLD_FILES+=usr/share/man/man8/makemap.8.gz +OLD_FILES+=usr/share/man/man8/praliases.8.gz +OLD_FILES+=usr/share/man/man8/purgestat.8.gz +OLD_FILES+=usr/share/man/man8/rmail.8.gz +OLD_FILES+=usr/share/man/man8/sendmail.8.gz +OLD_FILES+=usr/share/man/man8/smrsh.8.gz +OLD_FILES+=usr/share/sendmail/cf/README +OLD_FILES+=usr/share/sendmail/cf/cf/Makefile +OLD_FILES+=usr/share/sendmail/cf/cf/README +OLD_FILES+=usr/share/sendmail/cf/cf/chez.cs.mc +OLD_FILES+=usr/share/sendmail/cf/cf/clientproto.mc +OLD_FILES+=usr/share/sendmail/cf/cf/cs-hpux10.mc +OLD_FILES+=usr/share/sendmail/cf/cf/cs-hpux9.mc +OLD_FILES+=usr/share/sendmail/cf/cf/cs-osf1.mc +OLD_FILES+=usr/share/sendmail/cf/cf/cs-solaris2.mc +OLD_FILES+=usr/share/sendmail/cf/cf/cs-sunos4.1.mc +OLD_FILES+=usr/share/sendmail/cf/cf/cs-ultrix4.mc +OLD_FILES+=usr/share/sendmail/cf/cf/cyrusproto.mc +OLD_FILES+=usr/share/sendmail/cf/cf/generic-bsd4.4.mc +OLD_FILES+=usr/share/sendmail/cf/cf/generic-hpux10.mc +OLD_FILES+=usr/share/sendmail/cf/cf/generic-hpux9.mc +OLD_FILES+=usr/share/sendmail/cf/cf/generic-linux.mc +OLD_FILES+=usr/share/sendmail/cf/cf/generic-mpeix.mc +OLD_FILES+=usr/share/sendmail/cf/cf/generic-nextstep3.3.mc +OLD_FILES+=usr/share/sendmail/cf/cf/generic-osf1.mc +OLD_FILES+=usr/share/sendmail/cf/cf/generic-solaris.mc +OLD_FILES+=usr/share/sendmail/cf/cf/generic-sunos4.1.mc +OLD_FILES+=usr/share/sendmail/cf/cf/generic-ultrix4.mc +OLD_FILES+=usr/share/sendmail/cf/cf/huginn.cs.mc +OLD_FILES+=usr/share/sendmail/cf/cf/knecht.mc +OLD_FILES+=usr/share/sendmail/cf/cf/mail.cs.mc +OLD_FILES+=usr/share/sendmail/cf/cf/mail.eecs.mc +OLD_FILES+=usr/share/sendmail/cf/cf/mailspool.cs.mc +OLD_FILES+=usr/share/sendmail/cf/cf/python.cs.mc +OLD_FILES+=usr/share/sendmail/cf/cf/s2k-osf1.mc +OLD_FILES+=usr/share/sendmail/cf/cf/s2k-ultrix4.mc +OLD_FILES+=usr/share/sendmail/cf/cf/submit.cf +OLD_FILES+=usr/share/sendmail/cf/cf/submit.mc +OLD_FILES+=usr/share/sendmail/cf/cf/tcpproto.mc +OLD_FILES+=usr/share/sendmail/cf/cf/ucbarpa.mc +OLD_FILES+=usr/share/sendmail/cf/cf/ucbvax.mc +OLD_FILES+=usr/share/sendmail/cf/cf/uucpproto.mc +OLD_FILES+=usr/share/sendmail/cf/cf/vangogh.cs.mc +OLD_FILES+=usr/share/sendmail/cf/domain/Berkeley.EDU.m4 +OLD_FILES+=usr/share/sendmail/cf/domain/CS.Berkeley.EDU.m4 +OLD_FILES+=usr/share/sendmail/cf/domain/EECS.Berkeley.EDU.m4 +OLD_FILES+=usr/share/sendmail/cf/domain/S2K.Berkeley.EDU.m4 +OLD_FILES+=usr/share/sendmail/cf/domain/berkeley-only.m4 +OLD_FILES+=usr/share/sendmail/cf/domain/generic.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/accept_unqualified_senders.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/accept_unresolvable_domains.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/access_db.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/allmasquerade.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/always_add_domain.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/authinfo.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/badmx.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/bestmx_is_local.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/bitdomain.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/blacklist_recipients.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/block_bad_helo.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/compat_check.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/conncontrol.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/delay_checks.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/dnsbl.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/domaintable.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/enhdnsbl.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/generics_entire_domain.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/genericstable.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/greet_pause.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/ldap_routing.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/limited_masquerade.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/local_lmtp.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/local_no_masquerade.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/local_procmail.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/lookupdotdomain.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/loose_relay_check.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/mailertable.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/masquerade_entire_domain.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/masquerade_envelope.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/msp.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/mtamark.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/no_default_msa.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/nocanonify.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/notsticky.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/nouucp.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/nullclient.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/preserve_local_plus_detail.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/preserve_luser_host.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/promiscuous_relay.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/queuegroup.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/ratecontrol.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/redirect.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/relay_based_on_MX.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/relay_entire_domain.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/relay_hosts_only.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/relay_local_from.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/relay_mail_from.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/require_rdns.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/smrsh.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/stickyhost.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/use_client_ptr.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/use_ct_file.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/use_cw_file.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/uucpdomain.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/virtuser_entire_domain.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/virtusertable.m4 +OLD_FILES+=usr/share/sendmail/cf/hack/cssubdomain.m4 +OLD_FILES+=usr/share/sendmail/cf/m4/cf.m4 +OLD_FILES+=usr/share/sendmail/cf/m4/cfhead.m4 +OLD_FILES+=usr/share/sendmail/cf/m4/proto.m4 +OLD_FILES+=usr/share/sendmail/cf/m4/version.m4 +OLD_FILES+=usr/share/sendmail/cf/mailer/cyrus.m4 +OLD_FILES+=usr/share/sendmail/cf/mailer/cyrusv2.m4 +OLD_FILES+=usr/share/sendmail/cf/mailer/fax.m4 +OLD_FILES+=usr/share/sendmail/cf/mailer/local.m4 +OLD_FILES+=usr/share/sendmail/cf/mailer/mail11.m4 +OLD_FILES+=usr/share/sendmail/cf/mailer/phquery.m4 +OLD_FILES+=usr/share/sendmail/cf/mailer/pop.m4 +OLD_FILES+=usr/share/sendmail/cf/mailer/procmail.m4 +OLD_FILES+=usr/share/sendmail/cf/mailer/qpage.m4 +OLD_FILES+=usr/share/sendmail/cf/mailer/smtp.m4 +OLD_FILES+=usr/share/sendmail/cf/mailer/usenet.m4 +OLD_FILES+=usr/share/sendmail/cf/mailer/uucp.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/a-ux.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/aix3.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/aix4.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/aix5.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/altos.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/amdahl-uts.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/bsd4.3.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/bsd4.4.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/bsdi.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/bsdi1.0.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/bsdi2.0.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/darwin.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/dgux.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/domainos.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/dragonfly.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/dynix3.2.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/freebsd4.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/freebsd5.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/freebsd6.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/gnu.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/hpux10.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/hpux11.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/hpux9.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/irix4.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/irix5.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/irix6.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/isc4.1.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/linux.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/maxion.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/mklinux.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/mpeix.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/nextstep.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/openbsd.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/osf1.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/powerux.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/ptx2.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/qnx.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/riscos4.5.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/sco-uw-2.1.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/sco3.2.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/sinix.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/solaris2.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/solaris2.ml.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/solaris2.pre5.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/solaris8.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/sunos3.5.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/sunos4.1.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/svr4.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/ultrix4.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/unicos.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/unicosmk.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/unicosmp.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/unixware7.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/unknown.m4 +OLD_FILES+=usr/share/sendmail/cf/ostype/uxpds.m4 +OLD_FILES+=usr/share/sendmail/cf/sendmail.schema +OLD_FILES+=usr/share/sendmail/cf/sh/makeinfo.sh +OLD_FILES+=usr/share/sendmail/cf/siteconfig/uucp.cogsci.m4 +OLD_FILES+=usr/share/sendmail/cf/siteconfig/uucp.old.arpa.m4 +OLD_FILES+=usr/share/sendmail/cf/siteconfig/uucp.ucbarpa.m4 +OLD_FILES+=usr/share/sendmail/cf/siteconfig/uucp.ucbvax.m4 +.endif #.if ${MK_SHAREDOCS} == no # to be filled in -- 2.45.0