6 files changed, 1 insertions, 231 deletions

diff --git a/mail/Makefile b/mail/Makefile
index d81e0b3782c4..0e1d99fac26e 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -56,7 +56,7 @@
     SUBDIR += cyrus-imapd23
     SUBDIR += cyrus2courier
     SUBDIR += dbmail
-    SUBDIR += dbmail-devel
+    SUBDIR += dbmail21
     SUBDIR += dcc-dccd
     SUBDIR += delatt
     SUBDIR += demime
diff --git a/mail/dbmail-devel/Makefile b/mail/dbmail-devel/Makefile
deleted file mode 100644
index 7757983ee16e..000000000000
--- a/mail/dbmail-devel/Makefile
+++ /dev/null
@@ -1,135 +0,0 @@
-# New ports collection makefile for:	dbmail-devel
-# Date created:				3 August 2006
-# Whom:					Mark Starovoytov <mark_sf@kikg.ifmo.ru>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	dbmail
-PORTVERSION=	2.1.7
-PORTREVISION=	1
-CATEGORIES=	mail
-MASTER_SITES=	http://www.dbmail.org/download/2.1/
-
-MAINTAINER=	mark_sf@kikg.ifmo.ru
-COMMENT=	An SQL database-based mail system (POP3 and IMAP)
-
-CONFLICTS=	dbmail-*-2.0.*
-
-OPTIONS=	MYSQL		"Build with MySQL support" on \
-		POSTGRESQL	"Build with PostgreSQL support"	off \
-		SQLITE		"Build with SQLite support" off \
-		SIEVE		"Build w. support for Sieve mail sorting language" off \
-		LDAP		"Build with support for LDAP authentication" off
-
-USE_AUTOTOOLS=	libtool:15
-GNU_CONFIGURE=	YES
-CONFIGURE_ARGS=	--prefix=${PREFIX}
-USE_GMAKE=	YES
-USE_GCC=	3.2+
-USE_LDCONFIG=	${PREFIX}/lib/dbmail
-USE_RC_SUBR=	dbmail-pop3d.sh dbmail-lmtpd.sh dbmail-imapd.sh
-
-LIB_DEPENDS+=	gmime-2.0.4:${PORTSDIR}/mail/gmime2
-USE_GNOME=	glib20
-USE_OPENSSL=	YES
-USE_PTHREADS=	YES
-
-CFLAGS+=	-fPIC -I${LOCALBASE}/include -L${LOCALBASE}/lib
-LDFLAGS+=	-pthread
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE}
-
-PORTDOCS=	AUTHORS BUGS COPYING INSTALL NEWS README \
-		README.aliases README.exim README.ldap \
-		README.postfix README.qmail README.sieve \
-		README.smtp README.solaris README.usermap \
-		THANKS
-MAN1=		dbmail-smtp.1 dbmail.1
-MAN5=		dbmail.conf.5
-MAN8=		dbmail-export.8 dbmail-imapd.8 dbmail-lmtpd.8 \
-		dbmail-pop3d.8 dbmail-sievecmd.8 dbmail-timsieved.8 \
-		dbmail-users.8 dbmail-util.8
-MANCOMPRESSED=	no
-MSG_FILE=	${PKGDIR}/pkg-message
-PKGMESSAGE=	${WRKDIR}/pkg-message
-
-PLIST_SUB+=	PORTNAME=${PORTNAME}
-.if defined(NOPORTDOCS)
-PLIST_SUB+=	PORTDOCS="@comment "
-.else
-PLIST_SUB+=	PORTDOCS=""
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_MYSQL)
-CONFIGURE_ARGS+=--with-mysql
-USE_MYSQL=	YES
-DATABASE+=	mysql
-PLIST_SUB+=	MYSQL=""
-.else
-PLIST_SUB+=	MYSQL="@comment "
-.endif
-
-.if defined(WITH_POSTGRESQL)
-CONFIGURE_ARGS+=--with-pgsql
-USE_PGSQL=	yes
-DATABASE+=	postgresql
-PLIST_SUB+=	PGSQL=""
-.else
-PLIST_SUB+=	PGSQL="@comment "
-.endif
-
-.if defined(WITH_SQLITE)
-CONFIGURE_ARGS+=--with-sqlite
-USE_SQLITE=	yes
-DATABASE+=	sqlite
-PLIST_SUB+=	SQLITE=""
-.else
-PLIST_SUB+=	SQLITE="@comment "
-.endif
-
-.if defined(WITH_SIEVE)
-CONFIGURE_ARGS+=--with-sieve=${LOCALBASE}/include
-LIB_DEPENDS+=	sieve.1:${PORTSDIR}/mail/libsieve
-PLIST_SUB+=	SIEVE=""
-.else
-PLIST_SUB+=	SIEVE="@comment "
-.endif
-
-.if defined(WITH_LDAP)
-CONFIGURE_ARGS+=--with-auth-ldap=${LOCALBASE}/include
-USE_OPENLDAP=	yes
-.endif
-
-.if defined(WITHOUT_MYSQL) && defined(WITHOUT_POSTGRESQL) && defined(WITHOUT_SQLITE)
-IGNORE="requires at least one database backend selected. Run 'make config'"
-.endif
-
-post-patch:
-	@${FIND} ${WRKSRC} -name CVS -type d | ${XARGS} ${RM} -fr
-	@${FIND} ${WRKSRC} -name *.orig -type f | ${XARGS} ${RM} -fr
-	${SED}  -e 's|%%DATADIR%%|${DATADIR}|g' \
-	        ${MSG_FILE} > ${PKGMESSAGE}
-
-post-configure:
-	@${REINPLACE_CMD} -i.orig 's!/etc/dbmail.conf!${PREFIX}/etc/dbmail.conf!g' \
-				${WRKSRC}/dbmail.h
-
-post-install:
-	@${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${PREFIX}/etc/dbmail.conf-dist
-	@if [ ! -f ${PREFIX}/etc/dbmail.conf ] ; then \
-	  ${CP} -p ${PREFIX}/etc/dbmail.conf-dist ${PREFIX}/etc/dbmail.conf; \
-	fi
-	@${MKDIR} ${DATADIR}
-	@for f in ${DATABASE}; do \
-	  ${MKDIR} ${DATADIR}/$$f ; \
-	  ${INSTALL_DATA} ${WRKSRC}/sql/$$f/* ${DATADIR}/$$f; \
-	done
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
-.endif
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/mail/dbmail-devel/distinfo b/mail/dbmail-devel/distinfo
deleted file mode 100644
index 345b98be2d99..000000000000
--- a/mail/dbmail-devel/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (dbmail-2.1.7.tar.gz) = b6523e36d228198eeaf631c9a78a7fec
-SHA256 (dbmail-2.1.7.tar.gz) = f46272083fcf4a30cd79a4c97ef19d3e4abc047dbea39eb137eab66c1b6ae133
-SIZE (dbmail-2.1.7.tar.gz) = 842237
diff --git a/mail/dbmail-devel/pkg-descr b/mail/dbmail-devel/pkg-descr
deleted file mode 100644
index 975d756571ae..000000000000
--- a/mail/dbmail-devel/pkg-descr
+++ /dev/null
@@ -1,26 +0,0 @@
-Dbmail is the name of a group of programs that enable the possiblilty
-of storing and retrieving mail messages from a database (currently
-MySQL, PostgreSQL or SQLite).
-
-What are the advantages?
-
-    * Scalability.
-      Dbmail is as scalable as the database that is used for the
-      mail storage.
-    * Manageability.
-      Dbmail is based upon a database. Dbmail can be managed by
-      changing settings in the database (f.e. using PHP/Perl/SQL).
-    * Speed.
-      Dbmail uses very efficient, database specific queries for
-      retrieving mail information. This is much faster then parsing
-      a filesystem.
-    * Security.
-      Dbmail has got nothing to do with the filesystem or interaction
-      with other programs in the Unix environment which need special
-      permissions.  Dbmail is as secure as the database it's based
-      upon.
-    * Flexibility.
-      Changes on a Dbmail system (adding of users, changing passwords
-      etc.) are effective immediately.
-
-WWW: http://www.dbmail.org/
diff --git a/mail/dbmail-devel/pkg-message b/mail/dbmail-devel/pkg-message
deleted file mode 100644
index 5cb452372e73..000000000000
--- a/mail/dbmail-devel/pkg-message
+++ /dev/null
@@ -1,12 +0,0 @@
-
-IMPORTANT NOTE FOR ADMINS UPGRADING FROM 1.X->2.X!!!
-
-	*) Don't forget to update the database using a script from
-	   %%DATADIR%%/
-	*) Many programs have been renamed and their arguments changed.
-	*) Read the upgrading notes.
-	*) Don't be careless with this upgrade or mail will be lost!
-	*) dbmail can be controled by setting dbmail_imapd_enable,
-	   dbmail_lmtpd_enable, and/or dbmail_pop3d_enable in
-	   /etc/rc.conf.
-
diff --git a/mail/dbmail-devel/pkg-plist b/mail/dbmail-devel/pkg-plist
deleted file mode 100644
index 441f27155676..000000000000
--- a/mail/dbmail-devel/pkg-plist
+++ /dev/null
@@ -1,54 +0,0 @@
-@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
-lib/libdbmail.a
-lib/libdbmail.la
-lib/libdbmail.so
-lib/libdbmail.so.0
-lib/dbmail/libauth_ldap.a
-lib/dbmail/libauth_ldap.la
-lib/dbmail/libauth_ldap.so
-lib/dbmail/libauth_ldap.so.0
-lib/dbmail/libauth_sql.a
-lib/dbmail/libauth_sql.la
-lib/dbmail/libauth_sql.so
-lib/dbmail/libauth_sql.so.0
-lib/dbmail/libmysql.a
-lib/dbmail/libmysql.la
-lib/dbmail/libmysql.so
-lib/dbmail/libmysql.so.0
-lib/dbmail/libpgsql.a
-lib/dbmail/libpgsql.la
-lib/dbmail/libpgsql.so
-lib/dbmail/libpgsql.so.0
-lib/dbmail/libsort_sieve.a
-lib/dbmail/libsort_sieve.la
-lib/dbmail/libsort_sieve.so
-lib/dbmail/libsort_sieve.so.0
-lib/dbmail/libsqlite.a
-lib/dbmail/libsqlite.la
-lib/dbmail/libsqlite.so
-lib/dbmail/libsqlite.so.0
-@dirrm lib/dbmail
-sbin/dbmail-export
-sbin/dbmail-imapd
-sbin/dbmail-lmtpd
-sbin/dbmail-pop3d
-sbin/dbmail-smtp
-sbin/dbmail-users
-sbin/dbmail-util
-%%SIEVE%%sbin/dbmail-sievecmd
-%%SIEVE%%sbin/dbmail-timsieved
-%%MYSQL%%%%DATADIR%%/mysql/create_tables.mysql
-%%MYSQL%%%%DATADIR%%/mysql/migrate_from_1.x_to_2.0_innodb.mysql
-%%MYSQL%%%%DATADIR%%/mysql/migrate_from_2.0_to_2.1.mysql
-%%MYSQL%%%%DATADIR%%/mysql/update_headervalue_01.mysql
-%%MYSQL%%@dirrm %%DATADIR%%/mysql
-%%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.1.pgsql
-%%PGSQL%%@dirrm %%DATADIR%%/postgresql
-%%SQLITE%%%%DATADIR%%/sqlite/create_tables.sqlite
-%%SQLITE%%@dirrm %%DATADIR%%/sqlite
-@dirrm %%DATADIR%%