9 files changed, 17 insertions, 71 deletions

diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index b7d94f7e42b5..72af964ba943 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xfmail
-PORTVERSION=	1.5.2
+PORTVERSION=	1.5.3
 CATEGORIES=	mail
 MASTER_SITES=	ftp://xfmail.ufies.org/pub/xfmail/release/%SUBDIR%/	       \
 		ftp://cupido.geophys.nat.tu-bs.de/pub/xfmail/release/%SUBDIR%/ \
diff --git a/mail/xfmail/distinfo b/mail/xfmail/distinfo
index 650dfc1f891b..d15417cc2dba 100644
--- a/mail/xfmail/distinfo
+++ b/mail/xfmail/distinfo
@@ -1 +1 @@
-MD5 (xfmail-1.5.2.tar.bz2) = 62aa48a5bdc8aa61cc4fb0b70410c7e1
+MD5 (xfmail-1.5.3.tar.bz2) = ce7fb31306642ba336f41ac2e0e9738f
diff --git a/mail/xfmail/files/patch-aa b/mail/xfmail/files/patch-aa
index ea0e293d831a..d00d3e6d35a9 100644
--- a/mail/xfmail/files/patch-aa
+++ b/mail/xfmail/files/patch-aa
@@ -1,9 +1,10 @@
---- src/ui/dialogs.auto.orig	Tue Jul  2 02:31:16 2002
-+++ src/ui/dialogs.auto	Tue Jul  2 02:31:29 2002
-@@ -1,6 +1,5 @@
- /* Form definition file generated with fdesign. */
+--- contrib/Makefile.am.orig	Wed Nov  6 10:04:08 2002
++++ contrib/Makefile.am	Wed Nov  6 10:04:18 2002
+@@ -4,6 +4,6 @@
+ 	xfmail-full.spec \
+ 	xfmail.spec
  
--#include "forms.h"
- #include <stdlib.h>
- #include "dialogs.h"
+-SUBDIRS = misc specfiles
++SUBDIRS = misc
  
+ DIST_SUBDIRS = $(SUBDIRS)
diff --git a/mail/xfmail/files/patch-ab b/mail/xfmail/files/patch-ab
index fd617266cca3..58faa3690989 100644
--- a/mail/xfmail/files/patch-ab
+++ b/mail/xfmail/files/patch-ab
@@ -1,7 +1,7 @@
---- autogen.sh.orig	Mon Feb  5 17:40:21 2001
-+++ autogen.sh	Sat Jul  7 20:21:07 2001
+--- autogen.sh.orig	Wed Nov  6 00:30:46 2002
++++ autogen.sh	Wed Nov  6 00:31:22 2002
 @@ -42,15 +42,4 @@
- automake --gnu --add-missing
+ automake -a --gnu --add-missing
  cd "$THEDIR"
  
 -if test -z "$*"; then
diff --git a/mail/xfmail/files/patch-ac b/mail/xfmail/files/patch-ac
deleted file mode 100644
index ae3bcbc6731e..000000000000
--- a/mail/xfmail/files/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/mail/cfgfile.h.orig	Tue Oct 15 17:29:47 2002
-+++ src/mail/cfgfile.h	Tue Oct 15 16:51:06 2002
-@@ -30,8 +30,10 @@
- 
- #include <config.h>
- 
--#include <iostream.h>
--#include <fstream.h>
-+using namespace std;
-+
-+#include <iostream>
-+#include <fstream>
- #include <assert.h>
- #include <map>
- #include <string>
diff --git a/mail/xfmail/files/patch-ad b/mail/xfmail/files/patch-ad
deleted file mode 100644
index aee644a03de0..000000000000
--- a/mail/xfmail/files/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/mail/connection.cpp.orig	Tue Oct 15 17:32:03 2002
-+++ src/mail/connection.cpp	Tue Oct 15 16:56:49 2002
-@@ -25,9 +25,9 @@
-  *                                                                             *
-  ******************************************************************************/
- 
-+using namespace std;
- 
--
--#include <iostream.h>
-+#include <iostream>
- #include <list>
- #include <string>
- #include <string.h>
diff --git a/mail/xfmail/files/patch-ae b/mail/xfmail/files/patch-ae
deleted file mode 100644
index 42f60480b7cf..000000000000
--- a/mail/xfmail/files/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/mail/debug.cpp.orig	Tue Oct 15 17:32:57 2002
-+++ src/mail/debug.cpp	Tue Oct 15 16:59:15 2002
-@@ -25,9 +25,12 @@
-  *                                                                             *
-  ******************************************************************************/
- 
-+using namespace std;
-+
- #include <glib.h>
- #include <debug.h>
- #include <fmail.h>
-+#include <iostream>
- 
- #if STDC_HEADERS || defined(USE_STDARG)
- void _debugpf(char *fmt, ...)
diff --git a/mail/xfmail/files/patch-af b/mail/xfmail/files/patch-af
deleted file mode 100644
index 92516f71b4ba..000000000000
--- a/mail/xfmail/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mail/fmail.h.orig	Tue Oct 15 17:34:06 2002
-+++ src/mail/fmail.h	Tue Oct 15 16:54:32 2002
-@@ -47,6 +47,8 @@
- 		#include <config.h>
- 	#endif
- 
-+	using namespace std;
-+
- 	#include <vector>
- 	#include <list>
- 	#include <stdio.h>
diff --git a/mail/xfmail/files/patch-ag b/mail/xfmail/files/patch-ag
index 06d9fca57ee0..b113b8356f5b 100644
--- a/mail/xfmail/files/patch-ag
+++ b/mail/xfmail/files/patch-ag
@@ -1,10 +1,10 @@
---- src/ui/rules.cpp.orig	Tue Oct 15 17:35:07 2002
-+++ src/ui/rules.cpp	Tue Oct 15 17:22:11 2002
-@@ -366,7 +366,7 @@
+--- src/ui/rules.cpp.orig	Fri Jan 25 22:14:55 2002
++++ src/ui/rules.cpp	Wed Nov  6 00:32:49 2002
+@@ -362,7 +362,7 @@
  	r_modified = 0;
  	fl_delete_browser_line(rule_obj->Rule_List, k);
  	add_dead_rule(rules[i]);
--	rules.erase(&rules[i]);
+-	rules.erase((vector<struct _xf_rule *>::iterator) &rules[i]);
 +	rules.erase(rules.begin() + i);
  
  	changed = 1;