Index: head/mail/mailfront/Makefile
===================================================================
--- head/mail/mailfront/Makefile	(revision 432015)
+++ head/mail/mailfront/Makefile	(revision 432016)
@@ -1,69 +1,63 @@
 # Created by: Sergei Kolobov <sergei@kolobov.com>
 # $FreeBSD$
 
 PORTNAME=	mailfront
 PORTVERSION=	2.01
 PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://untroubled.org/${PORTNAME}/ \
 		http://untroubled.org/${PORTNAME}/archive/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mail server network protocol front-ends
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 LIB_DEPENDS=	libcvm-v2client.so:security/cvm
 
-OPTIONS_DEFINE=	LUA DOCS
-
-OPTIONS_DEFAULT=LUA
-OPTIONS_SUB=	yes
-
 USES=		qmail:vars
 
 CFLAGS+=	-I${CVM_INC}
 CFLAGS_SO=	${CFLAGS} -fPIC -shared -L${CVM_LIB}
 LDFLAGS+=	-g -L${CVM_LIB}
 BGLIBS_INC=	${LOCALBASE}/include/bglibs
 BGLIBS_LIB=	${LOCALBASE}/lib/bglibs
 CVM_INC=	${LOCALBASE}/include
 CVM_LIB=	${LOCALBASE}/lib
 MODULES_DIR=	${PREFIX}/libexec/${PORTNAME}
 
 ALL_TARGET=	all
 LATE_INSTALL_ARGS=	install_prefix=${STAGEDIR}
 
-DOCS=		NEWS README TODO *.html
+PORTDOCS=	NEWS README TODO *.html
 
-.include <bsd.port.options.mk>
+LDFLAGS+=	-rdynamic
 
-.if ${PORT_OPTIONS:MLUA}
-ALL_TARGET+=	lua
-USES+=		lua:51
-CFLAGS+=	-I${LUA_INCDIR}
-CFLAGS_SO+=	-L${LUA_LIBDIR}
-LDFLAGS+=	-L${LUA_LIBDIR}
-.endif
+OPTIONS_DEFINE=	LUA DOCS
+OPTIONS_DEFAULT=LUA
+OPTIONS_SUB=	yes
 
-LDFLAGS+=	-rdynamic
+LUA_ALL_TARGET=	lua
+LUA_USES=	lua:51
+LUA_VARS=	CFLAGS+=-I${LUA_INCDIR} LUA_CFLAGS_SO+=-L${LUA_LIBDIR} LUA_LDFLAGS+=-L${LUA_LIBDIR}
 
 do-configure:
 	${ECHO_CMD} "${PREFIX}/bin"	> ${WRKSRC}/conf-bin
 	${ECHO_CMD} "${PREFIX}/include"	> ${WRKSRC}/conf-include
 	${ECHO_CMD} "${MODULES_DIR}"	> ${WRKSRC}/conf-modules
 	${ECHO_CMD} "${CC} ${CFLAGS}"	> ${WRKSRC}/conf-cc
 	${ECHO_CMD} "${CC} ${CFLAGS_SO}"> ${WRKSRC}/conf-ccso
 	${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}"	> ${WRKSRC}/conf-ld
 	${ECHO_CMD} "${BGLIBS_INC}"	> ${WRKSRC}/conf-bgincs
 	${ECHO_CMD} "${BGLIBS_LIB}"	> ${WRKSRC}/conf-bglibs
 	${ECHO_CMD} "${QMAIL_PREFIX}"	> ${WRKSRC}/conf-qmail
 
 post-patch:
 	@${REINPLACE_CMD} 's,-llua,-llua-${LUA_VER},' ${WRKSRC}/Makefile
 
-.if ${PORT_OPTIONS:MDOCS}
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
-.endif
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/mail/mailfront/pkg-plist
===================================================================
--- head/mail/mailfront/pkg-plist	(revision 432015)
+++ head/mail/mailfront/pkg-plist	(revision 432016)
@@ -1,66 +1,30 @@
 bin/imapfront-auth
 bin/mailfront
 bin/pop3front-auth
 bin/pop3front-maildir
 bin/qmqpfront-echo
 bin/qmqpfront-qmail
 bin/qmtpfront-echo
 bin/qmtpfront-qmail
 bin/smtpfront-echo
 bin/smtpfront-qmail
 include/mailfront/constants.h
 include/mailfront/mailfront.h
 include/mailfront/responses.h
 libexec/mailfront/backend-echo.so
 libexec/mailfront/backend-qmail.so
 libexec/mailfront/plugin-add-received.so
 libexec/mailfront/plugin-check-fqdn.so
 libexec/mailfront/plugin-clamav.so
 libexec/mailfront/plugin-counters.so
 libexec/mailfront/plugin-cvm-authenticate.so
 libexec/mailfront/plugin-cvm-validate.so
 %%LUA%%libexec/mailfront/plugin-lua.so
 libexec/mailfront/plugin-mailrules.so
 libexec/mailfront/plugin-patterns.so
 libexec/mailfront/plugin-qmail-validate.so
 libexec/mailfront/plugin-spamassassin.so
 libexec/mailfront/plugin-starttls-ucspi.so
 libexec/mailfront/protocol-qmqp.so
 libexec/mailfront/protocol-qmtp.so
 libexec/mailfront/protocol-smtp.so
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/backend-echo.html
-%%PORTDOCS%%%%DOCSDIR%%/backend-qmail.html
-%%PORTDOCS%%%%DOCSDIR%%/imapfront.html
-%%PORTDOCS%%%%DOCSDIR%%/mailfront.html
-%%PORTDOCS%%%%DOCSDIR%%/mailrules.html
-%%PORTDOCS%%%%DOCSDIR%%/mailrulesx.html
-%%PORTDOCS%%%%DOCSDIR%%/msa.html
-%%PORTDOCS%%%%DOCSDIR%%/plugin-accept-recipient.html
-%%PORTDOCS%%%%DOCSDIR%%/plugin-accept-sender.html
-%%PORTDOCS%%%%DOCSDIR%%/plugin-accept.html
-%%PORTDOCS%%%%DOCSDIR%%/plugin-add-received.html
-%%PORTDOCS%%%%DOCSDIR%%/plugin-api.html
-%%PORTDOCS%%%%DOCSDIR%%/plugin-check-fqdn.html
-%%PORTDOCS%%%%DOCSDIR%%/plugin-clamav.html
-%%PORTDOCS%%%%DOCSDIR%%/plugin-counters.html
-%%PORTDOCS%%%%DOCSDIR%%/plugin-cvm-authenticate.html
-%%PORTDOCS%%%%DOCSDIR%%/plugin-cvm-validate.html
-%%PORTDOCS%%%%DOCSDIR%%/plugin-force-file.html
-%%PORTDOCS%%%%DOCSDIR%%/plugin-lua.html
-%%PORTDOCS%%%%DOCSDIR%%/plugin-mailrules.html
-%%PORTDOCS%%%%DOCSDIR%%/plugin-patterns.html
-%%PORTDOCS%%%%DOCSDIR%%/plugin-qmail-validate.html
-%%PORTDOCS%%%%DOCSDIR%%/plugin-reject.html
-%%PORTDOCS%%%%DOCSDIR%%/plugin-relayclient.html
-%%PORTDOCS%%%%DOCSDIR%%/plugin-require-auth.html
-%%PORTDOCS%%%%DOCSDIR%%/plugin-spamassassin.html
-%%PORTDOCS%%%%DOCSDIR%%/plugin-starttls-ucspi.html
-%%PORTDOCS%%%%DOCSDIR%%/plugin-template.html
-%%PORTDOCS%%%%DOCSDIR%%/pop3front.html
-%%PORTDOCS%%%%DOCSDIR%%/protocol-qmqp.html
-%%PORTDOCS%%%%DOCSDIR%%/protocol-qmtp.html
-%%PORTDOCS%%%%DOCSDIR%%/protocol-smtp.html
-%%PORTDOCS%%%%DOCSDIR%%/std-handle.html