From 99b99437f7babf37dc09d23e13ddc05e94dfa0eb Mon Sep 17 00:00:00 2001 From: gshapiro Date: Sun, 23 Feb 2003 21:58:16 +0000 Subject: [PATCH] Follow the (good) trend of returning import files to vendor versions where possible for easier future imports. --- contrib/sendmail/cf/ostype/bsd4.4.m4 | 2 +- contrib/sendmail/contrib/bitdomain.c | 2 -- contrib/sendmail/mailstats/mailstats.c | 1 - contrib/sendmail/makemap/makemap.c | 3 +-- contrib/sendmail/praliases/praliases.c | 2 -- contrib/sendmail/smrsh/smrsh.c | 2 -- contrib/sendmail/src/aliases.5 | 1 - contrib/sendmail/src/conf.c | 2 -- contrib/sendmail/src/conf.h | 2 -- contrib/sendmail/src/err.c | 2 -- contrib/sendmail/src/headers.c | 2 -- contrib/sendmail/src/mailq.1 | 1 - contrib/sendmail/src/mci.c | 2 -- contrib/sendmail/src/savemail.c | 2 -- contrib/sendmail/vacation/vacation.1 | 1 - 15 files changed, 2 insertions(+), 25 deletions(-) diff --git a/contrib/sendmail/cf/ostype/bsd4.4.m4 b/contrib/sendmail/cf/ostype/bsd4.4.m4 index dd4ec6cc2e61..3f7b0891de2c 100644 --- a/contrib/sendmail/cf/ostype/bsd4.4.m4 +++ b/contrib/sendmail/cf/ostype/bsd4.4.m4 @@ -10,7 +10,7 @@ divert(-1) # forth in the LICENSE file which can be found at the top level of # the sendmail distribution. # -# $FreeBSD$ +# # divert(0) diff --git a/contrib/sendmail/contrib/bitdomain.c b/contrib/sendmail/contrib/bitdomain.c index b864d65fe164..0b7073d39215 100644 --- a/contrib/sendmail/contrib/bitdomain.c +++ b/contrib/sendmail/contrib/bitdomain.c @@ -18,8 +18,6 @@ * The bitdomain table should be rebuilt monthly. */ -/* $FreeBSD$ */ - #include #include #include diff --git a/contrib/sendmail/mailstats/mailstats.c b/contrib/sendmail/mailstats/mailstats.c index 94ac213e6b5e..ec56e3a7e5c8 100644 --- a/contrib/sendmail/mailstats/mailstats.c +++ b/contrib/sendmail/mailstats/mailstats.c @@ -9,7 +9,6 @@ * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $FreeBSD$ * */ diff --git a/contrib/sendmail/makemap/makemap.c b/contrib/sendmail/makemap/makemap.c index 350d8970bf36..59c28f627df8 100644 --- a/contrib/sendmail/makemap/makemap.c +++ b/contrib/sendmail/makemap/makemap.c @@ -9,8 +9,6 @@ * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $FreeBSD$ - * */ #include @@ -24,6 +22,7 @@ SM_IDSTR(copyright, SM_IDSTR(id, "@(#)$Id: makemap.c,v 8.175 2001/12/28 22:44:01 ca Exp $") + #include #ifndef ISC_UNIX # include diff --git a/contrib/sendmail/praliases/praliases.c b/contrib/sendmail/praliases/praliases.c index d33a96ce39c5..720fa6d2777d 100644 --- a/contrib/sendmail/praliases/praliases.c +++ b/contrib/sendmail/praliases/praliases.c @@ -9,8 +9,6 @@ * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $FreeBSD$ - * */ #include diff --git a/contrib/sendmail/smrsh/smrsh.c b/contrib/sendmail/smrsh/smrsh.c index 4bb461de3c79..9a9bc213a449 100644 --- a/contrib/sendmail/smrsh/smrsh.c +++ b/contrib/sendmail/smrsh/smrsh.c @@ -9,8 +9,6 @@ * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $FreeBSD$ - * */ #include diff --git a/contrib/sendmail/src/aliases.5 b/contrib/sendmail/src/aliases.5 index 1678475d3443..62b5dfb55891 100644 --- a/contrib/sendmail/src/aliases.5 +++ b/contrib/sendmail/src/aliases.5 @@ -118,4 +118,3 @@ The .B aliases file format appeared in 4.0BSD. -.\" $FreeBSD$ diff --git a/contrib/sendmail/src/conf.c b/contrib/sendmail/src/conf.c index 3460c1a98157..69e5c67abd97 100644 --- a/contrib/sendmail/src/conf.c +++ b/contrib/sendmail/src/conf.c @@ -9,8 +9,6 @@ * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $FreeBSD$ - * */ #include diff --git a/contrib/sendmail/src/conf.h b/contrib/sendmail/src/conf.h index 8e48ec6e8f20..0675c2dd92a0 100644 --- a/contrib/sendmail/src/conf.h +++ b/contrib/sendmail/src/conf.h @@ -20,8 +20,6 @@ ** included in the next release. */ -/* $FreeBSD$ */ - #ifndef CONF_H #define CONF_H 1 diff --git a/contrib/sendmail/src/err.c b/contrib/sendmail/src/err.c index f4ec6865aabe..484af9e85ddd 100644 --- a/contrib/sendmail/src/err.c +++ b/contrib/sendmail/src/err.c @@ -9,8 +9,6 @@ * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $FreeBSD$ - * */ #include diff --git a/contrib/sendmail/src/headers.c b/contrib/sendmail/src/headers.c index a474de08f074..5d90344658dd 100644 --- a/contrib/sendmail/src/headers.c +++ b/contrib/sendmail/src/headers.c @@ -9,8 +9,6 @@ * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $FreeBSD$ - * */ #include diff --git a/contrib/sendmail/src/mailq.1 b/contrib/sendmail/src/mailq.1 index dae4e32d3730..1eb234e38ebb 100644 --- a/contrib/sendmail/src/mailq.1 +++ b/contrib/sendmail/src/mailq.1 @@ -100,4 +100,3 @@ The .B mailq command appeared in 4.0BSD. -.\" $FreeBSD$ diff --git a/contrib/sendmail/src/mci.c b/contrib/sendmail/src/mci.c index 690d3ef48bd4..5172333812f2 100644 --- a/contrib/sendmail/src/mci.c +++ b/contrib/sendmail/src/mci.c @@ -9,8 +9,6 @@ * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $FreeBSD$ - * */ #include diff --git a/contrib/sendmail/src/savemail.c b/contrib/sendmail/src/savemail.c index b9d7b59529db..073c31ff3e61 100644 --- a/contrib/sendmail/src/savemail.c +++ b/contrib/sendmail/src/savemail.c @@ -9,8 +9,6 @@ * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $FreeBSD$ - * */ #include diff --git a/contrib/sendmail/vacation/vacation.1 b/contrib/sendmail/vacation/vacation.1 index 913a41238c1b..055fb7a4bf95 100644 --- a/contrib/sendmail/vacation/vacation.1 +++ b/contrib/sendmail/vacation/vacation.1 @@ -268,4 +268,3 @@ The .B vacation command appeared in 4.3BSD. -.\" $FreeBSD$