4 files changed, 11 insertions, 23 deletions

diff --git a/mail/greylite/Makefile b/mail/greylite/Makefile
index 0316d56481cb..ab893f5d453d 100644
--- a/mail/greylite/Makefile
+++ b/mail/greylite/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	greylite
 PORTVERSION=	2.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	mail
 MASTER_SITES=	LOCAL/oliver
 
@@ -22,19 +22,13 @@ PLIST_FILES=	bin/greylite \
 
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=		GEOIP DNSBLENV UCSPI2SOCKET
-OPTIONS_DEFAULT=	GEOIP DNSBLENV UCSPI2SOCKET
-GEOIP_DESC=		Support for GeoIP in suspicion rules
+OPTIONS_DEFINE=		DNSBLENV UCSPI2SOCKET
+OPTIONS_DEFAULT=	DNSBLENV UCSPI2SOCKET
 DNSBLENV_DESC=		Module for interfacing with DNS blacklists
 UCSPI2SOCKET_DESC=	Module for using greylite as SMTP proxy
 
 .include <bsd.port.pre.mk>
 
-.if ${PORT_OPTIONS:MGEOIP}
-LIB_DEPENDS+=	libGeoIP.so:net/GeoIP
-MAKE_ARGS+=	WITH_GEOIP=yep
-.endif
-
 .if ${PORT_OPTIONS:MDNSBLENV}
 LIB_DEPENDS+=	libcares.so:dns/c-ares
 MAKE_ARGS+=	WITH_DNSBLENV=yep
diff --git a/mail/mailfromd/Makefile b/mail/mailfromd/Makefile
index 91f17be58dc8..7646b73c713b 100644
--- a/mail/mailfromd/Makefile
+++ b/mail/mailfromd/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mailfromd
 PORTVERSION=	8.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://download.gnu.org.ua/pub/release/${PORTNAME}/ \
 		http://download.gnu.org.ua/pub/alpha/${PORTNAME}/
@@ -34,7 +34,7 @@ SUB_LIST+=	MFD_RUN_DIR=${MFD_RUN_DIR}
 INFO=		${PORTNAME}
 PORTDOCS=	AUTHORS ChangeLog NEWS README THANKS TODO
 
-OPTIONS_DEFINE=		DEBUG DOCS DSPAM GEOIP NLS
+OPTIONS_DEFINE=		DEBUG DOCS DSPAM NLS
 OPTIONS_DEFAULT=	GDBM
 OPTIONS_MULTI=		DB
 OPTIONS_MULTI_DB=	BDB GDBM
@@ -50,9 +50,6 @@ DSPAM_LIB_DEPENDS=	libdspam.so:mail/dspam
 DSPAM_USES=		pkgconfig
 DSPAM_CONFIGURE_WITH=	dspam
 
-GEOIP_LIB_DEPENDS=	libGeoIP.so:net/GeoIP
-GEOIP_CONFIGURE_WITH=	geoip
-
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
diff --git a/mail/milter-greylist/Makefile b/mail/milter-greylist/Makefile
index bed6c1375964..f9fa8df2968c 100644
--- a/mail/milter-greylist/Makefile
+++ b/mail/milter-greylist/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	milter-greylist
 PORTVERSION=	4.6.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.espci.fr/pub/milter-greylist/ \
 		http://fossies.org/unix/privat/
@@ -28,8 +28,8 @@ USES=		tar:tgz
 # installed port preference over it.
 ##
 
-OPTIONS_DEFINE=		DKIM SPF GEOIP CURL LDAP P0F POSTFIX DOCS EXAMPLES
-OPTIONS_DEFAULT=	DKIM SPF GEOIP CURL
+OPTIONS_DEFINE=		DKIM SPF CURL LDAP P0F POSTFIX DOCS EXAMPLES
+OPTIONS_DEFAULT=	DKIM SPF CURL
 DKIM_DESC=		DKIM support
 SPF_DESC=		SPF support
 CURL_DESC=		curl support
@@ -40,7 +40,6 @@ DKIM_LIB_DEPENDS=	libopendkim.so:mail/opendkim
 P0F_RUN_DEPENDS=	p0f:net-mgmt/p0f
 SPF_LIB_DEPENDS=	libspf2.so:mail/libspf2
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
-GEOIP_LIB_DEPENDS=	libGeoIP.so:net/GeoIP
 
 POSTFIX_CONFIGURE_ENABLE=	postfix
 POSTFIX_LDFLAGS_OFF=		${SENDMAIL_LDFLAGS}
@@ -51,7 +50,6 @@ P0F_CONFIGURE_ENABLE=		p0f306
 DKIM_CONFIGURE_ON=		--with-libopendkim=${LOCALBASE}
 DKIM_USES=			ssl
 SPF_CONFIGURE_ON=		--with-libspf2=${LOCALBASE}
-GEOIP_CONFIGURE_ON=		--with-libGeoIP=${LOCALBASE}
 CURL_CONFIGURE_ON=		--with-libcurl=${LOCALBASE}
 LDAP_CONFIGURE_ON=		--with-openldap=${LOCALBASE}
 LDAP_LDFLAGS=			-L${LOCALBASE}/lib
diff --git a/mail/py-ppolicy/Makefile b/mail/py-ppolicy/Makefile
index 368003953a35..d15fb7c477ca 100644
--- a/mail/py-ppolicy/Makefile
+++ b/mail/py-ppolicy/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ppolicy
 PORTVERSION=	2.6.6
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	mail python
 MASTER_SITES=	http://kmlinux.fjfi.cvut.cz/~vokac/activities/ppolicy/download/%SUBDIR%/ \
 		http://www.chifeng.name/dist/ppolicy/%SUBDIR%/
@@ -24,10 +24,9 @@ DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=	GEOIP LDAP MYSQL DOCS
-OPTIONS_DEFAULT=	GEOIP LDAP
+OPTIONS_DEFINE=	LDAP MYSQL DOCS
+OPTIONS_DEFAULT=	LDAP
 
-GEOIP_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/GeoIP.so:net/py-GeoIP@${PY_FLAVOR}
 MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:databases/py-MySQLdb@${PY_FLAVOR}
 LDAP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ldap>=2.3.1:net/py-ldap@${PY_FLAVOR}