d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move the $FreeBSD$ CVS labels far enough away from the $Id$ CVS labels so

Browse Source 
I don't have to manually resolve conflicts on every import.  Ironically,
most of these files have no changes from the vendor version except the
$FreeBSD$ line.
This commit is contained in:
gshapiro 2002-08-28 18:12:33 +00:00
parent cfce8d25d3
commit fd175e74b3
18 changed files with 29 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/sendmail/mail.local/mail.local.8
View File

@ -10,8 +10,6 @@
.\"
.\" $Id: mail.local.8,v 8.23 2001/04/05 23:27:35 gshapiro Exp $
.\"
.\" $FreeBSD$
.\"
.TH MAIL.LOCAL 8 "$Date: 2001/04/05 23:27:35 $"
.SH NAME
mail.local
@ -140,3 +138,4 @@ appeared in
Version 7 AT&T UNIX
as the program
.BR mail .
.\" $FreeBSD$

4
contrib/sendmail/mail.local/mail.local.c
View File

@ -8,6 +8,8 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
* $FreeBSD$
*
*/
#include <sm/gen.h>
@ -31,8 +33,6 @@ SM_IDSTR(id, "@(#)$Id: mail.local.c,v 8.239 2002/05/24 20:56:32 gshapiro Exp $")
#include <sm/mbdb.h>
#include <sm/sysexits.h>
/* $FreeBSD$ */
/*
** This is not intended to work on System V derived systems
** such as Solaris or HP-UX, since they use a totally different

3
contrib/sendmail/mailstats/mailstats.c
View File

@ -9,6 +9,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
* $FreeBSD$
*
*/
@ -22,8 +23,6 @@ SM_IDSTR(copyright,
SM_IDSTR(id, "@(#)$Id: mailstats.c,v 8.98 2002/05/24 23:10:15 gshapiro Exp $")
/* $FreeBSD$ */
#include <unistd.h>
#include <stddef.h>
#include <stdlib.h>

4
contrib/sendmail/makemap/makemap.c
View File

@ -9,6 +9,8 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
* $FreeBSD$
*
*/
#include <sm/gen.h>
@ -22,8 +24,6 @@ SM_IDSTR(copyright,
SM_IDSTR(id, "@(#)$Id: makemap.c,v 8.175 2001/12/28 22:44:01 ca Exp $")
/* $FreeBSD$ */
#include <sys/types.h>
#ifndef ISC_UNIX
# include <sys/file.h>

4
contrib/sendmail/praliases/praliases.c
View File

@ -9,6 +9,8 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
* $FreeBSD$
*
*/
#include <sm/gen.h>
@ -22,8 +24,6 @@ SM_IDSTR(copyright,
SM_IDSTR(id, "@(#)$Id: praliases.c,v 8.93 2001/09/11 04:05:07 gshapiro Exp $")
/* $FreeBSD$ */
#include <sys/types.h>
#include <ctype.h>
#include <stdlib.h>

4
contrib/sendmail/rmail/rmail.c
View File

@ -8,6 +8,8 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
* $FreeBSD$
*
*/
#include <sm/gen.h>
@ -20,8 +22,6 @@ SM_IDSTR(copyright,
SM_IDSTR(id, "@(#)$Id: rmail.c,v 8.61 2001/09/18 21:45:29 gshapiro Exp $")
/* $FreeBSD$ */
/*
* RMAIL -- UUCP mail server.
*

3
contrib/sendmail/smrsh/smrsh.8
View File

@ -11,8 +11,6 @@
.\"
.\" $Id: smrsh.8,v 8.16 2002/04/25 13:33:40 ca Exp $
.\"
.\" $FreeBSD$
.\"
.TH SMRSH 8 "$Date: 2001/01/24 00:40:47 $"
.SH NAME
smrsh \- restricted shell for sendmail
@ -87,3 +85,4 @@ to change the default program directory
/usr/libexec/sm.bin \- directory for restricted programs
.SH SEE ALSO
sendmail(8)
.\" $FreeBSD$

4
contrib/sendmail/smrsh/smrsh.c
View File

@ -9,6 +9,8 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
* $FreeBSD$
*
*/
#include <sm/gen.h>
@ -22,8 +24,6 @@ SM_IDSTR(copyright,
SM_IDSTR(id, "@(#)$Id: smrsh.c,v 8.58 2002/05/25 02:41:31 ca Exp $")
/* $FreeBSD$ */
/*
** SMRSH -- sendmail restricted shell
**

3
contrib/sendmail/src/aliases.5
View File

@ -11,8 +11,6 @@
.\"
.\" $Id: aliases.5,v 8.17 2000/12/14 23:09:46 gshapiro Exp $
.\"
.\" $FreeBSD$
.\"
.TH ALIASES 5 "$Date: 2000/12/14 23:09:46 $"
.SH NAME
aliases
@ -120,3 +118,4 @@ The
.B aliases
file format appeared in
4.0BSD.
.\" $FreeBSD$

4
contrib/sendmail/src/conf.c
View File

@ -9,14 +9,14 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
* $FreeBSD$
*
*/
#include <sendmail.h>
SM_RCSID("@(#)$Id: conf.c,v 8.972.2.5 2002/08/16 14:56:01 ca Exp $")
/* $FreeBSD$ */
#include <sendmail/pathnames.h>
# include <sys/ioctl.h>

4
contrib/sendmail/src/conf.h
View File

@ -13,8 +13,6 @@
* $Id: conf.h,v 8.563 2002/06/04 02:13:50 geir Exp $
*/
/* $FreeBSD$ */
/*
** CONF.H -- All user-configurable parameters for sendmail
**
@ -22,6 +20,8 @@
** included in the next release.
*/
/* $FreeBSD$ */
#ifndef CONF_H
#define CONF_H 1

4
contrib/sendmail/src/err.c
View File

@ -9,14 +9,14 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
* $FreeBSD$
*
*/
#include <sendmail.h>
SM_RCSID("@(#)$Id: err.c,v 8.189 2002/01/09 18:52:30 ca Exp $")
/* $FreeBSD$ */
#if LDAPMAP
# include <lber.h>
# include <ldap.h> /* for LDAP error codes */

4
contrib/sendmail/src/headers.c
View File

@ -9,12 +9,12 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
* $FreeBSD$
*
*/
#include <sendmail.h>
/* $FreeBSD$ */
SM_RCSID("@(#)$Id: headers.c,v 8.266.4.1 2002/08/16 14:56:01 ca Exp $")
static size_t fix_mime_header __P((char *));

3
contrib/sendmail/src/mailq.1
View File

@ -11,8 +11,6 @@
.\"
.\" $Id: mailq.1,v 8.19 2002/04/12 05:07:58 gshapiro Exp $
.\"
.\" $FreeBSD$
.\"
.TH MAILQ 1 "$Date: 2000/12/23 19:37:48 $"
.SH NAME
mailq
@ -80,3 +78,4 @@ The
.B mailq
command appeared in
4.0BSD.
.\" $FreeBSD$

4
contrib/sendmail/src/mci.c
View File

@ -9,10 +9,10 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
* $FreeBSD$
*
*/
/* $FreeBSD$ */
#include <sendmail.h>
SM_RCSID("@(#)$Id: mci.c,v 8.205 2002/05/24 18:53:48 gshapiro Exp $")

4
contrib/sendmail/src/savemail.c
View File

@ -9,10 +9,10 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
* $FreeBSD$
*
*/
/* $FreeBSD$ */
#include <sendmail.h>
SM_RCSID("@(#)$Id: savemail.c,v 8.299 2002/05/24 20:50:17 gshapiro Exp $")

3
contrib/sendmail/src/sendmail.8
View File

@ -11,8 +11,6 @@
.\"
.\" $Id: sendmail.8,v 8.51 2002/05/24 15:42:13 ca Exp $
.\"
.\" $FreeBSD$
.\"
.TH SENDMAIL 8 "$Date: 2001/03/23 22:10:00 $"
.SH NAME
sendmail
@ -711,3 +709,4 @@ The
.B sendmail
command appeared in
4.2BSD.
.\" $FreeBSD$

3
contrib/sendmail/vacation/vacation.1
View File

@ -11,8 +11,6 @@
.\"
.\" $Id: vacation.1,v 8.29.2.1 2002/06/21 21:28:06 ca Exp $
.\"
.\" $FreeBSD$
.\"
.TH VACATION 1 "$Date: 2002/06/21 21:28:06 $"
.SH NAME
vacation
@ -270,3 +268,4 @@ The
.B vacation
command appeared in
4.3BSD.
.\" $FreeBSD$