Index: irc/inspircd/Makefile
===================================================================
--- irc/inspircd/Makefile
+++ irc/inspircd/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	inspircd
-PORTVERSION=	2.0.23
+PORTVERSION=	2.0.25
 DISTVERSIONPREFIX=	v
-PORTREVISION=	0
 CATEGORIES=	irc
 
 MAINTAINER=	feld@FreeBSD.org
@@ -48,7 +47,7 @@
 		--enable-kqueue --disable-interactive \
 		--uid=${INSPIRCD_UID}
 
-OPTIONS_DEFINE=	MYSQL PGSQL SQLITE LDAPAUTH LDAPOPER GNUTLS OPENSSL PCRE POSIX
+OPTIONS_DEFINE=	MYSQL PGSQL SQLITE LDAPAUTH LDAPOPER GNUTLS OPENSSL PCRE POSIX GEOIP
 OPTIONS_DEFAULT=	OPENSSL POSIX
 
 GNUTLS_DESC=	Build m_ssl_gnutls module
@@ -60,6 +59,7 @@
 SQLITE_DESC=	Build m_sqlite3 module
 PCRE_DESC=	Build m_regex_pcre module
 POSIX_DESC=	Build m_regex_posix module
+GEOIP_DESC=	Build m_geoip module
 
 .include <bsd.port.options.mk>
 
@@ -137,6 +137,14 @@
 PLIST_SUB+=	POSIX="@comment "
 .endif
 
+.if ${PORT_OPTIONS:MGEOIP}
+LIB_DEPENDS+=	libGeoIP.so:net/GeoIP
+EXTRAS:=${EXTRAS},m_geoip.cpp
+PLIST_SUB+=	GEOIP=""
+.else
+PLIST_SUB+=	GEOIP="@comment "
+.endif
+
 pre-configure:
 	@if [ ${EXTRAS} ]; then \
 		cd ${WRKSRC} && ${CONFIGURE_CMD} --enable-extras=${EXTRAS} ; \
Index: irc/inspircd/distinfo
===================================================================
--- irc/inspircd/distinfo
+++ irc/inspircd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1473170069
-SHA256 (inspircd-inspircd-v2.0.23_GH0.tar.gz) = 522b31fc80e8fd90b66837bf50f8a941233709d5b1fc9c0b3c47a413fb69f162
-SIZE (inspircd-inspircd-v2.0.23_GH0.tar.gz) = 731695
+TIMESTAMP = 1511032831
+SHA256 (inspircd-inspircd-v2.0.25_GH0.tar.gz) = c2488fafd04fcabbd8ddc8b9cdc6e0b57e942802b451c9cbccaf5d8483ebd251
+SIZE (inspircd-inspircd-v2.0.25_GH0.tar.gz) = 734017
Index: irc/inspircd/pkg-plist
===================================================================
--- irc/inspircd/pkg-plist
+++ irc/inspircd/pkg-plist
@@ -208,6 +208,7 @@
 %%OPENSSL%%lib/inspircd/modules/m_ssl_openssl.so
 %%PCRE%%lib/inspircd/modules/m_regex_pcre.so
 %%POSIX%%lib/inspircd/modules/m_regex_posix.so
+%%GEOIP%%lib/inspircd/modules/m_geoip.so
 lib/inspircd/modules/m_sslinfo.so
 lib/inspircd/modules/m_sslmodes.so
 lib/inspircd/modules/m_stripcolor.so