diff -uNr dbmail22/Makefile dbmail22/Makefile
--- dbmail22/Makefile	2013-11-15 10:44:06.000000000 +0000
+++ dbmail22/Makefile	2014-02-18 14:11:07.000000000 +0000
@@ -12,7 +12,7 @@
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	gmime-2.0:${PORTSDIR}/mail/gmime2
+LIB_DEPENDS=	libgmime-2.0.so:${PORTSDIR}/mail/gmime2
 
 CONFLICTS=	dbmail-3.*
 
@@ -22,14 +22,29 @@
 OPTIONS_MULTI_DB=MYSQL PGSQL SQLITE
 SIEVE_DESC=	Support for Sieve mail sorting language
 
+OPTIONS_SUB=	yes
+
+MYSQL_USE=	mysql=yes
+MYSQL_CONFIGURE_ON=	--with-mysql
+MYSQL_CONFIGURE_OFF=	--without-mysql
+SQLITE_USE=	sqlite=3
+SQLITE_CONFIGURE_ON=	--with-sqlite
+SQLITE_CONFIGURE_OFF=	--without-sqlite
+PGSQL_USE=	pgsql=yes
+PGSQL_CONFIGURE_ON=	--with-postgresql
+PGSQL_CONFIGURE_OFF=	--without-postgresql
+SIEVE_CONFIGURE_WITH=	sieve
+SIEVE_LIB_DEPENDS=	libsieve.so:${PORTSDIR}/mail/libsieve
+LDAP_CONFIGURE_WITH=	ldap
+LDAP_USE=		OPENLDAP=yes
+
 LATEST_LINK=	dbmail22
 USE_AUTOTOOLS=	libtool
-USE_GMAKE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/dbmail
 USE_RC_SUBR=	dbmail-pop3d dbmail-lmtpd dbmail-imapd dbmail-timsieved
 USE_GNOME=	glib20
 USE_OPENSSL=	yes
-USES=		pkgconfig
+USES=		gmake pkgconfig
 
 CFLAGS+=	-fPIC -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
@@ -54,46 +69,15 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMYSQL}
-CONFIGURE_ARGS+=--with-mysql
-USE_MYSQL=	yes
 DATABASE+=	mysql
-PLIST_SUB+=	MYSQL=""
-.else
-PLIST_SUB+=	MYSQL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
-CONFIGURE_ARGS+=--with-pgsql
-USE_PGSQL=	yes
 DATABASE+=	postgresql
-PLIST_SUB+=	PGSQL=""
-.else
-PLIST_SUB+=	PGSQL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE}
-CONFIGURE_ARGS+=--with-sqlite
-USE_SQLITE=	yes
 DATABASE+=	sqlite
-PLIST_SUB+=	SQLITE=""
-.else
-PLIST_SUB+=	SQLITE="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSIEVE}
-CONFIGURE_ARGS+=--with-sieve=${LOCALBASE}/include
-LIB_DEPENDS+=	sieve:${PORTSDIR}/mail/libsieve
-PLIST_SUB+=	SIEVE=""
-.else
-PLIST_SUB+=	SIEVE="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MLDAP}
-CONFIGURE_ARGS+=--with-auth-ldap=${LOCALBASE}/include
-USE_OPENLDAP=	yes
-PLIST_SUB+=	LDAP=""
-.else
-PLIST_SUB+=	LDAP="@comment "
 .endif
 
 post-patch: