Index: Makefile
===================================================================
--- Makefile	(revision 428510)
+++ Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ircd-hybrid
-PORTVERSION=	8.2.5
+PORTVERSION=	8.2.21
 CATEGORIES=	irc ipv6
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -40,13 +40,7 @@
 CONFIGURE_ARGS+=	--enable-openssl=${OPENSSLBASE}
 .endif
 
-# User Configurable Variables
-# NICKLEN		- Nick length. Default is 9. Must be consistent across the network.
 
-.if defined(NICKLEN)
-CONFIGURE_ARGS+=	--with-nicklen=${NICKLEN}
-.endif
-
 CONFIGURE_ARGS+=	\
 	--sysconfdir=${PREFIX}/etc/ircd-hybrid \
 	--datarootdir=${PREFIX}/share/${PORTNAME}-${PORTVERSION} \
Index: distinfo
===================================================================
--- distinfo	(revision 428510)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (ircd-hybrid-8.2.5.tgz) = dbdb63123ba27f7abd393f0cbb51462e5cca69fa40c158aa76af33478c8e9ca1
-SIZE (ircd-hybrid-8.2.5.tgz) = 1199513
+SHA256 (ircd-hybrid-8.2.21.tgz) = c37f67ff087bb471e6a4fbdd172e4b92d4c9924ba3ddfe481787855febcb8fa5
+SIZE (ircd-hybrid-8.2.21.tgz) = 1219746
Index: files/pkg-message.in
===================================================================
--- files/pkg-message.in	(revision 428510)
+++ files/pkg-message.in	(working copy)
@@ -13,4 +13,4 @@
 
 into your /etc/rc.conf.  You may then start the server by running:
 
-	%%PREFIX%%/etc/rc.d/ircd-hybrid.sh start
+	%%PREFIX%%/etc/rc.d/ircd-hybrid start
Index: pkg-descr
===================================================================
--- pkg-descr	(revision 428510)
+++ pkg-descr	(working copy)
@@ -2,6 +2,6 @@
 
 ircd-hybrid includes a number of improvements over a standard
 ircd-2.8 server, including compressed server<->server links, chanmode
-+e, and TS5 support.
++e, TS5 support, IPv6 support for libGeoIP
 
 WWW: http://www.ircd-hybrid.org/
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 428510)
+++ pkg-plist	(working copy)
@@ -1,6 +1,5 @@
 bin/ircd
 bin/mkpasswd
-bin/respond
 %%ETCDIR%%/reference.conf
 lib/ircd-hybrid/modules/autoload/m_accept.la
 lib/ircd-hybrid/modules/autoload/m_accept.so
@@ -14,8 +13,6 @@
 lib/ircd-hybrid/modules/autoload/m_capab.so
 lib/ircd-hybrid/modules/autoload/m_certfp.la
 lib/ircd-hybrid/modules/autoload/m_certfp.so
-lib/ircd-hybrid/modules/autoload/m_challenge.la
-lib/ircd-hybrid/modules/autoload/m_challenge.so
 lib/ircd-hybrid/modules/autoload/m_close.la
 lib/ircd-hybrid/modules/autoload/m_close.so
 lib/ircd-hybrid/modules/autoload/m_connect.la
@@ -28,8 +25,6 @@
 lib/ircd-hybrid/modules/autoload/m_eob.so
 lib/ircd-hybrid/modules/autoload/m_etrace.la
 lib/ircd-hybrid/modules/autoload/m_etrace.so
-lib/ircd-hybrid/modules/autoload/m_gline.la
-lib/ircd-hybrid/modules/autoload/m_gline.so
 lib/ircd-hybrid/modules/autoload/m_globops.la
 lib/ircd-hybrid/modules/autoload/m_globops.so
 lib/ircd-hybrid/modules/autoload/m_hash.la
@@ -84,6 +79,8 @@
 lib/ircd-hybrid/modules/autoload/m_stats.so
 lib/ircd-hybrid/modules/autoload/m_svinfo.la
 lib/ircd-hybrid/modules/autoload/m_svinfo.so
+lib/ircd-hybrid/modules/autoload/m_svshost.la
+lib/ircd-hybrid/modules/autoload/m_svshost.so
 lib/ircd-hybrid/modules/autoload/m_svsjoin.la
 lib/ircd-hybrid/modules/autoload/m_svsjoin.so
 lib/ircd-hybrid/modules/autoload/m_svskill.la
@@ -104,10 +101,10 @@
 lib/ircd-hybrid/modules/autoload/m_topic.so
 lib/ircd-hybrid/modules/autoload/m_trace.la
 lib/ircd-hybrid/modules/autoload/m_trace.so
+lib/ircd-hybrid/modules/autoload/m_undline.la
+lib/ircd-hybrid/modules/autoload/m_undline.so
 lib/ircd-hybrid/modules/autoload/m_unkline.la
 lib/ircd-hybrid/modules/autoload/m_unkline.so
-lib/ircd-hybrid/modules/autoload/m_undline.la
-lib/ircd-hybrid/modules/autoload/m_undline.so
 lib/ircd-hybrid/modules/autoload/m_unresv.la
 lib/ircd-hybrid/modules/autoload/m_unresv.so
 lib/ircd-hybrid/modules/autoload/m_unxline.la
@@ -168,18 +165,12 @@
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/accept
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/admin
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/away
-%%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/capab
-%%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/challenge
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/close
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/cmode
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/connect
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/die
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/dline
-%%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/eob
-%%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/error
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/etrace
-%%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/gline
-%%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/gungline
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/hash
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/help
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/index
@@ -212,12 +203,9 @@
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/rehash
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/restart
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/resv
-%%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/server
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/set
-%%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/sjoin
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/squit
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/stats
-%%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/svinfo
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/time
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/topic
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/trace
@@ -234,3 +222,5 @@
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/whois
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/whowas
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/xline
+@dir /var/lib
+