[src/netbsd-1-5]: src/gnu/usr.sbin/sendmail/cf/cf Pull up revisions 1.13-1.15...

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

details:   https://anonhg.NetBSD.org/src/rev/e7120c95b620
branches:  netbsd-1-5
changeset: 490800:e7120c95b620
user:      he <he%NetBSD.org@localhost>
date:      Fri Mar 09 18:01:52 2001 +0000

description:
Pull up revisions 1.13-1.15 (via patch, requested by itojun):
  Upgrade to sendmail 8.11.3.

diffstat:

 gnu/usr.sbin/sendmail/cf/cf/Makefile |  18 ++++--------------
 1 files changed, 4 insertions(+), 14 deletions(-)

diffs (55 lines):

diff -r dfdbe33e603a -r e7120c95b620 gnu/usr.sbin/sendmail/cf/cf/Makefile
--- a/gnu/usr.sbin/sendmail/cf/cf/Makefile      Fri Mar 09 18:01:23 2001 +0000
+++ b/gnu/usr.sbin/sendmail/cf/cf/Makefile      Fri Mar 09 18:01:52 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6.2.2 2000/08/28 04:13:09 hubertf Exp $
+#      $NetBSD: Makefile,v 1.6.2.3 2001/03/09 18:01:52 he Exp $
 #      install these sources in /usr/share/sendmail/cf
 
 DIST=          ${.CURDIR}/../../../../dist
@@ -6,8 +6,7 @@
 
 FILESDIR=      /usr/share/sendmail/cf
 FILES=         boat-anchor.mc chimera.mc ihack.net.mc minbar.mc \
-               netbsd-proto.mc netbsd-proto-IPv4only.mc sun-lamp.mc zhadum.mc \
-               Makefile
+               netbsd-proto.mc sun-lamp.mc zhadum.mc Makefile
 
 .if (${.CURDIR} == ${FILESDIR})
 CFDIR=         ${.CURDIR}/..
@@ -19,7 +18,7 @@
 ROMODE=                444
 RM=            rm -f
 
-ALL=           netbsd-proto.cf netbsd-proto-IPv4only.cf
+ALL=           netbsd-proto.cf
 
 OTHERS=                ${FILES:S/Makefile//:C/netbsd-proto.*//:S/.mc/.cf/g}
 
@@ -33,14 +32,7 @@
 
 realall: ${ALL}
 
-# netbsd-proto.mc pulls in netbsd-proto-IPv4only.mc
-netbsd-proto.cf: netbsd-proto-IPv4only.mc
-
 afterinstall:
-       sed 's,../../../../usr.sbin/sendmail/cf/cf/,,g' \
-               <${DESTDIR}${FILESDIR}/netbsd-proto.mc \
-               >${DESTDIR}${FILESDIR}/netbsd-proto.mc.new
-       mv ${DESTDIR}${FILESDIR}/netbsd-proto.mc.new ${DESTDIR}${FILESDIR}/netbsd-proto.mc
        ${CHMOD} ${ROMODE} ${DESTDIR}${FILESDIR}/netbsd-proto.mc
 
 # XXX not friendly with "make obj"
@@ -52,10 +44,8 @@
 realdepend:
 
 distribution: netbsd-proto.cf
-       ${INSTALL} ${INSTPRIV} -c -o root -g wheel -m 444 \
+       ${INSTALL} ${INSTPRIV} ${COPY} -o root -g wheel -m 444 \
            netbsd-proto.cf ${DESTDIR}/etc/mail/sendmail.cf
-       ${INSTALL} ${INSTPRIV} -c -o root -g wheel -m 444 \
-           netbsd-proto-IPv4only.cf ${DESTDIR}/etc/mail/sendmail-IPv4only.cf
 
 # this is overkill, but....
 M4FILES=       ${CFDIR}/domain/Berkeley.EDU.m4 \