- generate comment in sendmail.cf with standard date

- apply an extension to the vacation manpage

3 files changed, 59 insertions, 9 deletions

diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index 4fd1349e7505..158b3d8bc73f 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sendmail
 PORTVERSION=	8.11.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.sendmail.org/pub/sendmail/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/sendmail/&,}
diff --git a/mail/sendmail/files/patch-aa b/mail/sendmail/files/patch-aa
index 56d805cddf72..655cb74911ab 100644
--- a/mail/sendmail/files/patch-aa
+++ b/mail/sendmail/files/patch-aa
@@ -5,7 +5,7 @@ diff -ur cf/m4/cfhead.m4 src/contrib/sendmail/cf/m4/cfhead.m4
  # forth in the LICENSE file which can be found at the top level of
  # the sendmail distribution.
  #
-+# $FreeBSD: /tmp/pcvs/ports/mail/sendmail/files/Attic/patch-aa,v 1.3 2001-03-10 20:49:42 dinoex Exp $
++# $FreeBSD: /tmp/pcvs/ports/mail/sendmail/files/Attic/patch-aa,v 1.4 2001-06-26 05:13:51 dinoex Exp $
  #
  
  ######################################################################
@@ -27,7 +27,7 @@ diff -ur cf/ostype/bsd4.4.m4 src/contrib/sendmail/cf/ostype/bsd4.4.m4
  # the sendmail distribution.
  #
 -#
-+# $FreeBSD: /tmp/pcvs/ports/mail/sendmail/files/Attic/patch-aa,v 1.3 2001-03-10 20:49:42 dinoex Exp $
++# $FreeBSD: /tmp/pcvs/ports/mail/sendmail/files/Attic/patch-aa,v 1.4 2001-06-26 05:13:51 dinoex Exp $
  #
  
  divert(0)
@@ -43,7 +43,7 @@ diff -ur cf/sh/makeinfo.sh src/contrib/sendmail/cf/sh/makeinfo.sh
  #
  #	$Id: makeinfo.sh,v 8.14 1999/02/07 07:26:25 gshapiro Exp $
  #
-+# $FreeBSD: /tmp/pcvs/ports/mail/sendmail/files/Attic/patch-aa,v 1.3 2001-03-10 20:49:42 dinoex Exp $
++# $FreeBSD: /tmp/pcvs/ports/mail/sendmail/files/Attic/patch-aa,v 1.4 2001-06-26 05:13:51 dinoex Exp $
 +#
  
  usewhoami=0
@@ -53,7 +53,7 @@ diff -ur cf/sh/makeinfo.sh src/contrib/sendmail/cf/sh/makeinfo.sh
  	host=`uname -n`
  fi
 -echo '#####' built by $user@$host on `date`
-+echo '#####' built by $user@$host on `LC_TIME=C date`
++echo '#####' built by $user@$host on `LC_ALL=C LC_TIME=C date`
  echo '#####' in `pwd` | sed 's/\/tmp_mnt//'
  echo '#####' using $1 as configuration include directory | sed 's/\/tmp_mnt//'
  echo "define(\`__HOST__', $host)dnl"
@@ -64,7 +64,7 @@ diff -ur mail.local/mail.local.8 src/contrib/sendmail/mail.local/mail.local.8
  .\"
  .\"	$Id: mail.local.8,v 8.14.14.5 2000/12/29 18:12:16 gshapiro Exp $
  .\"
-+.\" $FreeBSD: /tmp/pcvs/ports/mail/sendmail/files/Attic/patch-aa,v 1.3 2001-03-10 20:49:42 dinoex Exp $
++.\" $FreeBSD: /tmp/pcvs/ports/mail/sendmail/files/Attic/patch-aa,v 1.4 2001-06-26 05:13:51 dinoex Exp $
 +.\"
  .TH MAIL.LOCAL 8 "$Date: 2000/12/29 18:12:16 $"
  .SH NAME
@@ -118,7 +118,7 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
  static char id[] = "@(#)$Id: mail.local.c,v 8.143.4.57 2001/02/11 20:08:20 gshapiro Exp $";
  #endif /* ! lint */
  
-+/* $FreeBSD: /tmp/pcvs/ports/mail/sendmail/files/Attic/patch-aa,v 1.3 2001-03-10 20:49:42 dinoex Exp $ */
++/* $FreeBSD: /tmp/pcvs/ports/mail/sendmail/files/Attic/patch-aa,v 1.4 2001-06-26 05:13:51 dinoex Exp $ */
 +
  /*
  **  This is not intended to work on System V derived systems
@@ -251,7 +251,7 @@ diff -ur rmail/rmail.c src/contrib/sendmail/rmail/rmail.c
  static char id[] = "@(#)$Id: rmail.c,v 8.39.4.8 2000/09/16 22:20:25 gshapiro Exp $";
  #endif /* ! lint */
  
-+/* $FreeBSD: /tmp/pcvs/ports/mail/sendmail/files/Attic/patch-aa,v 1.3 2001-03-10 20:49:42 dinoex Exp $ */
++/* $FreeBSD: /tmp/pcvs/ports/mail/sendmail/files/Attic/patch-aa,v 1.4 2001-06-26 05:13:51 dinoex Exp $ */
 +
  /*
   * RMAIL -- UUCP mail server.
@@ -275,7 +275,7 @@ diff -ur smrsh/smrsh.8 src/contrib/sendmail/smrsh/smrsh.8
  .\"
  .\"     $Id: smrsh.8,v 8.11.16.2 2000/12/15 19:50:46 gshapiro Exp $
  .\"
-+.\" $FreeBSD: /tmp/pcvs/ports/mail/sendmail/files/Attic/patch-aa,v 1.3 2001-03-10 20:49:42 dinoex Exp $
++.\" $FreeBSD: /tmp/pcvs/ports/mail/sendmail/files/Attic/patch-aa,v 1.4 2001-06-26 05:13:51 dinoex Exp $
 +.\"
  .TH SMRSH 8 "$Date: 2000/12/15 19:50:46 $"
  .SH NAME
diff --git a/mail/sendmail/files/patch-vacation.1 b/mail/sendmail/files/patch-vacation.1
new file mode 100644
index 000000000000..ef3a00f67039
--- /dev/null
+++ b/mail/sendmail/files/patch-vacation.1
@@ -0,0 +1,50 @@
+diff -ur vacation/vacation.1 src/contrib/sendmail/vacation/vacation.1
+--- vacation/vacation.1	Fri Dec 29 19:12:23 2000
++++ vacation/vacation.1	Sat Mar  3 11:27:12 2001
+@@ -11,6 +11,8 @@
+ .\"
+ .\"	$Id: vacation.1,v 8.11.4.6 2000/12/29 18:12:23 gshapiro Exp $
+ .\"
++.\" $FreeBSD$
++.\"
+ .TH VACATION 1 "$Date: 2000/12/29 18:12:23 $"
+ .SH NAME
+ vacation
+@@ -24,8 +26,10 @@
+ .RB [ \-x ]
+ .RB [ \-a
+ .IR alias ]
++.RB [ \-d ]
+ .RB [ \-f
+ .IR database ]
++.RB [ \-l ]
+ .RB [ \-m
+ .IR message ]
+ .RB [ \-s
+@@ -59,6 +63,15 @@
+ in the same manner as those received for the user's
+ login name.
+ .TP
++.B \-d
++Send error/debug messages to stdout instead of syslog.
++Otherwise, fatal errors, such as calling
++.B vacation
++with incorrect arguments, or with non-existent
++.IR login s,
++are logged in the system log file, using
++syslog(8).
++.TP
+ .BI \-f " filename"
+ Use
+ .I filename
+@@ -78,6 +91,10 @@
+ Same as
+ .B \-i
+ (for backwards compatibility).
++.TP
++.B \-l
++List the content of the vacation database file including the address
++and the associated time of the last auto-response to that address.
+ .TP
+ .BI \-m " filename"
+ Use