4 files changed, 69 insertions, 0 deletions
diff --git a/mail/xfmail/patches/patch-aa b/mail/xfmail/patches/patch-aa
new file mode 100644
index 00000000000..dd174e6c4e4
--- /dev/null
+++ b/mail/xfmail/patches/patch-aa
@@ -0,0 +1,7 @@
+--- ui/newobjs.h.orig	Wed Oct 22 04:31:31 1997
++++ ui/newobjs.h	Fri Jun 26 03:14:01 1998
+@@ -6,3 +6,3 @@
+ 
+-#include <forms.h>
++#include <X11/forms.h>
+ #include <sys/param.h>
diff --git a/mail/xfmail/patches/patch-ab b/mail/xfmail/patches/patch-ab
new file mode 100644
index 00000000000..71445589d4a
--- /dev/null
+++ b/mail/xfmail/patches/patch-ab
@@ -0,0 +1,7 @@
+--- ui/umail.h.orig	Fri Jun 26 03:19:23 1998
++++ ui/umail.h	Fri Jun 26 03:19:35 1998
+@@ -52,3 +52,3 @@
+ 
+-#include <forms.h>
++#include <X11/forms.h>
+ 
diff --git a/mail/xfmail/patches/patch-ac b/mail/xfmail/patches/patch-ac
new file mode 100644
index 00000000000..f3bebb54cbd
--- /dev/null
+++ b/mail/xfmail/patches/patch-ac
@@ -0,0 +1,7 @@
+--- editor/fl_edit.c.orig	Fri Jun 26 03:24:52 1998
++++ editor/fl_edit.c	Fri Jun 26 03:25:10 1998
+@@ -69,3 +69,3 @@
+ 
+-#include <forms.h>
++#include <X11/forms.h>
+ #include "fl_edit.h"
diff --git a/mail/xfmail/patches/patch-ad b/mail/xfmail/patches/patch-ad
new file mode 100644
index 00000000000..7b8964fdc1c
--- /dev/null
+++ b/mail/xfmail/patches/patch-ad
@@ -0,0 +1,48 @@
+--- configure.orig	Wed Apr 15 09:57:51 1998
++++ configure	Sat Jun 27 00:50:25 1998
+@@ -2909,16 +2909,16 @@
+ fi
+ 
+ 
+-ac_safe=`echo "forms.h" | sed 'y%./+-%__p_%'`
+-echo $ac_n "checking for forms.h""... $ac_c" 1>&6
+-echo "configure:2915: checking for forms.h" >&5
++ac_safe=`echo "X11/forms.h" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for X11/forms.h""... $ac_c" 1>&6
++echo "configure:2915: checking for X11/forms.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+ #line 2920 "configure"
+ #include "confdefs.h"
+-#include <forms.h>
++#include <X11/forms.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+ { (eval echo configure:2925: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -2942,13 +2942,13 @@
+   echo "$ac_t""no" 1>&6
+  
+ xfmail_error_txt="$xfmail_error_txt
+-** Can't find forms.h. Please check that
++** Can't find X11/forms.h. Please check that
+    the libforms library is installed correctly on your system.
+ "
+ xfmail_error=yes
+ fi
+ 
+-if test $ac_cv_header_forms_h = yes; then
++if test $ac_cv_header_X11_forms_h = yes; then
+   echo $ac_n "checking xforms library version""... $ac_c" 1>&6
+ echo "configure:2954: checking xforms library version" >&5
+ if eval "test \"`echo '$''{'xfmail_cv_xfversion'+set}'`\" = set"; then
+@@ -2958,7 +2958,7 @@
+ #line 2959 "configure"
+ #include "confdefs.h"
+ 
+-#include <forms.h>
++#include <X11/forms.h>
+ #if ! defined(FL_INCLUDE_VERSION)
+ %%%old!%%%
+ #else