4 files changed, 36 insertions, 76 deletions
diff --git a/mail/postilion/files/patch-ab b/mail/postilion/files/patch-ab
index d5242808791d..1e9911abe4f8 100644
--- a/mail/postilion/files/patch-ab
+++ b/mail/postilion/files/patch-ab
@@ -1,5 +1,5 @@
---- imap-4.6.BETA/src/osdep/unix/os_bsi.h.orig	Sat Oct 19 12:30:04 1996
-+++ imap-4.6.BETA/src/osdep/unix/os_bsi.h	Sun Feb 21 10:25:47 1999
+--- imap/src/osdep/unix/os_bsi.h.orig	Sat Oct 19 12:30:04 1996
++++ imap/src/osdep/unix/os_bsi.h	Sun Feb 21 10:25:47 1999
 @@ -37,7 +37,18 @@
  #include <unistd.h>
  #include <string.h>
diff --git a/mail/postilion/files/patch-ac b/mail/postilion/files/patch-ac
index 338a77609283..15b5752e74ad 100644
--- a/mail/postilion/files/patch-ac
+++ b/mail/postilion/files/patch-ac
@@ -1,5 +1,5 @@
---- imap-4.6.BETA/src/osdep/unix/Makefile.orig	Sun Feb 21 10:27:22 1999
-+++ imap-4.6.BETA/src/osdep/unix/Makefile	Sun Feb 21 10:29:24 1999
+--- imap/src/osdep/unix/Makefile.orig	Sun Feb 21 10:27:22 1999
++++ imap/src/osdep/unix/Makefile	Sun Feb 21 10:29:24 1999
 @@ -100,7 +100,7 @@
   dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
   rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
diff --git a/mail/postilion/files/patch-ae b/mail/postilion/files/patch-ae
index 1f7875c2f02d..f6b9c7654072 100644
--- a/mail/postilion/files/patch-ae
+++ b/mail/postilion/files/patch-ae
@@ -1,36 +1,11 @@
-*** imap-4.6.BETA/Makefile.orig	Thu Feb 18 13:09:30 1999
---- imap-4.6.BETA/Makefile	Wed Apr 21 10:54:50 1999
-***************
-*** 200,206 ****
-  
-  # Make the IMAP Toolkit
-  
-! all:	c-client rebuild bundled
-  
-  
-  #  The following ports are defined.  These refer to the *standard* compiler
---- 200,206 ----
-  
-  # Make the IMAP Toolkit
-  
-! all:	c-client rebuild
-  
-  
-  #  The following ports are defined.  These refer to the *standard* compiler
-***************
-*** 386,392 ****
-  	$(TOOLS)/$@ "$(LN)" src/imapd imapd
-  	$(LN) $(TOOLS)/$@ .
-  
-! build:	OSTYPE rebuild rebuildclean bundled
-  
-  OSTYPE:
-  	@echo Building c-client for $(OS)...
---- 386,392 ----
-  	$(TOOLS)/$@ "$(LN)" src/imapd imapd
-  	$(LN) $(TOOLS)/$@ .
-  
-! build:	OSTYPE rebuild rebuildclean
-  
-  OSTYPE:
-  	@echo Building c-client for $(OS)...
+--- lib/Makefile.in.orig	Sun Feb 27 17:06:43 2000
++++ lib/Makefile.in	Sun Feb 27 17:06:46 2000
+@@ -35,7 +35,7 @@
+ 
+ # To change the compiler switches, for example to change from -O
+ # to -g, change the following line:
+-override EXTRA_CFLAGS += @CFLAGS@
++#override EXTRA_CFLAGS += @CFLAGS@
+ 
+ # Default top-level directories in which to install architecture-
+ # specific files (exec_prefix) and machine-independent files such
diff --git a/mail/postilion/files/patch-af b/mail/postilion/files/patch-af
index 1cb29e7c2d33..ff8535970136 100644
--- a/mail/postilion/files/patch-af
+++ b/mail/postilion/files/patch-af
@@ -1,36 +1,21 @@
-*** postilion/options.tcl.orig	Sun Apr 18 06:20:34 1999
---- postilion/options.tcl	Wed Apr 21 11:16:43 1999
-***************
-*** 214,220 ****
-      set option(icon_name) "Postilion v$postilion_version"
-  
-      # Command to get default folder
-!     set option(default_folder) "INBOX file {} /var/spool/mail/$env(USER)"
-  
-      # Format of list of messages
-      set option(list_format) "%4S %6d  %-24n %4B %s"
---- 214,220 ----
-      set option(icon_name) "Postilion v$postilion_version"
-  
-      # Command to get default folder
-!     set option(default_folder) "INBOX file {} /var/mail/$env(USER)"
-  
-      # Format of list of messages
-      set option(list_format) "%4S %6d  %-24n %4B %s"
-***************
-*** 259,265 ****
-      set option(sendprot) smtp
-  
-      # Default sending program
-!     set option(sendprog) /usr/lib/sendmail
-  
-      # Can the sending program handle eightbit data
-      set option(sendprog_8bit) false
---- 259,265 ----
-      set option(sendprot) smtp
-  
-      # Default sending program
-!     set option(sendprog) /usr/sbin/sendmail
-  
-      # Can the sending program handle eightbit data
-      set option(sendprog_8bit) false
+--- postilion/options.tcl.orig	Wed Feb 23 14:27:28 2000
++++ postilion/options.tcl	Sun Feb 27 16:53:38 2000
+@@ -215,7 +215,7 @@
+ 
+     # Command to get default folder
+     if [info exists $env(MAIL)] {
+-	set option(default_folder) "INBOX file {} /var/spool/mail/$env(USER)"
++	set option(default_folder) "INBOX file {} /var/mail/$env(USER)"
+     } else {
+ 	set option(default_folder) "INBOX file {} $env(MAIL)"
+     }
+@@ -263,7 +263,7 @@
+     set option(sendprot) smtp
+ 
+     # Default sending program
+-    set option(sendprog) /usr/lib/sendmail
++    set option(sendprog) /usr/sbin/sendmail
+ 
+     # Can the sending program handle eightbit data
+     set option(sendprog_8bit) false
+