7 files changed, 35 insertions, 39 deletions

diff --git a/irc/ircd-ratbox-devel/Makefile b/irc/ircd-ratbox-devel/Makefile
index 36fa76c73503..ca18cbc19850 100644
--- a/irc/ircd-ratbox-devel/Makefile
+++ b/irc/ircd-ratbox-devel/Makefile
@@ -7,20 +7,17 @@
 # ex: ts=8
 
 PORTNAME=	ircd-ratbox
-PORTVERSION=	2.2.3
+PORTVERSION=	2.2.6
 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/		\
-		http://www.ircd-ratbox.org/download/
+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/
 PKGNAMESUFFIX=	-devel
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	shaun@FreeBSD.org
-COMMENT=	An advanced, stable IRC daemon, used on EFnet ('testing' release)
+MAINTAINER=	shaun@inerd.com
+COMMENT=	An advanced, stable IRC daemon, used on many EFnet servers
 
 CONFLICTS=	ircd-ratbox-[0-9]*
 
@@ -111,7 +108,7 @@ pre-configure:
 	@${ECHO_MSG} ""
 	@${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} "    TOPICLEN    [default 160, max 390] - Max topic length"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Press CTRL+C now if you wish to set them."
 	@${ECHO_MSG} ""
@@ -121,6 +118,9 @@ post-patch:
 	@${REINPLACE_CMD} -e "s#%%PREFIX%%#${PREFIX}#g"		  \
 			  ${WRKSRC}/doc/example.conf		  \
 			  ${WRKSRC}/doc/example.efnet.conf
+	@${REINPLACE_CMD} -e "s#%%LOGDIR%%#${LOGDIR}#g"		\
+				${WRKSRC}/doc/example.conf	\
+				${WRKSRC}/doc/example.efnet.conf
 	@${REINPLACE_CMD} -e "s#%%RUNDIR%%#${RUNDIR}#g" ${WRKSRC}/include/config.h
 
 pre-su-install:
diff --git a/irc/ircd-ratbox-devel/distinfo b/irc/ircd-ratbox-devel/distinfo
index 9714fdd683d0..66c1ae549f48 100644
--- a/irc/ircd-ratbox-devel/distinfo
+++ b/irc/ircd-ratbox-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (ircd-ratbox-2.2.3.tgz) = 5ddd1bf42ebcb139404fb8305c21fdfa
-SHA256 (ircd-ratbox-2.2.3.tgz) = 76e674cd1268c33c7278db95a61cc9186426f91d9453036f1153b591c1db1fbb
-SIZE (ircd-ratbox-2.2.3.tgz) = 704681
+MD5 (ircd-ratbox-2.2.6.tgz) = d288f8169e08d9031a115814a8a88033
+SHA256 (ircd-ratbox-2.2.6.tgz) = b6dd01a15d13f29c0a87f507a63b212b3fe7a62bcd101ac123ec75fcca847c35
+SIZE (ircd-ratbox-2.2.6.tgz) = 713577
diff --git a/irc/ircd-ratbox-devel/files/patch-doc_example.conf b/irc/ircd-ratbox-devel/files/patch-doc_example.conf
index 4108098b4891..ac40435cf404 100644
--- a/irc/ircd-ratbox-devel/files/patch-doc_example.conf
+++ b/irc/ircd-ratbox-devel/files/patch-doc_example.conf
@@ -1,6 +1,6 @@
---- doc/example.conf.orig	Sat Jun 11 22:26:01 2005
-+++ doc/example.conf	Fri Jan 27 06:46:05 2006
-@@ -110,16 +110,16 @@
+--- doc/example.conf.orig	Tue Aug 21 00:37:55 2007
++++ doc/example.conf	Tue Aug 21 00:37:55 2007
+@@ -117,16 +117,16 @@
  	 * - operspylog: operspy usage
  	 * - ioerrorlog: IO errors
  	 */
@@ -27,8 +27,8 @@
  };
  
  /* class {}: contain information about classes for users (OLD Y:) */
-@@ -309,7 +309,7 @@
- 	 * A password should not be defined when this is used, see 
+@@ -314,7 +314,7 @@
+ 	 * A password should not be defined when this is used, see
  	 * doc/challenge.txt for more information.
  	 */
 -	#rsa_public_key_file = "/usr/local/ircd/etc/oper.pub";
@@ -36,7 +36,7 @@
  
  	/* umodes: the specific umodes this oper gets when they oper.
  	 * If this is specified an oper will not be given oper_umodes
-@@ -878,7 +878,7 @@
+@@ -898,7 +898,7 @@
  	 *
  	 * only define if servlink is not in same directory as ircd itself.
  	 */
@@ -45,8 +45,8 @@
  
  	/* use egd: if your system does not have *random devices yet you
  	 * want to use OpenSSL and encrypted links, enable this.  Beware -
-@@ -923,8 +923,9 @@
- 	/* module path: paths to search for modules specified below and 
+@@ -948,8 +948,9 @@
+ 	/* module path: paths to search for modules specified below and
  	 * in /modload.
  	 */
 -	path = "/usr/local/ircd/modules";
diff --git a/irc/ircd-ratbox-devel/files/patch-doc_example.efnet.conf b/irc/ircd-ratbox-devel/files/patch-doc_example.efnet.conf
index 7ab45d8ada35..d9e521b3c1a3 100644
--- a/irc/ircd-ratbox-devel/files/patch-doc_example.efnet.conf
+++ b/irc/ircd-ratbox-devel/files/patch-doc_example.efnet.conf
@@ -1,6 +1,6 @@
---- doc/example.efnet.conf.orig	Sat Jun 11 22:26:01 2005
-+++ doc/example.efnet.conf	Fri Jan 27 06:47:05 2006
-@@ -112,16 +112,16 @@
+--- doc/example.efnet.conf.orig	Tue Aug 21 00:37:55 2007
++++ doc/example.efnet.conf	Tue Aug 21 00:37:55 2007
+@@ -119,16 +119,16 @@
  	 * - operspylog: operspy usage
  	 * - ioerrorlog: IO errors
  	 */
@@ -27,8 +27,8 @@
  };
  
  /* class {}: contain information about classes for users (OLD Y:) */
-@@ -311,7 +311,7 @@
- 	 * A password should not be defined when this is used, see 
+@@ -317,7 +317,7 @@
+ 	 * A password should not be defined when this is used, see
  	 * doc/challenge.txt for more information.
  	 */
 -	#rsa_public_key_file = "/usr/local/ircd/etc/oper.pub";
@@ -36,7 +36,7 @@
  
  	/* umodes: the specific umodes this oper gets when they oper.
  	 * If this is specified an oper will not be given oper_umodes
-@@ -897,7 +897,7 @@
+@@ -908,7 +908,7 @@
  	 *
  	 * only define if servlink is not in same directory as ircd itself.
  	 */
@@ -45,15 +45,15 @@
  
  	/* use egd: if your system does not have *random devices yet you
  	 * want to use OpenSSL and encrypted links, enable this.  Beware -
-@@ -942,8 +942,9 @@
- 	/* module path: paths to search for modules specified below and 
+@@ -958,8 +958,9 @@
+ 	/* module path: paths to search for modules specified below and
  	 * in /modload.
  	 */
 -	path = "/usr/local/ircd/modules";
 -	path = "/usr/local/ircd/modules/autoload";
-+        path = "%%PREFIX%%/lib/ircd-ratbox/modules/";
-+        path = "%%PREFIX%%/lib/ircd-ratbox/modules/autoload/";
-+        path = "%%PREFIX%%/lib/ircd-ratbox/modules/contrib/";
++	path = "%%PREFIX%%/lib/ircd-ratbox/modules/";
++	path = "%%PREFIX%%/lib/ircd-ratbox/modules/autoload/";
++	path = "%%PREFIX%%/lib/ircd-ratbox/modules/contrib/";
  
  	/* module: the name of a module to load on startup/rehash */
  	#module = "some_module.so";
diff --git a/irc/ircd-ratbox-devel/files/pkg-message.in b/irc/ircd-ratbox-devel/files/pkg-message.in
index ac96137de8c7..7f942cabc92a 100644
--- a/irc/ircd-ratbox-devel/files/pkg-message.in
+++ b/irc/ircd-ratbox-devel/files/pkg-message.in
@@ -8,7 +8,7 @@ documentation. This file is required to start the server.
 Once you have added ircd_ratbox_enable="YES" to /etc/rc.conf, the
 server can be started by running:
 
-	%%PREFIX%%/etc/rc.d/ircd-ratbox.sh start
+	%%PREFIX%%/etc/rc.d/ircd-ratbox start
 
 Be sure to check out 'ratbox-services' if you need a services package.
 ------------------------------------------------------------------------
diff --git a/irc/ircd-ratbox-devel/pkg-descr b/irc/ircd-ratbox-devel/pkg-descr
index e3b103c2c8a1..9ffd84789266 100644
--- a/irc/ircd-ratbox-devel/pkg-descr
+++ b/irc/ircd-ratbox-devel/pkg-descr
@@ -1,9 +1,5 @@
 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 a1e54f5b3de3..5aa61ac316cc 100644
--- a/irc/ircd-ratbox-devel/pkg-plist
+++ b/irc/ircd-ratbox-devel/pkg-plist
@@ -71,13 +71,13 @@ lib/ircd-ratbox/modules/contrib/m_ojoin.so
 lib/ircd-ratbox/modules/contrib/m_okick.so
 lib/ircd-ratbox/modules/contrib/m_olist.so
 lib/ircd-ratbox/modules/contrib/m_opme.so
+lib/ircd-ratbox/modules/contrib/m_webirc.so
 lib/ircd-ratbox/modules/contrib/spy_admin_notice.so
 lib/ircd-ratbox/modules/contrib/spy_info_notice.so
 lib/ircd-ratbox/modules/contrib/spy_links_notice.so
 lib/ircd-ratbox/modules/contrib/spy_motd_notice.so
 lib/ircd-ratbox/modules/contrib/spy_stats_notice.so
 lib/ircd-ratbox/modules/contrib/spy_stats_p_notice.so
-lib/ircd-ratbox/modules/contrib/spy_trace_notice.so
 lib/ircd-ratbox/modules/contrib/spy_whois_notice.so
 lib/ircd-ratbox/modules/contrib/spy_whois_notice_global.so
 lib/ircd-ratbox/modules/m_die.so