- Update to 1.01;

  Mailfront has been rewritten to be modular -
  see UPDATING entry for details

4 files changed, 63 insertions, 14 deletions

diff --git a/UPDATING b/UPDATING
index 650102cd57ca..804f2f4806c3 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,21 @@ You should get into the habit of checking this file for changes each
 time you update your ports collection, before attempting any port
 upgrades.
 
+20060921:
+  AFFECTS: users of mail/mailfront
+  AUTHOR: sergei@FreeBSD.org
+
+  Mailfront was rewritten in version 1.0 to be totally modular.
+  Its functionality has been split into several modules that are now
+  installed into ${PREFIX}/libexec/mailfront. Various *front-* commands
+  are now merely shell script wrappers around the newly introduced
+  mailfront command and its new modules. 
+
+  The smtpfront-reject command has been removed completely, 
+  being deprecated in favor of using a plugin. 
+
+  Please refer to http://untroubled.org/mailfront/NEWS for further details.
+
 20060910:
   AFFECTS: users of net-mgmt/zabbix
   AUTHOR: sem@FreeBSD.org
diff --git a/mail/mailfront/Makefile b/mail/mailfront/Makefile
index ad7d71b25a4e..9e48efea7809 100644
--- a/mail/mailfront/Makefile
+++ b/mail/mailfront/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mailfront
-PORTVERSION=	0.98.1
+PORTVERSION=	1.01
 CATEGORIES=	mail
 MASTER_SITES=	http://untroubled.org/${PORTNAME}/ \
 		${MASTER_SITE_LOCAL}
@@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR=	sergei
 MAINTAINER=	sergei@FreeBSD.org
 COMMENT=	Mail server network protocol front-ends
 
-BUILD_DEPENDS=	bglibs>=1.100:${PORTSDIR}/devel/bglibs
 LIB_DEPENDS=	cvm-v2client.1:${PORTSDIR}/security/cvm
 
 WANT_QMAIL=	yes
@@ -23,11 +22,13 @@ USE_GPG=	yes
 SIG_SUFFIX=	.sig
 QMAIL_PREFIX?=	/var/qmail
 CFLAGS+=	-I${CVM_INC}
-LDFLAGS=	-s -L${CVM_LIB}
+CFLAGS_SO=	${CFLAGS} -fPIC -shared -L${CVM_LIB}
+LDFLAGS+=	-g -L${CVM_LIB} -rdynamic
 BGLIBS_INC=	${LOCALBASE}/include/bglibs
 BGLIBS_LIB=	${LOCALBASE}/lib/bglibs
 CVM_INC=	${LOCALBASE}/include
 CVM_LIB=	${LOCALBASE}/lib
+MODULES_DIR=	${PREFIX}/libexec/${PORTNAME}
 
 DOCS=		NEWS README TODO *.html
 
@@ -41,7 +42,9 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-mailfront-0.92-dw-auth
 
 do-configure:
 	${ECHO_CMD} "${PREFIX}/bin"	> ${WRKSRC}/conf-bin
+	${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} ${LDFLAGS}"	> ${WRKSRC}/conf-ld
 	${ECHO_CMD} "${BGLIBS_INC}"	> ${WRKSRC}/conf-bgincs
 	${ECHO_CMD} "${BGLIBS_LIB}"	> ${WRKSRC}/conf-bglibs
diff --git a/mail/mailfront/distinfo b/mail/mailfront/distinfo
index 5f8a2c0d895b..618f68eb24c3 100644
--- a/mail/mailfront/distinfo
+++ b/mail/mailfront/distinfo
@@ -1,6 +1,6 @@
-MD5 (mailfront-0.98.1.tar.gz) = b38cab5fd0e6bc80e7c6e783822e66b5
-SHA256 (mailfront-0.98.1.tar.gz) = feeaabe6769c85c0b6e454c0b675c1fede4bda00143173cc528aa8d23324de12
-SIZE (mailfront-0.98.1.tar.gz) = 77812
-MD5 (mailfront-0.98.1.tar.gz.sig) = 92501ab4bef3a17f6cf664573d92fcf7
-SHA256 (mailfront-0.98.1.tar.gz.sig) = 80cacdbdb7a7b3a1b4b882976c31fa47be327108b7d650424cf2e145fdf2cc42
-SIZE (mailfront-0.98.1.tar.gz.sig) = 189
+MD5 (mailfront-1.01.tar.gz) = cfa732d1ffd53c8cb46c82dacc375579
+SHA256 (mailfront-1.01.tar.gz) = 190bcd4a4dcfd4d3755484f8b1504e0ad95fdfde83a786fb35a5d651e2447a2f
+SIZE (mailfront-1.01.tar.gz) = 90699
+MD5 (mailfront-1.01.tar.gz.sig) = 4dbc27ffb1b6d371f920ade021a8e286
+SHA256 (mailfront-1.01.tar.gz.sig) = 382f1e578880ab336ed8b1d1f0d507f4559d3e34100ca6df904e47a946f05147
+SIZE (mailfront-1.01.tar.gz.sig) = 189
diff --git a/mail/mailfront/pkg-plist b/mail/mailfront/pkg-plist
index 795463eec89d..c665a8e98024 100644
--- a/mail/mailfront/pkg-plist
+++ b/mail/mailfront/pkg-plist
@@ -1,5 +1,6 @@
 @comment $FreeBSD$
 bin/imapfront-auth
+bin/mailfront
 bin/pop3front-auth
 bin/pop3front-maildir
 bin/qmqpfront-echo
@@ -8,19 +9,49 @@ bin/qmtpfront-echo
 bin/qmtpfront-qmail
 bin/smtpfront-echo
 bin/smtpfront-qmail
-bin/smtpfront-reject
+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-counters.so
+libexec/mailfront/plugin-cvm-validate.so
+libexec/mailfront/plugin-mailrules.so
+libexec/mailfront/plugin-patterns.so
+libexec/mailfront/plugin-qmail-validate.so
+libexec/mailfront/plugin-reject.so
+libexec/mailfront/plugin-relayclient.so
+libexec/mailfront/plugin-require-auth.so
+libexec/mailfront/protocol-qmqp.so
+libexec/mailfront/protocol-qmtp.so
+libexec/mailfront/protocol-smtp.so
+@dirrmtry libexec/mailfront
 %%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%%/patterns.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-check-fqdn.html
+%%PORTDOCS%%%%DOCSDIR%%/plugin-counters.html
+%%PORTDOCS%%%%DOCSDIR%%/plugin-cvm-validate.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.html
 %%PORTDOCS%%%%DOCSDIR%%/pop3front.html
-%%PORTDOCS%%%%DOCSDIR%%/qmail-backend.html
-%%PORTDOCS%%%%DOCSDIR%%/qmail-validate.html
-%%PORTDOCS%%%%DOCSDIR%%/smtpfront.html
+%%PORTDOCS%%%%DOCSDIR%%/protocol-qmqp.html
+%%PORTDOCS%%%%DOCSDIR%%/protocol-qmtp.html
+%%PORTDOCS%%%%DOCSDIR%%/protocol-smtp.html
 %%PORTDOCS%%%%DOCSDIR%%/std-handle.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%