Update "xfmail" package to version 1.4.7. A list of the changes

from version 1.3 is not available. This update was contributed by
Tomasz Luchowski in PR pkg/12163

5 files changed, 77 insertions, 53 deletions

diff --git a/mail/xfmail/patches/patch-aa b/mail/xfmail/patches/patch-aa
index 7d766d086f9..466f8912bba 100644
--- a/mail/xfmail/patches/patch-aa
+++ b/mail/xfmail/patches/patch-aa
@@ -1,9 +1,13 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 11:09:54 agc Exp $
+$NetBSD: patch-aa,v 1.3 2001/02/26 22:32:09 tron Exp $
 
---- 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 @@
+--- ui/newobjs.h.orig	Tue Jan 18 02:38:23 2000
++++ ui/newobjs.h
+@@ -4,7 +4,7 @@
+ #ifndef _NEWOBJS_H
+     #define _NEWOBJS_H
  
--#include <forms.h>
-+#include <X11/forms.h>
- #include <sys/param.h>
+-    #include <forms.h>
++    #include <X11/forms.h>
+ 	#ifdef MAX
+ 	#undef MAX
+ 	#endif
diff --git a/mail/xfmail/patches/patch-ab b/mail/xfmail/patches/patch-ab
index 6a7bdde733b..0f8d8e4558b 100644
--- a/mail/xfmail/patches/patch-ab
+++ b/mail/xfmail/patches/patch-ab
@@ -1,9 +1,13 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 11:09:55 agc Exp $
+$NetBSD: patch-ab,v 1.3 2001/02/26 22:32:09 tron Exp $
 
---- 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 @@
+--- ui/umail.h.orig	Fri Jun 23 21:30:31 2000
++++ ui/umail.h
+@@ -30,7 +30,7 @@
+         #include <pwd.h>
+     #endif
  
--#include <forms.h>
-+#include <X11/forms.h>
+-    #include <forms.h>
++    #include <X11/forms.h>
+ 
+     #include "version.h"
  
diff --git a/mail/xfmail/patches/patch-ac b/mail/xfmail/patches/patch-ac
index df9b6b0559e..6a6fff101e8 100644
--- a/mail/xfmail/patches/patch-ac
+++ b/mail/xfmail/patches/patch-ac
@@ -1,9 +1,13 @@
-$NetBSD: patch-ac,v 1.2 1998/08/07 11:09:55 agc Exp $
+$NetBSD: patch-ac,v 1.3 2001/02/26 22:32:09 tron Exp $
 
---- 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 @@
+--- editor/fl_edit.c.orig	Sun May 28 00:11:08 2000
++++ editor/fl_edit.c
+@@ -71,7 +71,7 @@
+ 
+ #include <glib.h>
  
 -#include <forms.h>
 +#include <X11/forms.h>
+ #include <umail.h>
  #include "fl_edit.h"
+ #include "textbuf.h"
diff --git a/mail/xfmail/patches/patch-ad b/mail/xfmail/patches/patch-ad
index 4ca76d55368..47517184204 100644
--- a/mail/xfmail/patches/patch-ad
+++ b/mail/xfmail/patches/patch-ad
@@ -1,50 +1,40 @@
-$NetBSD: patch-ad,v 1.3 2000/09/07 00:35:48 dmcmahill Exp $
+$NetBSD: patch-ad,v 1.4 2001/02/26 22:32:09 tron Exp $
 
---- configure.orig	Wed Apr 15 03:57:51 1998
-+++ configure	Wed Sep  6 20:17:41 2000
-@@ -1809,5 +1809,5 @@
- fi
+--- config/configure.in.orig	Wed Nov  8 21:14:50 2000
++++ config/configure.in
+@@ -62,7 +62,7 @@
+     fi])
  
+ AC_PATH_XTRA
 -LIBS="$extra_libraries -L/usr/local/lib $X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS -lm"
-+LIBS="$extra_libraries -L${X11BASE}/lib -Wl,-R${X11BASE}/lib $X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS -lm"
++LIBS="$extra_libraries -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib $X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS -lm"
  CPPFLAGS="$extra_includes $CPPFLAGS $X_CFLAGS"
  
-@@ -2910,7 +2910,7 @@
- 
- 
--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
-@@ -2919,5 +2919,5 @@
- #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"
-@@ -2943,5 +2943,5 @@
-  
- 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.
- "
-@@ -2949,5 +2949,5 @@
- fi
+ ### Check for the pt library (for SCO, needed for X)
+@@ -83,7 +83,7 @@
+        case "`gcc -v 2>&1`" in *"2.95"*)
+                AC_LANG_CPLUSPLUS
+                AC_CACHE_CHECK(for X headers compilance with ANSI C++, 
+-			   		xfmail_cv_permiss, [AC_TRY_COMPILE([#include <forms.h>], 
++			   		xfmail_cv_permiss, [AC_TRY_COMPILE([#include <X11/forms.h>], 
+ 					[int x; x=0], xfmail_cv_permiss=yes, xfmail_cv_permiss=no)])
+                if test x$xfmail_cv_permiss = xno; then
+                        CPPFLAGS="-fpermissive $CPPFLAGS"
+@@ -217,14 +217,14 @@
+ AC_CHECK_HEADER(X11/xpm.h,[],XFMAIL_LIB_ERROR(X11/xpm.h,libXpm))
  
+ dnl Check for xforms headers
+-AC_CHECK_HEADER(forms.h,[],XFMAIL_LIB_ERROR(forms.h,libforms))
 -if test $ac_cv_header_forms_h = yes; then
++AC_CHECK_HEADER(X11/forms.h,[],XFMAIL_LIB_ERROR(X11/forms.h,libforms))
 +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
-@@ -2959,5 +2959,5 @@
+   AC_CACHE_CHECK([xforms library version],xfmail_cv_xfversion,
+   [ cat > conftest.$ac_ext <<EOF
+ #line __oline__ "configure"
  #include "confdefs.h"
  
 -#include <forms.h>
 +#include <X11/forms.h>
  #if ! defined(FL_INCLUDE_VERSION)
  %%%old!%%%
+ #else
diff --git a/mail/xfmail/patches/patch-ae b/mail/xfmail/patches/patch-ae
new file mode 100644
index 00000000000..4782f23c231
--- /dev/null
+++ b/mail/xfmail/patches/patch-ae
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.1 2001/02/26 22:32:10 tron Exp $
+
+--- mail/fmail.h.orig	Thu Nov  2 16:38:04 2000
++++ mail/fmail.h	Mon Feb 26 23:20:21 2001
+@@ -121,11 +121,13 @@
+     #include <arpa/inet.h>
+     #include <netdb.h>
+ 
+-    #ifndef HAVE_SYS_NERR
+-        #define sys_nerr    65535
+-    #else
+-        #ifndef sys_nerr
++    #ifndef __NetBSD__
++        #ifndef HAVE_SYS_NERR
++            #define sys_nerr    65535
++        #else
++            #ifndef sys_nerr
+ extern int sys_nerr;
++            #endif
+         #endif
+     #endif
+