Update xfmail to 1.5.5. The old xfmail 1.4.7 would not build on NetBSD 2.0

9 files changed, 55 insertions, 147 deletions

diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index ab359b3ac93..14380bad0b5 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2004/10/03 00:12:55 tv Exp $
+# $NetBSD: Makefile,v 1.34 2005/02/10 19:10:21 garbled Exp $
 
-DISTNAME=		xfmail-1.4.7
-PKGREVISION=		6
+DISTNAME=		xfmail-1.5.5
+PKGREVISION=		0
 CATEGORIES=		mail x11
 MASTER_SITES=		ftp://xfmail.ufies.org/pub/xfmail/release/1.4.7/source/
 EXTRACT_SUFX=		.tar.bz2
@@ -24,10 +24,6 @@ USE_X11BASE=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ENV+=		LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
 
-pre-configure:
-	cd ${WRKSRC} && ( ${LN} -sf config/configure.in . && ${LN} -sf config/acconfig.h . )
-	cd ${WRKSRC} && ( ${AUTOHEADER} && ${AUTOCONF} )
-
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xfmail
 	${INSTALL_DATA} ${WRKSRC}/Copyright ${PREFIX}/share/doc/xfmail
diff --git a/mail/xfmail/PLIST b/mail/xfmail/PLIST
index 131a71fd215..5d4f7efd4b8 100644
--- a/mail/xfmail/PLIST
+++ b/mail/xfmail/PLIST
@@ -1,5 +1,39 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:01:46 zuntum Exp $
-bin/xfmail
-man/man1/xfmail.1
+@comment $NetBSD: PLIST,v 1.2 2005/02/10 19:10:21 garbled Exp $
+share/xfmail/abook.xpm
+share/xfmail/abort.xpm
+share/xfmail/attach.xpm
+share/xfmail/delete.xpm
+share/xfmail/delsign.xpm
+share/xfmail/edit.xpm
+share/xfmail/exit.xpm
+share/xfmail/forward.xpm
+share/xfmail/gena.xpm
+share/xfmail/help.xpm
+share/xfmail/icon_mail.xpm
+share/xfmail/icon_nomail.xpm
+share/xfmail/insert.xpm
+share/xfmail/insorig.xpm
+share/xfmail/mail_edit.xpm
+share/xfmail/mailcur.xbm
+share/xfmail/mailcur_mask.xbm
+share/xfmail/move.xpm
+share/xfmail/newmail.xpm
+share/xfmail/next.xpm
+share/xfmail/nextu.xpm
+share/xfmail/prev.xpm
+share/xfmail/prevu.xpm
+share/xfmail/print.xpm
+share/xfmail/reply.xpm
+share/xfmail/retr.xpm
+share/xfmail/save.xpm
+share/xfmail/send.xpm
+share/xfmail/sign.xpm
+share/xfmail/spell.xpm
+share/xfmail/view.xpm
 share/doc/xfmail/Copyright
+man/man1/xfmail.1
+lib/libeditor.la
+lib/libmail.la
+bin/xfmail
 @dirrm share/doc/xfmail
+@dirrm share/xfmail
diff --git a/mail/xfmail/distinfo b/mail/xfmail/distinfo
index 98ac061ee8b..ab14df28254 100644
--- a/mail/xfmail/distinfo
+++ b/mail/xfmail/distinfo
@@ -1,10 +1,5 @@
-$NetBSD: distinfo,v 1.4 2002/04/17 04:45:14 fredb Exp $
+$NetBSD: distinfo,v 1.5 2005/02/10 19:10:21 garbled Exp $
 
-SHA1 (xfmail-1.4.7.tar.bz2) = 3d4df175c67433330fd1e8418f8f12c27323e64c
-Size (xfmail-1.4.7.tar.bz2) = 452411 bytes
-SHA1 (patch-aa) = 117ebc7c64c278ec9faeb9168b4c014d85ae7608
-SHA1 (patch-ab) = 83e6abecd67fbdfcbd2e6c1372b3997b53505b3b
-SHA1 (patch-ac) = 38aa66b7446ad007e2e0b26e21c21f519442360d
-SHA1 (patch-ad) = c9eb240fbfb3d4bc8b69107b690c75d325232d93
-SHA1 (patch-ae) = e51f9ef076cd751fd8abb93c4f9122ad5f921520
-SHA1 (patch-af) = d9dcf7c83a0c956c8126fcb36758c52ceaa67c40
+SHA1 (xfmail-1.5.5.tar.bz2) = 7a98486d1f8cce956efaf37d9540369d5f327401
+Size (xfmail-1.5.5.tar.bz2) = 1185913 bytes
+SHA1 (patch-aa) = 975551cddd979b39d423e32cb353f5ed48cb600a
diff --git a/mail/xfmail/patches/patch-aa b/mail/xfmail/patches/patch-aa
index 466f8912bba..b482eedbc0b 100644
--- a/mail/xfmail/patches/patch-aa
+++ b/mail/xfmail/patches/patch-aa
@@ -1,13 +1,11 @@
-$NetBSD: patch-aa,v 1.3 2001/02/26 22:32:09 tron Exp $
-
---- 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>
- 	#ifdef MAX
- 	#undef MAX
- 	#endif
+--- src/mail/fmail.h.orig	2004-01-01 20:54:01.000000000 -0700
++++ src/mail/fmail.h	2005-02-10 11:27:57.000000000 -0700
+@@ -170,7 +170,7 @@
+ 		#define sys_nerr    65535
+ 	#else
+ 		#ifndef sys_nerr
+-		#ifndef __FreeBSD__
++		#if !defined (__FreeBSD__) && !defined(__NetBSD__)
+ extern int sys_nerr;
+ 			#endif
+ 		#endif
diff --git a/mail/xfmail/patches/patch-ab b/mail/xfmail/patches/patch-ab
deleted file mode 100644
index 0f8d8e4558b..00000000000
--- a/mail/xfmail/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2001/02/26 22:32:09 tron Exp $
-
---- 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 "version.h"
- 
diff --git a/mail/xfmail/patches/patch-ac b/mail/xfmail/patches/patch-ac
deleted file mode 100644
index 6a6fff101e8..00000000000
--- a/mail/xfmail/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2001/02/26 22:32:09 tron Exp $
-
---- 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
deleted file mode 100644
index 2d1b65cda2c..00000000000
--- a/mail/xfmail/patches/patch-ad
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2002/04/17 04:45:14 fredb Exp $
-
---- config/configure.in.orig	Wed Nov  8 14: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 -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib $X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS -lm"
- CPPFLAGS="$extra_includes $CPPFLAGS $X_CFLAGS"
- 
- ### 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"
-@@ -95,8 +95,12 @@
- AC_CHECK_LIB(Xpm, XpmCreateBufferFromImage,LIBS="-lXpm $LIBS",
-   [XFMAIL_LIB_ERROR(libXpm,libXpm)])
- 
-+dnl Check for jpeg library
-+AC_CHECK_LIB(jpeg, jpeg_set_defaults,LIBS="-ljpeg $LIBS",
-+  [XFMAIL_LIB_ERROR(libjpeg,libjpeg)])
-+
- dnl Check for libforms or libxforms
--AC_CHECK_LIB(forms, fl_initialize, LIBS="-lforms $LIBS",
-+AC_CHECK_LIB(forms, fl_initialize, LIBS="-lforms -ljpeg -lXpm $LIBS",
-   [AC_CHECK_LIB(xforms, fl_initialize, LIBS="-lxforms $LIBS",
-   [XFMAIL_LIB_ERROR(libforms nor libxforms,libforms)])])
- 
-@@ -217,14 +221,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
-   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
deleted file mode 100644
index 4782f23c231..00000000000
--- a/mail/xfmail/patches/patch-ae
+++ /dev/null
@@ -1,22 +0,0 @@
-$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
- 
diff --git a/mail/xfmail/patches/patch-af b/mail/xfmail/patches/patch-af
deleted file mode 100644
index 88e00948f15..00000000000
--- a/mail/xfmail/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2001/10/12 19:49:26 tron Exp $
-
---- mail/cache.c.orig	Tue Jan 18 02:38:20 2000
-+++ mail/cache.c	Fri Oct 12 21:47:10 2001
-@@ -463,7 +463,7 @@
-     if(dbm_error(db) || (msgdata.dptr == NULL) || (msgdata.dsize == 0))
-         return NULL;
- 
--    msgbuf = msgdata.dptr;
-+    msgbuf = (char *)msgdata.dptr;
-     msgbuflen = 0;
- 
-     memcpy(&i, msgbuf + msgbuflen, sizeof(i));