[Midnightbsd-cvs] mports: mail/milter-greylist: Update to 4.0

[laffer1 at midnightbsd.org]

Log Message:
-----------
Update to 4.0

Modified Files:
--------------
    mports/mail/milter-greylist:
        Makefile (r1.2 -> r1.3)
        distinfo (r1.1 -> r1.2)
        pkg-plist (r1.1 -> r1.2)
    mports/mail/milter-greylist/files:
        milter-greylist.sh (r1.1 -> r1.2)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/mail/milter-greylist/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -L mail/milter-greylist/pkg-plist -L mail/milter-greylist/pkg-plist -u -r1.1 -r1.2
--- mail/milter-greylist/pkg-plist
+++ mail/milter-greylist/pkg-plist
@@ -4,7 +4,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%EXAMPLESDIR%%/greylist.conf
 @exec /bin/mkdir -p /var/milter-greylist
- at exec /usr/sbin/chown smmsp /var/milter-greylist
+ at exec /usr/sbin/chown -R mailnull /var/milter-greylist
 @exec [ -f /var/db/milter-greylist/greylist.db ] && printf '\n\n************************************************************\n************************************************************\n**                                                        **\n**                        WARNING                         **\n**                                                        **\n** The default dump file location has changed.            **\n** Please move greylist.db from /var/db/milter-greylist/  **\n** to /var/milter-greylist/ and update your greylist.conf **\n** accordingly.                                           **\n**                                                        **\n************************************************************\n************************************************************\n' ||true
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/mail/milter-greylist/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L mail/milter-greylist/Makefile -L mail/milter-greylist/Makefile -u -r1.2 -r1.3
--- mail/milter-greylist/Makefile
+++ mail/milter-greylist/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	milter-greylist
-PORTVERSION=	3.0
+PORTVERSION=	4.0
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.espci.fr/pub/milter-greylist/
 DISTNAME=	milter-greylist-${PORTVERSION}
@@ -18,9 +18,13 @@
 LICENSE=	bsd4
 # well bsd3 but it's advertising... be conservative
 
-CONFLICTS=	milter-greylist-devel-[1-9]*.*
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
+
+OPTIONS=	LIBSPF2	 "Enable SPF checks" Off \
+		GEOIP	 "Enable GEOIP"  Off \
+		CURL	" Enable CURL for URL checks" Off
+
 ##
 # Use the following quirks to choose which sendmail to use (ports or system):
 #
@@ -55,15 +59,25 @@
 .endif
 
 .if defined(WITH_LIBSPF2)
-LIB_DEPENDS+=	spf2.2:${PORTSDIR}/mail/libspf2
+LIB_DEPENDS+=		libspf2>=1.2.5:${PORTSDIR}/mail/libspf2
 CONFIGURE_ARGS+=	--with-libspf2=${LOCALBASE}
 .endif
 
+.if defined(WITH_GEOIP)
+BUILD_DEPENDS+=       GeoIP>=1.4.4:${PORTSDIR}/net/GeoIP
+CONFIGURE_ARGS+=      --with-libGeoIP=${LOCALBASE}
+.endif
+
+.if defined(WITH_CURL)
+BUILD_DEPENDS+= curl>=7.18:${PORTSDIR}/ftp/curl
+CONFIGURE_ARGS+=      --with-curl=${LOCALBASE}
+.endif
+
 CFLAGS+=	${PTHREAD_CFLAGS}
 LIBS+=		${PTHREAD_LIBS}
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd6.0
 CONFIGURE_ARGS+=	--with-user=mailnull --with-libmilter=${MILTERBASE}
 CONFIGURE_ARGS+=	--enable-dnsrbl --with-thread-safe-resolver
 CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LIBS="${LIBS} "
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/mail/milter-greylist/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L mail/milter-greylist/distinfo -L mail/milter-greylist/distinfo -u -r1.1 -r1.2
--- mail/milter-greylist/distinfo
+++ mail/milter-greylist/distinfo
@@ -1,3 +1,3 @@
-MD5 (milter-greylist-3.0.tgz) = ffdd5588c78a405c107d4c8a40c7e01a
-SHA256 (milter-greylist-3.0.tgz) = 8962c29b730eb024e83d142f8c2ff36ffc41b65f6111ca6707752173b25c8cd0
-SIZE (milter-greylist-3.0.tgz) = 141461
+MD5 (milter-greylist-4.0.tgz) = 2834933b27298d30630eea621cbfdcf5
+SHA256 (milter-greylist-4.0.tgz) = 8b348062af8f46879a21a190070d72616536365f6e1e318eff18c3fcb024c875
+SIZE (milter-greylist-4.0.tgz) = 185107
Index: milter-greylist.sh
===================================================================
RCS file: /home/cvs/mports/mail/milter-greylist/files/milter-greylist.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -L mail/milter-greylist/files/milter-greylist.sh -L mail/milter-greylist/files/milter-greylist.sh -u -r1.1 -r1.2
--- mail/milter-greylist/files/milter-greylist.sh
+++ mail/milter-greylist/files/milter-greylist.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 # $FreeBSD: ports/mail/milter-greylist/files/milter-greylist.sh,v 1.4 2006/12/10 05:10:38 ache Exp $
+# $MidnightBSD$
 
 # PROVIDE: miltergreylist
 # REQUIRE: LOGIN