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,93 +45,72 @@
 		--enable-kqueue --disable-interactive \
 		--uid=${INSPIRCD_UID}
 
-OPTIONS_DEFINE=	MYSQL PGSQL SQLITE LDAPAUTH LDAPOPER GNUTLS OPENSSL PCRE POSIX
+OPTIONS_DEFINE=	GEOIP GNUTLS LDAPAUTH LDAPOPER MYSQL OPENSSL PCRE PGSQL POSIX SQLITE
 OPTIONS_DEFAULT=	OPENSSL POSIX
-
+GEOIP_DESC=	Build m_geoip module
 GNUTLS_DESC=	Build m_ssl_gnutls module
 LDAPAUTH_DESC=	Build m_ldapauth module
 LDAPOPER_DESC=	Build m_ldapoper module
 MYSQL_DESC=	Build m_mysql module
 OPENSSL_DESC=	Build m_ssl_openssl module
-PGSQL_DESC=	Build m_pgsql module
-SQLITE_DESC=	Build m_sqlite3 module
 PCRE_DESC=	Build m_regex_pcre module
+PGSQL_DESC=	Build m_pgsql module
 POSIX_DESC=	Build m_regex_posix module
+SQLITE_DESC=	Build m_sqlite3 module
+OPTIONS_SUB=	yes
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MGEOIP}
+LIB_DEPENDS+=	libGeoIP.so:net/GeoIP
+EXTRAS:=${EXTRAS},m_geoip.cpp
+.endif
+
+.if ${PORT_OPTIONS:MGNUTLS}
+USES+=	pkgconfig
+LIB_DEPENDS+=	libgnutls.so:security/gnutls
+CONFIGURE_ARGS+=	--enable-gnutls
+EXTRAS:=${EXTRAS},m_ssl_gnutls.cpp
+.endif
+
 .if ${PORT_OPTIONS:MLDAPAUTH}
 USE_OPENLDAP=	yes
 EXTRAS:=${EXTRAS},m_ldapauth.cpp
-PLIST_SUB+=	LDAPAUTH=""
-.else
-PLIST_SUB+=	LDAPAUTH="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MLDAPOPER}
 USE_OPENLDAP=	yes
 EXTRAS:=${EXTRAS},m_ldapoper.cpp
-PLIST_SUB+=	LDAPOPER=""
-.else
-PLIST_SUB+=	LDAPOPER="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
 EXTRAS:=${EXTRAS},m_mysql.cpp
-PLIST_SUB+=	MYSQL=""
-.else
-PLIST_SUB+=	MYSQL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPGSQL}
-USES+=		pgsql
-EXTRAS:=${EXTRAS},m_pgsql.cpp
-PLIST_SUB+=	PGSQL=""
-.else
-PLIST_SUB+=	PGSQL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSQLITE}
-USES+=	pkgconfig sqlite
-EXTRAS:=${EXTRAS},m_sqlite3.cpp
-PLIST_SUB+=	SQLITE=""
-.else
-PLIST_SUB+=	SQLITE="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MGNUTLS}
-USES+=	pkgconfig
-LIB_DEPENDS+=	libgnutls.so:security/gnutls
-CONFIGURE_ARGS+=	--enable-gnutls
-EXTRAS:=${EXTRAS},m_ssl_gnutls.cpp
-PLIST_SUB+=	GNUTLS=""
-.else
-PLIST_SUB+=	GNUTLS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MOPENSSL}
 USES+=	ssl pkgconfig
 CONFIGURE_ARGS+=	--enable-openssl
 EXTRAS:=${EXTRAS},m_ssl_openssl.cpp
-PLIST_SUB+=	OPENSSL=""
-.else
-PLIST_SUB+=	OPENSSL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPCRE}
 LIB_DEPENDS+=	libpcre.so:devel/pcre
 EXTRAS:=${EXTRAS},m_regex_pcre.cpp
-PLIST_SUB+=	PCRE=""
-.else
-PLIST_SUB+=	PCRE="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MPGSQL}
+USES+=		pgsql
+EXTRAS:=${EXTRAS},m_pgsql.cpp
 .endif
 
 .if ${PORT_OPTIONS:MPOSIX}
 EXTRAS:=${EXTRAS},m_regex_posix.cpp
-PLIST_SUB+=	POSIX=""
-.else
-PLIST_SUB+=	POSIX="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MSQLITE}
+USES+=	pkgconfig sqlite
+EXTRAS:=${EXTRAS},m_sqlite3.cpp
 .endif
 
 pre-configure:
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
@@ -199,15 +199,16 @@
 lib/inspircd/modules/m_spanningtree.so
 lib/inspircd/modules/m_sqlauth.so
 lib/inspircd/modules/m_sqloper.so
+%%GEOIP%%lib/inspircd/modules/m_geoip.so
+%%GNUTLS%%lib/inspircd/modules/m_ssl_gnutls.so
 %%LDAPAUTH%%lib/inspircd/modules/m_ldapauth.so
 %%LDAPOPER%%lib/inspircd/modules/m_ldapoper.so
 %%MYSQL%%lib/inspircd/modules/m_mysql.so
-%%PGSQL%%lib/inspircd/modules/m_pgsql.so
-%%SQLITE%%lib/inspircd/modules/m_sqlite3.so
-%%GNUTLS%%lib/inspircd/modules/m_ssl_gnutls.so
 %%OPENSSL%%lib/inspircd/modules/m_ssl_openssl.so
 %%PCRE%%lib/inspircd/modules/m_regex_pcre.so
+%%PGSQL%%lib/inspircd/modules/m_pgsql.so
 %%POSIX%%lib/inspircd/modules/m_regex_posix.so
+%%SQLITE%%lib/inspircd/modules/m_sqlite3.so
 lib/inspircd/modules/m_sslinfo.so
 lib/inspircd/modules/m_sslmodes.so
 lib/inspircd/modules/m_stripcolor.so