Update dbmail to 2.0.0. This upgrade requires a migration script to be run.

See UPDATING for details.  Grab maintainership of this port for the time being.

10 files changed, 215 insertions, 180 deletions

diff --git a/mail/dbmail-devel/Makefile b/mail/dbmail-devel/Makefile
index 586abe59846d..ce379a171139 100644
--- a/mail/dbmail-devel/Makefile
+++ b/mail/dbmail-devel/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	dbmail
-PORTVERSION=	1.2.9
+PORTVERSION=	2.0.0
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dbmail.org/download/
 PKGNAMESUFFIX=	-${DATABASE}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	seanc@FreeBSD.org
 COMMENT=	An SQL database-based mail system (POP3 and IMAP)
 
 USE_REINPLACE=	YES
@@ -41,8 +41,9 @@ LDFLAGS+=		-L${LOCALBASE}/lib/mysql
 CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE}
 PORTDOCS=		INSTALL README EXTRAS
 
-MAN1=			dbmail-adduser.1 dbmail-imapd.1 \
-			dbmail-maintenance.1 dbmail-pop3d.1 dbmail-smtp.1
+MAN1=			dbmail-smtp.1
+MAN8=			dbmail-imapd.8 dbmail-lmtpd.8 dbmail-pop3d.8 \
+			dbmail-users.8 dbmail-util.8
 MANCOMPRESSED=		no
 
 pre-everything::
@@ -65,10 +66,17 @@ post-install:
 	@${MKDIR} ${DATADIR}/sql
 	@${INSTALL_DATA} ${WRKSRC}/sql/${DATABASE}/* ${DATADIR}/sql
 	@cd ${WRKSRC}/man && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1
-	@${RM} ${PREFIX}/bin/install-dbmail.sh
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
+	@${ECHO} ""
+	@${ECHO} "IMPORTANT NOTE FOR ADMINS UPGRADING FROM 1.X->2.X!!!"
+	@${ECHO} ""
+	@${ECHO} "	*) Don't forget to update the database using a script from"
+	@${ECHO} "	   ${DATADIR}/sql/"
+	@${ECHO} "	*) Many programs have been renamed and their arguments changed."
+	@${ECHO} "	*) Read the upgrading notes."
+	@${ECHO} "	*) Don't be careless with this upgrade or mail will be lost!"
 
 .include <bsd.port.mk>
diff --git a/mail/dbmail-devel/pkg-plist b/mail/dbmail-devel/pkg-plist
index ad4d35b22245..82a3966d018d 100644
--- a/mail/dbmail-devel/pkg-plist
+++ b/mail/dbmail-devel/pkg-plist
@@ -1,37 +1,36 @@
-bin/dbmail-adduser
-bin/dbmail-imapd
-bin/dbmail-maintenance
-bin/dbmail-mini-injector
-bin/dbmail-pop3d
-bin/dbmail-readvut
-bin/dbmail-smtp
-bin/raw-convertor
 etc/dbmail.conf-dist
-%%MYSQL%%lib/libmysqldbmail.a
-%%PGSQL%%lib/libpgsqldbmail.a
-%%MYSQL%%%%DATADIR%%/sql/add-lastlogin.mysql
-%%MYSQL%%%%DATADIR%%/sql/add_auto_notification.mysql
-%%MYSQL%%%%DATADIR%%/sql/add_auto_reply.mysql
-%%MYSQL%%%%DATADIR%%/sql/add_rfcsize.mysql
+lib/dbmail/libauthdbmail.0
+lib/dbmail/libauthdbmail.a
+lib/dbmail/libauthdbmail.la
+lib/dbmail/libauthdbmail
+lib/dbmail/libsortdbmail.0
+lib/dbmail/libsortdbmail.a
+lib/dbmail/libsortdbmail.la
+lib/dbmail/libsortdbmail
+lib/libdbmail
+lib/libdbmail.0
+lib/libdbmail.a
+lib/libdbmail.la
+sbin/dbmail-imapd
+sbin/dbmail-lmtpd
+sbin/dbmail-pop3d
+sbin/dbmail-smtp
+sbin/dbmail-users
+sbin/dbmail-util
 %%MYSQL%%%%DATADIR%%/sql/create_tables.mysql
 %%MYSQL%%%%DATADIR%%/sql/create_tables_innoDB.mysql
-%%MYSQL%%%%DATADIR%%/sql/newnames.mysql
-%%MYSQL%%%%DATADIR%%/sql/pop_before_smtp.mysql
-%%MYSQL%%%%DATADIR%%/sql/update_encryption.mysql
-%%MYSQL%%%%DATADIR%%/sql/update_mailbox_subscribed_folders.mysql
-%%MYSQL%%%%DATADIR%%/sql/update_mysql_tmptables.mysql
-%%MYSQL%%%%DATADIR%%/sql/update_ownerid_aliases.mysql
-%%PGSQL%%%%DATADIR%%/sql/add-constraints.pgsql
-%%PGSQL%%%%DATADIR%%/sql/add-indexes-fkeys-to-1.2.pgsql
-%%PGSQL%%%%DATADIR%%/sql/add-lastlogin.postgresql
-%%PGSQL%%%%DATADIR%%/sql/add_auto_notification.pgsql
-%%PGSQL%%%%DATADIR%%/sql/add_auto_reply.pgsql
-%%PGSQL%%%%DATADIR%%/sql/add_rfcsize.postgresql
+%%MYSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0.mysql
+%%MYSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0_innodb.mysql
+%%MYSQL%%/lib/dbmail/libmysqldbmail.0
+%%MYSQL%%/lib/dbmail/libmysqldbmail.a
+%%MYSQL%%/lib/dbmail/libmysqldbmail.la
+%%MYSQL%%/lib/dbmail/libmysqldbmail
 %%PGSQL%%%%DATADIR%%/sql/create_tables.pgsql
-%%PGSQL%%%%DATADIR%%/sql/md5_alter_users.7.3-pgsql
-%%PGSQL%%%%DATADIR%%/sql/md5_alter_users.pre_7.3-pgsql
-%%PGSQL%%%%DATADIR%%/sql/no-constraint-tables.pgsql
-%%PGSQL%%%%DATADIR%%/sql/pop_before_smtp.pgsql
-%%PGSQL%%%%DATADIR%%/sql/update_encryption.pgsql
+%%PGSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0.pgsql
+%%PGSQL%%/lib/dbmail/libpgsqldbmail.0
+%%PGSQL%%/lib/dbmail/libpgsqldbmail.a
+%%PGSQL%%/lib/dbmail/libpgsqldbmail.la
+%%PGSQL%%/lib/dbmail/libpgsqldbmail
+@dirrm lib/dbmail
 @dirrm %%DATADIR%%/sql
 @dirrm %%DATADIR%%
diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile
index 586abe59846d..ce379a171139 100644
--- a/mail/dbmail/Makefile
+++ b/mail/dbmail/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	dbmail
-PORTVERSION=	1.2.9
+PORTVERSION=	2.0.0
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dbmail.org/download/
 PKGNAMESUFFIX=	-${DATABASE}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	seanc@FreeBSD.org
 COMMENT=	An SQL database-based mail system (POP3 and IMAP)
 
 USE_REINPLACE=	YES
@@ -41,8 +41,9 @@ LDFLAGS+=		-L${LOCALBASE}/lib/mysql
 CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE}
 PORTDOCS=		INSTALL README EXTRAS
 
-MAN1=			dbmail-adduser.1 dbmail-imapd.1 \
-			dbmail-maintenance.1 dbmail-pop3d.1 dbmail-smtp.1
+MAN1=			dbmail-smtp.1
+MAN8=			dbmail-imapd.8 dbmail-lmtpd.8 dbmail-pop3d.8 \
+			dbmail-users.8 dbmail-util.8
 MANCOMPRESSED=		no
 
 pre-everything::
@@ -65,10 +66,17 @@ post-install:
 	@${MKDIR} ${DATADIR}/sql
 	@${INSTALL_DATA} ${WRKSRC}/sql/${DATABASE}/* ${DATADIR}/sql
 	@cd ${WRKSRC}/man && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1
-	@${RM} ${PREFIX}/bin/install-dbmail.sh
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
+	@${ECHO} ""
+	@${ECHO} "IMPORTANT NOTE FOR ADMINS UPGRADING FROM 1.X->2.X!!!"
+	@${ECHO} ""
+	@${ECHO} "	*) Don't forget to update the database using a script from"
+	@${ECHO} "	   ${DATADIR}/sql/"
+	@${ECHO} "	*) Many programs have been renamed and their arguments changed."
+	@${ECHO} "	*) Read the upgrading notes."
+	@${ECHO} "	*) Don't be careless with this upgrade or mail will be lost!"
 
 .include <bsd.port.mk>
diff --git a/mail/dbmail/pkg-plist b/mail/dbmail/pkg-plist
index ad4d35b22245..82a3966d018d 100644
--- a/mail/dbmail/pkg-plist
+++ b/mail/dbmail/pkg-plist
@@ -1,37 +1,36 @@
-bin/dbmail-adduser
-bin/dbmail-imapd
-bin/dbmail-maintenance
-bin/dbmail-mini-injector
-bin/dbmail-pop3d
-bin/dbmail-readvut
-bin/dbmail-smtp
-bin/raw-convertor
 etc/dbmail.conf-dist
-%%MYSQL%%lib/libmysqldbmail.a
-%%PGSQL%%lib/libpgsqldbmail.a
-%%MYSQL%%%%DATADIR%%/sql/add-lastlogin.mysql
-%%MYSQL%%%%DATADIR%%/sql/add_auto_notification.mysql
-%%MYSQL%%%%DATADIR%%/sql/add_auto_reply.mysql
-%%MYSQL%%%%DATADIR%%/sql/add_rfcsize.mysql
+lib/dbmail/libauthdbmail.0
+lib/dbmail/libauthdbmail.a
+lib/dbmail/libauthdbmail.la
+lib/dbmail/libauthdbmail
+lib/dbmail/libsortdbmail.0
+lib/dbmail/libsortdbmail.a
+lib/dbmail/libsortdbmail.la
+lib/dbmail/libsortdbmail
+lib/libdbmail
+lib/libdbmail.0
+lib/libdbmail.a
+lib/libdbmail.la
+sbin/dbmail-imapd
+sbin/dbmail-lmtpd
+sbin/dbmail-pop3d
+sbin/dbmail-smtp
+sbin/dbmail-users
+sbin/dbmail-util
 %%MYSQL%%%%DATADIR%%/sql/create_tables.mysql
 %%MYSQL%%%%DATADIR%%/sql/create_tables_innoDB.mysql
-%%MYSQL%%%%DATADIR%%/sql/newnames.mysql
-%%MYSQL%%%%DATADIR%%/sql/pop_before_smtp.mysql
-%%MYSQL%%%%DATADIR%%/sql/update_encryption.mysql
-%%MYSQL%%%%DATADIR%%/sql/update_mailbox_subscribed_folders.mysql
-%%MYSQL%%%%DATADIR%%/sql/update_mysql_tmptables.mysql
-%%MYSQL%%%%DATADIR%%/sql/update_ownerid_aliases.mysql
-%%PGSQL%%%%DATADIR%%/sql/add-constraints.pgsql
-%%PGSQL%%%%DATADIR%%/sql/add-indexes-fkeys-to-1.2.pgsql
-%%PGSQL%%%%DATADIR%%/sql/add-lastlogin.postgresql
-%%PGSQL%%%%DATADIR%%/sql/add_auto_notification.pgsql
-%%PGSQL%%%%DATADIR%%/sql/add_auto_reply.pgsql
-%%PGSQL%%%%DATADIR%%/sql/add_rfcsize.postgresql
+%%MYSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0.mysql
+%%MYSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0_innodb.mysql
+%%MYSQL%%/lib/dbmail/libmysqldbmail.0
+%%MYSQL%%/lib/dbmail/libmysqldbmail.a
+%%MYSQL%%/lib/dbmail/libmysqldbmail.la
+%%MYSQL%%/lib/dbmail/libmysqldbmail
 %%PGSQL%%%%DATADIR%%/sql/create_tables.pgsql
-%%PGSQL%%%%DATADIR%%/sql/md5_alter_users.7.3-pgsql
-%%PGSQL%%%%DATADIR%%/sql/md5_alter_users.pre_7.3-pgsql
-%%PGSQL%%%%DATADIR%%/sql/no-constraint-tables.pgsql
-%%PGSQL%%%%DATADIR%%/sql/pop_before_smtp.pgsql
-%%PGSQL%%%%DATADIR%%/sql/update_encryption.pgsql
+%%PGSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0.pgsql
+%%PGSQL%%/lib/dbmail/libpgsqldbmail.0
+%%PGSQL%%/lib/dbmail/libpgsqldbmail.a
+%%PGSQL%%/lib/dbmail/libpgsqldbmail.la
+%%PGSQL%%/lib/dbmail/libpgsqldbmail
+@dirrm lib/dbmail
 @dirrm %%DATADIR%%/sql
 @dirrm %%DATADIR%%
diff --git a/mail/dbmail20/Makefile b/mail/dbmail20/Makefile
index 586abe59846d..ce379a171139 100644
--- a/mail/dbmail20/Makefile
+++ b/mail/dbmail20/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	dbmail
-PORTVERSION=	1.2.9
+PORTVERSION=	2.0.0
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dbmail.org/download/
 PKGNAMESUFFIX=	-${DATABASE}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	seanc@FreeBSD.org
 COMMENT=	An SQL database-based mail system (POP3 and IMAP)
 
 USE_REINPLACE=	YES
@@ -41,8 +41,9 @@ LDFLAGS+=		-L${LOCALBASE}/lib/mysql
 CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE}
 PORTDOCS=		INSTALL README EXTRAS
 
-MAN1=			dbmail-adduser.1 dbmail-imapd.1 \
-			dbmail-maintenance.1 dbmail-pop3d.1 dbmail-smtp.1
+MAN1=			dbmail-smtp.1
+MAN8=			dbmail-imapd.8 dbmail-lmtpd.8 dbmail-pop3d.8 \
+			dbmail-users.8 dbmail-util.8
 MANCOMPRESSED=		no
 
 pre-everything::
@@ -65,10 +66,17 @@ post-install:
 	@${MKDIR} ${DATADIR}/sql
 	@${INSTALL_DATA} ${WRKSRC}/sql/${DATABASE}/* ${DATADIR}/sql
 	@cd ${WRKSRC}/man && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1
-	@${RM} ${PREFIX}/bin/install-dbmail.sh
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
+	@${ECHO} ""
+	@${ECHO} "IMPORTANT NOTE FOR ADMINS UPGRADING FROM 1.X->2.X!!!"
+	@${ECHO} ""
+	@${ECHO} "	*) Don't forget to update the database using a script from"
+	@${ECHO} "	   ${DATADIR}/sql/"
+	@${ECHO} "	*) Many programs have been renamed and their arguments changed."
+	@${ECHO} "	*) Read the upgrading notes."
+	@${ECHO} "	*) Don't be careless with this upgrade or mail will be lost!"
 
 .include <bsd.port.mk>
diff --git a/mail/dbmail20/pkg-plist b/mail/dbmail20/pkg-plist
index ad4d35b22245..82a3966d018d 100644
--- a/mail/dbmail20/pkg-plist
+++ b/mail/dbmail20/pkg-plist
@@ -1,37 +1,36 @@
-bin/dbmail-adduser
-bin/dbmail-imapd
-bin/dbmail-maintenance
-bin/dbmail-mini-injector
-bin/dbmail-pop3d
-bin/dbmail-readvut
-bin/dbmail-smtp
-bin/raw-convertor
 etc/dbmail.conf-dist
-%%MYSQL%%lib/libmysqldbmail.a
-%%PGSQL%%lib/libpgsqldbmail.a
-%%MYSQL%%%%DATADIR%%/sql/add-lastlogin.mysql
-%%MYSQL%%%%DATADIR%%/sql/add_auto_notification.mysql
-%%MYSQL%%%%DATADIR%%/sql/add_auto_reply.mysql
-%%MYSQL%%%%DATADIR%%/sql/add_rfcsize.mysql
+lib/dbmail/libauthdbmail.0
+lib/dbmail/libauthdbmail.a
+lib/dbmail/libauthdbmail.la
+lib/dbmail/libauthdbmail
+lib/dbmail/libsortdbmail.0
+lib/dbmail/libsortdbmail.a
+lib/dbmail/libsortdbmail.la
+lib/dbmail/libsortdbmail
+lib/libdbmail
+lib/libdbmail.0
+lib/libdbmail.a
+lib/libdbmail.la
+sbin/dbmail-imapd
+sbin/dbmail-lmtpd
+sbin/dbmail-pop3d
+sbin/dbmail-smtp
+sbin/dbmail-users
+sbin/dbmail-util
 %%MYSQL%%%%DATADIR%%/sql/create_tables.mysql
 %%MYSQL%%%%DATADIR%%/sql/create_tables_innoDB.mysql
-%%MYSQL%%%%DATADIR%%/sql/newnames.mysql
-%%MYSQL%%%%DATADIR%%/sql/pop_before_smtp.mysql
-%%MYSQL%%%%DATADIR%%/sql/update_encryption.mysql
-%%MYSQL%%%%DATADIR%%/sql/update_mailbox_subscribed_folders.mysql
-%%MYSQL%%%%DATADIR%%/sql/update_mysql_tmptables.mysql
-%%MYSQL%%%%DATADIR%%/sql/update_ownerid_aliases.mysql
-%%PGSQL%%%%DATADIR%%/sql/add-constraints.pgsql
-%%PGSQL%%%%DATADIR%%/sql/add-indexes-fkeys-to-1.2.pgsql
-%%PGSQL%%%%DATADIR%%/sql/add-lastlogin.postgresql
-%%PGSQL%%%%DATADIR%%/sql/add_auto_notification.pgsql
-%%PGSQL%%%%DATADIR%%/sql/add_auto_reply.pgsql
-%%PGSQL%%%%DATADIR%%/sql/add_rfcsize.postgresql
+%%MYSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0.mysql
+%%MYSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0_innodb.mysql
+%%MYSQL%%/lib/dbmail/libmysqldbmail.0
+%%MYSQL%%/lib/dbmail/libmysqldbmail.a
+%%MYSQL%%/lib/dbmail/libmysqldbmail.la
+%%MYSQL%%/lib/dbmail/libmysqldbmail
 %%PGSQL%%%%DATADIR%%/sql/create_tables.pgsql
-%%PGSQL%%%%DATADIR%%/sql/md5_alter_users.7.3-pgsql
-%%PGSQL%%%%DATADIR%%/sql/md5_alter_users.pre_7.3-pgsql
-%%PGSQL%%%%DATADIR%%/sql/no-constraint-tables.pgsql
-%%PGSQL%%%%DATADIR%%/sql/pop_before_smtp.pgsql
-%%PGSQL%%%%DATADIR%%/sql/update_encryption.pgsql
+%%PGSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0.pgsql
+%%PGSQL%%/lib/dbmail/libpgsqldbmail.0
+%%PGSQL%%/lib/dbmail/libpgsqldbmail.a
+%%PGSQL%%/lib/dbmail/libpgsqldbmail.la
+%%PGSQL%%/lib/dbmail/libpgsqldbmail
+@dirrm lib/dbmail
 @dirrm %%DATADIR%%/sql
 @dirrm %%DATADIR%%
diff --git a/mail/dbmail21/Makefile b/mail/dbmail21/Makefile
index 586abe59846d..ce379a171139 100644
--- a/mail/dbmail21/Makefile
+++ b/mail/dbmail21/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	dbmail
-PORTVERSION=	1.2.9
+PORTVERSION=	2.0.0
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dbmail.org/download/
 PKGNAMESUFFIX=	-${DATABASE}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	seanc@FreeBSD.org
 COMMENT=	An SQL database-based mail system (POP3 and IMAP)
 
 USE_REINPLACE=	YES
@@ -41,8 +41,9 @@ LDFLAGS+=		-L${LOCALBASE}/lib/mysql
 CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE}
 PORTDOCS=		INSTALL README EXTRAS
 
-MAN1=			dbmail-adduser.1 dbmail-imapd.1 \
-			dbmail-maintenance.1 dbmail-pop3d.1 dbmail-smtp.1
+MAN1=			dbmail-smtp.1
+MAN8=			dbmail-imapd.8 dbmail-lmtpd.8 dbmail-pop3d.8 \
+			dbmail-users.8 dbmail-util.8
 MANCOMPRESSED=		no
 
 pre-everything::
@@ -65,10 +66,17 @@ post-install:
 	@${MKDIR} ${DATADIR}/sql
 	@${INSTALL_DATA} ${WRKSRC}/sql/${DATABASE}/* ${DATADIR}/sql
 	@cd ${WRKSRC}/man && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1
-	@${RM} ${PREFIX}/bin/install-dbmail.sh
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
+	@${ECHO} ""
+	@${ECHO} "IMPORTANT NOTE FOR ADMINS UPGRADING FROM 1.X->2.X!!!"
+	@${ECHO} ""
+	@${ECHO} "	*) Don't forget to update the database using a script from"
+	@${ECHO} "	   ${DATADIR}/sql/"
+	@${ECHO} "	*) Many programs have been renamed and their arguments changed."
+	@${ECHO} "	*) Read the upgrading notes."
+	@${ECHO} "	*) Don't be careless with this upgrade or mail will be lost!"
 
 .include <bsd.port.mk>
diff --git a/mail/dbmail21/pkg-plist b/mail/dbmail21/pkg-plist
index ad4d35b22245..82a3966d018d 100644
--- a/mail/dbmail21/pkg-plist
+++ b/mail/dbmail21/pkg-plist
@@ -1,37 +1,36 @@
-bin/dbmail-adduser
-bin/dbmail-imapd
-bin/dbmail-maintenance
-bin/dbmail-mini-injector
-bin/dbmail-pop3d
-bin/dbmail-readvut
-bin/dbmail-smtp
-bin/raw-convertor
 etc/dbmail.conf-dist
-%%MYSQL%%lib/libmysqldbmail.a
-%%PGSQL%%lib/libpgsqldbmail.a
-%%MYSQL%%%%DATADIR%%/sql/add-lastlogin.mysql
-%%MYSQL%%%%DATADIR%%/sql/add_auto_notification.mysql
-%%MYSQL%%%%DATADIR%%/sql/add_auto_reply.mysql
-%%MYSQL%%%%DATADIR%%/sql/add_rfcsize.mysql
+lib/dbmail/libauthdbmail.0
+lib/dbmail/libauthdbmail.a
+lib/dbmail/libauthdbmail.la
+lib/dbmail/libauthdbmail
+lib/dbmail/libsortdbmail.0
+lib/dbmail/libsortdbmail.a
+lib/dbmail/libsortdbmail.la
+lib/dbmail/libsortdbmail
+lib/libdbmail
+lib/libdbmail.0
+lib/libdbmail.a
+lib/libdbmail.la
+sbin/dbmail-imapd
+sbin/dbmail-lmtpd
+sbin/dbmail-pop3d
+sbin/dbmail-smtp
+sbin/dbmail-users
+sbin/dbmail-util
 %%MYSQL%%%%DATADIR%%/sql/create_tables.mysql
 %%MYSQL%%%%DATADIR%%/sql/create_tables_innoDB.mysql
-%%MYSQL%%%%DATADIR%%/sql/newnames.mysql
-%%MYSQL%%%%DATADIR%%/sql/pop_before_smtp.mysql
-%%MYSQL%%%%DATADIR%%/sql/update_encryption.mysql
-%%MYSQL%%%%DATADIR%%/sql/update_mailbox_subscribed_folders.mysql
-%%MYSQL%%%%DATADIR%%/sql/update_mysql_tmptables.mysql
-%%MYSQL%%%%DATADIR%%/sql/update_ownerid_aliases.mysql
-%%PGSQL%%%%DATADIR%%/sql/add-constraints.pgsql
-%%PGSQL%%%%DATADIR%%/sql/add-indexes-fkeys-to-1.2.pgsql
-%%PGSQL%%%%DATADIR%%/sql/add-lastlogin.postgresql
-%%PGSQL%%%%DATADIR%%/sql/add_auto_notification.pgsql
-%%PGSQL%%%%DATADIR%%/sql/add_auto_reply.pgsql
-%%PGSQL%%%%DATADIR%%/sql/add_rfcsize.postgresql
+%%MYSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0.mysql
+%%MYSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0_innodb.mysql
+%%MYSQL%%/lib/dbmail/libmysqldbmail.0
+%%MYSQL%%/lib/dbmail/libmysqldbmail.a
+%%MYSQL%%/lib/dbmail/libmysqldbmail.la
+%%MYSQL%%/lib/dbmail/libmysqldbmail
 %%PGSQL%%%%DATADIR%%/sql/create_tables.pgsql
-%%PGSQL%%%%DATADIR%%/sql/md5_alter_users.7.3-pgsql
-%%PGSQL%%%%DATADIR%%/sql/md5_alter_users.pre_7.3-pgsql
-%%PGSQL%%%%DATADIR%%/sql/no-constraint-tables.pgsql
-%%PGSQL%%%%DATADIR%%/sql/pop_before_smtp.pgsql
-%%PGSQL%%%%DATADIR%%/sql/update_encryption.pgsql
+%%PGSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0.pgsql
+%%PGSQL%%/lib/dbmail/libpgsqldbmail.0
+%%PGSQL%%/lib/dbmail/libpgsqldbmail.a
+%%PGSQL%%/lib/dbmail/libpgsqldbmail.la
+%%PGSQL%%/lib/dbmail/libpgsqldbmail
+@dirrm lib/dbmail
 @dirrm %%DATADIR%%/sql
 @dirrm %%DATADIR%%
diff --git a/mail/dbmail22/Makefile b/mail/dbmail22/Makefile
index 586abe59846d..ce379a171139 100644
--- a/mail/dbmail22/Makefile
+++ b/mail/dbmail22/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	dbmail
-PORTVERSION=	1.2.9
+PORTVERSION=	2.0.0
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dbmail.org/download/
 PKGNAMESUFFIX=	-${DATABASE}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	seanc@FreeBSD.org
 COMMENT=	An SQL database-based mail system (POP3 and IMAP)
 
 USE_REINPLACE=	YES
@@ -41,8 +41,9 @@ LDFLAGS+=		-L${LOCALBASE}/lib/mysql
 CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE}
 PORTDOCS=		INSTALL README EXTRAS
 
-MAN1=			dbmail-adduser.1 dbmail-imapd.1 \
-			dbmail-maintenance.1 dbmail-pop3d.1 dbmail-smtp.1
+MAN1=			dbmail-smtp.1
+MAN8=			dbmail-imapd.8 dbmail-lmtpd.8 dbmail-pop3d.8 \
+			dbmail-users.8 dbmail-util.8
 MANCOMPRESSED=		no
 
 pre-everything::
@@ -65,10 +66,17 @@ post-install:
 	@${MKDIR} ${DATADIR}/sql
 	@${INSTALL_DATA} ${WRKSRC}/sql/${DATABASE}/* ${DATADIR}/sql
 	@cd ${WRKSRC}/man && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1
-	@${RM} ${PREFIX}/bin/install-dbmail.sh
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
+	@${ECHO} ""
+	@${ECHO} "IMPORTANT NOTE FOR ADMINS UPGRADING FROM 1.X->2.X!!!"
+	@${ECHO} ""
+	@${ECHO} "	*) Don't forget to update the database using a script from"
+	@${ECHO} "	   ${DATADIR}/sql/"
+	@${ECHO} "	*) Many programs have been renamed and their arguments changed."
+	@${ECHO} "	*) Read the upgrading notes."
+	@${ECHO} "	*) Don't be careless with this upgrade or mail will be lost!"
 
 .include <bsd.port.mk>
diff --git a/mail/dbmail22/pkg-plist b/mail/dbmail22/pkg-plist
index ad4d35b22245..82a3966d018d 100644
--- a/mail/dbmail22/pkg-plist
+++ b/mail/dbmail22/pkg-plist
@@ -1,37 +1,36 @@
-bin/dbmail-adduser
-bin/dbmail-imapd
-bin/dbmail-maintenance
-bin/dbmail-mini-injector
-bin/dbmail-pop3d
-bin/dbmail-readvut
-bin/dbmail-smtp
-bin/raw-convertor
 etc/dbmail.conf-dist
-%%MYSQL%%lib/libmysqldbmail.a
-%%PGSQL%%lib/libpgsqldbmail.a
-%%MYSQL%%%%DATADIR%%/sql/add-lastlogin.mysql
-%%MYSQL%%%%DATADIR%%/sql/add_auto_notification.mysql
-%%MYSQL%%%%DATADIR%%/sql/add_auto_reply.mysql
-%%MYSQL%%%%DATADIR%%/sql/add_rfcsize.mysql
+lib/dbmail/libauthdbmail.0
+lib/dbmail/libauthdbmail.a
+lib/dbmail/libauthdbmail.la
+lib/dbmail/libauthdbmail
+lib/dbmail/libsortdbmail.0
+lib/dbmail/libsortdbmail.a
+lib/dbmail/libsortdbmail.la
+lib/dbmail/libsortdbmail
+lib/libdbmail
+lib/libdbmail.0
+lib/libdbmail.a
+lib/libdbmail.la
+sbin/dbmail-imapd
+sbin/dbmail-lmtpd
+sbin/dbmail-pop3d
+sbin/dbmail-smtp
+sbin/dbmail-users
+sbin/dbmail-util
 %%MYSQL%%%%DATADIR%%/sql/create_tables.mysql
 %%MYSQL%%%%DATADIR%%/sql/create_tables_innoDB.mysql
-%%MYSQL%%%%DATADIR%%/sql/newnames.mysql
-%%MYSQL%%%%DATADIR%%/sql/pop_before_smtp.mysql
-%%MYSQL%%%%DATADIR%%/sql/update_encryption.mysql
-%%MYSQL%%%%DATADIR%%/sql/update_mailbox_subscribed_folders.mysql
-%%MYSQL%%%%DATADIR%%/sql/update_mysql_tmptables.mysql
-%%MYSQL%%%%DATADIR%%/sql/update_ownerid_aliases.mysql
-%%PGSQL%%%%DATADIR%%/sql/add-constraints.pgsql
-%%PGSQL%%%%DATADIR%%/sql/add-indexes-fkeys-to-1.2.pgsql
-%%PGSQL%%%%DATADIR%%/sql/add-lastlogin.postgresql
-%%PGSQL%%%%DATADIR%%/sql/add_auto_notification.pgsql
-%%PGSQL%%%%DATADIR%%/sql/add_auto_reply.pgsql
-%%PGSQL%%%%DATADIR%%/sql/add_rfcsize.postgresql
+%%MYSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0.mysql
+%%MYSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0_innodb.mysql
+%%MYSQL%%/lib/dbmail/libmysqldbmail.0
+%%MYSQL%%/lib/dbmail/libmysqldbmail.a
+%%MYSQL%%/lib/dbmail/libmysqldbmail.la
+%%MYSQL%%/lib/dbmail/libmysqldbmail
 %%PGSQL%%%%DATADIR%%/sql/create_tables.pgsql
-%%PGSQL%%%%DATADIR%%/sql/md5_alter_users.7.3-pgsql
-%%PGSQL%%%%DATADIR%%/sql/md5_alter_users.pre_7.3-pgsql
-%%PGSQL%%%%DATADIR%%/sql/no-constraint-tables.pgsql
-%%PGSQL%%%%DATADIR%%/sql/pop_before_smtp.pgsql
-%%PGSQL%%%%DATADIR%%/sql/update_encryption.pgsql
+%%PGSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0.pgsql
+%%PGSQL%%/lib/dbmail/libpgsqldbmail.0
+%%PGSQL%%/lib/dbmail/libpgsqldbmail.a
+%%PGSQL%%/lib/dbmail/libpgsqldbmail.la
+%%PGSQL%%/lib/dbmail/libpgsqldbmail
+@dirrm lib/dbmail
 @dirrm %%DATADIR%%/sql
 @dirrm %%DATADIR%%