- Update to 7.1rc4

PR:		ports/73966
Submitted by:	Evgueni V. Gavrilov <aquatique@rusunix.org> (maintainer)

26 files changed, 422 insertions, 212 deletions

diff --git a/russian/ircd-hybrid-ru/Makefile b/russian/ircd-hybrid-ru/Makefile
index 17df3ace2c86..4fe1cd6a3026 100644
--- a/russian/ircd-hybrid-ru/Makefile
+++ b/russian/ircd-hybrid-ru/Makefile
@@ -7,36 +7,33 @@
 
 PORTNAME=	ircd
 PORTVERSION=	7.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	irc russian
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://rusunix.org/pub/FreeBSD/distfiles/
 MASTER_SITE_SUBDIR=	ircd-hybrid-ru
 PKGNAMESUFFIX=	-hybrid-ru
-DISTNAME=	ircd-hybrid-ru-7.1rc2
+DISTNAME=	ircd-hybrid-ru-7.0rc4
 
 MAINTAINER=	aquatique-ports@rambler.ru
 COMMENT=	Russian version of well known hybrid IRC server
 
-CONFLICTS=	ircd*
+CONFLICTS=	ircd-hybrid-7* ircd-ru[0-9]*
 
 WRKSRC=		${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}
 USE_OPENSSL=	yes
 USE_BISON=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/ircd-hybrid-ru
+CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/ircd-hybrid-ru --enable-kqueue
 
+MANCOMPRESSED=	no
 MAN8=		ircd.8
 
 .if defined(WITH_SMALL_NET)
 CONFIGURE_ARGS+=-enable-small-net
 .endif
 
-.if defined(WITH_SYSLOG)
-CONFIGURE_ARGS+=--enable-syslog=\"kill squit connect users oper\"
-.endif
-
 .if defined(NICKLENGTH)
 CONFIGURE_ARGS+=--with-nicklen=${NICKLENGTH}
 .endif
@@ -45,22 +42,30 @@ CONFIGURE_ARGS+=--with-nicklen=${NICKLENGTH}
 CONFIGURE_ARGS+=--with-topiclen=${TOPICLENGTH}
 .endif
 
-.if defined(MAXCONN)
-CONFIGURE_ARGS+=--with-maxconn=${MAXCONN}
+.if defined(MAXCLIENTS)
+CONFIGURE_ARGS+=--with-maxclients=${MAXCLIENTS}
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's,"-g,",; s,-O2 -g,-O,' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's,/modules/,/lib/ircd-hybrid-ru-modules/,' ${WRKSRC}/include/config.h
+	@${REINPLACE_CMD} -e 's,/etc,/etc/ircd-hybrid-ru,' ${WRKSRC}/include/config.h
+	@${REINPLACE_CMD} -e 's,IRCD_PREFIX "/logs","/var/log/ircd-hybrid-ru",' ${WRKSRC}/include/config.h
+	@${FIND} ${WRKSRC} -type f -name Makefile.in -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
+		-e "s,/modules,/lib/ircd-hybrid-ru-modules,"
+
 pre-extract:
 	@${ECHO_MSG} "* * * Build options for ircd-hybrid-ru * * *"
 	@${ECHO_MSG} "Issue make WITH_SMALL_NET=yes to build server optimized for small network"
-	@${ECHO_MSG} "Issue make WITH_SYSLOG=yes to enable logging via syslogd"
 	@${ECHO_MSG} "You can define maximum nick length. For example make NICKLENGTH=46 (default is 30)"
 	@${ECHO_MSG} "You can define maximum topic length. For example make TOPICLENGTH=254 (default is 120; maximum is 390)"
-	@${ECHO_MSG} "You can define maximum number of connections for ircd. For example make MAXCONN=512"
+	@${ECHO_MSG} "You can define maximum number of connections for ircd. For example make MAXCLIENTS=512"
 
 pre-install:
 	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-	@${REINPLACE_CMD} -e 's,ircd/etc/codepage,etc/ircd-hybrid-ru/codepage,' ${WRKSRC}/etc/example.conf
-	@${REINPLACE_CMD} -e 's,/ircd/modules,/lib/ircd-hybrid-ru-modules,' ${WRKSRC}/etc/example.conf
+	@${REINPLACE_CMD} -e 's,ircd/etc/codepage,etc/ircd-hybrid-ru/codepage,' ${WRKSRC}/doc/example.conf
+	@${REINPLACE_CMD} -e 's,/ircd/modules,/lib/ircd-hybrid-ru-modules,' ${WRKSRC}/doc/example.conf
+	@${REINPLACE_CMD} -e 's,logs/,/var/log/ircd-hybrid-ru/,' ${WRKSRC}/doc/example.conf
 
 post-install:
 	@${INSTALL_SCRIPT} -m 555 ${FILESDIR}/ircd-hybrid-ru.sh.sample ${PREFIX}/etc/rc.d
diff --git a/russian/ircd-hybrid-ru/distinfo b/russian/ircd-hybrid-ru/distinfo
index 7a4121457308..2313ec7c03ba 100644
--- a/russian/ircd-hybrid-ru/distinfo
+++ b/russian/ircd-hybrid-ru/distinfo
@@ -1,2 +1,2 @@
-MD5 (ircd-hybrid-ru-7.1rc2.tar.gz) = 3f3b6311c55eb6d697285d6437ced084
-SIZE (ircd-hybrid-ru-7.1rc2.tar.gz) = 1178463
+MD5 (ircd-hybrid-ru-7.0rc4.tar.gz) = 74daff8d8c3737e77e0506b49e9efc3f
+SIZE (ircd-hybrid-ru-7.0rc4.tar.gz) = 1153665
diff --git a/russian/ircd-hybrid-ru/files/ircd-hybrid-ru.sh.sample b/russian/ircd-hybrid-ru/files/ircd-hybrid-ru.sh.sample
index f62cb23e9862..fae85a3c8289 100644
--- a/russian/ircd-hybrid-ru/files/ircd-hybrid-ru.sh.sample
+++ b/russian/ircd-hybrid-ru/files/ircd-hybrid-ru.sh.sample
@@ -13,7 +13,7 @@ start)
 	;;
 stop)
 	kill `cat ${PREFIX}/etc/ircd-hybrid-ru/ircd.pid` >/dev/null 2>&1
-	echo -n ' ircd'
+	echo -n ' ircd-hybrid-ru'
 	;;
 *)
 	echo "Usage: `basename $0` {start|stop}" >&2
diff --git a/russian/ircd-hybrid-ru/files/patch-configure b/russian/ircd-hybrid-ru/files/patch-configure
deleted file mode 100644
index 1da7b9f5f2e6..000000000000
--- a/russian/ircd-hybrid-ru/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Thu Oct  9 17:38:48 2003
-+++ configure	Sun Dec 14 14:35:48 2003
-@@ -1944,7 +1944,7 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_prog_cc_g=yes
-+  ac_cv_prog_cc_g=no
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
diff --git a/russian/ircd-hybrid-ru/files/patch-defaults.h b/russian/ircd-hybrid-ru/files/patch-defaults.h
deleted file mode 100644
index 70eb87ddefcb..000000000000
--- a/russian/ircd-hybrid-ru/files/patch-defaults.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- include/defaults.h.orig	Sun Oct  5 02:31:17 2003
-+++ include/defaults.h	Sun Dec 14 16:29:00 2003
-@@ -49,9 +49,9 @@
- #define DPATH   IRCD_PREFIX                                                     
- #define BINPATH IRCD_PREFIX "/bin/"
- #define MSGPATH IRCD_PREFIX "/messages/"
--#define ETCPATH IRCD_PREFIX "/etc"
--#define LOGPATH IRCD_PREFIX "/logs"
--#define MODPATH IRCD_PREFIX "/modules/"
-+#define ETCPATH IRCD_PREFIX "/etc/ircd-hybrid-ru"
-+#define LOGPATH             "/var/log/ircd-hybrid-ru"
-+#define MODPATH IRCD_PREFIX "/lib/ircd-hybrid-ru-modules/"
- 
- /* files */
- #define SPATH   BINPATH "/ircd"                 /* ircd executable */
diff --git a/russian/ircd-hybrid-ru/files/patch-doc-Makefile.in b/russian/ircd-hybrid-ru/files/patch-doc-Makefile.in
new file mode 100644
index 000000000000..10b829b4b40a
--- /dev/null
+++ b/russian/ircd-hybrid-ru/files/patch-doc-Makefile.in
@@ -0,0 +1,20 @@
+--- doc/Makefile.in.orig	Sat Nov 13 23:58:49 2004
++++ doc/Makefile.in	Mon Nov 15 17:34:02 2004
+@@ -26,7 +26,7 @@
+ automoduledir	= @prefix@/modules/autoload
+ 
+ # Local to the etc Makefile
+-mandir          = @prefix@/man8
++mandir          = @prefix@/man/man8
+ MANPAGES        = ircd.8
+ 
+ CONFS		= example.conf example.dalnetru.conf
+@@ -81,6 +81,8 @@
+ 			touch $(sysconfdir)/$${i}line.conf; \
+ 		fi; \
+ 	done
++	mkdir -p $(sysconfdir)/codepage; \
++	$(INSTALL_DATA) codepage/* $(sysconfdir)/codepage/
+ 
+ 	@for i in n c; do \
+ 		if test ! -f "$(sysconfdir)/$${i}resv.conf"; then \
diff --git a/russian/ircd-hybrid-ru/files/patch-etc-Makefile.in b/russian/ircd-hybrid-ru/files/patch-etc-Makefile.in
deleted file mode 100644
index 873c8b2be553..000000000000
--- a/russian/ircd-hybrid-ru/files/patch-etc-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- etc/Makefile.in.orig	Sun Dec 14 14:56:56 2003
-+++ etc/Makefile.in	Sun Dec 14 14:57:51 2003
-@@ -27,6 +27,8 @@
- 		echo $(INSTALL_DATA) $$i $(sysconfdir); \
- 		$(INSTALL_DATA) $$i $(sysconfdir); \
- 	done
-+	mkdir -p $(sysconfdir)/codepage; \
-+	$(INSTALL_DATA) codepage/* $(sysconfdir)/codepage/
- 
- 	@echo "Note: more example configuration files can be found in this directory (etc/)."
- 	
diff --git a/russian/ircd-hybrid-ru/files/patch-include-Makefile.in b/russian/ircd-hybrid-ru/files/patch-include-Makefile.in
new file mode 100644
index 000000000000..3f7c0db6e4c3
--- /dev/null
+++ b/russian/ircd-hybrid-ru/files/patch-include-Makefile.in
@@ -0,0 +1,14 @@
+--- include/Makefile.in.orig	Mon Nov 15 15:32:30 2004
++++ include/Makefile.in	Mon Nov 15 15:33:04 2004
+@@ -21,9 +21,9 @@
+ 	@echo installing header files...
+ 	-@if test ! -d $(prefix)/include; then \
+ 		echo "mkdir $(prefix)/include"; \
+-		mkdir $(prefix)/include; \
+-		mkdir $(prefix)/include/ircd-hybrid-7; \
++		mkdir $(prefix)/include; \
+ 	fi
++	mkdir $(prefix)/include/ircd-hybrid-7
+ 	@for header in *.h; do \
+ 		${INSTALL_DATA} $$header $(prefix)/include/ircd-hybrid-7; \
+ 	done
diff --git a/russian/ircd-hybrid-ru/files/patch-modules-Makefile.in b/russian/ircd-hybrid-ru/files/patch-modules-Makefile.in
deleted file mode 100644
index 8c21fc46e83b..000000000000
--- a/russian/ircd-hybrid-ru/files/patch-modules-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/Makefile.in.orig	Sun Dec 14 15:13:18 2003
-+++ modules/Makefile.in	Sun Dec 14 15:13:52 2003
-@@ -23,7 +23,7 @@
- 
- prefix          = $(DESTDIR)@prefix@
- # Change this later! -- adrian
--moduledir       = ${prefix}/modules
-+moduledir       = ${prefix}/lib/ircd-hybrid-ru-modules
- automoduledir   = ${moduledir}/autoload
- 
- INCLUDES	= -I../include $(SSL_INCLUDES)
diff --git a/russian/ircd-hybrid-ru/files/patch-src-Makefile.in b/russian/ircd-hybrid-ru/files/patch-src-Makefile.in
index d10f7a029b79..300e5d791c3b 100644
--- a/russian/ircd-hybrid-ru/files/patch-src-Makefile.in
+++ b/russian/ircd-hybrid-ru/files/patch-src-Makefile.in
@@ -1,11 +1,15 @@
---- src/Makefile.in.orig	Sun Dec 14 14:44:19 2003
-+++ src/Makefile.in	Sun Dec 14 14:44:37 2003
-@@ -128,7 +128,7 @@
- 
- install-mkdirs:
- 	mkdir -p $(prefix) $(exec_prefix) $(bindir) $(sysconfdir) \
--		$(localstatedir)/logs 
-+		/var/log/ircd-hybrid-ru
+--- src/Makefile.in.orig	Mon Nov 15 14:39:25 2004
++++ src/Makefile.in	Mon Nov 15 14:39:59 2004
+@@ -141,9 +141,9 @@
+ 		echo "mkdir $(sysconfdir)"; \
+ 		mkdir $(sysconfdir); \
+ 	fi
+-	-@if test ! -d $(localstatedir)/logs; then \
+-		echo "mkdir $(localstatedir)/logs"; \
+-		mkdir $(localstatedir)/logs; \
++	-@if test ! -d /var/log/ircd-hybrid-ru; then \
++		echo "/var/log/ircd-hybrid-ru"; \
++		mkdir /var/log/ircd-hybrid-ru; \
+ 	fi
  
  install: install-mkdirs build
- 	@for i in $(PROGS); do \
diff --git a/russian/ircd-hybrid-ru/files/patch-src-packet.c b/russian/ircd-hybrid-ru/files/patch-src-packet.c
index 2d192ac37b96..e9b0c04150b5 100644
--- a/russian/ircd-hybrid-ru/files/patch-src-packet.c
+++ b/russian/ircd-hybrid-ru/files/patch-src-packet.c
@@ -1,11 +1,11 @@
---- src/packet.c.orig	Mon Jun 21 09:43:24 2004
-+++ src/packet.c	Mon Jun 21 09:44:15 2004
-@@ -467,7 +467,7 @@
+--- src/packet.c.orig	Mon Nov 15 14:41:32 2004
++++ src/packet.c	Mon Nov 15 14:42:04 2004
+@@ -531,7 +531,7 @@
    parse_client_queued(client_p);
  
    /* Check to make sure we're not flooding */
 -  if (IsPerson(client_p) &&
 +  if (!(IsServer(client_p) || IsHandshake(client_p) || IsConnecting(client_p)) &&
-       (dbuf_length(&client_p->localClient->buf_recvq) >
-        (unsigned int)ConfigFileEntry.client_flood))
+       (linebuf_alloclen(&client_p->localClient->buf_recvq) >
+        ConfigFileEntry.client_flood))
    {
diff --git a/russian/ircd-hybrid-ru/files/patch-tools-Makefile.in b/russian/ircd-hybrid-ru/files/patch-tools-Makefile.in
new file mode 100644
index 000000000000..c807f0577a4c
--- /dev/null
+++ b/russian/ircd-hybrid-ru/files/patch-tools-Makefile.in
@@ -0,0 +1,20 @@
+--- tools/Makefile.in.orig	Fri Jul 12 06:40:27 2002
++++ tools/Makefile.in	Mon Nov 15 16:51:10 2004
+@@ -121,17 +121,9 @@
+ 		echo "mkdir $(moduledir)"; \
+ 		mkdir $(moduledir); \
+ 	fi
+-	-@if test ! -d $(automoduledir); then \
+-		echo "mkdir $(automoduledir)"; \
+-		mkdir $(automoduledir); \
+-	fi
+ 	-@if test ! -d $(sysconfdir); then \
+ 		echo "mkdir $(sysconfdir)"; \
+ 		mkdir $(sysconfdir); \
+-	fi
+-	-@if test ! -d $(localstatedir)/logs; then \
+-		echo "mkdir $(localstatedir)/logs"; \
+-		mkdir $(localstatedir)/logs; \
+ 	fi
+ 
+ install: install-mkdirs build
diff --git a/russian/ircd-hybrid-ru/pkg-plist b/russian/ircd-hybrid-ru/pkg-plist
index 3472e9b442aa..0f36af9ebe7a 100644
--- a/russian/ircd-hybrid-ru/pkg-plist
+++ b/russian/ircd-hybrid-ru/pkg-plist
@@ -1,36 +1,34 @@
 bin/ircd
-bin/servlink
 bin/viconf
 bin/mkpasswd
 bin/convertconf
 bin/convertilines
 bin/convertklines
 bin/encspeed
-bin/viklines
 bin/vimotd
+bin/viklines
+bin/servlink
 etc/rc.d/ircd-hybrid-ru.sh.sample
 etc/ircd-hybrid-ru/example.conf
-etc/ircd-hybrid-ru/codepage/cp866.tab
-etc/ircd-hybrid-ru/codepage/iso8859-5.tab
-etc/ircd-hybrid-ru/codepage/koi8.tab
-etc/ircd-hybrid-ru/codepage/macintosh.tab
-etc/ircd-hybrid-ru/codepage/translit.tab
+etc/ircd-hybrid-ru/example.dalnetru.conf
 etc/ircd-hybrid-ru/ircd.motd
-etc/ircd-hybrid-ru/dline.conf
 etc/ircd-hybrid-ru/kline.conf
+etc/ircd-hybrid-ru/dline.conf
 etc/ircd-hybrid-ru/xline.conf
 etc/ircd-hybrid-ru/nresv.conf
 etc/ircd-hybrid-ru/cresv.conf
+etc/ircd-hybrid-ru/codepage/cp866.tab
+etc/ircd-hybrid-ru/codepage/iso8859-5.tab
+etc/ircd-hybrid-ru/codepage/koi8.tab
+etc/ircd-hybrid-ru/codepage/macintosh.tab
+etc/ircd-hybrid-ru/codepage/translit.tab
 include/ircd-hybrid-7/balloc.h
-include/ircd-hybrid-7/blalloc.h
 include/ircd-hybrid-7/channel.h
 include/ircd-hybrid-7/channel_mode.h
+include/ircd-hybrid-7/class.h
 include/ircd-hybrid-7/client.h
-include/ircd-hybrid-7/cluster.h
 include/ircd-hybrid-7/common.h
-include/ircd-hybrid-7/control.h
-include/ircd-hybrid-7/dalloca.h
-include/ircd-hybrid-7/dbuf.h
+include/ircd-hybrid-7/config.h
 include/ircd-hybrid-7/defaults.h
 include/ircd-hybrid-7/event.h
 include/ircd-hybrid-7/fdlist.h
@@ -39,12 +37,6 @@ include/ircd-hybrid-7/handlers.h
 include/ircd-hybrid-7/hash.h
 include/ircd-hybrid-7/hook.h
 include/ircd-hybrid-7/hostmask.h
-include/ircd-hybrid-7/inet_misc.h
-include/ircd-hybrid-7/io.h
-include/ircd-hybrid-7/irc_getaddrinfo.h
-include/ircd-hybrid-7/irc_getnameinfo.h
-include/ircd-hybrid-7/irc_res.h
-include/ircd-hybrid-7/irc_reslib.h
 include/ircd-hybrid-7/irc_string.h
 include/ircd-hybrid-7/ircd.h
 include/ircd-hybrid-7/ircd_defs.h
@@ -52,9 +44,12 @@ include/ircd-hybrid-7/ircd_getopt.h
 include/ircd-hybrid-7/ircd_handler.h
 include/ircd-hybrid-7/ircd_signal.h
 include/ircd-hybrid-7/ircdauth.h
+include/ircd-hybrid-7/linebuf.h
 include/ircd-hybrid-7/list.h
 include/ircd-hybrid-7/listener.h
 include/ircd-hybrid-7/m_info.h
+include/ircd-hybrid-7/m_kline.h
+include/ircd-hybrid-7/md5.h
 include/ircd-hybrid-7/memory.h
 include/ircd-hybrid-7/modules.h
 include/ircd-hybrid-7/motd.h
@@ -63,9 +58,9 @@ include/ircd-hybrid-7/numeric.h
 include/ircd-hybrid-7/packet.h
 include/ircd-hybrid-7/parse.h
 include/ircd-hybrid-7/patchlevel.h
+include/ircd-hybrid-7/res.h
 include/ircd-hybrid-7/restart.h
 include/ircd-hybrid-7/resv.h
-include/ircd-hybrid-7/rlimits.h
 include/ircd-hybrid-7/rsa.h
 include/ircd-hybrid-7/s_auth.h
 include/ircd-hybrid-7/s_bsd.h
@@ -77,34 +72,38 @@ include/ircd-hybrid-7/s_misc.h
 include/ircd-hybrid-7/s_serv.h
 include/ircd-hybrid-7/s_stats.h
 include/ircd-hybrid-7/s_user.h
+include/ircd-hybrid-7/s_zip.h
+include/ircd-hybrid-7/scache.h
 include/ircd-hybrid-7/send.h
 include/ircd-hybrid-7/serno.h
-include/ircd-hybrid-7/servlink.h
 include/ircd-hybrid-7/setup.h
 include/ircd-hybrid-7/sprintf_irc.h
 include/ircd-hybrid-7/stdinc.h
 include/ircd-hybrid-7/supported.h
 include/ircd-hybrid-7/tools.h
 include/ircd-hybrid-7/translate.h
-include/ircd-hybrid-7/userhost.h
+include/ircd-hybrid-7/vchannel.h
 include/ircd-hybrid-7/whowas.h
 lib/ircd-hybrid-ru-modules/autoload/m_accept.so
 lib/ircd-hybrid-ru-modules/autoload/m_admin.so
 lib/ircd-hybrid-ru-modules/autoload/m_away.so
 lib/ircd-hybrid-ru-modules/autoload/m_capab.so
 lib/ircd-hybrid-ru-modules/autoload/m_cburst.so
-lib/ircd-hybrid-ru-modules/autoload/m_close.so
 lib/ircd-hybrid-ru-modules/autoload/m_challenge.so
-lib/ircd-hybrid-ru-modules/autoload/m_cryptlink.so
+lib/ircd-hybrid-ru-modules/autoload/m_cjoin.so
+lib/ircd-hybrid-ru-modules/autoload/m_close.so
 lib/ircd-hybrid-ru-modules/autoload/m_connect.so
+lib/ircd-hybrid-ru-modules/autoload/m_cryptlink.so
 lib/ircd-hybrid-ru-modules/autoload/m_dmem.so
 lib/ircd-hybrid-ru-modules/autoload/m_drop.so
 lib/ircd-hybrid-ru-modules/autoload/m_encap.so
 lib/ircd-hybrid-ru-modules/autoload/m_eob.so
 lib/ircd-hybrid-ru-modules/autoload/m_gline.so
+lib/ircd-hybrid-ru-modules/autoload/m_help.so
 lib/ircd-hybrid-ru-modules/autoload/m_info.so
 lib/ircd-hybrid-ru-modules/autoload/m_invite.so
 lib/ircd-hybrid-ru-modules/autoload/m_ison.so
+lib/ircd-hybrid-ru-modules/autoload/m_join.so
 lib/ircd-hybrid-ru-modules/autoload/m_kline.so
 lib/ircd-hybrid-ru-modules/autoload/m_knock.so
 lib/ircd-hybrid-ru-modules/autoload/m_links.so
@@ -127,15 +126,17 @@ lib/ircd-hybrid-ru-modules/autoload/m_post.so
 lib/ircd-hybrid-ru-modules/autoload/m_rehash.so
 lib/ircd-hybrid-ru-modules/autoload/m_restart.so
 lib/ircd-hybrid-ru-modules/autoload/m_resv.so
+lib/ircd-hybrid-ru-modules/autoload/m_services.so
 lib/ircd-hybrid-ru-modules/autoload/m_set.so
+lib/ircd-hybrid-ru-modules/autoload/m_svs.so
 lib/ircd-hybrid-ru-modules/autoload/m_stats.so
 lib/ircd-hybrid-ru-modules/autoload/m_svinfo.so
-lib/ircd-hybrid-ru-modules/autoload/m_svs.so
 lib/ircd-hybrid-ru-modules/autoload/m_tburst.so
 lib/ircd-hybrid-ru-modules/autoload/m_testline.so
 lib/ircd-hybrid-ru-modules/autoload/m_time.so
 lib/ircd-hybrid-ru-modules/autoload/m_topic.so
 lib/ircd-hybrid-ru-modules/autoload/m_trace.so
+lib/ircd-hybrid-ru-modules/autoload/m_unkline.so
 lib/ircd-hybrid-ru-modules/autoload/m_user.so
 lib/ircd-hybrid-ru-modules/autoload/m_userhost.so
 lib/ircd-hybrid-ru-modules/autoload/m_users.so
@@ -146,7 +147,6 @@ lib/ircd-hybrid-ru-modules/autoload/m_whois.so
 lib/ircd-hybrid-ru-modules/autoload/m_whowas.so
 lib/ircd-hybrid-ru-modules/autoload/m_xline.so
 lib/ircd-hybrid-ru-modules/m_die.so
-lib/ircd-hybrid-ru-modules/m_join.so
 lib/ircd-hybrid-ru-modules/m_kick.so
 lib/ircd-hybrid-ru-modules/m_kill.so
 lib/ircd-hybrid-ru-modules/m_message.so
@@ -157,12 +157,101 @@ lib/ircd-hybrid-ru-modules/m_quit.so
 lib/ircd-hybrid-ru-modules/m_server.so
 lib/ircd-hybrid-ru-modules/m_sjoin.so
 lib/ircd-hybrid-ru-modules/m_squit.so
+messages/ayb/LC_MESSAGES/ircd-hybrid.mo
+messages/custom/LC_MESSAGES/ircd-hybrid.mo
+help/users/index
+help/users/info
+help/users/notice
+help/users/privmsg
+help/users/stats
+help/users/umode
+help/opers/accept
+help/opers/admin
+help/opers/away
+help/opers/capab
+help/opers/cburst
+help/opers/challenge
+help/opers/cjoin
+help/opers/client
+help/opers/close
+help/opers/cmode
+help/opers/connect
+help/opers/credits
+help/opers/cryptlink
+help/opers/die
+help/opers/dline
+help/opers/dmem
+help/opers/drop
+help/opers/eob
+help/opers/error
+help/opers/gline
+help/opers/help
+help/opers/index
+help/opers/info
+help/opers/invite
+help/opers/ison
+help/opers/join
+help/opers/kick
+help/opers/kill
+help/opers/kline
+help/opers/knock
+help/opers/knockll
+help/opers/links
+help/opers/list
+help/opers/lljoin
+help/opers/llnick
+help/opers/locops
+help/opers/lusers
+help/opers/modlist
+help/opers/modload
+help/opers/modrestart
+help/opers/modunload
+help/opers/motd
+help/opers/names
+help/opers/nburst
+help/opers/nick
+help/opers/notice
+help/opers/oper
+help/opers/operwall
+help/opers/part
+help/opers/pass
+help/opers/ping
+help/opers/pong
+help/opers/post
+help/opers/privmsg
+help/opers/quit
+help/opers/rehash
+help/opers/restart
+help/opers/resv
+help/opers/server
+help/opers/set
+help/opers/sjoin
+help/opers/squit
+help/opers/stats
+help/opers/svinfo
+help/opers/testline
+help/opers/time
+help/opers/topic
+help/opers/trace
+help/opers/uhelp
+help/opers/umode
+help/opers/undline
+help/opers/ungline
+help/opers/unkline
+help/opers/unresv
+help/opers/user
+help/opers/userhost
+help/opers/users
+help/opers/version
+help/opers/wallops
+help/opers/who
+help/opers/whois
+help/opers/whowas
 %%PORTDOCS%%%%DOCSDIR%%/RELNOTES
 %%PORTDOCS%%%%DOCSDIR%%/RELNOTES.hybrid-ru
 %%PORTDOCS%%%%DOCSDIR%%/CIDR.txt
 %%PORTDOCS%%%%DOCSDIR%%/LazyLinks.txt
 %%PORTDOCS%%%%DOCSDIR%%/challenge.txt
-%%PORTDOCS%%%%DOCSDIR%%/channels.txt
 %%PORTDOCS%%%%DOCSDIR%%/guidelines.txt
 %%PORTDOCS%%%%DOCSDIR%%/index.txt
 %%PORTDOCS%%%%DOCSDIR%%/kline.txt
@@ -173,6 +262,7 @@ lib/ircd-hybrid-ru-modules/m_squit.so
 %%PORTDOCS%%%%DOCSDIR%%/opermyth.txt
 %%PORTDOCS%%%%DOCSDIR%%/resv.txt
 %%PORTDOCS%%%%DOCSDIR%%/serverhide.txt
+%%PORTDOCS%%%%DOCSDIR%%/vchans.txt
 %%PORTDOCS%%%%DOCSDIR%%/whats-new.txt
 %%PORTDOCS%%%%DOCSDIR%%/server-version-info
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/russian/ircd-hybrid/Makefile b/russian/ircd-hybrid/Makefile
index 17df3ace2c86..4fe1cd6a3026 100644
--- a/russian/ircd-hybrid/Makefile
+++ b/russian/ircd-hybrid/Makefile
@@ -7,36 +7,33 @@
 
 PORTNAME=	ircd
 PORTVERSION=	7.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	irc russian
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://rusunix.org/pub/FreeBSD/distfiles/
 MASTER_SITE_SUBDIR=	ircd-hybrid-ru
 PKGNAMESUFFIX=	-hybrid-ru
-DISTNAME=	ircd-hybrid-ru-7.1rc2
+DISTNAME=	ircd-hybrid-ru-7.0rc4
 
 MAINTAINER=	aquatique-ports@rambler.ru
 COMMENT=	Russian version of well known hybrid IRC server
 
-CONFLICTS=	ircd*
+CONFLICTS=	ircd-hybrid-7* ircd-ru[0-9]*
 
 WRKSRC=		${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}
 USE_OPENSSL=	yes
 USE_BISON=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/ircd-hybrid-ru
+CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/ircd-hybrid-ru --enable-kqueue
 
+MANCOMPRESSED=	no
 MAN8=		ircd.8
 
 .if defined(WITH_SMALL_NET)
 CONFIGURE_ARGS+=-enable-small-net
 .endif
 
-.if defined(WITH_SYSLOG)
-CONFIGURE_ARGS+=--enable-syslog=\"kill squit connect users oper\"
-.endif
-
 .if defined(NICKLENGTH)
 CONFIGURE_ARGS+=--with-nicklen=${NICKLENGTH}
 .endif
@@ -45,22 +42,30 @@ CONFIGURE_ARGS+=--with-nicklen=${NICKLENGTH}
 CONFIGURE_ARGS+=--with-topiclen=${TOPICLENGTH}
 .endif
 
-.if defined(MAXCONN)
-CONFIGURE_ARGS+=--with-maxconn=${MAXCONN}
+.if defined(MAXCLIENTS)
+CONFIGURE_ARGS+=--with-maxclients=${MAXCLIENTS}
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's,"-g,",; s,-O2 -g,-O,' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's,/modules/,/lib/ircd-hybrid-ru-modules/,' ${WRKSRC}/include/config.h
+	@${REINPLACE_CMD} -e 's,/etc,/etc/ircd-hybrid-ru,' ${WRKSRC}/include/config.h
+	@${REINPLACE_CMD} -e 's,IRCD_PREFIX "/logs","/var/log/ircd-hybrid-ru",' ${WRKSRC}/include/config.h
+	@${FIND} ${WRKSRC} -type f -name Makefile.in -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
+		-e "s,/modules,/lib/ircd-hybrid-ru-modules,"
+
 pre-extract:
 	@${ECHO_MSG} "* * * Build options for ircd-hybrid-ru * * *"
 	@${ECHO_MSG} "Issue make WITH_SMALL_NET=yes to build server optimized for small network"
-	@${ECHO_MSG} "Issue make WITH_SYSLOG=yes to enable logging via syslogd"
 	@${ECHO_MSG} "You can define maximum nick length. For example make NICKLENGTH=46 (default is 30)"
 	@${ECHO_MSG} "You can define maximum topic length. For example make TOPICLENGTH=254 (default is 120; maximum is 390)"
-	@${ECHO_MSG} "You can define maximum number of connections for ircd. For example make MAXCONN=512"
+	@${ECHO_MSG} "You can define maximum number of connections for ircd. For example make MAXCLIENTS=512"
 
 pre-install:
 	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-	@${REINPLACE_CMD} -e 's,ircd/etc/codepage,etc/ircd-hybrid-ru/codepage,' ${WRKSRC}/etc/example.conf
-	@${REINPLACE_CMD} -e 's,/ircd/modules,/lib/ircd-hybrid-ru-modules,' ${WRKSRC}/etc/example.conf
+	@${REINPLACE_CMD} -e 's,ircd/etc/codepage,etc/ircd-hybrid-ru/codepage,' ${WRKSRC}/doc/example.conf
+	@${REINPLACE_CMD} -e 's,/ircd/modules,/lib/ircd-hybrid-ru-modules,' ${WRKSRC}/doc/example.conf
+	@${REINPLACE_CMD} -e 's,logs/,/var/log/ircd-hybrid-ru/,' ${WRKSRC}/doc/example.conf
 
 post-install:
 	@${INSTALL_SCRIPT} -m 555 ${FILESDIR}/ircd-hybrid-ru.sh.sample ${PREFIX}/etc/rc.d
diff --git a/russian/ircd-hybrid/distinfo b/russian/ircd-hybrid/distinfo
index 7a4121457308..2313ec7c03ba 100644
--- a/russian/ircd-hybrid/distinfo
+++ b/russian/ircd-hybrid/distinfo
@@ -1,2 +1,2 @@
-MD5 (ircd-hybrid-ru-7.1rc2.tar.gz) = 3f3b6311c55eb6d697285d6437ced084
-SIZE (ircd-hybrid-ru-7.1rc2.tar.gz) = 1178463
+MD5 (ircd-hybrid-ru-7.0rc4.tar.gz) = 74daff8d8c3737e77e0506b49e9efc3f
+SIZE (ircd-hybrid-ru-7.0rc4.tar.gz) = 1153665
diff --git a/russian/ircd-hybrid/files/ircd-hybrid-ru.sh.sample b/russian/ircd-hybrid/files/ircd-hybrid-ru.sh.sample
index f62cb23e9862..fae85a3c8289 100644
--- a/russian/ircd-hybrid/files/ircd-hybrid-ru.sh.sample
+++ b/russian/ircd-hybrid/files/ircd-hybrid-ru.sh.sample
@@ -13,7 +13,7 @@ start)
 	;;
 stop)
 	kill `cat ${PREFIX}/etc/ircd-hybrid-ru/ircd.pid` >/dev/null 2>&1
-	echo -n ' ircd'
+	echo -n ' ircd-hybrid-ru'
 	;;
 *)
 	echo "Usage: `basename $0` {start|stop}" >&2
diff --git a/russian/ircd-hybrid/files/patch-configure b/russian/ircd-hybrid/files/patch-configure
deleted file mode 100644
index 1da7b9f5f2e6..000000000000
--- a/russian/ircd-hybrid/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Thu Oct  9 17:38:48 2003
-+++ configure	Sun Dec 14 14:35:48 2003
-@@ -1944,7 +1944,7 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_prog_cc_g=yes
-+  ac_cv_prog_cc_g=no
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
diff --git a/russian/ircd-hybrid/files/patch-defaults.h b/russian/ircd-hybrid/files/patch-defaults.h
deleted file mode 100644
index 70eb87ddefcb..000000000000
--- a/russian/ircd-hybrid/files/patch-defaults.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- include/defaults.h.orig	Sun Oct  5 02:31:17 2003
-+++ include/defaults.h	Sun Dec 14 16:29:00 2003
-@@ -49,9 +49,9 @@
- #define DPATH   IRCD_PREFIX                                                     
- #define BINPATH IRCD_PREFIX "/bin/"
- #define MSGPATH IRCD_PREFIX "/messages/"
--#define ETCPATH IRCD_PREFIX "/etc"
--#define LOGPATH IRCD_PREFIX "/logs"
--#define MODPATH IRCD_PREFIX "/modules/"
-+#define ETCPATH IRCD_PREFIX "/etc/ircd-hybrid-ru"
-+#define LOGPATH             "/var/log/ircd-hybrid-ru"
-+#define MODPATH IRCD_PREFIX "/lib/ircd-hybrid-ru-modules/"
- 
- /* files */
- #define SPATH   BINPATH "/ircd"                 /* ircd executable */
diff --git a/russian/ircd-hybrid/files/patch-doc-Makefile.in b/russian/ircd-hybrid/files/patch-doc-Makefile.in
new file mode 100644
index 000000000000..10b829b4b40a
--- /dev/null
+++ b/russian/ircd-hybrid/files/patch-doc-Makefile.in
@@ -0,0 +1,20 @@
+--- doc/Makefile.in.orig	Sat Nov 13 23:58:49 2004
++++ doc/Makefile.in	Mon Nov 15 17:34:02 2004
+@@ -26,7 +26,7 @@
+ automoduledir	= @prefix@/modules/autoload
+ 
+ # Local to the etc Makefile
+-mandir          = @prefix@/man8
++mandir          = @prefix@/man/man8
+ MANPAGES        = ircd.8
+ 
+ CONFS		= example.conf example.dalnetru.conf
+@@ -81,6 +81,8 @@
+ 			touch $(sysconfdir)/$${i}line.conf; \
+ 		fi; \
+ 	done
++	mkdir -p $(sysconfdir)/codepage; \
++	$(INSTALL_DATA) codepage/* $(sysconfdir)/codepage/
+ 
+ 	@for i in n c; do \
+ 		if test ! -f "$(sysconfdir)/$${i}resv.conf"; then \
diff --git a/russian/ircd-hybrid/files/patch-etc-Makefile.in b/russian/ircd-hybrid/files/patch-etc-Makefile.in
deleted file mode 100644
index 873c8b2be553..000000000000
--- a/russian/ircd-hybrid/files/patch-etc-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- etc/Makefile.in.orig	Sun Dec 14 14:56:56 2003
-+++ etc/Makefile.in	Sun Dec 14 14:57:51 2003
-@@ -27,6 +27,8 @@
- 		echo $(INSTALL_DATA) $$i $(sysconfdir); \
- 		$(INSTALL_DATA) $$i $(sysconfdir); \
- 	done
-+	mkdir -p $(sysconfdir)/codepage; \
-+	$(INSTALL_DATA) codepage/* $(sysconfdir)/codepage/
- 
- 	@echo "Note: more example configuration files can be found in this directory (etc/)."
- 	
diff --git a/russian/ircd-hybrid/files/patch-include-Makefile.in b/russian/ircd-hybrid/files/patch-include-Makefile.in
new file mode 100644
index 000000000000..3f7c0db6e4c3
--- /dev/null
+++ b/russian/ircd-hybrid/files/patch-include-Makefile.in
@@ -0,0 +1,14 @@
+--- include/Makefile.in.orig	Mon Nov 15 15:32:30 2004
++++ include/Makefile.in	Mon Nov 15 15:33:04 2004
+@@ -21,9 +21,9 @@
+ 	@echo installing header files...
+ 	-@if test ! -d $(prefix)/include; then \
+ 		echo "mkdir $(prefix)/include"; \
+-		mkdir $(prefix)/include; \
+-		mkdir $(prefix)/include/ircd-hybrid-7; \
++		mkdir $(prefix)/include; \
+ 	fi
++	mkdir $(prefix)/include/ircd-hybrid-7
+ 	@for header in *.h; do \
+ 		${INSTALL_DATA} $$header $(prefix)/include/ircd-hybrid-7; \
+ 	done
diff --git a/russian/ircd-hybrid/files/patch-modules-Makefile.in b/russian/ircd-hybrid/files/patch-modules-Makefile.in
deleted file mode 100644
index 8c21fc46e83b..000000000000
--- a/russian/ircd-hybrid/files/patch-modules-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/Makefile.in.orig	Sun Dec 14 15:13:18 2003
-+++ modules/Makefile.in	Sun Dec 14 15:13:52 2003
-@@ -23,7 +23,7 @@
- 
- prefix          = $(DESTDIR)@prefix@
- # Change this later! -- adrian
--moduledir       = ${prefix}/modules
-+moduledir       = ${prefix}/lib/ircd-hybrid-ru-modules
- automoduledir   = ${moduledir}/autoload
- 
- INCLUDES	= -I../include $(SSL_INCLUDES)
diff --git a/russian/ircd-hybrid/files/patch-src-Makefile.in b/russian/ircd-hybrid/files/patch-src-Makefile.in
index d10f7a029b79..300e5d791c3b 100644
--- a/russian/ircd-hybrid/files/patch-src-Makefile.in
+++ b/russian/ircd-hybrid/files/patch-src-Makefile.in
@@ -1,11 +1,15 @@
---- src/Makefile.in.orig	Sun Dec 14 14:44:19 2003
-+++ src/Makefile.in	Sun Dec 14 14:44:37 2003
-@@ -128,7 +128,7 @@
- 
- install-mkdirs:
- 	mkdir -p $(prefix) $(exec_prefix) $(bindir) $(sysconfdir) \
--		$(localstatedir)/logs 
-+		/var/log/ircd-hybrid-ru
+--- src/Makefile.in.orig	Mon Nov 15 14:39:25 2004
++++ src/Makefile.in	Mon Nov 15 14:39:59 2004
+@@ -141,9 +141,9 @@
+ 		echo "mkdir $(sysconfdir)"; \
+ 		mkdir $(sysconfdir); \
+ 	fi
+-	-@if test ! -d $(localstatedir)/logs; then \
+-		echo "mkdir $(localstatedir)/logs"; \
+-		mkdir $(localstatedir)/logs; \
++	-@if test ! -d /var/log/ircd-hybrid-ru; then \
++		echo "/var/log/ircd-hybrid-ru"; \
++		mkdir /var/log/ircd-hybrid-ru; \
+ 	fi
  
  install: install-mkdirs build
- 	@for i in $(PROGS); do \
diff --git a/russian/ircd-hybrid/files/patch-src-packet.c b/russian/ircd-hybrid/files/patch-src-packet.c
index 2d192ac37b96..e9b0c04150b5 100644
--- a/russian/ircd-hybrid/files/patch-src-packet.c
+++ b/russian/ircd-hybrid/files/patch-src-packet.c
@@ -1,11 +1,11 @@
---- src/packet.c.orig	Mon Jun 21 09:43:24 2004
-+++ src/packet.c	Mon Jun 21 09:44:15 2004
-@@ -467,7 +467,7 @@
+--- src/packet.c.orig	Mon Nov 15 14:41:32 2004
++++ src/packet.c	Mon Nov 15 14:42:04 2004
+@@ -531,7 +531,7 @@
    parse_client_queued(client_p);
  
    /* Check to make sure we're not flooding */
 -  if (IsPerson(client_p) &&
 +  if (!(IsServer(client_p) || IsHandshake(client_p) || IsConnecting(client_p)) &&
-       (dbuf_length(&client_p->localClient->buf_recvq) >
-        (unsigned int)ConfigFileEntry.client_flood))
+       (linebuf_alloclen(&client_p->localClient->buf_recvq) >
+        ConfigFileEntry.client_flood))
    {
diff --git a/russian/ircd-hybrid/files/patch-tools-Makefile.in b/russian/ircd-hybrid/files/patch-tools-Makefile.in
new file mode 100644
index 000000000000..c807f0577a4c
--- /dev/null
+++ b/russian/ircd-hybrid/files/patch-tools-Makefile.in
@@ -0,0 +1,20 @@
+--- tools/Makefile.in.orig	Fri Jul 12 06:40:27 2002
++++ tools/Makefile.in	Mon Nov 15 16:51:10 2004
+@@ -121,17 +121,9 @@
+ 		echo "mkdir $(moduledir)"; \
+ 		mkdir $(moduledir); \
+ 	fi
+-	-@if test ! -d $(automoduledir); then \
+-		echo "mkdir $(automoduledir)"; \
+-		mkdir $(automoduledir); \
+-	fi
+ 	-@if test ! -d $(sysconfdir); then \
+ 		echo "mkdir $(sysconfdir)"; \
+ 		mkdir $(sysconfdir); \
+-	fi
+-	-@if test ! -d $(localstatedir)/logs; then \
+-		echo "mkdir $(localstatedir)/logs"; \
+-		mkdir $(localstatedir)/logs; \
+ 	fi
+ 
+ install: install-mkdirs build
diff --git a/russian/ircd-hybrid/pkg-plist b/russian/ircd-hybrid/pkg-plist
index 3472e9b442aa..0f36af9ebe7a 100644
--- a/russian/ircd-hybrid/pkg-plist
+++ b/russian/ircd-hybrid/pkg-plist
@@ -1,36 +1,34 @@
 bin/ircd
-bin/servlink
 bin/viconf
 bin/mkpasswd
 bin/convertconf
 bin/convertilines
 bin/convertklines
 bin/encspeed
-bin/viklines
 bin/vimotd
+bin/viklines
+bin/servlink
 etc/rc.d/ircd-hybrid-ru.sh.sample
 etc/ircd-hybrid-ru/example.conf
-etc/ircd-hybrid-ru/codepage/cp866.tab
-etc/ircd-hybrid-ru/codepage/iso8859-5.tab
-etc/ircd-hybrid-ru/codepage/koi8.tab
-etc/ircd-hybrid-ru/codepage/macintosh.tab
-etc/ircd-hybrid-ru/codepage/translit.tab
+etc/ircd-hybrid-ru/example.dalnetru.conf
 etc/ircd-hybrid-ru/ircd.motd
-etc/ircd-hybrid-ru/dline.conf
 etc/ircd-hybrid-ru/kline.conf
+etc/ircd-hybrid-ru/dline.conf
 etc/ircd-hybrid-ru/xline.conf
 etc/ircd-hybrid-ru/nresv.conf
 etc/ircd-hybrid-ru/cresv.conf
+etc/ircd-hybrid-ru/codepage/cp866.tab
+etc/ircd-hybrid-ru/codepage/iso8859-5.tab
+etc/ircd-hybrid-ru/codepage/koi8.tab
+etc/ircd-hybrid-ru/codepage/macintosh.tab
+etc/ircd-hybrid-ru/codepage/translit.tab
 include/ircd-hybrid-7/balloc.h
-include/ircd-hybrid-7/blalloc.h
 include/ircd-hybrid-7/channel.h
 include/ircd-hybrid-7/channel_mode.h
+include/ircd-hybrid-7/class.h
 include/ircd-hybrid-7/client.h
-include/ircd-hybrid-7/cluster.h
 include/ircd-hybrid-7/common.h
-include/ircd-hybrid-7/control.h
-include/ircd-hybrid-7/dalloca.h
-include/ircd-hybrid-7/dbuf.h
+include/ircd-hybrid-7/config.h
 include/ircd-hybrid-7/defaults.h
 include/ircd-hybrid-7/event.h
 include/ircd-hybrid-7/fdlist.h
@@ -39,12 +37,6 @@ include/ircd-hybrid-7/handlers.h
 include/ircd-hybrid-7/hash.h
 include/ircd-hybrid-7/hook.h
 include/ircd-hybrid-7/hostmask.h
-include/ircd-hybrid-7/inet_misc.h
-include/ircd-hybrid-7/io.h
-include/ircd-hybrid-7/irc_getaddrinfo.h
-include/ircd-hybrid-7/irc_getnameinfo.h
-include/ircd-hybrid-7/irc_res.h
-include/ircd-hybrid-7/irc_reslib.h
 include/ircd-hybrid-7/irc_string.h
 include/ircd-hybrid-7/ircd.h
 include/ircd-hybrid-7/ircd_defs.h
@@ -52,9 +44,12 @@ include/ircd-hybrid-7/ircd_getopt.h
 include/ircd-hybrid-7/ircd_handler.h
 include/ircd-hybrid-7/ircd_signal.h
 include/ircd-hybrid-7/ircdauth.h
+include/ircd-hybrid-7/linebuf.h
 include/ircd-hybrid-7/list.h
 include/ircd-hybrid-7/listener.h
 include/ircd-hybrid-7/m_info.h
+include/ircd-hybrid-7/m_kline.h
+include/ircd-hybrid-7/md5.h
 include/ircd-hybrid-7/memory.h
 include/ircd-hybrid-7/modules.h
 include/ircd-hybrid-7/motd.h
@@ -63,9 +58,9 @@ include/ircd-hybrid-7/numeric.h
 include/ircd-hybrid-7/packet.h
 include/ircd-hybrid-7/parse.h
 include/ircd-hybrid-7/patchlevel.h
+include/ircd-hybrid-7/res.h
 include/ircd-hybrid-7/restart.h
 include/ircd-hybrid-7/resv.h
-include/ircd-hybrid-7/rlimits.h
 include/ircd-hybrid-7/rsa.h
 include/ircd-hybrid-7/s_auth.h
 include/ircd-hybrid-7/s_bsd.h
@@ -77,34 +72,38 @@ include/ircd-hybrid-7/s_misc.h
 include/ircd-hybrid-7/s_serv.h
 include/ircd-hybrid-7/s_stats.h
 include/ircd-hybrid-7/s_user.h
+include/ircd-hybrid-7/s_zip.h
+include/ircd-hybrid-7/scache.h
 include/ircd-hybrid-7/send.h
 include/ircd-hybrid-7/serno.h
-include/ircd-hybrid-7/servlink.h
 include/ircd-hybrid-7/setup.h
 include/ircd-hybrid-7/sprintf_irc.h
 include/ircd-hybrid-7/stdinc.h
 include/ircd-hybrid-7/supported.h
 include/ircd-hybrid-7/tools.h
 include/ircd-hybrid-7/translate.h
-include/ircd-hybrid-7/userhost.h
+include/ircd-hybrid-7/vchannel.h
 include/ircd-hybrid-7/whowas.h
 lib/ircd-hybrid-ru-modules/autoload/m_accept.so
 lib/ircd-hybrid-ru-modules/autoload/m_admin.so
 lib/ircd-hybrid-ru-modules/autoload/m_away.so
 lib/ircd-hybrid-ru-modules/autoload/m_capab.so
 lib/ircd-hybrid-ru-modules/autoload/m_cburst.so
-lib/ircd-hybrid-ru-modules/autoload/m_close.so
 lib/ircd-hybrid-ru-modules/autoload/m_challenge.so
-lib/ircd-hybrid-ru-modules/autoload/m_cryptlink.so
+lib/ircd-hybrid-ru-modules/autoload/m_cjoin.so
+lib/ircd-hybrid-ru-modules/autoload/m_close.so
 lib/ircd-hybrid-ru-modules/autoload/m_connect.so
+lib/ircd-hybrid-ru-modules/autoload/m_cryptlink.so
 lib/ircd-hybrid-ru-modules/autoload/m_dmem.so
 lib/ircd-hybrid-ru-modules/autoload/m_drop.so
 lib/ircd-hybrid-ru-modules/autoload/m_encap.so
 lib/ircd-hybrid-ru-modules/autoload/m_eob.so
 lib/ircd-hybrid-ru-modules/autoload/m_gline.so
+lib/ircd-hybrid-ru-modules/autoload/m_help.so
 lib/ircd-hybrid-ru-modules/autoload/m_info.so
 lib/ircd-hybrid-ru-modules/autoload/m_invite.so
 lib/ircd-hybrid-ru-modules/autoload/m_ison.so
+lib/ircd-hybrid-ru-modules/autoload/m_join.so
 lib/ircd-hybrid-ru-modules/autoload/m_kline.so
 lib/ircd-hybrid-ru-modules/autoload/m_knock.so
 lib/ircd-hybrid-ru-modules/autoload/m_links.so
@@ -127,15 +126,17 @@ lib/ircd-hybrid-ru-modules/autoload/m_post.so
 lib/ircd-hybrid-ru-modules/autoload/m_rehash.so
 lib/ircd-hybrid-ru-modules/autoload/m_restart.so
 lib/ircd-hybrid-ru-modules/autoload/m_resv.so
+lib/ircd-hybrid-ru-modules/autoload/m_services.so
 lib/ircd-hybrid-ru-modules/autoload/m_set.so
+lib/ircd-hybrid-ru-modules/autoload/m_svs.so
 lib/ircd-hybrid-ru-modules/autoload/m_stats.so
 lib/ircd-hybrid-ru-modules/autoload/m_svinfo.so
-lib/ircd-hybrid-ru-modules/autoload/m_svs.so
 lib/ircd-hybrid-ru-modules/autoload/m_tburst.so
 lib/ircd-hybrid-ru-modules/autoload/m_testline.so
 lib/ircd-hybrid-ru-modules/autoload/m_time.so
 lib/ircd-hybrid-ru-modules/autoload/m_topic.so
 lib/ircd-hybrid-ru-modules/autoload/m_trace.so
+lib/ircd-hybrid-ru-modules/autoload/m_unkline.so
 lib/ircd-hybrid-ru-modules/autoload/m_user.so
 lib/ircd-hybrid-ru-modules/autoload/m_userhost.so
 lib/ircd-hybrid-ru-modules/autoload/m_users.so
@@ -146,7 +147,6 @@ lib/ircd-hybrid-ru-modules/autoload/m_whois.so
 lib/ircd-hybrid-ru-modules/autoload/m_whowas.so
 lib/ircd-hybrid-ru-modules/autoload/m_xline.so
 lib/ircd-hybrid-ru-modules/m_die.so
-lib/ircd-hybrid-ru-modules/m_join.so
 lib/ircd-hybrid-ru-modules/m_kick.so
 lib/ircd-hybrid-ru-modules/m_kill.so
 lib/ircd-hybrid-ru-modules/m_message.so
@@ -157,12 +157,101 @@ lib/ircd-hybrid-ru-modules/m_quit.so
 lib/ircd-hybrid-ru-modules/m_server.so
 lib/ircd-hybrid-ru-modules/m_sjoin.so
 lib/ircd-hybrid-ru-modules/m_squit.so
+messages/ayb/LC_MESSAGES/ircd-hybrid.mo
+messages/custom/LC_MESSAGES/ircd-hybrid.mo
+help/users/index
+help/users/info
+help/users/notice
+help/users/privmsg
+help/users/stats
+help/users/umode
+help/opers/accept
+help/opers/admin
+help/opers/away
+help/opers/capab
+help/opers/cburst
+help/opers/challenge
+help/opers/cjoin
+help/opers/client
+help/opers/close
+help/opers/cmode
+help/opers/connect
+help/opers/credits
+help/opers/cryptlink
+help/opers/die
+help/opers/dline
+help/opers/dmem
+help/opers/drop
+help/opers/eob
+help/opers/error
+help/opers/gline
+help/opers/help
+help/opers/index
+help/opers/info
+help/opers/invite
+help/opers/ison
+help/opers/join
+help/opers/kick
+help/opers/kill
+help/opers/kline
+help/opers/knock
+help/opers/knockll
+help/opers/links
+help/opers/list
+help/opers/lljoin
+help/opers/llnick
+help/opers/locops
+help/opers/lusers
+help/opers/modlist
+help/opers/modload
+help/opers/modrestart
+help/opers/modunload
+help/opers/motd
+help/opers/names
+help/opers/nburst
+help/opers/nick
+help/opers/notice
+help/opers/oper
+help/opers/operwall
+help/opers/part
+help/opers/pass
+help/opers/ping
+help/opers/pong
+help/opers/post
+help/opers/privmsg
+help/opers/quit
+help/opers/rehash
+help/opers/restart
+help/opers/resv
+help/opers/server
+help/opers/set
+help/opers/sjoin
+help/opers/squit
+help/opers/stats
+help/opers/svinfo
+help/opers/testline
+help/opers/time
+help/opers/topic
+help/opers/trace
+help/opers/uhelp
+help/opers/umode
+help/opers/undline
+help/opers/ungline
+help/opers/unkline
+help/opers/unresv
+help/opers/user
+help/opers/userhost
+help/opers/users
+help/opers/version
+help/opers/wallops
+help/opers/who
+help/opers/whois
+help/opers/whowas
 %%PORTDOCS%%%%DOCSDIR%%/RELNOTES
 %%PORTDOCS%%%%DOCSDIR%%/RELNOTES.hybrid-ru
 %%PORTDOCS%%%%DOCSDIR%%/CIDR.txt
 %%PORTDOCS%%%%DOCSDIR%%/LazyLinks.txt
 %%PORTDOCS%%%%DOCSDIR%%/challenge.txt
-%%PORTDOCS%%%%DOCSDIR%%/channels.txt
 %%PORTDOCS%%%%DOCSDIR%%/guidelines.txt
 %%PORTDOCS%%%%DOCSDIR%%/index.txt
 %%PORTDOCS%%%%DOCSDIR%%/kline.txt
@@ -173,6 +262,7 @@ lib/ircd-hybrid-ru-modules/m_squit.so
 %%PORTDOCS%%%%DOCSDIR%%/opermyth.txt
 %%PORTDOCS%%%%DOCSDIR%%/resv.txt
 %%PORTDOCS%%%%DOCSDIR%%/serverhide.txt
+%%PORTDOCS%%%%DOCSDIR%%/vchans.txt
 %%PORTDOCS%%%%DOCSDIR%%/whats-new.txt
 %%PORTDOCS%%%%DOCSDIR%%/server-version-info
 %%PORTDOCS%%@dirrm %%DOCSDIR%%