Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/mailfront/Makefile,v
retrieving revision 1.24
diff -u -u -r1.24 Makefile
--- Makefile	11 Mar 2009 17:04:03 -0000	1.24
+++ Makefile	12 Mar 2009 18:20:26 -0000
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	mailfront
-PORTVERSION=	1.11
-PORTREVISION=	2
+PORTVERSION=	1.12
 CATEGORIES=	mail
 MASTER_SITES=	http://untroubled.org/${PORTNAME}/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	sergei
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	tarkhil@over.ru
 COMMENT=	Mail server network protocol front-ends
 
 LIB_DEPENDS=	cvm-v2client.2:${PORTSDIR}/security/cvm
@@ -31,14 +30,8 @@
 
 DOCS=		NEWS README TODO *.html
 
-OPTIONS=	DW_AUTH "Include Dale Woolridge's auth patch" off
-
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_DW_AUTH)
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-mailfront-0.92-dw-auth
-.endif
-
 do-configure:
 	${ECHO_CMD} "${PREFIX}/bin"	> ${WRKSRC}/conf-bin
 	${ECHO_CMD} "${PREFIX}/include"	> ${WRKSRC}/conf-include
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/mail/mailfront/distinfo,v
retrieving revision 1.17
diff -u -u -r1.17 distinfo
--- distinfo	7 Nov 2008 10:19:37 -0000	1.17
+++ distinfo	12 Mar 2009 18:17:25 -0000
@@ -1,3 +1,3 @@
-MD5 (mailfront-1.11.tar.gz) = 25f5d9029335c29bc541e2c17e1afc61
-SHA256 (mailfront-1.11.tar.gz) = fc78baad4ef064f9b3e2f4e98a0a0a8d9c9391fc3e3fddb5710df4a668d5d803
-SIZE (mailfront-1.11.tar.gz) = 102211
+MD5 (mailfront-1.12.tar.gz) = f28b2a1325e542b578d82e7153a1d2d2
+SHA256 (mailfront-1.12.tar.gz) = 23cf29608a32c22995e4c1b847875b4c43bc17b6f4ac9ee47e780f4cbd3dd25a
+SIZE (mailfront-1.12.tar.gz) = 104598
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/mail/mailfront/pkg-plist,v
retrieving revision 1.11
diff -u -u -r1.11 pkg-plist
--- pkg-plist	14 Nov 2008 17:33:59 -0000	1.11
+++ pkg-plist	12 Mar 2009 18:19:12 -0000
@@ -1,4 +1,3 @@
-@comment $FreeBSD: ports/mail/mailfront/pkg-plist,v 1.11 2008/11/14 17:33:59 araujo Exp $
 bin/imapfront-auth
 bin/mailfront
 bin/pop3front-auth
@@ -28,8 +27,6 @@
 libexec/mailfront/protocol-qmqp.so
 libexec/mailfront/protocol-qmtp.so
 libexec/mailfront/protocol-smtp.so
-@dirrmtry libexec/mailfront
-@dirrm include/mailfront
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
@@ -43,9 +40,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/plugin-accept-recipient.html
 %%PORTDOCS%%%%DOCSDIR%%/plugin-accept-sender.html
 %%PORTDOCS%%%%DOCSDIR%%/plugin-accept.html
-%%PORTDOCS%%%%DOCSDIR%%/plugin-api.html
-%%PORTDOCS%%%%DOCSDIR%%/plugin-template.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
@@ -57,9 +53,12 @@
 %%PORTDOCS%%%%DOCSDIR%%/plugin-reject.html
 %%PORTDOCS%%%%DOCSDIR%%/plugin-relayclient.html
 %%PORTDOCS%%%%DOCSDIR%%/plugin-require-auth.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
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm libexec/mailfront
+@dirrm include/mailfront
Index: files/extra-patch-mailfront-0.92-dw-auth
===================================================================
RCS file: files/extra-patch-mailfront-0.92-dw-auth
diff -N files/extra-patch-mailfront-0.92-dw-auth
--- files/extra-patch-mailfront-0.92-dw-auth	25 Oct 2005 17:41:47 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-Index: mailrules.c
-===================================================================
---- mailrules.c	(revision 326)
-+++ mailrules.c	(working copy)
-@@ -296,7 +296,7 @@
-   struct rule* r;
-   unsigned long databytes;
-   
--  if (*l != 'k' && *l != 'd' && *l != 'z' && *l != 'p' && *l != 'n') return 0;
-+  if (*l != 'k' && *l != 'd' && *l != 'z' && *l != 'p' && *l != 'n' && *l != 'a') return 0;
-   r = alloc_rule();
-   r->code = *l++;
- 
-@@ -423,6 +423,7 @@
-   case 'k': code = 250; defmsg = "OK"; break;
-   case 'd': code = 553; defmsg = "Rejected"; break;
-   case 'z': code = 451; defmsg = "Deferred"; break;
-+  case 'a': code = 553; defmsg = "Authenticate first"; if (authenticated) return 0; break;
-   default:  code = 451; defmsg = "Temporary failure"; break;
-   }
-