- Update to 7.2.0

PR:		ports/91559
Submitted by:	Diane Bruce <db@db.net> (maintainer)

12 files changed, 170 insertions, 142 deletions

diff --git a/irc/ircd-hybrid/Makefile b/irc/ircd-hybrid/Makefile
index 7a3f7c99af94..e4d18b5f29d5 100644
--- a/irc/ircd-hybrid/Makefile
+++ b/irc/ircd-hybrid/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ircd-hybrid
-PORTVERSION=	7.1.2
+PORTVERSION=	7.2.0
 CATEGORIES=	irc ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	ircd-hybrid
diff --git a/irc/ircd-hybrid/distinfo b/irc/ircd-hybrid/distinfo
index 135b3414996a..c5fe0e59a7df 100644
--- a/irc/ircd-hybrid/distinfo
+++ b/irc/ircd-hybrid/distinfo
@@ -1,2 +1,3 @@
-MD5 (ircd-hybrid-7.1.2.tgz) = 355bfc7bf5b3dbad201c76f46258368a
-SIZE (ircd-hybrid-7.1.2.tgz) = 1165828
+MD5 (ircd-hybrid-7.2.0.tgz) = e3c716fef0c62eaba147df06f32ea87d
+SHA256 (ircd-hybrid-7.2.0.tgz) = b4b5f331efcf44dc6293148db799d1a01eb92db358069277b79f9c68db3f01f4
+SIZE (ircd-hybrid-7.2.0.tgz) = 990320
diff --git a/irc/ircd-hybrid/files/patch-Makefile.in b/irc/ircd-hybrid/files/patch-Makefile.in
index 3dcb6b9562b8..23b1dd366a80 100644
--- a/irc/ircd-hybrid/files/patch-Makefile.in
+++ b/irc/ircd-hybrid/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Thu Jul 17 20:41:39 2003
-+++ Makefile.in	Sat Jul 23 12:06:49 2005
+--- Makefile.in.orig	Fri Dec  9 00:53:00 2005
++++ Makefile.in	Sun Jan  8 23:04:59 2006
 @@ -24,7 +24,7 @@
  # Default make flags - you may want to uncomment this on a multicpu machine
  #MFLAGS   = -j 4
- DEPEND_DIRS  = modules src servlink
+ DEPEND_DIRS  = lib modules src servlink
 -BUILD_DIRS   = ${DEPEND_DIRS} tools
 +BUILD_DIRS   = ${DEPEND_DIRS} tools contrib messages
- INSTALL_DIRS = ${BUILD_DIRS} etc doc include
+ INSTALL_DIRS = ${BUILD_DIRS} etc doc help
  CLEAN_DIRS   = ${BUILD_DIRS} contrib
  # Anywhere that we can make install, we obviously can rm -f Makefile
diff --git a/irc/ircd-hybrid/files/patch-configure b/irc/ircd-hybrid/files/patch-configure
index 1ea180260e16..8aa5a37f4169 100644
--- a/irc/ircd-hybrid/files/patch-configure
+++ b/irc/ircd-hybrid/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	Sat Jul  9 09:09:19 2005
-+++ configure	Sat Jul 23 16:23:25 2005
+--- configure.orig	Fri Dec  9 00:53:00 2005
++++ configure	Mon Jan  9 03:11:02 2006
 @@ -351,6 +351,12 @@
  oldincludedir='/usr/include'
  infodir='${prefix}/info'
@@ -48,12 +48,12 @@
  do
    eval ac_val=$`echo $ac_var`
    case $ac_val in
-@@ -10693,6 +10718,13 @@
+@@ -10800,6 +10825,13 @@
  
  cat >>confdefs.h <<_ACEOF
  #define IRCD_PREFIX "$ac_default_prefix"
 +#define MODPATH "$moduledir/"
-+#define AMODPATH "$automoduledir/"
++#define AUTOMODPATH "$automoduledir/"
 +#define UHPATH "$uhelpdir/"
 +#define HPATH "$ohelpdir/"
 +#define MSGPATH "$messagedir/"
@@ -62,12 +62,12 @@
  _ACEOF
  
  
-@@ -10703,6 +10735,13 @@
+@@ -10810,12 +10842,19 @@
  
  cat >>confdefs.h <<_ACEOF
  #define IRCD_PREFIX "$prefix"
 +#define MODPATH "$moduledir/"
-+#define AMODPATH "$automoduledir/"
++#define AUTOMODPATH "$automoduledir/"
 +#define UHPATH "$uhelpdir/"
 +#define HPATH "$ohelpdir/"
 +#define MSGPATH "$messagedir/"
@@ -76,7 +76,23 @@
  _ACEOF
  
  
-@@ -11323,6 +11362,12 @@
+ fi
+ 
+-                                                                                                                                  ac_config_files="$ac_config_files Makefile etc/Makefile servlink/Makefile contrib/Makefile contrib/help/Makefile src/Makefile messages/Makefile modules/Makefile tools/Makefile doc/Makefile help/Makefile lib/Makefile lib/pcre/Makefile"
++                                                                                                                                  ac_config_files="$ac_config_files Makefile etc/Makefile servlink/Makefile contrib/Makefile contrib/help/Makefile help/Makefile src/Makefile messages/Makefile modules/Makefile tools/Makefile doc/Makefile help/Makefile lib/Makefile lib/pcre/Makefile"
+ 
+ 
+ cat >confcache <<\_ACEOF
+@@ -11418,6 +11457,8 @@
+ s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
+ s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
+ s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
++s,@UPATH@,$uhelpdir,;t t
++s,@HPATH@,$ohelpdir,;t t
+ s,@exec_prefix@,$exec_prefix,;t t
+ s,@prefix@,$prefix,;t t
+ s,@program_transform_name@,$program_transform_name,;t t
+@@ -11433,6 +11474,12 @@
  s,@oldincludedir@,$oldincludedir,;t t
  s,@infodir@,$infodir,;t t
  s,@mandir@,$mandir,;t t
diff --git a/irc/ircd-hybrid/files/patch-contrib-help_Makefile.in b/irc/ircd-hybrid/files/patch-contrib-help_Makefile.in
new file mode 100644
index 000000000000..9dde0d060f5e
--- /dev/null
+++ b/irc/ircd-hybrid/files/patch-contrib-help_Makefile.in
@@ -0,0 +1,35 @@
+--- contrib/help/Makefile.in.orig	Fri Dec  9 00:52:54 2005
++++ contrib/help/Makefile.in	Mon Jan  9 10:54:42 2006
+@@ -7,8 +7,8 @@
+ 
+ prefix=		@prefix@
+ exec_prefix=	@execprefix@
+-uhelpdir=	${prefix}/help/users
+-ohelpdir=	${prefix}/help/opers
++uhelpdir=	@UPATH@
++ohelpdir=	@HPATH@
+ 
+ SYMLINKS=   topic accept cmode admin names links away whowas \
+ 		version kick who invite quit join list nick oper part \
+@@ -21,19 +21,13 @@
+ 
+ install: 
+ 	@echo installing help files...
+-	-@if test ! -d $(prefix)/help; then \
+-		echo "mkdir $(prefix)/help"; \
+-		mkdir $(prefix)/help; \
+-		echo "mkdir $(prefix)/help/users"; \
+-		mkdir $(prefix)/help/users; \
+-		echo "mkdir $(prefix)/help/opers"; \
+-		mkdir $(prefix)/help/opers; \
+-	fi
++	mkdir -p $(ohelpdir)
+ 	@for help in opers/*; do \
+ 	if [ -f $$help ]; then \
+ 		${INSTALL_DATA} $$help $(ohelpdir); \
+ 	fi \
+ 	done
++	mkdir -p $(uhelpdir)
+ 	@for help in users/*; do \
+ 	if [ -f $$help ]; then \
+ 		$(INSTALL_DATA) $$help $(uhelpdir); \
diff --git a/irc/ircd-hybrid/files/patch-contrib_Makefile.in b/irc/ircd-hybrid/files/patch-contrib_Makefile.in
index 318ea81fd753..4e3aed8298a8 100644
--- a/irc/ircd-hybrid/files/patch-contrib_Makefile.in
+++ b/irc/ircd-hybrid/files/patch-contrib_Makefile.in
@@ -1,5 +1,5 @@
---- contrib/Makefile.in.orig	Sat Jul 23 10:40:46 2005
-+++ contrib/Makefile.in	Sat Jul 23 10:41:30 2005
+--- contrib/Makefile.in.orig	Fri Dec  9 00:52:55 2005
++++ contrib/Makefile.in	Sun Jan  8 23:05:43 2006
 @@ -19,7 +19,7 @@
  
  prefix		= $(DESTDIR)@prefix@
@@ -9,14 +9,3 @@
  
  SSL_LIBS	= @SSL_LIBS@
  SSL_INCLUDES	= @SSL_INCLUDES@
-@@ -29,8 +29,8 @@
- INCLUDES	= -I../include $(SSL_INCLUDES)
- CPPFLAGS	= ${INCLUDES} @CPPFLAGS@
- 
--uhelpdir	= ${prefix}/help/users
--ohelpdir	= ${prefix}/help/opers
-+uhelpdir	= @uhelpdir@
-+ohelpdir	= @ohelpdir@
- 
- SYMLINKS	= topic accept cmode admin names links away whowas \
- 		  version kick who invite quit join list nick oper part \
diff --git a/irc/ircd-hybrid/files/patch-help_Makefile.in b/irc/ircd-hybrid/files/patch-help_Makefile.in
new file mode 100644
index 000000000000..3504cf01d96c
--- /dev/null
+++ b/irc/ircd-hybrid/files/patch-help_Makefile.in
@@ -0,0 +1,41 @@
+--- help/Makefile.in.orig	Fri Dec  9 00:52:54 2005
++++ help/Makefile.in	Mon Jan  9 09:54:19 2006
+@@ -7,8 +7,8 @@
+ 
+ prefix=		@prefix@
+ exec_prefix=	@execprefix@
+-uhelpdir=	${prefix}/help/users
+-ohelpdir=	${prefix}/help/opers
++uhelpdir=	@UPATH@
++ohelpdir=	@HPATH@
+ 
+ SYMLINKS=	topic accept cmode admin names links away whowas \
+ 		version kick who invite quit join list nick oper part \
+@@ -21,14 +21,8 @@
+ 
+ install: 
+ 	@echo installing help files...
+-	-@if test ! -d $(prefix)/help; then \
+-		echo "mkdir $(prefix)/help"; \
+-		mkdir $(prefix)/help; \
+-		echo "mkdir $(prefix)/help/users"; \
+-		mkdir $(prefix)/help/users; \
+-		echo "mkdir $(prefix)/help/opers"; \
+-		mkdir $(prefix)/help/opers; \
+-	fi
++	mkdir -p $(ohelpdir)
++	mkdir -p $(uhelpdir)
+ 	@for help in opers/*; do \
+ 	if [ -f $$help ]; then \
+ 		${INSTALL_DATA} $$help $(ohelpdir); \
+@@ -38,10 +32,6 @@
+ 	if [ -f $$help ]; then \
+ 		$(INSTALL_DATA) $$help $(uhelpdir); \
+ 	fi \
+-	done
+-	@for link in $(SYMLINKS); do \
+-		rm -f $(uhelpdir)/$$link; \
+-		ln -s $(ohelpdir)/$$link $(uhelpdir); \
+ 	done
+ 
+ distclean:
diff --git a/irc/ircd-hybrid/files/patch-include_defaults.h b/irc/ircd-hybrid/files/patch-include_defaults.h
index 4bc6bb97798b..83a3a39c2760 100644
--- a/irc/ircd-hybrid/files/patch-include_defaults.h
+++ b/irc/ircd-hybrid/files/patch-include_defaults.h
@@ -1,25 +1,27 @@
---- include/defaults.h.orig	Sat Oct  4 15:31:17 2003
-+++ include/defaults.h	Sat Jul 23 14:00:15 2005
-@@ -41,17 +41,11 @@
-  * DPATH       = root directory of installation,
-  * BINPATH     = directory for binary files,
-  * ETCPATH     = directory for configuration files,
-- * LOGPATH     = directory for logfiles,
-- * MSGPATH     = directory for language files.
+--- include/defaults.h.orig	Fri Dec  9 00:52:49 2005
++++ include/defaults.h	Mon Jan  9 00:44:02 2006
+@@ -42,19 +42,11 @@
+  * BINPATH     = directory for binary files
+  * MSGPATH     = directory for language files
+  * ETCPATH     = directory for configuration files
+- * LOGPATH     = directory for logfiles
+- * MODPATH     = directory for modules
+- * AUTOMODPATH = directory for autoloaded modules
   */
  
  /* dirs */
- #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 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 AUTOMODPATH IRCD_PREFIX "/modules/autoload/"
  
  /* files */
  #define SPATH   BINPATH "/ircd"                 /* ircd executable */
-@@ -65,7 +59,7 @@
- #define XPATH   ETCPATH "/xline.conf"           /* xline file */
+@@ -70,7 +62,7 @@
+ #define RKPATH  ETCPATH "/rkline.conf"
  #define MPATH   ETCPATH "/ircd.motd"            /* MOTD file */
  #define LPATH   LOGPATH "/ircd.log"             /* ircd logfile */
 -#define PPATH   ETCPATH "/ircd.pid"             /* pid file */
diff --git a/irc/ircd-hybrid/files/patch-include_setup.h.in b/irc/ircd-hybrid/files/patch-include_setup.h.in
index 7028f4f060d5..1164682bbafa 100644
--- a/irc/ircd-hybrid/files/patch-include_setup.h.in
+++ b/irc/ircd-hybrid/files/patch-include_setup.h.in
@@ -1,13 +1,13 @@
---- include/setup.h.in.orig	Sun Jun 26 20:18:20 2005
-+++ include/setup.h.in	Sat Jul 23 16:34:51 2005
-@@ -171,6 +171,22 @@
+--- include/setup.h.in.orig	Fri Dec  9 00:52:49 2005
++++ include/setup.h.in	Mon Jan  9 01:13:18 2006
+@@ -177,6 +177,22 @@
  /* Prefix where the ircd is installed. */
  #undef IRCD_PREFIX
  
 +/* patched in by FreeBSD port */
 +#undef MODPATH
 +
-+#undef AMODPATH
++#undef AUTOMODPATH
 +
 +#undef UHPATH
 +
diff --git a/irc/ircd-hybrid/files/patch-contrib_m_help.c b/irc/ircd-hybrid/files/patch-modules_m_help.c
index 4c5424163109..302fee91a4ce 100644
--- a/irc/ircd-hybrid/files/patch-contrib_m_help.c
+++ b/irc/ircd-hybrid/files/patch-modules_m_help.c
@@ -1,5 +1,5 @@
---- contrib/m_help.c.orig	Sat Jul 23 15:52:17 2005
-+++ contrib/m_help.c	Sat Jul 23 15:50:40 2005
+--- modules/m_help.c.orig	Mon Jan  9 01:33:47 2006
++++ modules/m_help.c	Mon Jan  9 01:33:51 2006
 @@ -36,8 +36,6 @@
  #include "modules.h"
  #include "irc_string.h"
@@ -8,4 +8,4 @@
 -#define UHPATH IRCD_PREFIX "/help/users"
  #define HELPLEN 400
  
- static void m_help(struct Client*, struct Client*, int, char *[]);
+ static void m_help(struct Client *, struct Client *, int, char *[]);
diff --git a/irc/ircd-hybrid/files/patch-src_modules.c b/irc/ircd-hybrid/files/patch-src_modules.c
deleted file mode 100644
index ae55c20e6da0..000000000000
--- a/irc/ircd-hybrid/files/patch-src_modules.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/modules.c.orig	Wed Jun 22 18:37:48 2005
-+++ src/modules.c	Sat Jul 23 14:06:28 2005
-@@ -160,11 +160,10 @@
- 
-   MyFree (base_autoload);
- 
--  len = strlen(MODPATH) + 9;
--  /* whatever MODPATH + "autoload/" */
-+  len = strlen(AMODPATH);
-   
--  base_autoload = MyMalloc(len + 1);
--  snprintf(base_autoload, len, "%sautoload/", MODPATH);
-+  base_autoload = MyMalloc(len + 2);
-+  snprintf(base_autoload, len, "%s/", AMODPATH);
- }
- 
- /* mod_add_path()
diff --git a/irc/ircd-hybrid/pkg-plist b/irc/ircd-hybrid/pkg-plist
index 684e668437ae..82a74808ad35 100644
--- a/irc/ircd-hybrid/pkg-plist
+++ b/irc/ircd-hybrid/pkg-plist
@@ -1,13 +1,7 @@
-bin/convertconf
-bin/convertilines
-bin/convertklines
 bin/encspeed
 bin/ircd
 bin/mkpasswd
 bin/servlink
-bin/viconf
-bin/viklines
-bin/vimotd
 etc/ircd-hybrid/cresv.conf
 etc/ircd-hybrid/dline.conf
 etc/ircd-hybrid/example.conf
@@ -16,91 +10,39 @@ etc/ircd-hybrid/example.efnet.conf
 etc/ircd-hybrid/ircd.motd
 etc/ircd-hybrid/kline.conf
 etc/ircd-hybrid/nresv.conf
+etc/ircd-hybrid/rkline.conf
+etc/ircd-hybrid/rxline.conf
 etc/ircd-hybrid/simple.conf
 etc/ircd-hybrid/xline.conf
-include/ircd-hybrid-7/balloc.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/defaults.h
-include/ircd-hybrid-7/event.h
-include/ircd-hybrid-7/fdlist.h
-include/ircd-hybrid-7/fileio.h
-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/channel.h
-include/ircd-hybrid-7/channel_mode.h
-include/ircd-hybrid-7/inet_misc.h
-include/ircd-hybrid-7/io.h
-include/ircd-hybrid-7/ircdauth.h
-include/ircd-hybrid-7/ircd.h
-include/ircd-hybrid-7/ircd_defs.h
-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/irc_getaddrinfo.h
-include/ircd-hybrid-7/irc_getnameinfo.h
-include/ircd-hybrid-7/irc_reslib.h
-include/ircd-hybrid-7/irc_res.h
-include/ircd-hybrid-7/irc_string.h
-include/ircd-hybrid-7/listener.h
-include/ircd-hybrid-7/list.h
-include/ircd-hybrid-7/memory.h
-include/ircd-hybrid-7/modules.h
-include/ircd-hybrid-7/motd.h
-include/ircd-hybrid-7/msg.h
-include/ircd-hybrid-7/m_info.h
-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/restart.h
-include/ircd-hybrid-7/resv.h
-include/ircd-hybrid-7/rlimits.h
-include/ircd-hybrid-7/rsa.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/s_auth.h
-include/ircd-hybrid-7/s_bsd.h
-include/ircd-hybrid-7/s_conf.h
-include/ircd-hybrid-7/s_debug.h
-include/ircd-hybrid-7/s_gline.h
-include/ircd-hybrid-7/s_log.h
-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/tools.h
-include/ircd-hybrid-7/userhost.h
-include/ircd-hybrid-7/whowas.h
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/accept
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/admin
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/away
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/capab
+share/ircd-hybrid-%%PORTVERSION%%/help/opers/capture
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/cburst
+share/ircd-hybrid-%%PORTVERSION%%/help/opers/chghost
+share/ircd-hybrid-%%PORTVERSION%%/help/opers/chgident
+share/ircd-hybrid-%%PORTVERSION%%/help/opers/chgname
+share/ircd-hybrid-%%PORTVERSION%%/help/opers/classlist
+share/ircd-hybrid-%%PORTVERSION%%/help/opers/clearchan
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/client
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/close
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/cmode
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/connect
-share/ircd-hybrid-%%PORTVERSION%%/help/opers/credits
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/cryptlink
+share/ircd-hybrid-%%PORTVERSION%%/help/opers/ctrace
+share/ircd-hybrid-%%PORTVERSION%%/help/opers/delspoof
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/die
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/dline
-share/ircd-hybrid-%%PORTVERSION%%/help/opers/dmem
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/drop
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/eob
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/error
+share/ircd-hybrid-%%PORTVERSION%%/help/opers/etrace
+share/ircd-hybrid-%%PORTVERSION%%/help/opers/flags
+share/ircd-hybrid-%%PORTVERSION%%/help/opers/forcejoin
+share/ircd-hybrid-%%PORTVERSION%%/help/opers/forcepart
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/gline
+share/ircd-hybrid-%%PORTVERSION%%/help/opers/hash
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/help
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/challenge
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/index
@@ -108,6 +50,7 @@ share/ircd-hybrid-%%PORTVERSION%%/help/opers/info
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/invite
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/ison
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/join
+share/ircd-hybrid-%%PORTVERSION%%/help/opers/jupe
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/kick
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/kill
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/kline
@@ -118,7 +61,10 @@ share/ircd-hybrid-%%PORTVERSION%%/help/opers/list
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/lljoin
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/llnick
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/locops
+share/ircd-hybrid-%%PORTVERSION%%/help/opers/ltrace
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/lusers
+share/ircd-hybrid-%%PORTVERSION%%/help/opers/map
+share/ircd-hybrid-%%PORTVERSION%%/help/opers/mkpasswd
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/modlist
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/modload
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/modrestart
@@ -128,8 +74,11 @@ share/ircd-hybrid-%%PORTVERSION%%/help/opers/names
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/nburst
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/nick
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/notice
+share/ircd-hybrid-%%PORTVERSION%%/help/opers/ojoin
+share/ircd-hybrid-%%PORTVERSION%%/help/opers/omotd
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/oper
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/operwall
+share/ircd-hybrid-%%PORTVERSION%%/help/opers/opme
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/part
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/pass
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/ping
@@ -140,18 +89,25 @@ share/ircd-hybrid-%%PORTVERSION%%/help/opers/quit
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/rehash
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/restart
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/resv
+share/ircd-hybrid-%%PORTVERSION%%/help/opers/rkline
+share/ircd-hybrid-%%PORTVERSION%%/help/opers/rxline
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/server
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/set
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/sjoin
+share/ircd-hybrid-%%PORTVERSION%%/help/opers/spoof
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/squit
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/stats
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/svinfo
+share/ircd-hybrid-%%PORTVERSION%%/help/opers/svsnick
+share/ircd-hybrid-%%PORTVERSION%%/help/opers/testgecos
+share/ircd-hybrid-%%PORTVERSION%%/help/opers/testmask
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/testline
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/time
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/topic
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/trace
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/uhelp
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/umode
+share/ircd-hybrid-%%PORTVERSION%%/help/opers/uncapture
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/undline
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/ungline
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/unkline
@@ -170,10 +126,10 @@ share/ircd-hybrid-%%PORTVERSION%%/help/users/accept
 share/ircd-hybrid-%%PORTVERSION%%/help/users/admin
 share/ircd-hybrid-%%PORTVERSION%%/help/users/away
 share/ircd-hybrid-%%PORTVERSION%%/help/users/cmode
-share/ircd-hybrid-%%PORTVERSION%%/help/users/credits
 share/ircd-hybrid-%%PORTVERSION%%/help/users/error
 share/ircd-hybrid-%%PORTVERSION%%/help/users/help
 share/ircd-hybrid-%%PORTVERSION%%/help/users/challenge
+share/ircd-hybrid-%%PORTVERSION%%/help/users/flags
 share/ircd-hybrid-%%PORTVERSION%%/help/users/index
 share/ircd-hybrid-%%PORTVERSION%%/help/users/info
 share/ircd-hybrid-%%PORTVERSION%%/help/users/invite
@@ -207,6 +163,7 @@ share/ircd-hybrid-%%PORTVERSION%%/help/users/who
 share/ircd-hybrid-%%PORTVERSION%%/help/users/whois
 share/ircd-hybrid-%%PORTVERSION%%/help/users/whowas
 share/ircd-hybrid-%%PORTVERSION%%/messages/ayb.lang
+share/ircd-hybrid-%%PORTVERSION%%/messages/custom.lang
 share/ircd-hybrid-%%PORTVERSION%%/messages/ircd-croatian.lang
 share/ircd-hybrid-%%PORTVERSION%%/messages/ircd-danish.lang
 share/ircd-hybrid-%%PORTVERSION%%/messages/ircd-dutch.lang
@@ -217,6 +174,7 @@ share/ircd-hybrid-%%PORTVERSION%%/messages/ircd-polish.lang
 share/ircd-hybrid-%%PORTVERSION%%/messages/ircd-russian.lang
 share/ircd-hybrid-%%PORTVERSION%%/messages/ircd-spanish.lang
 share/ircd-hybrid-%%PORTVERSION%%/messages/ircd-swedish.lang
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/ip_cloaking.so
 share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_accept.so
 share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_admin.so
 share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_away.so
@@ -239,6 +197,7 @@ share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_gline.so
 share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_help.so
 share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_challenge.so
 share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_change.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_hash.so
 share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_info.so
 share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_invite.so
 share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_ison.so
@@ -271,6 +230,9 @@ share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_post.so
 share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_rehash.so
 share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_restart.so
 share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_resv.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_rkline.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_rxline.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_services.so
 share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_set.so
 share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_spoof.so
 share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_stats.so
@@ -317,5 +279,4 @@ share/ircd-hybrid-%%PORTVERSION%%/modules/m_squit.so
 @dirrm share/ircd-hybrid-%%PORTVERSION%%/help/opers
 @dirrm share/ircd-hybrid-%%PORTVERSION%%/help
 @dirrm share/ircd-hybrid-%%PORTVERSION%%
-@dirrm include/ircd-hybrid-7
 @dirrm etc/ircd-hybrid