- Update ircd-ratbox and ircd-ratbox-devel. They are now both at the

  same version.
- Enable IPv6 by default in both ports.

5 files changed, 21 insertions, 26 deletions

diff --git a/irc/ircd-ratbox-devel/Makefile b/irc/ircd-ratbox-devel/Makefile
index 929ef6bac813..36fa76c73503 100644
--- a/irc/ircd-ratbox-devel/Makefile
+++ b/irc/ircd-ratbox-devel/Makefile
@@ -7,25 +7,26 @@
 # ex: ts=8
 
 PORTNAME=	ircd-ratbox
-PORTVERSION=	2.2.2
-CATEGORIES=	irc
+PORTVERSION=	2.2.3
+CATEGORIES=	irc ipv6
 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/
+		ftp://ftp.parodius.com/pub/ircd-ratbox/old/		\
+		http://www.ircd-ratbox.org/download/
 PKGNAMESUFFIX=	-devel
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	An advanced, stable IRC daemon, used on EFnet ('testing' release)
 
+CONFLICTS=	ircd-ratbox-[0-9]*
+
 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
@@ -44,7 +45,7 @@ PORTDOCS=	[^i]*.txt README.* technical/[^i]*.txt Tao-of-IRC.*
 
 OPTIONS=	KQUEUE		"Use superior kqueue(2) instead of poll(2)"	on  \
 		OPENSSL		"Enable openssl support"			on  \
-		IPV6		"Enable IPv6 support"				off \
+		IPV6		"Enable IPv6 support"				on  \
 		ZIPLINKS	"Enable ziplinks support"			on  \
 		SHARED_MODULES	"Enable shared modules support"			on  \
 		ASSERT		"Enable debugging code"				off \
@@ -68,8 +69,7 @@ CONFIGURE_ARGS+=	--enable-openssl
 CONFIGURE_ARGS+=	--disable-openssl
 .endif
 
-.if defined(WITH_IPV6)
-CATEGORIES+=	ipv6
+.if !defined(WITHOUT_IPV6)
 CONFIGURE_ARGS+=	--enable-ipv6
 .endif
 
diff --git a/irc/ircd-ratbox-devel/distinfo b/irc/ircd-ratbox-devel/distinfo
index 62abd6c4b987..9714fdd683d0 100644
--- a/irc/ircd-ratbox-devel/distinfo
+++ b/irc/ircd-ratbox-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (ircd-ratbox-2.2.2.tgz) = d62e339b4a680f7065cd82643fc1fbff
-SHA256 (ircd-ratbox-2.2.2.tgz) = 891f21ca32e99021e7160fb6f012be5f360a27ca5b01f92f0c4bd4936a145183
-SIZE (ircd-ratbox-2.2.2.tgz) = 704194
+MD5 (ircd-ratbox-2.2.3.tgz) = 5ddd1bf42ebcb139404fb8305c21fdfa
+SHA256 (ircd-ratbox-2.2.3.tgz) = 76e674cd1268c33c7278db95a61cc9186426f91d9453036f1153b591c1db1fbb
+SIZE (ircd-ratbox-2.2.3.tgz) = 704681
diff --git a/irc/ircd-ratbox/Makefile b/irc/ircd-ratbox/Makefile
index ce113ccb47b8..772b9a2fe215 100644
--- a/irc/ircd-ratbox/Makefile
+++ b/irc/ircd-ratbox/Makefile
@@ -7,8 +7,7 @@
 # ex: ts=8
 
 PORTNAME=	ircd-ratbox
-PORTVERSION=	2.1.8
-PORTREVISION=	1
+PORTVERSION=	2.2.3
 CATEGORIES=	irc ipv6
 MASTER_SITES=	ftp://ftp.ircd-ratbox.org/pub/ircd-ratbox/	\
 		ftp://ftp.demon.co.uk/pub/mirrors/ircd-ratbox/	\
@@ -19,7 +18,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	An advanced, stable IRC daemon, used on many EFnet servers
 
-CONFLICTS=	rcd-ratbox-devel-[0-9]*
+CONFLICTS=	ircd-ratbox-devel-[0-9]*
 
 MAN8=		ircd.8
 USE_RC_SUBR=	ircd-ratbox.sh
@@ -42,7 +41,7 @@ PORTDOCS=	[^i]*.txt README.* technical/[^i]*.txt Tao-of-IRC.*
 
 OPTIONS=	KQUEUE		"Use superior kqueue(2) instead of poll(2)"	on  \
 		OPENSSL		"Enable openssl support"			on  \
-		IPV6		"Enable IPv6 support"				off \
+		IPV6		"Enable IPv6 support"				on  \
 		ZIPLINKS	"Enable ziplinks support"			on  \
 		SHARED_MODULES	"Enable shared modules support"			on  \
 		ASSERT		"Enable debugging code"				off \
@@ -66,7 +65,7 @@ CONFIGURE_ARGS+=	--enable-openssl
 CONFIGURE_ARGS+=	--disable-openssl
 .endif
 
-.if defined(WITH_IPV6)
+.if !defined(WITHOUT_IPV6)
 CONFIGURE_ARGS+=	--enable-ipv6
 .endif
 
@@ -102,10 +101,6 @@ CONFIGURE_ARGS+=	--with-nicklen=${NICKLEN}
 CONFIGURE_ARGS+=	--with-topiclen=${TOPICLEN}
 .endif
 
-.if defined(MAXCLIENTS)
-CONFIGURE_ARGS+=	--with-maxclients=${MAXCLIENTS}
-.endif
-
 #-----------------------------------------------------------------------
 
 pre-configure:
@@ -113,7 +108,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/distinfo b/irc/ircd-ratbox/distinfo
index 1f275f1d66bc..9714fdd683d0 100644
--- a/irc/ircd-ratbox/distinfo
+++ b/irc/ircd-ratbox/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.3.tgz) = 5ddd1bf42ebcb139404fb8305c21fdfa
+SHA256 (ircd-ratbox-2.2.3.tgz) = 76e674cd1268c33c7278db95a61cc9186426f91d9453036f1153b591c1db1fbb
+SIZE (ircd-ratbox-2.2.3.tgz) = 704681
diff --git a/irc/ircd-ratbox/pkg-plist b/irc/ircd-ratbox/pkg-plist
index c2f27389fee2..a1e54f5b3de3 100644
--- a/irc/ircd-ratbox/pkg-plist
+++ b/irc/ircd-ratbox/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