- Update to 2.0

Changes:
- greylite can now work as a generic SMTP proxy
- command errors in client behaviour analysis
- completely new command session control, now able to extract  
  envelope information out of any SMTP command session even with
  unrecognized/custom commands. SMTP AUTH still passes transparently
  automatically

PR:		ports/119736
Submitted by:	Mij <mij@bitchx.it> (maintainer)
Approved by:	linimon (mentor)

3 files changed, 38 insertions, 20 deletions

diff --git a/mail/greylite/Makefile b/mail/greylite/Makefile
index 6a9ab963170e..4b0f10f7d6cc 100644
--- a/mail/greylite/Makefile
+++ b/mail/greylite/Makefile
@@ -5,37 +5,58 @@
 # $FreeBSD$
 #
 
-PORTNAME=	greylite
-DISTVERSION=	1.3
-CATEGORIES=	mail
-MASTER_SITES=	http://mij.oltrelinux.com/net/greylite/
+PORTNAME=		greylite
+DISTVERSION=	2.0
+CATEGORIES=		mail
+MASTER_SITES=	http://mij.oltrelinux.com/net/greylite/releases/
 
-MAINTAINER=	mij@bitchx.it
-COMMENT=	An efficient greylisting module for qmail
+MAINTAINER=		mij@bitchx.it
+COMMENT=		Modified greylisting for qmail and for any other MDA
 
-USE_BZIP2=	yes
-USE_SQLITE=	3
-PLIST_FILES=	bin/greylite
+RUN_DEPENDS=	tcpserver:${PORTSDIR}/sysutils/ucspi-tcp
 
-MAN8=		greylite.8
+USE_BZIP2=		yes
+USE_SQLITE=		3
+PLIST_FILES=	bin/greylite \
+				%%DNSBLENV%%bin/dnsblenv	\
+				%%UCSPI2SOCKET%%bin/ucspi2socket
+
+MAN8=			greylite.8
 MANCOMPRESSED=	yes
 
-OPTIONS=	GEOIP	"Enable support for GeoIP in suspicion rules" On
+OPTIONS=	GEOIP		"Support for GeoIP in suspicion rules" On \
+			DNSBLENV   	"Module for interfacing with DNS blacklists" On \
+			UCSPI2SOCKET "Module for using greylite as SMTP proxy" On
 
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_GEOIP)
-LIB_DEPENDS+=	GeoIP:$(PORTSDIR)/net/GeoIP
+LIB_DEPENDS+=	GeoIP:${PORTSDIR}/net/GeoIP
 MAKE_ARGS+=	WITH_GEOIP=yep
 .endif
 
+.if !defined(WITHOUT_DNSBLENV)
+LIB_DEPENDS+=	cares:${PORTSDIR}/dns/c-ares
+MAKE_ARGS+=		WITH_DNSBLENV=yep WITH_CARES14=yep
+PLIST_SUB+=		DNSBLENV=""
+.else
+PLIST_SUB+=		DNSBLENV="@comment "
+.endif
+
+.if !defined(WITHOUT_UCSPI2SOCKET)
+MAKE_ARGS+=		WITH_UCSPI2SOCKET=yep
+PLIST_SUB+=		UCSPI2SOCKET=""
+.else
+PLIST_SUB+=		UCSPI2SOCKET="@comment "
+.endif
+
 post-patch:
 	${CP} ${WRKSRC}/Makefile.bsdmake ${WRKSRC}/Makefile
 
 do-build:
-	$(MAKE) -C $(WRKSRC) $(MAKE_ARGS)
+	${MAKE} -C ${WRKSRC} ${MAKE_ARGS}
 
 post-install:
-	@$(CAT) pkg-message
+	@${CAT} pkg-message
 
 .include <bsd.port.post.mk>
diff --git a/mail/greylite/distinfo b/mail/greylite/distinfo
index 1e08b8867e1b..2a2d3f72e409 100644
--- a/mail/greylite/distinfo
+++ b/mail/greylite/distinfo
@@ -1,3 +1,3 @@
-MD5 (greylite-1.3.tar.bz2) = a034d736a75555a3b710a288f33ade96
-SHA256 (greylite-1.3.tar.bz2) = 8393fd976daa4e0f514567f9a39905d4115cbe1f5809315bf4b16e082e8f7eba
-SIZE (greylite-1.3.tar.bz2) = 13629
+MD5 (greylite-2.0.tar.bz2) = 4de0975465025b5808f0cf6c21d324af
+SHA256 (greylite-2.0.tar.bz2) = 7f6900746931cc9bb76cd25e579fe4213266a89282f4bfe954683fd2ab0ecee5
+SIZE (greylite-2.0.tar.bz2) = 19082
diff --git a/mail/greylite/pkg-message b/mail/greylite/pkg-message
index 7c915c9d3183..0d76c900a170 100644
--- a/mail/greylite/pkg-message
+++ b/mail/greylite/pkg-message
@@ -2,7 +2,4 @@
 Greylite has been installed. Some steps are required for setting
 it up with qmail. greylite(8) has a synthesis and the website at
 http://mij.oltrelinux.com/net/greylite/ has more information.
-You might be also interested in further refinements to improve
-the effectiveness and performance of greylite:
-http://mij.oltrelinux.com/net/greylite/practmatters.html
 ################################################################