From 4377aa4cf4485ead32c589c48620459aebf0a591 Mon Sep 17 00:00:00 2001 From: Gregory Neil Shapiro Date: Thu, 13 Apr 2006 04:12:38 +0000 Subject: [PATCH] Add a note regarding bumping the freebsd*mc files for mergemaster's sake. --- contrib/sendmail/FREEBSD-upgrade | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/sendmail/FREEBSD-upgrade b/contrib/sendmail/FREEBSD-upgrade index 772435cbd0e9..967490458a62 100644 --- a/contrib/sendmail/FREEBSD-upgrade +++ b/contrib/sendmail/FREEBSD-upgrade @@ -24,6 +24,10 @@ Imported using: cvs import -m 'Import sendmail 8.13.6' \ src/contrib/sendmail SENDMAIL v8_13_6 +After importing, bump the version of src/etc/sendmail/freebsd*mc +so mergemaster will merge /etc/mail/freebsd*cf: + + cvs commit -f src/etc/sendmail/freebsd*mc To make local changes to sendmail, simply patch and commit to the main branch (aka HEAD). Never make local changes on the vendor (SENDMAIL) @@ -93,4 +97,4 @@ infrastructure in FreeBSD: usr.sbin/mailwrapper/Makefile gshapiro@FreeBSD.org -22-March-2006 +12-April-2006