13 files changed, 38 insertions, 37 deletions

diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 3ef9274a0b30..631bfbc0839b 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	exim
 PORTVERSION?=	${EXIM_VERSION}
+PORTREVISION?=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_EXIM:S/$/:exim/}
 MASTER_SITE_SUBDIR=	exim4/:exim
diff --git a/mail/libspf2/Makefile b/mail/libspf2/Makefile
index 75ce79cddf14..88e4b802b6f7 100644
--- a/mail/libspf2/Makefile
+++ b/mail/libspf2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libspf2
 PORTVERSION=	1.2.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.libspf2.org/spf/ \
 		LOCAL/sunpoet
@@ -17,11 +17,11 @@ LICENSE_COMB=	dual
 CONFLICTS=	${PORTNAME}-1.0.* p5-Mail-SPF-Query-[0-9]*
 
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool
+INSTALL_TARGET=	install-strip
+USES=		libtool
 USE_LDCONFIG=	yes
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '/__VA_ARGS__/ s|format, ||g' ${WRKSRC}/src/include/spf_log.h
 
 .include <bsd.port.mk>
diff --git a/mail/libspf2/pkg-plist b/mail/libspf2/pkg-plist
index e88079a0af1c..b9b198941f90 100644
--- a/mail/libspf2/pkg-plist
+++ b/mail/libspf2/pkg-plist
@@ -21,7 +21,7 @@ include/spf2/spf_request.h
 include/spf2/spf_response.h
 include/spf2/spf_server.h
 lib/libspf2.a
-lib/libspf2.la
 lib/libspf2.so
-lib/libspf2.so.3
+lib/libspf2.so.2
+lib/libspf2.so.2.1.0
 @dirrm include/spf2
diff --git a/mail/milter-callback/Makefile b/mail/milter-callback/Makefile
index ddfffb2ef959..ad681d313249 100644
--- a/mail/milter-callback/Makefile
+++ b/mail/milter-callback/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	milter-callback
 PORTVERSION=	1.6.0
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	CRITICAL
 
@@ -11,7 +12,7 @@ COMMENT=	Milter to perform a envelope-from sender verification on target MX
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS+=	libspf2.so:${PORTSDIR}/mail/libspf2
+LIB_DEPENDS=	libspf2.so:${PORTSDIR}/mail/libspf2
 
 USES=		tar:xz
 USE_RC_SUBR=	milter-callback
@@ -50,7 +51,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf \
 		${STAGEDIR}${PREFIX}/etc/mail/${PORTNAME}.conf.sample
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.mk>
diff --git a/mail/milter-greylist-devel/Makefile b/mail/milter-greylist-devel/Makefile
index 4388e32a2c4a..f562c5ffcbe0 100644
--- a/mail/milter-greylist-devel/Makefile
+++ b/mail/milter-greylist-devel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	milter-greylist
 PORTVERSION=	4.5.11
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.espci.fr/pub/milter-greylist/ \
 		http://fossies.org/unix/privat/ \
diff --git a/mail/milter-greylist/Makefile b/mail/milter-greylist/Makefile
index 795a5e73729f..bb96b6dcf47d 100644
--- a/mail/milter-greylist/Makefile
+++ b/mail/milter-greylist/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	milter-greylist
 PORTVERSION=	4.4.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.espci.fr/pub/milter-greylist/ \
 		http://fossies.org/unix/privat/
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 5ab6c8affaf0..3f3bb4bd4130 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	2.11.1
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix210/Makefile b/mail/postfix210/Makefile
index c5347168157d..97d089db0f70 100644
--- a/mail/postfix210/Makefile
+++ b/mail/postfix210/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	2.10.3
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile
index 45fe94eaee16..b7b933758810 100644
--- a/mail/postfix28/Makefile
+++ b/mail/postfix28/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	2.8.17
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix29/Makefile b/mail/postfix29/Makefile
index c7dc9304002f..cc483c0d92f2 100644
--- a/mail/postfix29/Makefile
+++ b/mail/postfix29/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	2.9.9
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/rmilter/Makefile b/mail/rmilter/Makefile
index 8ffb68beded1..db9e9c977936 100644
--- a/mail/rmilter/Makefile
+++ b/mail/rmilter/Makefile
@@ -1,37 +1,38 @@
 # $FreeBSD$
 
-PORTNAME=		rmilter
-PORTVERSION=		1.6.1
-CATEGORIES=		mail
+PORTNAME=	rmilter
+PORTVERSION=	1.6.1
+PORTREVISION=	1
+CATEGORIES=	mail
 
-MAINTAINER=		vsevolod@FreeBSD.org
-COMMENT=		Milter that performs spamd, clamav, and spf checks
+MAINTAINER=	vsevolod@FreeBSD.org
+COMMENT=	Milter that performs spamd, clamav, and spf checks
 
 LICENSE=	BSD2CLAUSE
 
-USE_GITHUB=		yes
-GH_ACCOUNT=		vstakhov
-GH_PROJECT=		${PORTNAME}
+LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
+		libspf2.so:${PORTSDIR}/mail/libspf2 \
+		libopendkim.so:${PORTSDIR}/mail/opendkim
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	vstakhov
+GH_PROJECT=	${PORTNAME}
 GH_TAG=		${PORTVERSION}
-GH_COMMIT=		a8d7db5
+GH_COMMIT=	a8d7db5
 
 USE_RC_SUBR=	yes
-USES=	cmake:outsource bison
+USES=		cmake:outsource bison
 USE_OPENSSL=	yes
 
 PLIST_FILES=	sbin/rmilter etc/rc.d/rmilter.sh \
-				etc/rmilter.conf.sample \
-				man/man8/rmilter.8.gz
+		etc/rmilter.conf.sample \
+		man/man8/rmilter.8.gz
 
 CMAKE_ARGS+=	-DENABLE_SPF=ON \
-				-DENABLE_DKIM=ON
+		-DENABLE_DKIM=ON
 
 WITH_SENDMAIL_BASE=	yes
 
-LIB_DEPENDS+=		libpcre.so:${PORTSDIR}/devel/pcre \
-			libspf2.so:${PORTSDIR}/mail/libspf2 \
-			libopendkim.so:${PORTSDIR}/mail/opendkim
-
 .include <bsd.port.pre.mk>
 
 # Workaround to prevent bsd.milter.mk from breaking the build with the recent clang
diff --git a/mail/softfail/Makefile b/mail/softfail/Makefile
index 58355c2271aa..10cd07463a6c 100644
--- a/mail/softfail/Makefile
+++ b/mail/softfail/Makefile
@@ -3,17 +3,17 @@
 
 PORTNAME=	softfail
 PORTVERSION=	2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www6.freebsdbrasil.com.br/~eksffa/l/dev/qmail-smtpextfork/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	jmelo/${PORTNAME}
 DISTNAME=	${PORTNAME}_fbsdbrasil-${PORTVERSION}
 
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Enhanced greylisting system for qmail w/ SMTPEXTFORK patch
 
-LIB_DEPENDS+=	libspf2.so:${PORTSDIR}/mail/libspf2
+LIB_DEPENDS=	libspf2.so:${PORTSDIR}/mail/libspf2
 
 SUB_FILES=	pkg-message
 SUB_LIST=	QMAIL_PREFIX=${QMAIL_PREFIX}
diff --git a/mail/xf-spf/Makefile b/mail/xf-spf/Makefile
index 40a43a32db6b..e0e7293d6950 100644
--- a/mail/xf-spf/Makefile
+++ b/mail/xf-spf/Makefile
@@ -3,14 +3,14 @@
 
 PORTNAME=	xf-spf
 PORTVERSION=	0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www6.freebsdbrasil.com.br/~eksffa/l/dev/qmail-smtpextfork/
 
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SPF checker for Qmail's SMTPEXTFORK patch
 
-LIB_DEPENDS+=	libspf2.so:${PORTSDIR}/mail/libspf2
+LIB_DEPENDS=	libspf2.so:${PORTSDIR}/mail/libspf2
 
 USES=		qmail tar:bzip2
 USE_GCC=	any