1 files changed, 36 insertions, 75 deletions

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