5 files changed, 3 insertions, 52 deletions

diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile
index 2829aeb22972..1bf7d889a8a1 100644
--- a/mail/dbmail/Makefile
+++ b/mail/dbmail/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dbmail
-PORTVERSION=	3.1.10
-PORTREVISION=	2
+PORTVERSION=	3.1.11
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dbmail.org/download/3.1/ \
 		http://git.dbmail.eu/paul/dbmail/snapshot/
diff --git a/mail/dbmail/distinfo b/mail/dbmail/distinfo
index 75018568a7fd..c96eff80aea9 100644
--- a/mail/dbmail/distinfo
+++ b/mail/dbmail/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dbmail-3.1.10.tar.gz) = 7a5b82eb8feb45faf215bebee7fb648092e5eaa71b2d5acd5826ca36d8e63f4f
-SIZE (dbmail-3.1.10.tar.gz) = 2397512
+SHA256 (dbmail-3.1.11.tar.gz) = 8c1b11f604447944ec23985a1ff30869a2cf58fb918f47d53bd7db4c610856d7
+SIZE (dbmail-3.1.11.tar.gz) = 2399545
diff --git a/mail/dbmail/files/patch-src_db__dm.c b/mail/dbmail/files/patch-src_db__dm.c
deleted file mode 100644
index 3430ced2e91a..000000000000
--- a/mail/dbmail/files/patch-src_db__dm.c
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git src/dm_db.c b/src/dm_db.c
-index 559d83c..529a48e 100644
---- src/dm_db.c
-+++ src/dm_db.c
-@@ -1832,7 +1832,9 @@ char * db_get_message_lines(uint64_t message_idnr, long lines)
- 		return NULL;
- 
- 	msg = dbmail_message_new(NULL);
--	msg = dbmail_message_retrieve(msg, physmessage_id);
-+	if (! (msg = dbmail_message_retrieve(msg, physmessage_id)))
-+		return NULL;
-+
- 	stream = msg->crlf;
- 
- 	if (lines >=0) {
diff --git a/mail/dbmail/files/patch-src_pop3.c b/mail/dbmail/files/patch-src_pop3.c
deleted file mode 100644
index 5d021fabdd21..000000000000
--- a/mail/dbmail/files/patch-src_pop3.c
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git src/pop3.c src/pop3.c
-index 2b8792e..a09524e 100644
---- src/pop3.c
-+++ src/pop3.c
-@@ -302,7 +302,6 @@ int pop3_error(ClientSession_T * session, const char *formatstring, ...)
- 
- 	if (session->error_count >= MAX_ERRORS) {
- 		ci_write(ci, "-ERR too many errors\r\n");
--		client_session_bailout(&session);
- 		return -3;
- 	} 
- 	va_start(ap, formatstring);
-@@ -314,7 +313,6 @@ int pop3_error(ClientSession_T * session, const char *formatstring, ...)
- 	g_free(s);
- 
- 	if (ci->client_state & CLIENT_ERR) {
--		client_session_bailout(&session);
- 		return -3;
- 	}
- 
diff --git a/mail/dbmail/pkg-message b/mail/dbmail/pkg-message
deleted file mode 100644
index 73bfb8260a82..000000000000
--- a/mail/dbmail/pkg-message
+++ /dev/null
@@ -1,13 +0,0 @@
-
-************************************************************************
-
-See INSTALL for Installation instructions
-
-IMPORTANT NOTE FOR ADMINS UPGRADING FROM A PREVIOUS RELEASE
-
-There are a number of significant changes including Dependencies,
-Config, Schema and Server changes. See UPGRADING for details.
-
-Don't forget to backup and fully test before upgrading.
-
-************************************************************************