- Fix build on -current

1 files changed, 95 insertions, 15 deletions

diff --git a/mail/xmail/files/patch-aa b/mail/xmail/files/patch-aa
index 0ce9873658bb..fd65a954a33a 100644
--- a/mail/xmail/files/patch-aa
+++ b/mail/xmail/files/patch-aa
@@ -1,24 +1,104 @@
---- Imakefile.orig	Mon Jan 30 16:41:47 1995
-+++ Imakefile	Tue Mar  4 23:50:35 1997
-@@ -31,7 +31,7 @@
- /* */# Define MAILBOX_DIRECTORY if your mail spool is located in other than the
- /* */# default /usr/spool/mail.  (If not specified, the default will be used.)
- /* */#
+--- Imakefile.orig	Mon Jan 30 22:41:47 1995
++++ Imakefile	Wed Oct 15 09:52:37 2003
+@@ -1,63 +1,62 @@
+-/* */#
+-/* */# @(#)Imakefile - for xmail version 1 patchlevel 5
+-/* */#
+-/* */# Uncomment USE_DIRENT if readdir() uses <dirent.h> instead of <sys/dir.h>
+-/* */#
++#
++# @(#)Imakefile - for xmail version 1 patchlevel 5
++#
++# Uncomment USE_DIRENT if readdir() uses <dirent.h> instead of <sys/dir.h>
++#
+      USE_DIRENT = -DUSE_DIRENT
+-/* */#
+-/* */# Uncomment X_FACE and COMPFACE if you have the compface library installed
+-/* */# and you want xmail to automatically display the X-Face: header, if found
+-/* */# in a message.
+-/* */#
++#
++# Uncomment X_FACE and COMPFACE if you have the compface library installed
++# and you want xmail to automatically display the X-Face: header, if found
++# in a message.
++#
+ #ifdef USE_X_FACE
+           X_FACE = -DX_FACE
+         COMPFACE = -L./compface -lcompface
+ #endif
+-/* */#
+-/* */# Uncomment XPM if you have the Xpm version 3 library and want color icons
+-/* */#
++#
++# Uncomment XPM if you have the Xpm version 3 library and want color icons
++#
+             XPM = -DXPM
+          LIBXPM = -lXpm
+-/* */#
+-/* */# Uncomment LPT if you require att environment support for pseudo ports.
+-/* */#
+-/* */#            LPT = -lpt
+-/* */#
+-/* */# Uncomment REGEXP if your system supplies the regexp.h include file.
+-/* */# Otherwise, xmail will use the regex procedures re_comp and re_exec.
+-/* */#
+-/* */#   REGEXP = -DUSE_REGEXP
+-/* */#
+-/* */# Define MAILBOX_DIRECTORY if your mail spool is located in other than the
+-/* */# default /usr/spool/mail.  (If not specified, the default will be used.)
+-/* */#
 -/* */#    MAILBOX_DIR = -DMAILBOX_DIRECTORY=\"/usr/spool/mail\"
+-/* */#
+-/* */# Define DEFAULT_VISUAL if your copy of vi lies in some place other than
+-/* */# /usr/ucb.  (If not specified, /usr/ucb/vi will be the default editor.)
+-/* */#
++#
++# Uncomment LPT if you require att environment support for pseudo ports.
++#
++#            LPT = -lpt
++#
++# Uncomment REGEXP if your system supplies the regexp.h include file.
++# Otherwise, xmail will use the regex procedures re_comp and re_exec.
++#
++#   REGEXP = -DUSE_REGEXP
++#
++# Define MAILBOX_DIRECTORY if your mail spool is located in other than the
++# default /usr/spool/mail.  (If not specified, the default will be used.)
++#
 +    MAILBOX_DIR = -DMAILBOX_DIRECTORY=\"/var/mail\"
- /* */#
- /* */# Define DEFAULT_VISUAL if your copy of vi lies in some place other than
- /* */# /usr/ucb.  (If not specified, /usr/ucb/vi will be the default editor.)
-@@ -41,7 +41,7 @@
- /* */# Define DEFAULT_MAILER if your mail program is not the standard
- /* */# /usr/ucb/Mail.  CAUTION - Operation is NOT guaranteed with other mailers.
++#
++# Define DEFAULT_VISUAL if your copy of vi lies in some place other than
++# /usr/ucb.  (If not specified, /usr/ucb/vi will be the default editor.)
++#
+            DEF_VISUAL = -DDEFAULT_VISUAL=\"/usr/bin/vi\"
+-/* */#
+-/* */# Define DEFAULT_MAILER if your mail program is not the standard
+-/* */# /usr/ucb/Mail.  CAUTION - Operation is NOT guaranteed with other mailers.
++#
++# Define DEFAULT_MAILER if your mail program is not the standard
++# /usr/ucb/Mail.  CAUTION - Operation is NOT guaranteed with other mailers.
  	
 -/* */# DEF_MAILER = -DDEFAULT_MAILER=\"/usr/ucb/Mail\"
 +    DEF_MAILER = -DDEFAULT_MAILER=\"/usr/bin/Mail\"
  
- /* */#
- /* */# Define SIGACTION if your system utilizes the sigaction() call rather
-@@ -57,7 +57,7 @@
+-/* */#
+-/* */# Define SIGACTION if your system utilizes the sigaction() call rather
+-/* */# than the sigvec() call (true on most SYSV and POSIX compilant systems)
+-/* */# You may also need to add the following BSD define (true on SGI systems)
+-/* */#
+-/* */#         SIGDEF = -D_BSD_SIGNALS
+-/* */#
++#
++# Define SIGACTION if your system utilizes the sigaction() call rather
++# than the sigvec() call (true on most SYSV and POSIX compilant systems)
++# You may also need to add the following BSD define (true on SGI systems)
++#
++#         SIGDEF = -D_BSD_SIGNALS
++#
+                SIGACT = -DSIGACTION
+-/* */#
+ 
+   XMAIL_DEFINES = $(MAILBOX_DIR) $(DEF_VISUAL) $(DEF_MAILER) $(SIGACT) $(SIGDEF)
          DEFINES = $(USE_DIRENT) $(X_FACE) $(XPM) $(REGEXP) $(XMAIL_DEFINES)
  
          DEPLIBS = $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB)