Index: irc/inspircd/Makefile
===================================================================
--- irc/inspircd/Makefile
+++ irc/inspircd/Makefile
@@ -1,27 +1,22 @@
-# Created by: Craig Edwards <brain@mail1.chatspike.net>
 # $FreeBSD$
 
 PORTNAME=	inspircd
-PORTVERSION=	2.0.23
 DISTVERSIONPREFIX=	v
-PORTREVISION=	0
+DISTVERSION=	2.0.24
 CATEGORIES=	irc
 
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	Modular C++ IRC daemon
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/docs/COPYING
 
 CONFLICTS=	inspircd-1.*
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	inspircd
-
-USE_RC_SUBR=	${PORTNAME}
 MAKEFILE=	BSDmakefile
 
-USERS=	ircd
-GROUPS=	ircd
+USERS=		ircd
+GROUPS=		ircd
 INSPIRCD_UID=	72
 
 INSPIRCD_RUN?=	/var/run/${PORTNAME}
@@ -34,7 +29,9 @@
 
 # Configure script is written in perl
 USES=		cpe perl5
+USE_GITHUB=	yes
 USE_PERL5=	build
+USE_RC_SUBR=	${PORTNAME}
 
 CPE_VENDOR=	inspire_ircd
 CPE_PRODUCT=	inspircd
@@ -48,9 +45,8 @@
 		--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
 LDAPAUTH_DESC=	Build m_ldapauth module
 LDAPOPER_DESC=	Build m_ldapoper module
@@ -60,6 +56,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 +134,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 = 1498570396
+SHA256 (inspircd-inspircd-v2.0.24_GH0.tar.gz) = 41f702cb84caa2db089a02f511a3da3e7fa3cdce7d2c5040b3c54c5da83c8b40
+SIZE (inspircd-inspircd-v2.0.24_GH0.tar.gz) = 732354
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