From 2576d2e3a1e1a663e8f0c5534eba86d651c32167 Mon Sep 17 00:00:00 2001
From: Marcus Alves Grando <mnag@FreeBSD.org>
Date: Sun, 13 Aug 2006 21:55:26 +0000
Subject: - Update to 1.20 - Add OPTIONS to select spf resolver

---
 mail/tumgreyspf/Makefile | 27 +++++++++++++++++++++++----
 mail/tumgreyspf/distinfo |  6 +++---
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/mail/tumgreyspf/Makefile b/mail/tumgreyspf/Makefile
index d77006fb3aed..e30c542bb7bb 100644
--- a/mail/tumgreyspf/Makefile
+++ b/mail/tumgreyspf/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tumgreyspf
-PORTVERSION=	1.19
+PORTVERSION=	1.20
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.tummy.com/pub/tummy/tumgreyspf/ \
 		ftp://ftp.tummy.com/pub/tummy/tumgreyspf/old-releases/
@@ -14,8 +14,6 @@ MASTER_SITES=	ftp://ftp.tummy.com/pub/tummy/tumgreyspf/ \
 MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	External policy checker for the postfix mail server
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/spf.py:${PORTSDIR}/mail/py-spf
-
 USE_PYTHON=	2.1+
 NO_BUILD=	yes
 
@@ -35,6 +33,23 @@ SUB_LIST=	TUMGREYSPF_DIR=${TUMGREYSPF_DIR} \
 
 PORTDOCS=	*
 
+OPTIONS=	PYSPF	"Use mail/py-spf to resolve spf entries"	on \
+		LIBSPF2	"Use mail/libspf2 (spfquery) to resolve spf entries"	off
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_PYSPF)
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/spf.py:${PORTSDIR}/mail/py-spf
+.endif
+
+.if defined(WITH_LIBSPF2)
+RUN_DEPENDS+=	spfquery:${PORTSDIR}/mail/libspf2
+.endif
+
+.if (!defined(WITHOUT_PYSPF) || defined(WITH_PYSPF)) && defined(WITH_LIBSPF2)
+BROKEN=		Select only one spf resolver
+.endif
+
 pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "You may set following options:"
@@ -50,6 +65,10 @@ post-patch:
 		${WRKSRC}/tumgreyspf.conf
 	@${GREP} -r "env python" ${WRKSRC} | ${CUT} -d: -f1 | \
 		${XARGS} ${REINPLACE_CMD} -e "s|env python|env ${PYTHON_CMD}|"
+.if defined(WITH_LIBSPF2)
+	@${REINPLACE_CMD} -e "s|import spf|import spfXXX # Added XXX to disable py-spf if mail/py-spf are installed|" \
+		${WRKSRC}/tumgreyspf
+.endif
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/tumgreyspfsupp.py ${PYTHONPREFIX_SITELIBDIR}
@@ -75,4 +94,4 @@ post-install:
 	@${SETENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/tumgreyspf/distinfo b/mail/tumgreyspf/distinfo
index f2637ef0b5d2..cc3c8611e5d7 100644
--- a/mail/tumgreyspf/distinfo
+++ b/mail/tumgreyspf/distinfo
@@ -1,3 +1,3 @@
-MD5 (tumgreyspf-1.19.tar.gz) = 15a9e3f0dd03e4475a7e4967bb02b071
-SHA256 (tumgreyspf-1.19.tar.gz) = 1fef1ede38cebe913c273891b82d22774a7b98114e30193a0cedac733cc5474c
-SIZE (tumgreyspf-1.19.tar.gz) = 25902
+MD5 (tumgreyspf-1.20.tar.gz) = 9e14a9ff9007d5d7ec715d0ee79a5a1d
+SHA256 (tumgreyspf-1.20.tar.gz) = 3409915459d84a41daf9c709683c5ad823d13c0aa6b62282cc1b65bcfa7fc488
+SIZE (tumgreyspf-1.20.tar.gz) = 26083
-- 
cgit v1.2.3