4 files changed, 9 insertions, 38 deletions

diff --git a/mail/mailfront/Makefile b/mail/mailfront/Makefile
index 835a695846da..166aa50cf0f1 100644
--- a/mail/mailfront/Makefile
+++ b/mail/mailfront/Makefile
@@ -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 @@ MODULES_DIR=	${PREFIX}/libexec/${PORTNAME}
 
 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
diff --git a/mail/mailfront/distinfo b/mail/mailfront/distinfo
index 1fdca17c7d49..6f1823d22157 100644
--- a/mail/mailfront/distinfo
+++ b/mail/mailfront/distinfo
@@ -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
diff --git a/mail/mailfront/files/extra-patch-mailfront-0.92-dw-auth b/mail/mailfront/files/extra-patch-mailfront-0.92-dw-auth
deleted file mode 100644
index 90126b819f02..000000000000
--- a/mail/mailfront/files/extra-patch-mailfront-0.92-dw-auth
+++ /dev/null
@@ -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;
-   }
- 
diff --git a/mail/mailfront/pkg-plist b/mail/mailfront/pkg-plist
index a3f6ea18185c..c0fd5f94a1ea 100644
--- a/mail/mailfront/pkg-plist
+++ b/mail/mailfront/pkg-plist
@@ -1,4 +1,3 @@
-@comment $FreeBSD$
 bin/imapfront-auth
 bin/mailfront
 bin/pop3front-auth
@@ -28,8 +27,6 @@ libexec/mailfront/plugin-require-auth.so
 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 @@ libexec/mailfront/protocol-smtp.so
 %%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 @@ libexec/mailfront/protocol-smtp.so
 %%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