Unbreak use with rmail and bump PORTREVISION.

PR:		22598
Submitted by:	MAINTAINER

3 files changed, 60 insertions, 40 deletions

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 90eece8b7c8f..ea932df52658 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	postfix
 PORTVERSION= 	19991231.13
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
 		ftp://ftp.tux.org/pub/net/postfix/official/ \
diff --git a/mail/postfix/files/patch-cb b/mail/postfix/files/patch-cb
index 58559c7273d1..ef73429287d2 100644
--- a/mail/postfix/files/patch-cb
+++ b/mail/postfix/files/patch-cb
@@ -1,20 +1,25 @@
-*** ./man/man1/sendmail.1.orig	Thu Mar 30 14:05:28 2000
---- ./man/man1/sendmail.1	Thu Jun  1 22:39:16 2000
-***************
-*** 63,65 ****
-  The path name of the \fBsendmail.cf\fR file. Postfix configuration
-! files are kept in \fB/etc/postfix\fR.
-  .IP "\fB-F \fIfull_name\fR
---- 63,65 ----
-  The path name of the \fBsendmail.cf\fR file. Postfix configuration
-! files are kept in \fB!!PREFIX!!/etc/postfix\fR.
-  .IP "\fB-F \fIfull_name\fR
-***************
-*** 173,175 ****
-  /var/spool/postfix, mail queue
-! /etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
---- 173,175 ----
-  /var/spool/postfix, mail queue
-! !!PREFIX!!/etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
+--- man/man1/sendmail.1.orig	Thu Mar 30 17:46:10 2000
++++ man/man1/sendmail.1	Wed Dec 20 18:37:45 2000
+@@ -61,10 +61,12 @@
+ \fBjust-send-eight\fR.
+ .IP "\fB-C \fIconfig_file\fR (ignored :-)"
+ The path name of the \fBsendmail.cf\fR file. Postfix configuration
+-files are kept in \fB/etc/postfix\fR.
++files are kept in \fB!!PREFIX!!/etc/postfix\fR.
+ .IP "\fB-F \fIfull_name\fR
+ Set the sender full name. This is used only with messages that
+ have no \fBFrom:\fR message header.
++.IP "\fB-G\fR (ignored)"
++Gateway (relay) submission, as opposed to initial user submission.
+ .IP \fB-I\fR
+ Initialize alias database. See the \fBnewaliases\fR
+ command above.
+@@ -171,7 +173,7 @@
+ .na
+ .nf
+ /var/spool/postfix, mail queue
+-/etc/postfix, configuration files
++!!PREFIX!!/etc/postfix, configuration files
+ .SH CONFIGURATION PARAMETERS
+ .na
+ .nf
diff --git a/mail/postfix/files/patch-eg b/mail/postfix/files/patch-eg
index cdf9e3097053..28950509870c 100644
--- a/mail/postfix/files/patch-eg
+++ b/mail/postfix/files/patch-eg
@@ -1,20 +1,34 @@
-*** ./sendmail/sendmail.c.orig	Tue Mar 14 10:42:06 2000
---- ./sendmail/sendmail.c	Thu Jun  1 22:47:24 2000
-***************
-*** 57,59 ****
-  /*	The path name of the \fBsendmail.cf\fR file. Postfix configuration
-! /*	files are kept in \fB/etc/postfix\fR.
-  /* .IP "\fB-F \fIfull_name\fR
---- 57,59 ----
-  /*	The path name of the \fBsendmail.cf\fR file. Postfix configuration
-! /*	files are kept in \fB!!PREFIX!!/etc/postfix\fR.
-  /* .IP "\fB-F \fIfull_name\fR
-***************
-*** 159,161 ****
-  /*	/var/spool/postfix, mail queue
-! /*	/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
---- 159,161 ----
-  /*	/var/spool/postfix, mail queue
-! /*	!!PREFIX!!/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
+--- sendmail/sendmail.c.orig	Sun Mar 26 22:51:33 2000
++++ sendmail/sendmail.c	Wed Dec 20 18:17:31 2000
+@@ -55,10 +55,12 @@
+ /*	\fBjust-send-eight\fR.
+ /* .IP "\fB-C \fIconfig_file\fR (ignored :-)"
+ /*	The path name of the \fBsendmail.cf\fR file. Postfix configuration
+-/*	files are kept in \fB/etc/postfix\fR.
++/*	files are kept in \fB!!PREFIX!!/etc/postfix\fR.
+ /* .IP "\fB-F \fIfull_name\fR
+ /*	Set the sender full name. This is used only with messages that
+ /*	have no \fBFrom:\fR message header.
++/* .IP "\fB-G \fR (ignored)"
++/*	Gateway (relay) submission, as opposed to initial user submission.
+ /* .IP \fB-I\fR
+ /*	Initialize alias database. See the \fBnewaliases\fR
+ /*	command above.
+@@ -157,7 +159,7 @@
+ /*	\fBdebugger_command\fR configuration parameter.
+ /* FILES
+ /*	/var/spool/postfix, mail queue
+-/*	/etc/postfix, configuration files
++/*	!!PREFIX!!/etc/postfix, configuration files
+ /* CONFIGURATION PARAMETERS
+ /* .ad
+ /* .fi
+@@ -710,6 +712,8 @@
+ 	    break;
+ 	case 'F':				/* full name */
+ 	    full_name = optarg;
++	    break;
++	case 'G':				/* gateway submission */
+ 	    break;
+ 	case 'I':				/* newaliases */
+ 	    mode = SM_MODE_NEWALIAS;