Index: Makefile
===================================================================
RCS file: /usr/cvs/ports/mail/xfmail/Makefile,v
retrieving revision 1.51
diff -u -r1.51 Makefile
--- Makefile	17 Oct 2003 06:09:39 -0000	1.51
+++ Makefile	21 Nov 2003 15:02:00 -0000
@@ -21,8 +21,6 @@
 LIB_DEPENDS=	forms.1:${PORTSDIR}/x11-toolkits/xforms \
 		gdbm.3:${PORTSDIR}/databases/gdbm
 
-CONFLICTS=	qt-3.*
-
 USE_AUTOMAKE_VER=	15
 USE_AUTOCONF=	yes
 USE_BZIP2=	yes
Index: pkg-plist
===================================================================
RCS file: /usr/cvs/ports/mail/xfmail/pkg-plist,v
retrieving revision 1.6
diff -u -r1.6 pkg-plist
--- pkg-plist	10 Jun 2003 03:06:31 -0000	1.6
+++ pkg-plist	21 Nov 2003 15:02:17 -0000
@@ -1,7 +1,7 @@
 bin/xfmail
-lib/libeditor.a
-lib/libeditor.so
-lib/libeditor.so.0
+lib/libxfeditor.a
+lib/libxfeditor.so
+lib/libxfeditor.so.0
 lib/libmail.a
 lib/libmail.so
 lib/libmail.so.0
Index: files/patch-ah
===================================================================
RCS file: files/patch-ah
diff -N files/patch-ah
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-ah	21 Nov 2003 14:58:11 -0000
@@ -0,0 +1,13 @@
+--- src/mail/imap.cpp.orig	Fri Nov 21 09:55:40 2003
++++ src/mail/imap.cpp	Fri Nov 21 09:55:52 2003
+@@ -1585,8 +1585,10 @@
+ 		} else if(!strcasecmp(p, "\\Draft")) {
+ 		} else if(!strcasecmp(p, "\\Recent"))
+ 			msg->status |= RECENT;
++#if 0
+ 		else
+ 			display_msg(MSG_WARN, "IMAP", "Unknown flag %s", p);
++#endif
+ 
+ 	} while((p = strtok(NULL, " ")) != NULL);
+ 
Index: files/patch-ai
===================================================================
RCS file: files/patch-ai
diff -N files/patch-ai
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-ai	21 Nov 2003 15:01:28 -0000
@@ -0,0 +1,13 @@
+--- src/editor/Makefile.am.orig	Fri Nov 21 10:00:29 2003
++++ src/editor/Makefile.am	Fri Nov 21 10:00:39 2003
+@@ -1,8 +1,8 @@
+ # $Id: Makefile.am,v 1.6 2002/12/22 04:34:25 fesnel Exp $
+ 
+-lib_LTLIBRARIES = libeditor.la
++lib_LTLIBRARIES = libxfeditor.la
+ 
+-libeditor_la_SOURCES = \
++libxfeditor_la_SOURCES = \
+ 	fl_edit.cpp \
+ 	textbuf.cpp 
+ 
Index: files/patch-aj
===================================================================
RCS file: files/patch-aj
diff -N files/patch-aj
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-aj	21 Nov 2003 15:01:44 -0000
@@ -0,0 +1,11 @@
+--- src/ui/Makefile.am.orig	Fri Nov 21 10:00:52 2003
++++ src/ui/Makefile.am	Fri Nov 21 10:01:04 2003
+@@ -44,7 +44,7 @@
+ 	@LDAP_LIBS@ \
+ 	@SOUND_LIBS@ \
+ 	../mail/libmail.la \
+-	../editor/libeditor.la
++	../editor/libxfeditor.la
+ 
+ INCLUDES = -I$(top_srcdir)/data -I$(top_srcdir)/src/editor -I$(top_srcdir)/src/mail
+