- Update to 2.3.6

- While here, clean up pkg-plist a bit

PR:		136724
Submitted by:	Mark Starovoytov <mark_sf@kikg.ifmo.ru> (maintainer)

5 files changed, 35 insertions, 154 deletions

diff --git a/mail/dbmail23/Makefile b/mail/dbmail23/Makefile
index 6150f581c838..33afcd7a7e06 100644
--- a/mail/dbmail23/Makefile
+++ b/mail/dbmail23/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	dbmail
-PORTVERSION=	2.3.5
-PORTREVISION=	3
+PORTVERSION=	2.3.6
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dbmail.org/download/2.3/
 
@@ -52,8 +51,6 @@ ADDITIONAL_DOCS=README.aliases README.exim README.ldap \
 PORTDOCS=	${MAIN_DOCS} ${ADDITIONAL_DOCS}
 SUB_FILES=	pkg-message
 
-PLIST_SUB+=	PORTNAME=${PORTNAME}
-
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_MYSQL)
diff --git a/mail/dbmail23/distinfo b/mail/dbmail23/distinfo
index 76e0806fba13..1b57bce19e4b 100644
--- a/mail/dbmail23/distinfo
+++ b/mail/dbmail23/distinfo
@@ -1,3 +1,3 @@
-MD5 (dbmail-2.3.5.tar.gz) = a3d4a9ab37686e2f62726083b075ac61
-SHA256 (dbmail-2.3.5.tar.gz) = 1fba44a0a41c324e60e01af5bffa388b0219491e6438135518241b24de205187
-SIZE (dbmail-2.3.5.tar.gz) = 902269
+MD5 (dbmail-2.3.6.tar.gz) = a2bbd25dde8774df7caefeda080569a9
+SHA256 (dbmail-2.3.6.tar.gz) = 711816180faca944495a93355313311d8c8edb41d7d182179361802e7dd28e8b
+SIZE (dbmail-2.3.6.tar.gz) = 916908
diff --git a/mail/dbmail23/files/patch-dm_db.c b/mail/dbmail23/files/patch-dm_db.c
deleted file mode 100644
index 2daeb25fb510..000000000000
--- a/mail/dbmail23/files/patch-dm_db.c
+++ /dev/null
@@ -1,114 +0,0 @@
---- src/dm_db.c.orig	Tue Jan  6 14:51:55 2009
-+++ src/dm_db.c	Sun Jan 25 19:25:06 2009
-@@ -312,8 +312,9 @@
- 	TRACE(TRACE_DATABASE,"[%p] [%s]", c, query);
- 	TRY
- 		gettimeofday(&before, NULL);
--		result = Connection_execute(c, query);
-+		Connection_execute(c, query);
- 		gettimeofday(&after, NULL);
-+		result = TRUE;
- 	CATCH(SQLException)
- 		LOG_SQLERROR;
- 		TRACE(TRACE_ERR,"failed query [%s]", query);
-@@ -395,26 +396,51 @@
- int db_stmt_set_str(S s, int index, const char *x)
- {
- 	TRACE(TRACE_DATABASE,"[%p] %d:[%s]", s, index, x);
--	return PreparedStatement_setString(s, index, x);
-+	TRY
-+		PreparedStatement_setString(s, index, x);
-+		return TRUE;
-+	CATCH(SQLException)
-+		return FALSE;
-+	END_TRY;
- }
- int db_stmt_set_int(S s, int index, int x)
- {
- 	TRACE(TRACE_DATABASE,"[%p] %d:[%d]", s, index, x);
--	return PreparedStatement_setInt(s, index, x);
-+	TRY
-+		PreparedStatement_setInt(s, index, x);
-+		return TRUE;
-+	CATCH(SQLException)
-+		return FALSE;
-+	END_TRY;
- }
- int db_stmt_set_u64(S s, int index, u64_t x)
- {	
- 	TRACE(TRACE_DATABASE,"[%p] %d:[%llu]", s, index, x);
--	return PreparedStatement_setLLong(s, index, (long long)x);
-+	TRY
-+		PreparedStatement_setLLong(s, index, (long long)x);
-+		return TRUE;
-+	CATCH(SQLException)
-+		return FALSE;
-+	END_TRY;
- }
- int db_stmt_set_blob(S s, int index, const void *x, int size)
- {
- //	TRACE(TRACE_DATABASE,"[%p] %d:[%s]", s, index, (const char *)x);
--	return PreparedStatement_setBlob(s, index, x, size);
-+	TRY
-+		PreparedStatement_setBlob(s, index, x, size);
-+		return TRUE;
-+	CATCH(SQLException)
-+		return FALSE;
-+	END_TRY;
- }
- gboolean db_stmt_exec(S s)
- {
--	return PreparedStatement_execute(s);
-+	TRY
-+		PreparedStatement_execute(s);
-+		return TRUE;
-+	CATCH(SQLException)
-+		return FALSE;
-+	END_TRY;
- }
- R db_stmt_query(S s)
- {
-@@ -474,28 +500,36 @@
- int db_begin_transaction(C c)
- {
- 	TRACE(TRACE_DATABASE,"BEGIN");
--	if (! Connection_beginTransaction(c))
-+	TRY
-+		Connection_beginTransaction(c);
-+		return DM_SUCCESS;
-+	CATCH(SQLException)
- 		return DM_EQUERY;
--	return DM_SUCCESS;
-+	END_TRY;
- }
- 
- int db_commit_transaction(C c)
- {
- 	TRACE(TRACE_DATABASE,"COMMIT");
--	if (! Connection_commit(c)) {
-+	TRY
-+		Connection_commit(c);
-+		return DM_SUCCESS;
-+	CATCH(SQLException)
- 		db_rollback_transaction(c);
- 		return DM_EQUERY;
--	}
--	return DM_SUCCESS;
-+	END_TRY;
- }
- 
- 
- int db_rollback_transaction(C c)
- {
- 	TRACE(TRACE_DATABASE,"ROLLBACK");
--	if (! Connection_rollback(c))
-+	TRY
-+		Connection_rollback(c);
-+		return DM_SUCCESS;
-+	CATCH(SQLException)
- 		return DM_EQUERY;
--	return DM_SUCCESS;
-+	END_TRY;
- }
- 
- int db_savepoint(C UNUSED c, const char UNUSED *id)
diff --git a/mail/dbmail23/files/patch-imap4.c b/mail/dbmail23/files/patch-imap4.c
index e3c1aab352dc..a2a5c0a2b6c9 100644
--- a/mail/dbmail23/files/patch-imap4.c
+++ b/mail/dbmail23/files/patch-imap4.c
@@ -1,11 +1,11 @@
---- src/imap4.c.orig	Tue Jan  6 14:51:55 2009
-+++ src/imap4.c	Sun Jan 25 18:35:09 2009
-@@ -172,7 +172,7 @@
+--- src/imap4.c.orig	Sun Jun 28 17:48:24 2009
++++ src/imap4.c	Mon Jul 13 21:25:51 2009
+@@ -204,7 +204,7 @@
  	if (strlen(banner) > 0)
  		imap_session_printf(session, "* OK %s\r\n", banner);
  	else
 -		imap_session_printf(session, "* OK imap 4r1 server (dbmail %s)\r\n", VERSION);
 +		imap_session_printf(session, "* OK imap 4r1 server (dbmail %s)\r\n", DBMAIL_VERSION);
- 	dbmail_imap_session_set_state(session,IMAPCS_NON_AUTHENTICATED);
+ 	dbmail_imap_session_set_state(session,CLIENTSTATE_NON_AUTHENTICATED);
  }
  
diff --git a/mail/dbmail23/pkg-plist b/mail/dbmail23/pkg-plist
index 9416f9d27df7..72eff0bb9252 100644
--- a/mail/dbmail23/pkg-plist
+++ b/mail/dbmail23/pkg-plist
@@ -1,7 +1,6 @@
 @unexec if cmp -s %D/etc/dbmail.conf-dist %D/etc/dbmail.conf; then rm -f %D/etc/dbmail.conf; fi
 etc/dbmail.conf-dist
 @exec if [ ! -f %D/etc/dbmail.conf ] ; then cp -p %D/%F %B/dbmail.conf; fi
-@exec mkdir -p %D/lib/dbmail
 %%LDAP%%lib/dbmail/libauth_ldap.a
 %%LDAP%%lib/dbmail/libauth_ldap.la
 %%LDAP%%lib/dbmail/libauth_ldap.so
@@ -28,31 +27,30 @@ sbin/dbmail-pop3d
 %%SIEVE%%sbin/dbmail-timsieved
 sbin/dbmail-users
 sbin/dbmail-util
-@exec mkdir -p %D/share/%%PORTNAME%%
-%%MYSQL%%@exec mkdir -p %D/share/PORTNAME/%%PORTNAME%%/mysql
-%%MYSQL%%share/%%PORTNAME%%/mysql/2_1_7-2_2_0.mysql
-%%MYSQL%%share/%%PORTNAME%%/mysql/2_2_5-2_3_0.mysql
-%%MYSQL%%share/%%PORTNAME%%/mysql/2_3_0-2_3_2.mysql
-%%MYSQL%%share/%%PORTNAME%%/mysql/2_3_4-2_3_5.mysql
-%%MYSQL%%share/%%PORTNAME%%/mysql/create_tables.mysql
-%%MYSQL%%share/%%PORTNAME%%/mysql/fix_foreign_keys.mysql
-%%MYSQL%%share/%%PORTNAME%%/mysql/migrate_from_1.x_to_2.0_innodb.mysql
-%%MYSQL%%share/%%PORTNAME%%/mysql/migrate_from_2.0_to_2.2.mysql
-%%MYSQL%%share/%%PORTNAME%%/mysql/update_headervalue_01.mysql
-%%MYSQL%%@dirrm share/%%PORTNAME%%/mysql
-%%PGSQL%%@exec mkdir -p %D/share/PORTNAME/%%PORTNAME%%/postgresql
-%%PGSQL%%share/%%PORTNAME%%/postgresql/2_1_7-2_2_0.pgsql
-%%PGSQL%%share/%%PORTNAME%%/postgresql/2_2_5-2_3_0.pgsql
-%%PGSQL%%share/%%PORTNAME%%/postgresql/2_3_4-2_3_5.pgsql
-%%PGSQL%%share/%%PORTNAME%%/postgresql/create_tables.pgsql
-%%PGSQL%%share/%%PORTNAME%%/postgresql/migrate_from_1.x_to_2.0.pgsql
-%%PGSQL%%share/%%PORTNAME%%/postgresql/migrate_from_2.0_to_2.2.pgsql
-%%PGSQL%%@dirrm share/%%PORTNAME%%/postgresql
-%%SQLITE%%@exec mkdir -p %D/share/PORTNAME/%%PORTNAME%%/sqlite
-%%SQLITE%%share/%%PORTNAME%%/sqlite/2_1_7-2_2_0.sqlite
-%%SQLITE%%share/%%PORTNAME%%/sqlite/2_2_5-2_3_0.sqlite
-%%SQLITE%%share/%%PORTNAME%%/sqlite/2_3_4-2_3_5.sqlite
-%%SQLITE%%share/%%PORTNAME%%/sqlite/create_tables.sqlite
-%%SQLITE%%share/%%PORTNAME%%/sqlite/trigger.tmpl.sql
-%%SQLITE%%@dirrm share/%%PORTNAME%%/sqlite
-@dirrm share/%%PORTNAME%%
+%%MYSQL%%%%DATADIR%%/mysql/2_1_7-2_2_0.mysql
+%%MYSQL%%%%DATADIR%%/mysql/2_2_5-2_3_0.mysql
+%%MYSQL%%%%DATADIR%%/mysql/2_3_0-2_3_2.mysql
+%%MYSQL%%%%DATADIR%%/mysql/2_3_4-2_3_5.mysql
+%%MYSQL%%%%DATADIR%%/mysql/2_3_5-2_3_6.mysql
+%%MYSQL%%%%DATADIR%%/mysql/create_tables.mysql
+%%MYSQL%%%%DATADIR%%/mysql/fix_foreign_keys.mysql
+%%MYSQL%%%%DATADIR%%/mysql/migrate_from_1.x_to_2.0_innodb.mysql
+%%MYSQL%%%%DATADIR%%/mysql/migrate_from_2.0_to_2.2.mysql
+%%MYSQL%%%%DATADIR%%/mysql/update_headervalue_01.mysql
+%%MYSQL%%@dirrm %%DATADIR%%/mysql
+%%PGSQL%%%%DATADIR%%/postgresql/2_1_7-2_2_0.pgsql
+%%PGSQL%%%%DATADIR%%/postgresql/2_2_5-2_3_0.pgsql
+%%PGSQL%%%%DATADIR%%/postgresql/2_3_4-2_3_5.pgsql
+%%PGSQL%%%%DATADIR%%/postgresql/2_3_5-2_3_6.pgsql
+%%PGSQL%%%%DATADIR%%/postgresql/create_tables.pgsql
+%%PGSQL%%%%DATADIR%%/postgresql/migrate_from_1.x_to_2.0.pgsql
+%%PGSQL%%%%DATADIR%%/postgresql/migrate_from_2.0_to_2.2.pgsql
+%%PGSQL%%@dirrm %%DATADIR%%/postgresql
+%%SQLITE%%%%DATADIR%%/sqlite/2_1_7-2_2_0.sqlite
+%%SQLITE%%%%DATADIR%%/sqlite/2_2_5-2_3_0.sqlite
+%%SQLITE%%%%DATADIR%%/sqlite/2_3_4-2_3_5.sqlite
+%%SQLITE%%%%DATADIR%%/sqlite/2_3_5-2_3_6.sqlite
+%%SQLITE%%%%DATADIR%%/sqlite/create_tables.sqlite
+%%SQLITE%%%%DATADIR%%/sqlite/trigger.tmpl.sql
+%%SQLITE%%@dirrm %%DATADIR%%/sqlite
+@dirrm %%DATADIR%%