4 files changed, 23 insertions, 17 deletions

diff --git a/irc/ircd-ratbox-devel/Makefile b/irc/ircd-ratbox-devel/Makefile
index 21fd8c7ee74e..2e5a3bfa9642 100644
--- a/irc/ircd-ratbox-devel/Makefile
+++ b/irc/ircd-ratbox-devel/Makefile
@@ -7,20 +7,25 @@
 # ex: ts=8
 
 PORTNAME=	ircd-ratbox
-PORTVERSION=	2.1.8
-CATEGORIES=	irc ipv6
-MASTER_SITES=	ftp://ftp.ircd-ratbox.org/pub/ircd-ratbox/	\
-		ftp://ftp.demon.co.uk/pub/mirrors/ircd-ratbox/	\
-		http://www.ircd-ratbox.org/download/		\
-		ftp://ftp.parodius.com/pub/ircd-ratbox/
+PORTVERSION=	2.2.2
+CATEGORIES=	irc
+MASTER_SITES=	ftp://ftp.ircd-ratbox.org/pub/ircd-ratbox/testing/	\
+		ftp://ftp.demon.co.uk/pub/mirrors/ircd-ratbox/testing/	\
+		http://www.ircd-ratbox.org/download/testing/		\
+		ftp://ftp.parodius.com/pub/ircd-ratbox/testing/		\
+		http://www.ircd-ratbox.org/download/old/		\
+		ftp://ftp.parodius.com/pub/ircd-ratbox/old/
+PKGNAMESUFFIX=	-devel
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	shaun@inerd.com
-COMMENT=	An advanced, stable IRC daemon, used on many EFnet servers
+COMMENT=	An advanced, stable IRC daemon, used on EFnet ('testing' release)
 
 MAN8=		ircd.8
 USE_RC_SUBR=	ircd-ratbox.sh
 
+CONFLICTS=	ircd-ratbox-[0-9]*
+
 LOGDIR=		/var/log/${PORTNAME}
 RUNDIR=		/var/run/${PORTNAME}
 SUB_FILES=	pkg-message pkg-install
@@ -64,6 +69,7 @@ CONFIGURE_ARGS+=	--disable-openssl
 .endif
 
 .if defined(WITH_IPV6)
+CATEGORIES+=	ipv6
 CONFIGURE_ARGS+=	--enable-ipv6
 .endif
 
@@ -99,10 +105,6 @@ CONFIGURE_ARGS+=	--with-nicklen=${NICKLEN}
 CONFIGURE_ARGS+=	--with-topiclen=${TOPICLEN}
 .endif
 
-.if defined(MAXCLIENTS)
-CONFIGURE_ARGS+=	--with-maxclients=${MAXCLIENTS}
-.endif
-
 #-----------------------------------------------------------------------
 
 pre-configure:
@@ -110,7 +112,6 @@ pre-configure:
 	@${ECHO_MSG} "This port has additional options:"
 	@${ECHO_MSG} "    NICKLEN     [default 9, max 50]    - Max nick length on server"
 	@${ECHO_MSG} "    TOPICLEN    [default 120, max 390] - Max topic length"
-	@${ECHO_MSG} "    MAXCLIENTS  [default 3000]         - Max clients server can handle"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Press CTRL+C now if you wish to set them."
 	@${ECHO_MSG} ""
diff --git a/irc/ircd-ratbox-devel/distinfo b/irc/ircd-ratbox-devel/distinfo
index 1f275f1d66bc..62abd6c4b987 100644
--- a/irc/ircd-ratbox-devel/distinfo
+++ b/irc/ircd-ratbox-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (ircd-ratbox-2.1.8.tgz) = 5fc49439e23926d98bd6d0d0ecb1f65f
-SHA256 (ircd-ratbox-2.1.8.tgz) = 8c0191c56d70d352dc4b64ff16a6652a06b5f2c66a9d147652da99347454da61
-SIZE (ircd-ratbox-2.1.8.tgz) = 1420957
+MD5 (ircd-ratbox-2.2.2.tgz) = d62e339b4a680f7065cd82643fc1fbff
+SHA256 (ircd-ratbox-2.2.2.tgz) = 891f21ca32e99021e7160fb6f012be5f360a27ca5b01f92f0c4bd4936a145183
+SIZE (ircd-ratbox-2.2.2.tgz) = 704194
diff --git a/irc/ircd-ratbox-devel/pkg-descr b/irc/ircd-ratbox-devel/pkg-descr
index 9ffd84789266..e3b103c2c8a1 100644
--- a/irc/ircd-ratbox-devel/pkg-descr
+++ b/irc/ircd-ratbox-devel/pkg-descr
@@ -1,5 +1,9 @@
 This is a port of the ircd-ratbox IRC daemon.
 
+This version is the 'testing' branch: it usually contains more features,
+but may contain as of yet unidentified bugs. Admins on smaller networks
+may prefer to use it over the standard production release.
+
 ircd-ratbox is the primary ircd used on EFnet; it combines the stability
 of an ircd required for a large production network together with a rich
 set of features, making it also suitable for use on smaller networks.
diff --git a/irc/ircd-ratbox-devel/pkg-plist b/irc/ircd-ratbox-devel/pkg-plist
index c2f27389fee2..a1e54f5b3de3 100644
--- a/irc/ircd-ratbox-devel/pkg-plist
+++ b/irc/ircd-ratbox-devel/pkg-plist
@@ -14,7 +14,6 @@ lib/ircd-ratbox/modules/autoload/m_admin.so
 lib/ircd-ratbox/modules/autoload/m_away.so
 lib/ircd-ratbox/modules/autoload/m_cap.so
 lib/ircd-ratbox/modules/autoload/m_capab.so
-lib/ircd-ratbox/modules/autoload/m_challenge.so
 lib/ircd-ratbox/modules/autoload/m_close.so
 lib/ircd-ratbox/modules/autoload/m_cmessage.so
 lib/ircd-ratbox/modules/autoload/m_connect.so
@@ -99,6 +98,7 @@ lib/ircd-ratbox/modules/m_squit.so
 %%DATADIR%%/help/opers/away
 %%DATADIR%%/help/opers/capab
 %%DATADIR%%/help/opers/challenge
+%%DATADIR%%/help/opers/chantrace
 %%DATADIR%%/help/opers/close
 %%DATADIR%%/help/opers/cmode
 %%DATADIR%%/help/opers/cnotice
@@ -107,7 +107,6 @@ lib/ircd-ratbox/modules/m_squit.so
 %%DATADIR%%/help/opers/credits
 %%DATADIR%%/help/opers/die
 %%DATADIR%%/help/opers/dline
-%%DATADIR%%/help/opers/eob
 %%DATADIR%%/help/opers/error
 %%DATADIR%%/help/opers/etrace
 %%DATADIR%%/help/opers/gline
@@ -126,6 +125,7 @@ lib/ircd-ratbox/modules/m_squit.so
 %%DATADIR%%/help/opers/locops
 %%DATADIR%%/help/opers/lusers
 %%DATADIR%%/help/opers/map
+%%DATADIR%%/help/opers/masktrace
 %%DATADIR%%/help/opers/modlist
 %%DATADIR%%/help/opers/modload
 %%DATADIR%%/help/opers/modrestart
@@ -164,6 +164,7 @@ lib/ircd-ratbox/modules/m_squit.so
 %%DATADIR%%/help/opers/undline
 %%DATADIR%%/help/opers/ungline
 %%DATADIR%%/help/opers/unkline
+%%DATADIR%%/help/opers/unreject
 %%DATADIR%%/help/opers/unresv
 %%DATADIR%%/help/opers/unxline
 %%DATADIR%%/help/opers/user