- Update to 1.6.0

Feature safe:	yes

mail/milter-callback/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	milter-callback
-PORTVERSION=	1.5.10
+PORTVERSION=	1.6.0
 CATEGORIES=	mail
 MASTER_SITES=	http://unix.zhegan.in/distfiles/ \
 		CRITICAL
@@ -12,24 +12,22 @@ COMMENT=	Milter to perform a envelope-from sender verification on target MX
 
 LICENSE=	GPLv3
 
+LIB_DEPENDS+=	spf2:${PORTSDIR}/mail/libspf2
+
 USE_BZIP2=	yes
 USE_RC_SUBR=	milter-callback
 
 SUB_FILES=	pkg-message
 MAN8=		milter-callback.8
 
+MAKE_ENV+=	WITH_SPF=yes
+
 # make sure flat distfile gets extracted in ${WRKSRC}
 EXTRACT_AFTER_ARGS=	| (${MKDIR} ${WRKSRC}; ${TAR} -xf - --no-same-owner \
 				--no-same-permissions -C ${WRKSRC})
 
-OPTIONS_DEFINE=	SPF
-SPF_DESC=	libspf support
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MSPF}
-MAKE_ENV+=	WITH_SPF=yes
-LIB_DEPENDS+=	spf2.3:${PORTSDIR}/mail/libspf2
+.if ${CC} == "clang" || ${CXX} == "clang++"
+BROKEN=	does not build with clang, uses nested functions
 .endif
 
 post-patch:

mail/milter-callback/distinfo

@@ -1,2 +1,2 @@
-SHA256 (milter-callback-1.5.10.tar.bz2) = 34936bfa7c270f57465fc5fadaac556d3440e948bab248aad1562419b8b6d946
-SIZE (milter-callback-1.5.10.tar.bz2) = 1309317
+SHA256 (milter-callback-1.6.0.tar.bz2) = 9800b8779b7d4eb137c8745d4a8380851120e48436b8ab8137f9ebcdd3455012
+SIZE (milter-callback-1.6.0.tar.bz2) = 1345345