Index: head/mail/opendmarc/Makefile
===================================================================
--- head/mail/opendmarc/Makefile	(revision 400213)
+++ head/mail/opendmarc/Makefile	(revision 400214)
@@ -1,57 +1,56 @@
 # Created by: Jaap Akkerhuis <jaap@NLnetLabs.nl>
 # $FreeBSD$
 
 PORTNAME=	opendmarc
 PORTVERSION=	1.3.1
+PORTREVISION=	1
 CATEGORIES=	mail security
 MASTER_SITES=	SF/${PORTNAME} \
 		SF/${PORTNAME}/Previous%20Releases
 
 MAINTAINER=	freebsd@gushi.org
 COMMENT=	DMARC library and milter implementation
 
 LICENSE=		BSD3CLAUSE SENDMAIL
 LICENSE_COMB=		multi
 
 LICENSE_FILE_SENDMAIL=	${WRKSRC}/LICENSE.Sendmail
 LICENSE_GROUPS_SENDMAIL=	FSF OSI
 LICENSE_NAME_SENDMAIL=	Sendmail Open Source License
 LICENSE_PERMS_SENDMAIL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-.if !exists( /usr/include/libmilter/mfapi.h )
-BUILD_DEPENDS+=	${LOCALBASE}/include/libmilter/mfapi.h:${PORTSDIR}/mail/sendmail
-CFLAGS+=	-I${LOCALBASE}/include
-.endif
-
 USES=		libtool shebangfix
-SHEBANG_FILES=	reports/opendmarc-expire.in \
-		reports/opendmarc-import.in \
-		reports/opendmarc-params.in \
-		reports/opendmarc-reports.in
-
-USE_RC_SUBR=	opendmarc
 USE_LDCONFIG=	yes
+USE_RC_SUBR=	opendmarc
 
-GNU_CONFIGURE=		yes
+GNU_CONFIGURE=	yes
 
-PORTDOCS=	*
-
-OPTIONS_DEFINE=	SPF
+OPTIONS_DEFINE=		SPF
 OPTIONS_DEFAULT=	SPF
-SPF_DESC=	Include direct SPF checking support
 
-SPF_BUILD_DEPENDS+=	libspf2>=1.2.5:${PORTSDIR}/mail/libspf2
+SPF_DESC=		Enable support for SPF record checking
 
-.include <bsd.port.options.mk>
+SPF_LIB_DEPENDS=	libspf2.so:${PORTSDIR}/mail/libspf2
+SPF_CONFIGURE_ON=	--with-spf \
+			--with-spf2-include=${LOCALBASE}/include/spf2 \
+			--with-spf2-lib=${LOCALBASE}/lib
 
-.if ${PORT_OPTIONS:MSPF}
-CONFIGURE_ARGS+=	--with-spf --with-spf2-include=${LOCALBASE}/include/spf2 --with-spf2-lib=${LOCALBASE}/lib
+SHEBANG_FILES=	reports/opendmarc-expire.in \
+		reports/opendmarc-import.in \
+		reports/opendmarc-params.in \
+		reports/opendmarc-reports.in
+
+PORTDOCS=	*
+
+.if !exists( /usr/include/libmilter/mfapi.h )
+BUILD_DEPENDS+=	${LOCALBASE}/include/libmilter/mfapi.h:${PORTSDIR}/mail/sendmail
+CFLAGS+=	-I${LOCALBASE}/include
 .endif
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/mail
 	${INSTALL_DATA} \
 		${WRKSRC}/opendmarc/opendmarc.conf.sample ${STAGEDIR}${PREFIX}/etc/mail
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libopendmarc.so.2
 
 .include <bsd.port.mk>
Index: head/mail/opendmarc/pkg-plist
===================================================================
--- head/mail/opendmarc/pkg-plist	(revision 400213)
+++ head/mail/opendmarc/pkg-plist	(revision 400214)
@@ -1,21 +1,21 @@
+etc/mail/opendmarc.conf.sample
+include/opendmarc/dmarc.h
+lib/libopendmarc.a
+lib/libopendmarc.so
+lib/libopendmarc.so.2
+lib/libopendmarc.so.2.0.1
 man/man5/opendmarc.conf.5.gz
 man/man8/opendmarc-check.8.gz
 man/man8/opendmarc-expire.8.gz
 man/man8/opendmarc-import.8.gz
+man/man8/opendmarc-importstats.8.gz
 man/man8/opendmarc-params.8.gz
 man/man8/opendmarc-reports.8.gz
 man/man8/opendmarc.8.gz
-man/man8/opendmarc-importstats.8.gz
-etc/mail/opendmarc.conf.sample
-include/opendmarc/dmarc.h
-lib/libopendmarc.a
-lib/libopendmarc.so.2
-lib/libopendmarc.so.2.0.1
-lib/libopendmarc.so
 sbin/opendmarc
 sbin/opendmarc-check
 sbin/opendmarc-expire
 sbin/opendmarc-import
 sbin/opendmarc-importstats
 sbin/opendmarc-params
 sbin/opendmarc-reports