18 files changed, 319 insertions, 300 deletions

diff --git a/irc/ircd-ratbox/Makefile b/irc/ircd-ratbox/Makefile
index cf29c219462b..b9bffd8be328 100644
--- a/irc/ircd-ratbox/Makefile
+++ b/irc/ircd-ratbox/Makefile
@@ -7,60 +7,62 @@
 # ex: ts=8
 
 PORTNAME=	ircd-ratbox
-PORTVERSION=	2.2.9
+PORTVERSION=	3.0.7
 CATEGORIES=	irc ipv6
 MASTER_SITES=	http://www.ratbox.org/download/				\
 		ftp://ftp.parodius.com/pub/ircd-ratbox/			\
 		http://www.ratbox.org/download/old/
 
 MAINTAINER=	moggie@elasticmind.net
-COMMENT=	An advanced, stable IRC daemon, used on many EFnet servers
+COMMENT=	Advanced, stable IRC daemon, used widely on EFnet
+
+LICENSE=	GPLv2
 
 CONFLICTS=	ircd-ratbox-devel-[0-9]*
 
 USE_BZIP2=	yes
-MAN8=		ircd.8
+#MAN8=		ircd.8
 USE_RC_SUBR=	ircd-ratbox.sh
-USE_PERL5_BUILD=	yes
+USE_SQLITE=	3
+USE_LDCONFIG=	${PREFIX}/lib/ircd-ratbox
 
 USERS=		ircd
 GROUPS=		${USERS}
 
-LOGDIR=		/var/log/${PORTNAME}
-RUNDIR=		/var/run/${PORTNAME}
+LOGDIR?=	/var/log/${PORTNAME}
+RUNDIR?=	/var/run/${PORTNAME}
+DBDIR?=		/var/db/${PORTNAME}
 SUB_FILES=	pkg-message pkg-install
-PLIST_SUB=	LOGDIR=${LOGDIR} RUNDIR=${RUNDIR}
-SUB_LIST=	LOGDIR=${LOGDIR} RUNDIR=${RUNDIR}
+PLIST_SUB=	LOGDIR=${LOGDIR} RUNDIR=${RUNDIR} DBDIR=${DBDIR}
+SUB_LIST=	LOGDIR=${LOGDIR} RUNDIR=${RUNDIR} DBDIR=${DBDIR}
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-confdir=${PREFIX}/etc/${PORTNAME}	   \
-		--with-logdir=/var/log/${PORTNAME}		   \
-		--with-moduledir=${PREFIX}/lib/${PORTNAME}/modules \
-		--with-helpdir=${DATADIR}/help
+CONFIGURE_ARGS=	--with-confdir=${PREFIX}/etc/${PORTNAME}		\
+		--with-logdir=/var/log/${PORTNAME}			\
+		--with-moduledir=${PREFIX}/lib/${PORTNAME}/modules	\
+		--libexecdir=${PREFIX}/libexec				\
+		--with-helpdir=${DATADIR}/help				\
+		--libdir=${PREFIX}/lib/${PORTNAME}			\
+		--with-sqlite3=${LOCALBASE}				\
+		--disable-backups
 
 PORTDOCS=	[^i]*.txt README.* technical/[^i]*.txt Tao-of-IRC.*
 
 #-- Options ------------------------------------------------------------
 
-OPTIONS=	KQUEUE		"Use superior kqueue(2) instead of poll(2)"	on  \
-		OPENSSL		"Enable openssl support"			on  \
+OPTIONS=	OPENSSL		"Enable openssl support"			on  \
 		IPV6		"Enable IPv6 support"				on  \
 		ZIPLINKS	"Enable ziplinks support"			on  \
 		SHARED_MODULES	"Enable shared modules support"			on  \
 		ASSERT		"Enable debugging code"				off \
 		SMALL_NET	"Tune server for small networks"		off \
-		SERVICES	"Enable ratbox-services compatibility code"	off
+		SERVICES	"Enable ratbox-services compatibility code"	off \
+		SHORTCUTS	"Build with ircd-shortcut commands"		off
 
 #----------------------------------------------------------------------
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_KQUEUE)
-CONFIGURE_ARGS+=	--enable-kqueue
-.else
-CONFIGURE_ARGS+=	--enable-poll
-.endif
-
 .if defined(WITH_OPENSSL)
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
 CONFIGURE_ARGS+=	--enable-openssl
@@ -68,8 +70,8 @@ CONFIGURE_ARGS+=	--enable-openssl
 CONFIGURE_ARGS+=	--disable-openssl
 .endif
 
-.if !defined(WITHOUT_IPV6)
-CONFIGURE_ARGS+=	--enable-ipv6
+.if defined(WITHOUT_IPV6)
+CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
 .if defined(WITHOUT_ZIPLINKS)
@@ -92,6 +94,16 @@ CONFIGURE_ARGS+=	--enable-small-net
 
 .if defined(WITH_SERVICES)
 CONFIGURE_ARGS+=	--enable-services
+PLIST_SUB+=		SERVICES=""
+.else
+PLIST_SUB+=		SERVICES="@comment "
+.endif
+
+.if defined(WITH_SHORTCUTS)
+USE_PERL5_BUILD=	yes
+PLIST_SUB+=		SHORTCUTS=""
+.else
+PLIST_SUB+=		SHORTCUTS="@comment "
 .endif
 
 #-- User Configuration -------------------------------------------------
@@ -100,17 +112,12 @@ CONFIGURE_ARGS+=	--enable-services
 CONFIGURE_ARGS+=	--with-nicklen=${NICKLEN}
 .endif
 
-.if defined(TOPICLEN)
-CONFIGURE_ARGS+=	--with-topiclen=${TOPICLEN}
-.endif
-
 #-----------------------------------------------------------------------
 
 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 160, max 390] - Max topic length"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "    SERVER_NAME [default 'services.ircd-ratbox.org'] - Name of services"
 	@${ECHO_MSG} "    USER_SERV   [default 'USERSERV'] - Name of user registration service"
@@ -131,9 +138,13 @@ pre-build:
 			${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
+			${WRKSRC}/doc/example.conf		\
+			${WRKSRC}/doc/example.efnet.conf
+	@${REINPLACE_CMD} -e "s#%%DBDIR%%#${DBDIR}#g"		\
+			${WRKSRC}/doc/example.conf		\
+			${WRKSRC}/doc/example.efnet.conf
 	@${REINPLACE_CMD} -e "s#%%RUNDIR%%#${RUNDIR}#g" ${WRKSRC}/include/config.h
+	@${REINPLACE_CMD} -e "s#%%DBDIR%%#${DBDIR}#g" ${WRKSRC}/include/config.h
 	@${REINPLACE_CMD} -e "s#%%WRKSRC%%#${WRKSRC}#g" ${WRKSRC}/contrib/ircd-shortcut.pl
 
 #-- ircd-shortcut.pl ratbox-services commands --------------------------------------
@@ -175,9 +186,22 @@ pre-build:
 	${WRKSRC}/contrib/ircd-shortcut.pl
 .endif
 
-#------ Execute ircd-shortcut perl script to generate the .c file. -----
+# ----- Execute ircd-shortcut perl script to generate the .c file. -----
+.if defined(WITH_SHORTCUTS)
 	@${ECHO_MSG} "Executing ircd-shortcut.pl for ircd-shortcuts generation."
 	${PERL} ${WRKSRC}/contrib/ircd-shortcut.pl
+.endif
+
+post-build:
+	@cd ${INSTALL_WRKSRC}/contrib && ${SETENV} ${MAKE_ENV} ${MAKE} \
+		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS}
+
+# ----- Need to build the m_rsshortcut.so module for ircd-shortcut.pl ----
+.if defined(WITH_SHORTCUTS)
+	@${ECHO_MSG} "Building m_rsshortcut.la for ircd-shortcuts."
+	@cd ${INSTALL_WRKSRC}/contrib && ${SETENV} ${MAKE_ENV} ${MAKE} \
+		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} m_rsshortcut.la
+.endif
 
 pre-su-install:
 	${MKDIR} ${PREFIX}/etc/${PORTNAME}
@@ -185,14 +209,23 @@ pre-su-install:
 	${MKDIR} ${PREFIX}/lib/${PORTNAME}/modules
 
 post-install:
-	${CHOWN} -R ircd:ircd ${PREFIX}/etc/${PORTNAME}
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
+	@cd ${INSTALL_WRKSRC}/contrib && ${SETENV} ${MAKE_ENV} ${MAKE} \
+		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install
 	${INSTALL_DATA} ${WRKSRC}/doc/ircd.motd ${PREFIX}/etc/${PORTNAME}/ircd.motd.sample
 	${INSTALL_DATA} ${WRKSRC}/doc/example.conf ${PREFIX}/etc/${PORTNAME}/ircd.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/doc/example.efnet.conf ${PREFIX}/etc/${PORTNAME}/ircd-efnet.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/doc/genssl.sh ${PREFIX}/etc/${PORTNAME}/genssl.sh
+
+# ----- We need to install the shortcut.pl module ----
+.if defined(WITH_SHORTCUTS)
+	@${ECHO_MSG} "Executing install-mod.sh for ircd-shortcuts module installation."
+	${SH} ${WRKSRC}/install-mod.sh ${WRKSRC}/contrib/m_rsshortcut.la \
+		${PREFIX}/lib/${PORTNAME}/modules/contrib
+.endif
 
 	@if [ ! -f ${PREFIX}/etc/${PORTNAME}/ircd.conf ]; then \
 		${ECHO} "Installing default configuration file."; \
diff --git a/irc/ircd-ratbox/distinfo b/irc/ircd-ratbox/distinfo
index 5b03a816a8bd..1414cc374ae6 100644
--- a/irc/ircd-ratbox/distinfo
+++ b/irc/ircd-ratbox/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ircd-ratbox-2.2.9.tar.bz2) = 8586f1cbc8f4633603fef6ecc587e917ecf7e868d8c068e259ceadfab274449a
-SIZE (ircd-ratbox-2.2.9.tar.bz2) = 578844
+SHA256 (ircd-ratbox-3.0.7.tar.bz2) = 71626a0eadc41822afb93a7abb374e38ec425129df6a20ee2fc431df0e5c4f6e
+SIZE (ircd-ratbox-3.0.7.tar.bz2) = 2379425
diff --git a/irc/ircd-ratbox/files/patch-Makefile.in b/irc/ircd-ratbox/files/patch-Makefile.in
deleted file mode 100644
index 199c2bf72f8e..000000000000
--- a/irc/ircd-ratbox/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig    Fri Dec 10 21:28:20 2004
-+++ Makefile.in Mon Jan 23 17:10:28 2006
-@@ -46,7 +46,7 @@
- # the system one.
- #CFLAGS= -DNDEBUG -g -O2 -D"FD_SETSIZE=1024"
- SHELL=/bin/sh
--SUBDIRS=modules adns src tools servlink doc help
-+SUBDIRS=modules adns src tools servlink doc help contrib
- CLEANDIRS = ${SUBDIRS} contrib
- RSA_FILES=rsa_respond/README rsa_respond/respond.c rsa_respond/Makefile
-
diff --git a/irc/ircd-ratbox/files/patch-contrib_Makefile.in b/irc/ircd-ratbox/files/patch-contrib_Makefile.in
deleted file mode 100644
index b6eecae32e76..000000000000
--- a/irc/ircd-ratbox/files/patch-contrib_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/Makefile.in.orig	Sun Jan 13 02:35:03 2008
-+++ contrib/Makefile.in	Sun Jan 13 02:38:59 2008
-@@ -44,7 +44,7 @@
-   spy_stats_p_notice.c		\
-   spy_whois_notice.c            \
-   spy_whois_notice_global.c	\
--  example_module.c
-+  m_rsshortcut.c
- 
- OBJS = ${SRCS:.c=.so}
- 
diff --git a/irc/ircd-ratbox/files/patch-contrib_ircd-shortcut.pl b/irc/ircd-ratbox/files/patch-contrib_ircd-shortcut.pl
index 9ec6882642da..8e2b4532bf84 100644
--- a/irc/ircd-ratbox/files/patch-contrib_ircd-shortcut.pl
+++ b/irc/ircd-ratbox/files/patch-contrib_ircd-shortcut.pl
@@ -1,5 +1,5 @@
---- contrib/ircd-shortcut.pl.orig	Fri Jan 11 20:28:57 2008
-+++ contrib/ircd-shortcut.pl	Sun Jan 13 14:55:34 2008
+--- ./contrib/ircd-shortcut.pl.orig	2008-04-24 16:43:42.000000000 +0100
++++ ./contrib/ircd-shortcut.pl	2008-11-15 02:55:35.000000000 +0000
 @@ -36,7 +36,7 @@
  ######################################
  
diff --git a/irc/ircd-ratbox/files/patch-doc_Makefile.in b/irc/ircd-ratbox/files/patch-doc_Makefile.in
index 5d60cc8aab3d..fd1595236f2d 100644
--- a/irc/ircd-ratbox/files/patch-doc_Makefile.in
+++ b/irc/ircd-ratbox/files/patch-doc_Makefile.in
@@ -1,6 +1,6 @@
---- doc/Makefile.in.orig	Fri Jun 18 01:19:00 2004
-+++ doc/Makefile.in	Fri Jan 27 07:03:15 2006
-@@ -53,28 +53,9 @@
+--- ./doc/Makefile.in.orig	2008-04-23 20:59:46.000000000 +0100
++++ ./doc/Makefile.in	2008-11-15 02:55:35.000000000 +0000
+@@ -43,24 +43,6 @@
  	fi
  
  install: install-mkdirs build
@@ -12,21 +12,16 @@
 -		$(INSTALL_DATA) $$i $(DESTDIR)$(confdir); \
 -	done
 -
--	@for i in $(DEFAULTCONFS); do \
--		if test ! -f $(DESTDIR)$(confdir)/$$i; then \
--			echo "ircd: creating config file ($$i)"; \
--			${TOUCH} $(DESTDIR)$(confdir)/$$i; \
--		fi; \
--	done
--
- 	-@if test ! -f $(DESTDIR)$(confdir)/ircd.motd; then \
- 		echo "ircd: installing motd file (ircd.motd)"; \
+-	-@if test ! -f $(DESTDIR)$(confdir)/ircd.motd; then \
+-		echo "ircd: installing motd file (ircd.motd)"; \
 -		$(INSTALL_DATA) ircd.motd $(DESTDIR)$(confdir); \
 -	fi
 -
+-	$(INSTALL_BIN) genssl.sh $(DESTDIR)$(confdir)
+-
 -	-@if test -f $(DESTDIR)$(confdir)/links.txt; then \
 -		$(RM) $(DESTDIR)$(confdir)/links.txt; \
-+		$(INSTALL_DATA) ircd.motd $(DESTDIR)$(confdir)/ircd.motd.sample; \
- 	fi
+-	fi
  
- 	@echo "ircd: installing manpage"
+ all:
+ build:
diff --git a/irc/ircd-ratbox/files/patch-doc_example.conf b/irc/ircd-ratbox/files/patch-doc_example.conf
index ac40435cf404..da5a6f1c74d6 100644
--- a/irc/ircd-ratbox/files/patch-doc_example.conf
+++ b/irc/ircd-ratbox/files/patch-doc_example.conf
@@ -1,6 +1,32 @@
---- 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 @@
+--- ./doc/example.conf.orig	2012-04-13 14:54:05.000000000 +0100
++++ ./doc/example.conf	2012-04-13 14:59:46.000000000 +0100
+@@ -98,13 +98,13 @@
+ 	default_max_clients = 10000;
+ 
+ 	/* ssl_private_key: our ssl private key */
+-	ssl_private_key = "etc/test.key";
++	ssl_private_key = "%%PREFIX%%/etc/ssl/test.key";
+ 
+ 	/* ssl_cert: certificate for our ssl server */
+-	ssl_cert = "etc/test.cert";
++	ssl_cert = "%%PREFIX%%/etc/ssl/test.cert";
+ 
+ 	/* ssl_dh_params: DH parameters, generate with openssl dhparam -out dh.pem 1024 */
+-	ssl_dh_params = "etc/dh.pem";
++	ssl_dh_params = "%%PREFIX%%/etc/ssl/dh.pem";
+ 
+ 	/* ssld_count: number of ssld processes you want to start, if you
+ 	 * have a really busy server, using N-1 where N is the number of
+@@ -115,7 +115,7 @@
+ 	ssld_count = 1;
+ 
+ 	/* bandb: path to the ban database - default is PREFIX/etc/ban.db */
+-	bandb = "etc/ban.db";
++	bandb = "%%DBDIR%%/ban.db";
+ };
+ 
+ /* admin {}: contains admin information about the server. (OLD A:) */
+@@ -142,16 +142,16 @@
  	 * - operspylog: operspy usage
  	 * - ioerrorlog: IO errors
  	 */
@@ -27,8 +53,8 @@
  };
  
  /* class {}: contain information about classes for users (OLD Y:) */
-@@ -314,7 +314,7 @@
- 	 * A password should not be defined when this is used, see
+@@ -354,7 +354,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,17 +62,8 @@
  
  	/* umodes: the specific umodes this oper gets when they oper.
  	 * If this is specified an oper will not be given oper_umodes
-@@ -898,7 +898,7 @@
- 	 *
- 	 * only define if servlink is not in same directory as ircd itself.
- 	 */
--	#servlink_path = "/usr/local/ircd/bin/servlink";
-+	#servlink_path = "%%PREFIX%%/bin/servlink";
- 
- 	/* use egd: if your system does not have *random devices yet you
- 	 * want to use OpenSSL and encrypted links, enable this.  Beware -
-@@ -948,8 +948,9 @@
- 	/* module path: paths to search for modules specified below and
+@@ -1022,8 +1022,9 @@
+ 	/* module path: paths to search for modules specified below and 
  	 * in /modload.
  	 */
 -	path = "/usr/local/ircd/modules";
diff --git a/irc/ircd-ratbox/files/patch-doc_example.efnet.conf b/irc/ircd-ratbox/files/patch-doc_example.efnet.conf
index d9e521b3c1a3..9200b6d79d4a 100644
--- a/irc/ircd-ratbox/files/patch-doc_example.efnet.conf
+++ b/irc/ircd-ratbox/files/patch-doc_example.efnet.conf
@@ -1,6 +1,32 @@
---- 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 @@
+--- ./doc/example.efnet.conf.orig	2012-04-13 14:59:57.000000000 +0100
++++ ./doc/example.efnet.conf	2012-04-13 15:02:33.000000000 +0100
+@@ -101,13 +101,13 @@
+ 	default_max_clients = 10000;
+ 
+ 	/* ssl_private_key: our ssl private key */
+-	ssl_private_key = "etc/test.key";
++	ssl_private_key = "%%PREFIX%%/etc/ssl/test.key";
+ 
+ 	/* ssl_cert: certificate for our ssl server */
+-	ssl_cert = "etc/test.cert";
++	ssl_cert = "%%PREFIX%%/etc/ssl/test.cert";
+ 
+ 	/* ssl_dh_params: DH parameters, generate with openssl dhparam -out dh.pem 1024 */
+-	ssl_dh_params = "etc/dh.pem";
++	ssl_dh_params = "%%PREFIX%%/etc/ssl/dh.pem";
+ 
+ 	/* ssld_count: number of ssld processes you want to start, if you
+ 	 * have a really busy server, using N-1 where N is the number of
+@@ -118,7 +118,7 @@
+ 	ssld_count = 1;
+ 
+ 	/* bandb: path to the ban database - default is PREFIX/etc/ban.db */
+-	bandb = "etc/ban.db";
++	bandb = "%%DBDIR%%/ban.db";
+ };
+ 
+ /* admin {}: contains admin information about the server. (OLD A:) */
+@@ -145,16 +145,16 @@
  	 * - operspylog: operspy usage
  	 * - ioerrorlog: IO errors
  	 */
@@ -27,8 +53,8 @@
  };
  
  /* class {}: contain information about classes for users (OLD Y:) */
-@@ -317,7 +317,7 @@
- 	 * A password should not be defined when this is used, see
+@@ -357,7 +357,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,24 +62,15 @@
  
  	/* umodes: the specific umodes this oper gets when they oper.
  	 * If this is specified an oper will not be given oper_umodes
-@@ -908,7 +908,7 @@
- 	 *
- 	 * only define if servlink is not in same directory as ircd itself.
- 	 */
--	#servlink_path = "/usr/local/ircd/bin/servlink";
-+	#servlink_path = "%%PREFIX%%/bin/servlink";
- 
- 	/* use egd: if your system does not have *random devices yet you
- 	 * want to use OpenSSL and encrypted links, enable this.  Beware -
-@@ -958,8 +958,9 @@
- 	/* module path: paths to search for modules specified below and
+@@ -1038,8 +1038,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/files/patch-help_Makefile.in b/irc/ircd-ratbox/files/patch-help_Makefile.in
deleted file mode 100644
index 8c7be9fe25b0..000000000000
--- a/irc/ircd-ratbox/files/patch-help_Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- help/Makefile.in.orig	Mon Sep 12 16:58:45 2005
-+++ help/Makefile.in	Mon Jan 23 23:15:32 2006
-@@ -63,14 +63,6 @@
- 	rm -f opers/index.tmp
- 
- install:
--	-@if test -d $(DESTDIR)$(helpdir)-old; then \
--		rm -rf $(DESTDIR)$(helpdir)-old; \
--	fi
--	-@if test -d $(DESTDIR)$(helpdir); then \
--		echo "ircd: backing up old help files"; \
--		mv $(DESTDIR)$(helpdir) $(DESTDIR)$(helpdir)-old; \
--	fi
--
- 	@echo "ircd: setting up help directory structure"
- 	@mkdir -p -m 755 $(DESTDIR)$(helpdir)
- 	@mkdir -p -m 755 $(DESTDIR)$(helpdir)/opers
diff --git a/irc/ircd-ratbox/files/patch-include_config.h b/irc/ircd-ratbox/files/patch-include_config.h
index 523b94915e00..7bb614ee8244 100644
--- a/irc/ircd-ratbox/files/patch-include_config.h
+++ b/irc/ircd-ratbox/files/patch-include_config.h
@@ -1,19 +1,22 @@
---- include/config.h.orig	Thu Jan 20 11:04:40 2005
-+++ include/config.h	Fri Jan 27 02:25:37 2006
-@@ -56,6 +56,7 @@
+--- ./include/config.h.orig	2012-04-13 15:02:51.000000000 +0100
++++ ./include/config.h	2012-04-13 15:06:23.000000000 +0100
+@@ -54,15 +54,17 @@
  #define LOGPATH LOG_DIR
  #define UHPATH   HELP_DIR "/users"
  #define HPATH  HELP_DIR "/opers"
-+#define RUNPATH "%%RUNDIR%%"
++#define RUNPATH	"%%RUNDIR%%"
++#define DBPTH	"%%DBDIR%%"
  
  /* files */
  #define SPATH    BINPATH "/ircd"	/* ircd executable */
-@@ -68,7 +69,7 @@
- #define RPATH    ETCPATH "/ircd.rsa"	/* ircd rsa private keyfile */
+ #define CPATH    ETCPATH "/ircd.conf"	/* ircd.conf file */
+-#define DBPATH   ETCPATH "/ban.db"
++#define DBPATH   DBPTH "/ban.db"
  #define MPATH    ETCPATH "/ircd.motd"	/* MOTD file */
  #define LPATH    LOGPATH "/ircd.log"	/* ircd logfile */
--#define PPATH    ETCPATH "/ircd.pid"	/* pid file */
-+#define PPATH    RUNPATH "/ircd.pid"	/* pid file */
- #define OPATH    ETCPATH "/opers.motd"	/* oper MOTD file */
+ #define PPATH    ETCPATH "/ircd.pid"	/* pid file */
+-#define OPATH    ETCPATH "/opers.motd"	/* oper MOTD file */
++#define OPATH    RUNPATH "/opers.motd"	/* oper MOTD file */
  
- /* IGNORE_BOGUS_TS
+ /* HANGONGOODLINK and HANGONGOODLINK
+  * Often net breaks for a short time and it's useful to try to
diff --git a/irc/ircd-ratbox/files/patch-modules_Makefile.in b/irc/ircd-ratbox/files/patch-modules_Makefile.in
deleted file mode 100644
index 09c39d6f5f7f..000000000000
--- a/irc/ircd-ratbox/files/patch-modules_Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
---- modules/Makefile.in.orig	Sun Jul 17 18:55:27 2005
-+++ modules/Makefile.in	Mon Jan 23 23:19:03 2006
-@@ -147,13 +147,6 @@
- 	-@if test ! -d $(DESTDIR)$(moduledir); then \
-                 mkdir $(DESTDIR)$(moduledir); \
-         fi
--	-@if test -d $(DESTDIR)$(moduledir)-old; then \
--		rm -rf $(DESTDIR)$(moduledir)-old; \
--	fi
--	-@if test -d $(DESTDIR)$(moduledir); then \
--		echo "ircd: backing up modules"; \
--		mv $(DESTDIR)$(moduledir) $(DESTDIR)$(moduledir)-old; \
--	fi
- 
- 	@mkdir -p -m 755 $(DESTDIR)$(moduledir)
- 	@mkdir -p -m 755 $(DESTDIR)$(automoduledir)
diff --git a/irc/ircd-ratbox/files/patch-servlink_Makefile.in b/irc/ircd-ratbox/files/patch-servlink_Makefile.in
deleted file mode 100644
index 39832cf4f987..000000000000
--- a/irc/ircd-ratbox/files/patch-servlink_Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- servlink/Makefile.in.orig	Thu Jun 17 23:19:00 2004
-+++ servlink/Makefile.in	Fri Jan 27 02:29:59 2006
-@@ -51,9 +51,6 @@
- install: build
- 	@echo "ircd: installing servlink ($(PROGS))"
- 	@for i in $(PROGS); do \
--                if test -f $(DESTDIR)$(bindir)/$$i; then \
--                        $(MV) $(DESTDIR)$(bindir)/$$i $(DESTDIR)$(bindir)/$$i.old; \
--                fi; \
-                 $(INSTALL_BIN) $$i $(DESTDIR)$(bindir); \
-         done
- 
diff --git a/irc/ircd-ratbox/files/patch-src_Makefile.in b/irc/ircd-ratbox/files/patch-src_Makefile.in
deleted file mode 100644
index 8c05204e83d8..000000000000
--- a/irc/ircd-ratbox/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/Makefile.in.orig	Thu Feb 24 01:48:06 2005
-+++ src/Makefile.in	Fri Jan 27 02:29:08 2006
-@@ -125,9 +125,6 @@
- 	fi
- 	@echo "ircd: installing ircd ($(PROGS))"
- 	@for i in $(PROGS); do \
--		if test -f $(DESTDIR)$(bindir)/$$i; then \
--			$(MV) $(DESTDIR)$(bindir)/$$i $(DESTDIR)$(bindir)/$$i.old; \
--		fi; \
- 		$(INSTALL_BIN) $$i $(DESTDIR)$(bindir); \
- 	done
- 
diff --git a/irc/ircd-ratbox/files/patch-tools_Makefile.in b/irc/ircd-ratbox/files/patch-tools_Makefile.in
deleted file mode 100644
index 7d3a70444b7d..000000000000
--- a/irc/ircd-ratbox/files/patch-tools_Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- tools/Makefile.in.orig	Thu Jun 17 23:19:00 2004
-+++ tools/Makefile.in	Fri Jan 27 02:30:32 2006
-@@ -92,9 +92,6 @@
- install: install-mkdirs build
- 	@echo "ircd: installing tools ($(PROGS))"
- 	@for i in $(PROGS); do \
--		if test -f $(DESTDIR)$(bindir)/$$i; then \
--			$(MV) $(DESTDIR)$(bindir)/$$i $(DESTDIR)$(bindir)/$$i.old; \
--		fi; \
- 		$(INSTALL_BIN) $$i $(DESTDIR)$(bindir); \
- 	done; \
- 	$(RM) -f $(DESTDIR)$(bindir)/vimotd $(DESTDIR)$(bindir)/viklines
diff --git a/irc/ircd-ratbox/files/pkg-install.in b/irc/ircd-ratbox/files/pkg-install.in
index dab2ae6b1d38..74fc38e357b1 100644
--- a/irc/ircd-ratbox/files/pkg-install.in
+++ b/irc/ircd-ratbox/files/pkg-install.in
@@ -6,9 +6,9 @@
 #-----------------------------------------------------------------------
 if [ "x$2" = "xPRE-INSTALL" ]; then
 #-----------------------------------------------------------------------
-#
+
 # ${DO_NADA}
-#
+
 #-----------------------------------------------------------------------
 elif [ "x$2" = "xPOST-INSTALL" ]; then
 #-----------------------------------------------------------------------
@@ -21,12 +21,20 @@ mkdir -p %%RUNDIR%%           \
 && chown ircd:ircd %%RUNDIR%% \
 && chmod 750 %%RUNDIR%%
 
-# Secure permissions if we think this is a fresh install
+mkdir -p %%DBDIR%%		\
+&& chown ircd:ircd %%DBDIR%%	\
+&& chmod 750 %%DBDIR%%
 
-if [ ! -f ${PKG_PREFIX}/etc/ircd-ratbox/ircd.conf ]; then
-	chown -R ircd:ircd ${PKG_PREFIX}/etc/ircd-ratbox/
-	chmod 750 ${PKG_PREFIX}/etc/ircd-ratbox/
-	chmod 640 ${PKG_PREFIX}/etc/ircd-ratbox/*
+# Secure permissions if we think this is a fresh install
+conffile="%%PREFIX%%/etc/ircd-ratbox/ircd.conf"
+samplefile="%%PREFIX%%/etc/ircd-ratbox/ircd.conf.sample"
+if cmp -s $conffile $samplefile; then
+	echo "Setting default permissions for config dir and files."
+	chown -R root:ircd %%PREFIX%%/etc/ircd-ratbox/
+	chmod 750 %%PREFIX%%/etc/ircd-ratbox/
+	chmod 640 %%PREFIX%%/etc/ircd-ratbox/*
+else
+	echo "Modified ircd.conf file found, permissions unchanged."
 fi
 
 #-----------------------------------------------------------------------
diff --git a/irc/ircd-ratbox/files/pkg-message.in b/irc/ircd-ratbox/files/pkg-message.in
index 6ac6c08989a9..45d3fb825fef 100644
--- a/irc/ircd-ratbox/files/pkg-message.in
+++ b/irc/ircd-ratbox/files/pkg-message.in
@@ -12,10 +12,25 @@ server can be started by running:
 
 	%%PREFIX%%/etc/rc.d/ircd-ratbox start
 
-If you specified options for ircd-shortcut commands, these will have
-been added and the module included in the contrib module directory.
-You may wish to add an entry to your ircd.conf file for this module to
-be loaded when your IRCD starts.
+You can check your ircd.conf configuration file for syntactical errors
+using the following rc.d script command:
+
+	%%PREFIX%%/etc/rc.d/ircd-ratbox conftest
+
+The ban.db database should be checked and updated using 'bantool -u'.
+For safety, bantool updates must be done while no ircd is running and
+before starting the new version.
+
+	%%PREFIX%%/bin/bantool -u
+
+Notice: ircd-ratbox has been updated to follow the current stable
+release branch (3.0.x). All previous branches are no longer supported
+by the ratbox team. Users of ircd-ratbox are advised to create new ircd
+configuration files based on the examples provided.
+
+For more information on upgrading, see:
+
+	http://svn.ratbox.org/svnroot/ircd-ratbox/trunk/INSTALL
 
 Be sure to check out 'ratbox-services' if you need a services package.
 ------------------------------------------------------------------------
diff --git a/irc/ircd-ratbox/pkg-descr b/irc/ircd-ratbox/pkg-descr
index 9ffd84789266..1b9cd0cfc90d 100644
--- a/irc/ircd-ratbox/pkg-descr
+++ b/irc/ircd-ratbox/pkg-descr
@@ -4,4 +4,16 @@ 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.
 
+Changes Include:
+  o Optional SSL support to enable encrypted connections between clients
+    and servers, as well as server to server links.
+  o Add support for SSL only channels, channel mode +S.
+  o sqlite3 for handling and storing k/x/d lines.
+  o Support for global CIDR limits.
+  o Added adminwall allowing admins to broadcast messages to each other.
+  o Creation of new library archive 'libratbox'.
+  o Support for forced nick changes (instead of collision kills).
+  o New ssld and bandb processes for SSL connections and ban checking;
+    these allow ratbox-3 to make better use of multi-processor systems.
+
 WWW: http://www.ircd-ratbox.org/
diff --git a/irc/ircd-ratbox/pkg-plist b/irc/ircd-ratbox/pkg-plist
index 95ab03e05b96..0b6f2d2f5948 100644
--- a/irc/ircd-ratbox/pkg-plist
+++ b/irc/ircd-ratbox/pkg-plist
@@ -1,98 +1,9 @@
-bin/convertilines
-bin/convertklines
 bin/ircd
-bin/mkpasswd
-bin/servlink
-bin/viconf
-bin/viklines
-bin/vimotd
-etc/ircd-ratbox/ircd-efnet.conf.sample
-lib/ircd-ratbox/modules/autoload/m_accept.so
-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_close.so
-lib/ircd-ratbox/modules/autoload/m_cmessage.so
-lib/ircd-ratbox/modules/autoload/m_connect.so
-lib/ircd-ratbox/modules/autoload/m_dline.so
-lib/ircd-ratbox/modules/autoload/m_encap.so
-lib/ircd-ratbox/modules/autoload/m_etrace.so
-lib/ircd-ratbox/modules/autoload/m_gline.so
-lib/ircd-ratbox/modules/autoload/m_help.so
-lib/ircd-ratbox/modules/autoload/m_info.so
-lib/ircd-ratbox/modules/autoload/m_invite.so
-lib/ircd-ratbox/modules/autoload/m_ison.so
-lib/ircd-ratbox/modules/autoload/m_kline.so
-lib/ircd-ratbox/modules/autoload/m_knock.so
-lib/ircd-ratbox/modules/autoload/m_links.so
-lib/ircd-ratbox/modules/autoload/m_list.so
-lib/ircd-ratbox/modules/autoload/m_locops.so
-lib/ircd-ratbox/modules/autoload/m_lusers.so
-lib/ircd-ratbox/modules/autoload/m_map.so
-lib/ircd-ratbox/modules/autoload/m_monitor.so
-lib/ircd-ratbox/modules/autoload/m_motd.so
-lib/ircd-ratbox/modules/autoload/m_names.so
-lib/ircd-ratbox/modules/autoload/m_oper.so
-lib/ircd-ratbox/modules/autoload/m_operspy.so
-lib/ircd-ratbox/modules/autoload/m_pass.so
-lib/ircd-ratbox/modules/autoload/m_ping.so
-lib/ircd-ratbox/modules/autoload/m_pong.so
-lib/ircd-ratbox/modules/autoload/m_post.so
-lib/ircd-ratbox/modules/autoload/m_rehash.so
-lib/ircd-ratbox/modules/autoload/m_restart.so
-lib/ircd-ratbox/modules/autoload/m_resv.so
-lib/ircd-ratbox/modules/autoload/m_set.so
-lib/ircd-ratbox/modules/autoload/m_stats.so
-lib/ircd-ratbox/modules/autoload/m_svinfo.so
-lib/ircd-ratbox/modules/autoload/m_tb.so
-lib/ircd-ratbox/modules/autoload/m_testline.so
-lib/ircd-ratbox/modules/autoload/m_testmask.so
-lib/ircd-ratbox/modules/autoload/m_time.so
-lib/ircd-ratbox/modules/autoload/m_topic.so
-lib/ircd-ratbox/modules/autoload/m_trace.so
-lib/ircd-ratbox/modules/autoload/m_unreject.so
-lib/ircd-ratbox/modules/autoload/m_user.so
-lib/ircd-ratbox/modules/autoload/m_userhost.so
-lib/ircd-ratbox/modules/autoload/m_users.so
-lib/ircd-ratbox/modules/autoload/m_version.so
-lib/ircd-ratbox/modules/autoload/m_wallops.so
-lib/ircd-ratbox/modules/autoload/m_who.so
-lib/ircd-ratbox/modules/autoload/m_whois.so
-lib/ircd-ratbox/modules/autoload/m_whowas.so
-lib/ircd-ratbox/modules/autoload/m_xline.so
-@unexec f="%D/lib/ircd-ratbox/modules/autoload/m_services.so"; if [ -f "$f" ]; then rm -f "$f"; fi
-lib/ircd-ratbox/modules/contrib/m_clearchan.so
-lib/ircd-ratbox/modules/contrib/m_flags.so
-lib/ircd-ratbox/modules/contrib/m_force.so
-lib/ircd-ratbox/modules/contrib/m_mkpasswd.so
-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_whois_notice.so
-lib/ircd-ratbox/modules/contrib/spy_whois_notice_global.so
-lib/ircd-ratbox/modules/contrib/m_rsshortcut.so
-lib/ircd-ratbox/modules/m_die.so
-lib/ircd-ratbox/modules/m_error.so
-lib/ircd-ratbox/modules/m_join.so
-lib/ircd-ratbox/modules/m_kick.so
-lib/ircd-ratbox/modules/m_kill.so
-lib/ircd-ratbox/modules/m_message.so
-lib/ircd-ratbox/modules/m_mode.so
-lib/ircd-ratbox/modules/m_nick.so
-lib/ircd-ratbox/modules/m_part.so
-lib/ircd-ratbox/modules/m_quit.so
-lib/ircd-ratbox/modules/m_server.so
-lib/ircd-ratbox/modules/m_sjoin.so
-lib/ircd-ratbox/modules/m_squit.so
+bin/ratbox-mkpasswd
+bin/bantool
+libexec/ircd-ratbox/bandb
+libexec/ircd-ratbox/resolver
+libexec/ircd-ratbox/ssld
 %%DATADIR%%/help/opers/accept
 %%DATADIR%%/help/opers/admin
 %%DATADIR%%/help/opers/away
@@ -110,6 +21,7 @@ lib/ircd-ratbox/modules/m_squit.so
 %%DATADIR%%/help/opers/error
 %%DATADIR%%/help/opers/etrace
 %%DATADIR%%/help/opers/gline
+%%DATADIR%%/help/opers/gungline
 %%DATADIR%%/help/opers/help
 %%DATADIR%%/help/opers/index
 %%DATADIR%%/help/opers/info
@@ -130,6 +42,7 @@ lib/ircd-ratbox/modules/m_squit.so
 %%DATADIR%%/help/opers/modload
 %%DATADIR%%/help/opers/modrestart
 %%DATADIR%%/help/opers/modunload
+%%DATADIR%%/help/opers/monitor
 %%DATADIR%%/help/opers/motd
 %%DATADIR%%/help/opers/names
 %%DATADIR%%/help/opers/nick
@@ -137,6 +50,7 @@ lib/ircd-ratbox/modules/m_squit.so
 %%DATADIR%%/help/opers/oper
 %%DATADIR%%/help/opers/operspy
 %%DATADIR%%/help/opers/operwall
+%%DATADIR%%/help/opers/adminwall
 %%DATADIR%%/help/opers/part
 %%DATADIR%%/help/opers/pass
 %%DATADIR%%/help/opers/ping
@@ -171,6 +85,10 @@ lib/ircd-ratbox/modules/m_squit.so
 %%DATADIR%%/help/opers/userhost
 %%DATADIR%%/help/opers/users
 %%DATADIR%%/help/opers/version
+%%DATADIR%%/help/opers/admindline
+%%DATADIR%%/help/opers/adminkline
+%%DATADIR%%/help/opers/adminresv
+%%DATADIR%%/help/opers/adminxline
 %%DATADIR%%/help/opers/wallops
 %%DATADIR%%/help/opers/who
 %%DATADIR%%/help/opers/whois
@@ -220,6 +138,98 @@ lib/ircd-ratbox/modules/m_squit.so
 %%DATADIR%%/help/users/who
 %%DATADIR%%/help/users/whois
 %%DATADIR%%/help/users/whowas
+lib/ircd-ratbox/libcore.la
+lib/ircd-ratbox/libcore.so
+lib/ircd-ratbox/libratbox.la
+lib/ircd-ratbox/libratbox.so
+%%SERVICES%%/lib/ircd-ratbox/modules/autoload/m_services.so
+%%SERVICES%%/lib/ircd-ratbox/modules/autoload/m_services.la
+lib/ircd-ratbox/modules/autoload/m_accept.so
+lib/ircd-ratbox/modules/autoload/m_admin.so
+lib/ircd-ratbox/modules/autoload/m_adminwall.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_close.so
+lib/ircd-ratbox/modules/autoload/m_cmessage.so
+lib/ircd-ratbox/modules/autoload/m_connect.so
+lib/ircd-ratbox/modules/autoload/m_dline.so
+lib/ircd-ratbox/modules/autoload/m_encap.so
+lib/ircd-ratbox/modules/autoload/m_gline.so
+lib/ircd-ratbox/modules/autoload/m_help.so
+lib/ircd-ratbox/modules/autoload/m_info.so
+lib/ircd-ratbox/modules/autoload/m_invite.so
+lib/ircd-ratbox/modules/autoload/m_ison.so
+lib/ircd-ratbox/modules/autoload/m_kline.so
+lib/ircd-ratbox/modules/autoload/m_knock.so
+lib/ircd-ratbox/modules/autoload/m_links.so
+lib/ircd-ratbox/modules/autoload/m_list.so
+lib/ircd-ratbox/modules/autoload/m_locops.so
+lib/ircd-ratbox/modules/autoload/m_lusers.so
+lib/ircd-ratbox/modules/autoload/m_map.so
+lib/ircd-ratbox/modules/autoload/m_monitor.so
+lib/ircd-ratbox/modules/autoload/m_motd.so
+lib/ircd-ratbox/modules/autoload/m_names.so
+lib/ircd-ratbox/modules/autoload/m_oper.so
+lib/ircd-ratbox/modules/autoload/m_operspy.so
+lib/ircd-ratbox/modules/autoload/m_pass.so
+lib/ircd-ratbox/modules/autoload/m_ping.so
+lib/ircd-ratbox/modules/autoload/m_pong.so
+lib/ircd-ratbox/modules/autoload/m_post.so
+lib/ircd-ratbox/modules/autoload/m_rehash.so
+lib/ircd-ratbox/modules/autoload/m_restart.so
+lib/ircd-ratbox/modules/autoload/m_resv.so
+lib/ircd-ratbox/modules/autoload/m_set.so
+lib/ircd-ratbox/modules/autoload/m_stats.so
+lib/ircd-ratbox/modules/autoload/m_svinfo.so
+lib/ircd-ratbox/modules/autoload/m_tb.so
+lib/ircd-ratbox/modules/autoload/m_testline.so
+lib/ircd-ratbox/modules/autoload/m_testmask.so
+lib/ircd-ratbox/modules/autoload/m_time.so
+lib/ircd-ratbox/modules/autoload/m_topic.so
+lib/ircd-ratbox/modules/autoload/m_trace.so
+lib/ircd-ratbox/modules/autoload/m_gungline.so
+lib/ircd-ratbox/modules/autoload/m_unreject.so
+lib/ircd-ratbox/modules/autoload/m_user.so
+lib/ircd-ratbox/modules/autoload/m_userhost.so
+lib/ircd-ratbox/modules/autoload/m_version.so
+lib/ircd-ratbox/modules/autoload/m_wallops.so
+lib/ircd-ratbox/modules/autoload/m_who.so
+lib/ircd-ratbox/modules/autoload/m_whois.so
+lib/ircd-ratbox/modules/autoload/m_whowas.so
+lib/ircd-ratbox/modules/autoload/m_xline.so
+%%SHORTCUTS%%lib/ircd-ratbox/modules/contrib/m_rsshortcut.so
+lib/ircd-ratbox/modules/contrib/example_module.so
+lib/ircd-ratbox/modules/contrib/m_42.so
+lib/ircd-ratbox/modules/contrib/m_clearchan.so
+lib/ircd-ratbox/modules/contrib/m_flags.so
+lib/ircd-ratbox/modules/contrib/m_force.so
+lib/ircd-ratbox/modules/contrib/m_mkpasswd.so
+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/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_whois_notice.so
+lib/ircd-ratbox/modules/contrib/spy_whois_notice_global.so
+lib/ircd-ratbox/modules/m_die.so
+lib/ircd-ratbox/modules/m_error.so
+lib/ircd-ratbox/modules/m_join.so
+lib/ircd-ratbox/modules/m_kick.so
+lib/ircd-ratbox/modules/m_kill.so
+lib/ircd-ratbox/modules/m_message.so
+lib/ircd-ratbox/modules/m_mode.so
+lib/ircd-ratbox/modules/m_nick.so
+lib/ircd-ratbox/modules/m_part.so
+lib/ircd-ratbox/modules/m_quit.so
+lib/ircd-ratbox/modules/m_server.so
+lib/ircd-ratbox/modules/m_squit.so
+@dirrm libexec/ircd-ratbox
 @dirrm lib/ircd-ratbox/modules/autoload
 @dirrm lib/ircd-ratbox/modules/contrib
 @dirrm lib/ircd-ratbox/modules
@@ -228,16 +238,16 @@ lib/ircd-ratbox/modules/m_squit.so
 @dirrm %%DATADIR%%/help/opers
 @dirrm %%DATADIR%%/help
 @dirrm %%DATADIR%%
-@unexec f="%D/etc/ircd-ratbox/dline.conf"; if [ ! -s "$f" ]; then rm -f "$f"; fi
-@unexec f="%D/etc/ircd-ratbox/kline.conf"; if [ ! -s "$f" ]; then rm -f "$f"; fi
-@unexec f="%D/etc/ircd-ratbox/resv.conf";  if [ ! -s "$f" ]; then rm -f "$f"; fi
-@unexec f="%D/etc/ircd-ratbox/xline.conf"; if [ ! -s "$f" ]; then rm -f "$f"; fi
-@unexec if cmp -s %D/etc/ircd-ratbox/ircd.conf.sample %D/etc/ircd-ratbox/ircd.conf; then rm -f %D/etc/ircd-ratbox/ircd.conf; fi
+etc/ircd-ratbox/genssl.sh
+etc/ircd-ratbox/ircd-efnet.conf.sample
+@unexec if cmp -s "%D/etc/ircd-ratbox/ircd.conf.sample" "%D/etc/ircd-ratbox/ircd.conf"; then rm -f "%D/etc/ircd-ratbox/ircd.conf"; fi
 etc/ircd-ratbox/ircd.conf.sample
-@exec if [ ! -f %D/etc/ircd-ratbox/ircd.conf ] ; then cp -p %D/%F %B/ircd.conf; fi
-@unexec if cmp -s %D/etc/ircd-ratbox/ircd.motd.sample %D/etc/ircd-ratbox/ircd.motd; then rm -f %D/etc/ircd-ratbox/ircd.motd; fi
+@exec if [ ! -f "%D/etc/ircd-ratbox/ircd.conf" ] ; then cp -p "%D/%F" "%B/ircd.conf"; fi
+@unexec if cmp -s "%D/etc/ircd-ratbox/ircd.motd.sample" "%D/etc/ircd-ratbox/ircd.motd"; then rm -f "%D/etc/ircd-ratbox/ircd.motd"; fi
 etc/ircd-ratbox/ircd.motd.sample
-@exec if [ ! -f %D/etc/ircd-ratbox/ircd.motd ] ; then cp -p %D/%F %B/ircd.motd; fi
+@exec if [ ! -f "%D/etc/ircd-ratbox/ircd.motd" ] ; then cp -p "%D/%F %B/ircd.motd"; fi
 @dirrmtry etc/ircd-ratbox
+@cwd /
 @dirrmtry %%LOGDIR%%
 @dirrmtry %%RUNDIR%%
+@dirrmtry %%DBDIR%%