- Update to 7.1.2

PR:		ports/84777
Submitted by:	Diane Bruce <db@db.net>
Approved by:	maintainer timeout (1 month)

- Switch to rcNG startup script

PR:		ports/85564
Submitted by:	hr <asher@raout.org>

25 files changed, 456 insertions, 327 deletions

diff --git a/irc/ircd-hybrid/Makefile b/irc/ircd-hybrid/Makefile
index d2f2890db83f..1d24830fc3ff 100644
--- a/irc/ircd-hybrid/Makefile
+++ b/irc/ircd-hybrid/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	ircd-hybrid
-PORTVERSION=	7.0.2
-PORTREVISION=	2
+PORTVERSION=	7.1.2
 CATEGORIES=	irc ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	ircd-hybrid
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	so14k@so14k.com
-COMMENT=	An irc daemon with a number of new features
+COMMENT=	A fast irc daemon with a number of new features
 
 MAN8=		ircd.8
 
@@ -22,16 +21,15 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 
+USE_RC_SUBR=	ircd-hybrid.sh
+SUB_FILES=	pkg-message
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
-EXTRA_PATCHES=	${WRKDIR}/patch-include-config.h
 
 #
 # User Configurable Variables
 #
 # PREFIX		- Where to install ircd-hybrid. Default is /usr/local/ircd
-# WITH_KQUEUE		- Use kqueue(2) instead of poll(2).
 # WITH_OPENSSL	- Enable openssl. Allows use of CHALLENGE and encrypted links.
-# WITH_IPV6		- Enable IPv6 Support.
 # WITHOUT_SHARED_MODULES - Disable shared modules. More secure but reduces flexability.
 # WITHOUT_ASSERT	- Disable parts of the debugging code.
 # WITH_SMALL_NET	- Tunes the memory allocation for small networks.
@@ -42,19 +40,11 @@ EXTRA_PATCHES=	${WRKDIR}/patch-include-config.h
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 .endif
 
-.if defined(WITH_KQUEUE)
-CONFIGURE_ARGS+=	--enable-kqueue
-.endif
-
 .if defined(WITH_OPENSSL)
 USE_OPENSSL=	yes
 CONFIGURE_ARGS+=	--enable-openssl=${OPENSSLINC}/openssl
 .endif
 
-.if defined(WITH_IPV6)
-CONFIGURE_ARGS+=	--enable-ipv6
-.endif
-
 .if defined(WITHOUT_SHARED_MODULES)
 CONFIGURE_ARGS+=	--disable-shared-modules
 PLIST_SUB+=		SHAREDMODULES="@comment "
@@ -86,23 +76,18 @@ CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc/ircd-hybrid \
 	--ohelpdir=${PREFIX}/share/${PORTNAME}-${PORTVERSION}/help/opers \
 	--messagedir=${PREFIX}/share/${PORTNAME}-${PORTVERSION}/messages \
 
-pre-patch:
-	@${SED} -e "s#%%PORTVERSION%%#${PORTVERSION}#" ${FILESDIR}/include-config.h.pre-patch > ${WRKDIR}/patch-include-config.h
-
-post-patch:
-	@${REINPLACE_CMD} -e "s#man8#man/man8#" ${WRKSRC}/doc/Makefile.in
-	@${MV} ${WRKSRC}/doc/ircd.motd ${WRKSRC}/doc/ircd.motd.sample
-	@${MV} ${WRKSRC}/doc/kline.conf ${WRKSRC}/doc/kline.conf.sample
-	@${MV} ${WRKSRC}/doc/dline.conf ${WRKSRC}/doc/dline.conf.sample
-
 pre-install:
 	${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 	${MKDIR} ${PREFIX}/etc/ircd-hybrid ${PREFIX}/share/${PORTNAME}-${PORTVERSION}
 	${MKDIR} ${PREFIX}/share/${PORTNAME}-${PORTVERSION}/help/
+	${MKDIR} /var/run/ircd
+	${CHOWN} ircd:ircd /var/run/ircd
 
 post-install:
-	@${SED} -e "s#%PREFIX%#${PREFIX}#" ${FILESDIR}/ircd-hybrid.sh > ${WRKDIR}/ircd-hybrid.sh
-	@${INSTALL_SCRIPT} ${WRKDIR}/ircd-hybrid.sh ${PREFIX}/etc/rc.d
-	@${SED} -e "s#/usr/local/#${PREFIX}/#" ${PKGMESSAGE}
+	${INSTALL_SCRIPT} ${WRKSRC}/etc/example.conf.quick ${PREFIX}/etc/ircd-hybrid
+	${INSTALL_SCRIPT} ${WRKSRC}/etc/example.efnet.conf ${PREFIX}/etc/ircd-hybrid
+	${INSTALL_SCRIPT} ${WRKSRC}/etc/simple.conf ${PREFIX}/etc/ircd-hybrid
+	@${CHOWN} ircd:ircd /var/log/ircd
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/irc/ircd-hybrid/distinfo b/irc/ircd-hybrid/distinfo
index 981ec33722d0..135b3414996a 100644
--- a/irc/ircd-hybrid/distinfo
+++ b/irc/ircd-hybrid/distinfo
@@ -1,2 +1,2 @@
-MD5 (ircd-hybrid-7.0.2.tgz) = e21a3bfac97d75701c04b9ca33b06453
-SIZE (ircd-hybrid-7.0.2.tgz) = 1147231
+MD5 (ircd-hybrid-7.1.2.tgz) = 355bfc7bf5b3dbad201c76f46258368a
+SIZE (ircd-hybrid-7.1.2.tgz) = 1165828
diff --git a/irc/ircd-hybrid/files/include-config.h.pre-patch b/irc/ircd-hybrid/files/include-config.h.pre-patch
deleted file mode 100644
index d6c77943e5c5..000000000000
--- a/irc/ircd-hybrid/files/include-config.h.pre-patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- include/config.h.orig	Sun Oct 26 03:08:12 2003
-+++ include/config.h	Thu Jul  7 11:27:45 2005
-@@ -90,7 +90,9 @@
- /*#define IRCD_PREFIX     "IRCD$BASEDIR:"*/
- #define DPATH           "IRCD$BASEDIR:"
- #define BINPATH         "IRCD$BINDIR:"
-+/*
- #define ETCPATH         "IRCD$CONFDIR:"
-+*/
- #define LOGPATH         "IRCD$LOGDIR:"
- 
- #undef  MODPATH
-@@ -137,13 +139,13 @@
- /* dirs */
- #define DPATH   IRCD_PREFIX                                                     
- #define BINPATH IRCD_PREFIX "/bin/"
--#define MODPATH IRCD_PREFIX "/modules/"
--#define AUTOMODPATH IRCD_PREFIX "/modules/autoload/"
--#define MSGPATH IRCD_PREFIX "/messages/"
--#define ETCPATH IRCD_PREFIX "/etc"
-+#define MODPATH IRCD_PREFIX "/share/ircd-hybrid-%%PORTVERSION%%/modules/"
-+#define AUTOMODPATH IRCD_PREFIX "/share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/"
-+#define MSGPATH IRCD_PREFIX "/share/ircd-hybrid-%%PORTVERSION%%/messages/"
-+#define ETCPATH IRCD_PREFIX "/etc/ircd-hybrid"
- #define LOGPATH IRCD_PREFIX "/logs"
--#define UHPATH   IRCD_PREFIX "/help/users"
--#define HPATH  IRCD_PREFIX "/help/opers"
-+#define UHPATH   IRCD_PREFIX "/share/ircd-hybrid-%%PORTVERSION%%/help/users"
-+#define HPATH  IRCD_PREFIX "/share/ircd-hybrid-%%PORTVERSION%%/help/opers"
- 
- /* files */
- #define SPATH   BINPATH "/ircd"                 /* ircd executable */
-@@ -158,7 +160,7 @@
- #define RPATH   ETCPATH "/ircd.rsa"             /* ircd rsa private keyfile */
- #define MPATH   ETCPATH "/ircd.motd"            /* MOTD file */
- #define LPATH   LOGPATH "/ircd.log"             /* ircd logfile */
--#define PPATH   ETCPATH "/ircd.pid"             /* pid file */
-+#define PPATH   "/var/run/ircd.pid"             /* pid file */
- #define OPATH   ETCPATH "/opers.motd"           /* oper MOTD file */
- #define LIPATH  ETCPATH "/links.txt"            /* cached links file */
- #endif /* !VMS */
diff --git a/irc/ircd-hybrid/files/ircd-hybrid.sh b/irc/ircd-hybrid/files/ircd-hybrid.sh
deleted file mode 100644
index 10751d94a161..000000000000
--- a/irc/ircd-hybrid/files/ircd-hybrid.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-PIDFILE=/var/run/ircd.pid
-
-if [ $# -eq 0 -o x$1 = xstart ]; then
-  if [ -x %PREFIX%/bin/ircd ]; then
-    touch $PIDFILE 
-    chown ircd $PIDFILE  
-    su -fm ircd -c %PREFIX%/bin/ircd && echo ' ircd'
-  fi
-fi
-if [ x$1 = xstop ]; then
-  if [ -s $PIDFILE ]; then
-    kill `cat $PIDFILE`
-  else
-    # oh well
-    killall ircd
-  fi
-  rm -f $PIDFILE
-fi
diff --git a/irc/ircd-hybrid/files/ircd-hybrid.sh.in b/irc/ircd-hybrid/files/ircd-hybrid.sh.in
new file mode 100644
index 000000000000..75acabd5fde2
--- /dev/null
+++ b/irc/ircd-hybrid/files/ircd-hybrid.sh.in
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+# PROVIDE: ircd-hybrid
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: FreeBSD shutdown
+
+# To get ircd-hybrid enabled at boot, add the following lines to /etc/rc.conf :
+# ircd_hybrid_enable (bool):    Set to "NO" by default.
+#                               Set it to "YES" to enable ircd-hybrid.
+
+. /etc/rc.subr
+
+name="ircd_hybrid"
+rcvar=`set_rcvar`
+
+command=/usr/local/bin/ircd
+pidfile=/var/run/ircd/ircd.pid
+required_files=/usr/local/etc/ircd-hybrid/ircd.conf
+
+start_precmd=pid_touch
+stop_postcmd=pid_rm
+
+[ -z "$ircd_hybrid_enable" ] && ircd_hybrid_enable=NO
+[ -z "$ircd_hybrid_user" ] && ircd_hybrid_user=ircd
+
+load_rc_config $name
+
+pid_touch ()
+{
+    touch $pidfile
+    chown $ircd_hybrid_user $pidfile
+}
+
+pid_rm ()
+{
+    rm $pidfile
+}
+
+run_rc_command "$1"
diff --git a/irc/ircd-hybrid/files/patch-Makefile.in b/irc/ircd-hybrid/files/patch-Makefile.in
new file mode 100644
index 000000000000..3dcb6b9562b8
--- /dev/null
+++ b/irc/ircd-hybrid/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Thu Jul 17 20:41:39 2003
++++ Makefile.in	Sat Jul 23 12:06:49 2005
+@@ -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
+-BUILD_DIRS   = ${DEPEND_DIRS} tools
++BUILD_DIRS   = ${DEPEND_DIRS} tools contrib messages
+ INSTALL_DIRS = ${BUILD_DIRS} etc doc include
+ 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 964922f70150..1ea180260e16 100644
--- a/irc/ircd-hybrid/files/patch-configure
+++ b/irc/ircd-hybrid/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Sat May 31 01:30:18 2003
-+++ configure	Wed Jan  7 03:06:07 2004
-@@ -334,6 +334,12 @@
+--- configure.orig	Sat Jul  9 09:09:19 2005
++++ configure	Sat Jul 23 16:23:25 2005
+@@ -351,6 +351,12 @@
  oldincludedir='/usr/include'
  infodir='${prefix}/info'
  mandir='${prefix}/man'
@@ -13,7 +13,7 @@
  
  ac_prev=
  for ac_option
-@@ -462,6 +468,24 @@
+@@ -479,6 +485,24 @@
    -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
      mandir=$ac_optarg ;;
  
@@ -38,17 +38,45 @@
    -nfp | --nfp | --nf)
      # Obsolete; use --without-fp.
      with_fp=no ;;
-@@ -653,7 +677,8 @@
+@@ -670,7 +694,8 @@
  
  # Be sure to have absolute paths.
  for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
--              localstatedir libdir includedir oldincludedir infodir mandir
-+              localstatedir libdir includedir oldincludedir infodir mandir \
+-	      localstatedir libdir includedir oldincludedir infodir mandir
++	      localstatedir libdir includedir oldincludedir infodir mandir \
 +	      moduledir automoduledir uhelpdir ohelpdir messagedir logsdir
  do
    eval ac_val=$`echo $ac_var`
    case $ac_val in
-@@ -8918,6 +8943,12 @@
+@@ -10693,6 +10718,13 @@
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define IRCD_PREFIX "$ac_default_prefix"
++#define MODPATH "$moduledir/"
++#define AMODPATH "$automoduledir/"
++#define UHPATH "$uhelpdir/"
++#define HPATH "$ohelpdir/"
++#define MSGPATH "$messagedir/"
++#define LOGPATH "$logsdir" 
++#define ETCPATH "$sysconfdir"
+ _ACEOF
+ 
+ 
+@@ -10703,6 +10735,13 @@
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define IRCD_PREFIX "$prefix"
++#define MODPATH "$moduledir/"
++#define AMODPATH "$automoduledir/"
++#define UHPATH "$uhelpdir/"
++#define HPATH "$ohelpdir/"
++#define MSGPATH "$messagedir/"
++#define LOGPATH "$logsdir"
++#define ETCPATH "$sysconfdir"
+ _ACEOF
+ 
+ 
+@@ -11323,6 +11362,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_Makefile.in b/irc/ircd-hybrid/files/patch-contrib_Makefile.in
new file mode 100644
index 000000000000..318ea81fd753
--- /dev/null
+++ b/irc/ircd-hybrid/files/patch-contrib_Makefile.in
@@ -0,0 +1,22 @@
+--- contrib/Makefile.in.orig	Sat Jul 23 10:40:46 2005
++++ contrib/Makefile.in	Sat Jul 23 10:41:30 2005
+@@ -19,7 +19,7 @@
+ 
+ prefix		= $(DESTDIR)@prefix@
+ 
+-AUTOMODULEDIR	= ${prefix}/modules
++AUTOMODULEDIR	= @automoduledir@
+ 
+ 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-contrib_m_help.c b/irc/ircd-hybrid/files/patch-contrib_m_help.c
new file mode 100644
index 000000000000..4c5424163109
--- /dev/null
+++ b/irc/ircd-hybrid/files/patch-contrib_m_help.c
@@ -0,0 +1,11 @@
+--- contrib/m_help.c.orig	Sat Jul 23 15:52:17 2005
++++ contrib/m_help.c	Sat Jul 23 15:50:40 2005
+@@ -36,8 +36,6 @@
+ #include "modules.h"
+ #include "irc_string.h"
+ 
+-#define HPATH  IRCD_PREFIX "/help/opers"
+-#define UHPATH IRCD_PREFIX "/help/users"
+ #define HELPLEN 400
+ 
+ static void m_help(struct Client*, struct Client*, int, char *[]);
diff --git a/irc/ircd-hybrid/files/patch-doc-Makefile.in b/irc/ircd-hybrid/files/patch-doc-Makefile.in
deleted file mode 100644
index 055a47a8bcaf..000000000000
--- a/irc/ircd-hybrid/files/patch-doc-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Makefile.in.bak	Mon Mar 29 21:57:04 2004
-+++ doc/Makefile.in	Mon Mar 29 21:56:12 2004
-@@ -30,7 +30,7 @@
- MANPAGES        = ircd.8
- 
- CONFS		= example.conf example.efnet.conf
--DEFAULTCONFS	= ircd.motd kline.conf dline.conf
-+DEFAULTCONFS	= ircd.motd.sample kline.conf.sample dline.conf.sample
- 
- SSL_LIBS	= @SSL_LIBS@
- SSL_INCLUDES	= @SSL_INCLUDES@
diff --git a/irc/ircd-hybrid/files/patch-help-Makefile b/irc/ircd-hybrid/files/patch-help-Makefile
deleted file mode 100644
index f139d552d817..000000000000
--- a/irc/ircd-hybrid/files/patch-help-Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
---- help/Makefile.in.orig	Sat Feb  2 09:01:13 2002
-+++ help/Makefile.in	Tue Jan  6 02:08:07 2004
-@@ -8,8 +8,8 @@
- 
- prefix=		@prefix@
- exec_prefix=	@execprefix@
--uhelpdir=	${prefix}/help/users
--ohelpdir=	${prefix}/help/opers
-+uhelpdir=	@uhelpdir@
-+ohelpdir=	@ohelpdir@
- 
- SYMLINKS=	topic accept cjoin cmode admin names links away whowas \
- 		version kick who invite quit join list nick oper part \
-@@ -63,12 +63,10 @@
- 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; \
-+		echo "mkdir $(uhelpdir)"; \
-+		mkdir -p $(uhelpdir); \
-+		echo "mkdir $(ohelpdir)"; \
-+		mkdir -p $(ohelpdir); \
- 	fi
- 	@for help in opers/*; do \
- 	if [ -f $$help ]; then \
diff --git a/irc/ircd-hybrid/files/patch-include_defaults.h b/irc/ircd-hybrid/files/patch-include_defaults.h
new file mode 100644
index 000000000000..4bc6bb97798b
--- /dev/null
+++ b/irc/ircd-hybrid/files/patch-include_defaults.h
@@ -0,0 +1,29 @@
+--- 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.
+  */
+ 
+ /* 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/"
+ 
+ /* files */
+ #define SPATH   BINPATH "/ircd"                 /* ircd executable */
+@@ -65,7 +59,7 @@
+ #define XPATH   ETCPATH "/xline.conf"           /* xline file */
+ #define MPATH   ETCPATH "/ircd.motd"            /* MOTD file */
+ #define LPATH   LOGPATH "/ircd.log"             /* ircd logfile */
+-#define PPATH   ETCPATH "/ircd.pid"             /* pid file */
++#define PPATH   "/var/run/ircd/ircd.pid"        /* pid file */
+ #define OPATH   ETCPATH "/opers.motd"           /* oper MOTD file */
+ #define LIPATH  ETCPATH "/links.txt"            /* cached links file */
+ 
diff --git a/irc/ircd-hybrid/files/patch-include_setup.h.in b/irc/ircd-hybrid/files/patch-include_setup.h.in
new file mode 100644
index 000000000000..7028f4f060d5
--- /dev/null
+++ b/irc/ircd-hybrid/files/patch-include_setup.h.in
@@ -0,0 +1,25 @@
+--- 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 @@
+ /* Prefix where the ircd is installed. */
+ #undef IRCD_PREFIX
+ 
++/* patched in by FreeBSD port */
++#undef MODPATH
++
++#undef AMODPATH
++
++#undef UHPATH
++
++#undef HPATH
++
++#undef MSGPATH
++
++#undef LOGPATH
++
++#undef ETCPATH
++
++/* End of FreeBSD port patch */
+ /* Size of the local client heap. */
+ #undef LCLIENT_HEAP_SIZE
+ 
diff --git a/irc/ircd-hybrid/files/patch-messages-Makefile b/irc/ircd-hybrid/files/patch-messages-Makefile
deleted file mode 100644
index 04039c89ee40..000000000000
--- a/irc/ircd-hybrid/files/patch-messages-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- messages/Makefile.in.ori	Thu Jan  1 03:36:00 2004
-+++ messages/Makefile.in	Thu Jan  1 03:36:29 2004
-@@ -16,7 +16,7 @@
- libexecdir      = @libexecdir@
- sysconfdir      = @sysconfdir@
- localstatedir   = @localstatedir@
--messagedir       = @prefix@/messages
-+messagedir      = @messagedir@
- 
- 
- all: ${OBJS}
diff --git a/irc/ircd-hybrid/files/patch-messages_Makefile.in b/irc/ircd-hybrid/files/patch-messages_Makefile.in
new file mode 100644
index 000000000000..49511d5de91f
--- /dev/null
+++ b/irc/ircd-hybrid/files/patch-messages_Makefile.in
@@ -0,0 +1,19 @@
+--- messages/Makefile.in.orig	Fri Jul  8 21:52:45 2005
++++ messages/Makefile.in	Sat Jul 23 12:39:38 2005
+@@ -5,7 +5,7 @@
+ INSTALL       = @INSTALL@
+ INSTALL_DATA  = @INSTALL_DATA@
+ prefix        = $(DESTDIR)@prefix@
+-messagedir    = $(prefix)/messages
++messagedir    = @messagedir@
+ 
+ CLOBBER=@CLOBBER@
+ 
+@@ -21,6 +21,7 @@
+                 ircd-spanish.lang   \
+                 ircd-swedish.lang
+ 
++build:
+ all:
+ 
+ install:
diff --git a/irc/ircd-hybrid/files/patch-modules-Makefile b/irc/ircd-hybrid/files/patch-modules-Makefile
deleted file mode 100644
index 4ecc8966656a..000000000000
--- a/irc/ircd-hybrid/files/patch-modules-Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- modules/Makefile.in.orig	Sun Jun 16 10:31:25 2002
-+++ modules/Makefile.in	Tue Jan  6 01:10:40 2004
-@@ -29,8 +29,8 @@
- 
- prefix          = @prefix@
- # Change this later! -- adrian
--moduledir       = @prefix@/modules
--automoduledir   = @prefix@/modules/autoload
-+moduledir       = @moduledir@
-+automoduledir   = @automoduledir@
- 
- INCLUDES	= -I../include -I../adns $(SSL_INCLUDES)
- CPPFLAGS	= ${INCLUDES} @CPPFLAGS@
diff --git a/irc/ircd-hybrid/files/patch-modules_Makefile.in b/irc/ircd-hybrid/files/patch-modules_Makefile.in
new file mode 100644
index 000000000000..c12da5f528ad
--- /dev/null
+++ b/irc/ircd-hybrid/files/patch-modules_Makefile.in
@@ -0,0 +1,13 @@
+--- modules/Makefile.in.orig	Sat Jul 23 08:59:28 2005
++++ modules/Makefile.in	Sat Jul 23 08:58:47 2005
+@@ -23,8 +23,8 @@
+ 
+ prefix          = $(DESTDIR)@prefix@
+ # Change this later! -- adrian
+-moduledir       = ${prefix}/modules
+-automoduledir   = ${moduledir}/autoload
++moduledir       = @moduledir@
++automoduledir	= @automoduledir@
+ 
+ INCLUDES	= -I../include $(SSL_INCLUDES)
+ CPPFLAGS	= ${INCLUDES} @CPPFLAGS@
diff --git a/irc/ircd-hybrid/files/patch-src-Makefile b/irc/ircd-hybrid/files/patch-src-Makefile
deleted file mode 100644
index e16a51b8d724..000000000000
--- a/irc/ircd-hybrid/files/patch-src-Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/Makefile.in.orig	Wed May 28 21:02:15 2003
-+++ src/Makefile.in	Thu Jan 29 19:54:25 2004
-@@ -23,6 +23,8 @@
- libexecdir	= @libexecdir@
- sysconfdir	= @sysconfdir@
- localstatedir	= @localstatedir@
-+logsdir		= @logsdir@
-+moduledir	= @moduledir@
- 
- DOLLAR = $$
- 
-@@ -140,9 +142,9 @@
- 		echo "mkdir $(sysconfdir)"; \
- 		mkdir $(sysconfdir); \
- 	fi
--	-@if test ! -d $(localstatedir)/logs; then \
--		echo "mkdir $(localstatedir)/logs"; \
--		mkdir $(localstatedir)/logs; \
-+	-@if test ! -d $(logsdir); then \
-+		echo "mkdir $(logsdir)"; \
-+		mkdir $(logsdir); \
- 	fi
- 
- install: install-mkdirs build
diff --git a/irc/ircd-hybrid/files/patch-src_Makefile.in b/irc/ircd-hybrid/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..6b9c0c733007
--- /dev/null
+++ b/irc/ircd-hybrid/files/patch-src_Makefile.in
@@ -0,0 +1,20 @@
+--- src/Makefile.in.orig	Thu Jul  7 21:49:02 2005
++++ src/Makefile.in	Sat Jul 23 13:14:03 2005
+@@ -22,6 +22,8 @@
+ bindir		= $(DESTDIR)@bindir@
+ sysconfdir	= $(DESTDIR)@sysconfdir@
+ localstatedir	= $(DESTDIR)@localstatedir@
++logsdir		= @logsdir@
++moduledir	= @moduledir@
+ 
+ # must not have whitespace here
+ CLOBBER=@CLOBBER@
+@@ -120,7 +122,7 @@
+ 
+ install-mkdirs:
+ 	mkdir -p $(DESTDIR)$(prefix) $(exec_prefix) $(bindir) $(sysconfdir) \
+-		$(localstatedir)/logs
++		$(logsdir)
+ 
+ install: install-mkdirs build
+ 	@for i in $(PROGS); do \
diff --git a/irc/ircd-hybrid/files/patch-src_modules.c b/irc/ircd-hybrid/files/patch-src_modules.c
new file mode 100644
index 000000000000..ae55c20e6da0
--- /dev/null
+++ b/irc/ircd-hybrid/files/patch-src_modules.c
@@ -0,0 +1,17 @@
+--- 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/files/patch-tools-Makefile b/irc/ircd-hybrid/files/patch-tools-Makefile
deleted file mode 100644
index ca25bf5c8a7b..000000000000
--- a/irc/ircd-hybrid/files/patch-tools-Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
---- tools/Makefile.in.orig	Thu Jul 11 17:40:27 2002
-+++ tools/Makefile.in	Wed Jan  7 03:41:07 2004
-@@ -29,8 +29,8 @@
- sysconfdir	= @sysconfdir@
- localstatedir	= @localstatedir@
- # Change this later! -- adrian
--moduledir	= @prefix@/modules
--automoduledir	= @prefix@/modules/autoload
-+moduledir	= @moduledir@
-+automoduledir	= @automoduledir@
- 
- PROGS		= viconf mkpasswd convertconf convertilines convertklines encspeed
- 
-@@ -99,8 +99,6 @@
- sysconfdir	= @sysconfdir@
- localstatedir	= @localstatedir@
- # Change this later! -- adrian
--moduledir	= @prefix@/modules
--automoduledir	= @prefix@/modules/autoload
- 
- 
-  
-@@ -129,9 +127,9 @@
- 		echo "mkdir $(sysconfdir)"; \
- 		mkdir $(sysconfdir); \
- 	fi
--	-@if test ! -d $(localstatedir)/logs; then \
--		echo "mkdir $(localstatedir)/logs"; \
--		mkdir $(localstatedir)/logs; \
-+	-@if test ! -d $(logsdir); then \
-+		echo "mkdir $(logsdir)"; \
-+		mkdir $(logsdir); \
- 	fi
- 
- install: install-mkdirs build
diff --git a/irc/ircd-hybrid/files/pkg-message.in b/irc/ircd-hybrid/files/pkg-message.in
new file mode 100644
index 000000000000..38935b9fd4c4
--- /dev/null
+++ b/irc/ircd-hybrid/files/pkg-message.in
@@ -0,0 +1,16 @@
+ircd-hybrid has now been installed.
+
+*** IMPORTANT: ***
+Please read the INSTALL file for more information.
+
+You should now copy %%PREFIX%%/etc/ircd-hybrid/example.conf to
+%%PREFIX%%/etc/ircd-hybrid/ircd.conf, and then edit to suit your needs.
+ircd-hybrid will not start without %%PREFIX%%/etc/ircd-hybrid/ircd.conf
+
+Don't forget to add
+
+ircd_hybrid_enable="YES"
+
+into your /etc/rc.conf.  You may then start the server by running:
+
+	%%PREFIX%%/etc/rc.d/ircd-hybrid.sh start
diff --git a/irc/ircd-hybrid/pkg-descr b/irc/ircd-hybrid/pkg-descr
index 12b464aeda49..61828c08dae1 100644
--- a/irc/ircd-hybrid/pkg-descr
+++ b/irc/ircd-hybrid/pkg-descr
@@ -1,9 +1,7 @@
 A port of the ircd-hybrid IRC daemon.
 
 ircd-hybrid includes a number of improvements over a standard
-ircd-2.8 server, including compressed server<->server links, chamode
+ircd-2.8 server, including compressed server<->server links, chanmode
 +e, and TS5 support.
 
 WWW: http://www.ircd-hybrid.org/
-
-- David-T
diff --git a/irc/ircd-hybrid/pkg-message b/irc/ircd-hybrid/pkg-message
deleted file mode 100644
index f4309a1bb408..000000000000
--- a/irc/ircd-hybrid/pkg-message
+++ /dev/null
@@ -1,18 +0,0 @@
-ircd-hybrid has now been installed.
-
-*** IMPORTANT: ***
-- The old config format WILL NOT WORK
-- The old kline format WILL NOT WORK
-Please read the INSTALL file for more information.
-
-You should now copy /usr/local/etc/ircd-hybrid/*.sample to
-/usr/local/etc/ircd-hybrid/*, and them to suit your needs.
-
-Please note: you should copy _all_ the sample files
-to the corresponding configuration file, even if you
-just leave it empty, otherwise ircd-hybrid may refuse
-to start.
-
-You may then start the server by running:
-
-	/usr/local/etc/rc.d/ircd-hybrid.sh start
diff --git a/irc/ircd-hybrid/pkg-plist b/irc/ircd-hybrid/pkg-plist
index 7660d1f34813..684e668437ae 100644
--- a/irc/ircd-hybrid/pkg-plist
+++ b/irc/ircd-hybrid/pkg-plist
@@ -8,21 +8,86 @@ bin/servlink
 bin/viconf
 bin/viklines
 bin/vimotd
+etc/ircd-hybrid/cresv.conf
+etc/ircd-hybrid/dline.conf
 etc/ircd-hybrid/example.conf
+etc/ircd-hybrid/example.conf.quick
 etc/ircd-hybrid/example.efnet.conf
-etc/ircd-hybrid/ircd.motd.sample
-etc/ircd-hybrid/kline.conf.sample
-etc/ircd-hybrid/dline.conf.sample
-etc/ircd-hybrid/.convertconf-example.conf
-etc/rc.d/ircd-hybrid.sh
-include/ircd-hybrid-7
+etc/ircd-hybrid/ircd.motd
+etc/ircd-hybrid/kline.conf
+etc/ircd-hybrid/nresv.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/cburst
-share/ircd-hybrid-%%PORTVERSION%%/help/opers/challenge
-share/ircd-hybrid-%%PORTVERSION%%/help/opers/cjoin
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/client
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/close
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/cmode
@@ -37,6 +102,7 @@ share/ircd-hybrid-%%PORTVERSION%%/help/opers/eob
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/error
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/gline
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/help
+share/ircd-hybrid-%%PORTVERSION%%/help/opers/challenge
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/index
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/info
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/invite
@@ -90,6 +156,7 @@ share/ircd-hybrid-%%PORTVERSION%%/help/opers/undline
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/ungline
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/unkline
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/unresv
+share/ircd-hybrid-%%PORTVERSION%%/help/opers/unxline
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/user
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/userhost
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/users
@@ -98,15 +165,15 @@ share/ircd-hybrid-%%PORTVERSION%%/help/opers/wallops
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/who
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/whois
 share/ircd-hybrid-%%PORTVERSION%%/help/opers/whowas
+share/ircd-hybrid-%%PORTVERSION%%/help/opers/xline
 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/challenge
-share/ircd-hybrid-%%PORTVERSION%%/help/users/cjoin
 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/index
 share/ircd-hybrid-%%PORTVERSION%%/help/users/info
 share/ircd-hybrid-%%PORTVERSION%%/help/users/invite
@@ -139,86 +206,116 @@ share/ircd-hybrid-%%PORTVERSION%%/help/users/version
 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/LC_MESSAGES/ircd-hybrid.mo
-share/ircd-hybrid-%%PORTVERSION%%/messages/custom/LC_MESSAGES/ircd-hybrid.mo
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_accept.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_admin.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_away.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_capab.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_cburst.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_challenge.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_cjoin.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_close.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_connect.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_cryptlink.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_dmem.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_drop.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_encap.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_eob.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_gline.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_help.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_info.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_invite.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_ison.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_join.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_kline.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_knock.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_links.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_list.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_lljoin.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_llnick.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_locops.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_lusers.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_motd.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_names.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_nburst.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_oper.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_operwall.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_pass.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_ping.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_pong.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_post.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_rehash.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_restart.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_resv.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_set.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_stats.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_svinfo.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_testline.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_time.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_topic.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_trace.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_unkline.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_user.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_userhost.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_users.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_version.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_wallops.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_who.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_whois.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_whowas.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_xline.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/m_die.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/m_kick.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/m_kill.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/m_message.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/m_mode.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/m_nick.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/m_part.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/m_quit.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/m_server.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/m_sjoin.so
-%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/m_squit.so
-@unexec rmdir %D/etc/ircd-hybrid 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf ${PKG_PREFIX}/etc/ircd-hybrid`` to remove any configuration files left." | fmt
-@unexec rmdir /var/log/ircd 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf /var/log/ircd`` to remove any configuration files left." | fmt
+share/ircd-hybrid-%%PORTVERSION%%/messages/ayb.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
+share/ircd-hybrid-%%PORTVERSION%%/messages/ircd-french.lang
+share/ircd-hybrid-%%PORTVERSION%%/messages/ircd-german.lang
+share/ircd-hybrid-%%PORTVERSION%%/messages/ircd-norwegian.lang
+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/m_accept.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_admin.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_away.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_capab.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_capture.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_cburst.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_classlist.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_clearchan.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_close.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_connect.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_cryptlink.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_ctrace.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_drop.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_encap.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_eob.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_etrace.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_flags.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_force.so
+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_info.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_invite.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_ison.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_jupe.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_killhost.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_kline.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_knock.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_links.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_list.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_lljoin.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_llnick.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_locops.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_ltrace.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_lusers.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_map.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_mkpasswd.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_motd.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_names.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_nburst.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_ojoin.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_omotd.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_operspy.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_operwall.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_oper.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_opme.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_pass.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_ping.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_pong.so
+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_set.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_spoof.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_stats.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_svinfo.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_tb.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_testline.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_testmask.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_time.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_topic.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_trace.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_userhost.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_users.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_user.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_version.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_wallops.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_whois.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_whowas.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_who.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_xline.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/spy_admin_notice.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/spy_info_notice.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/spy_links_notice.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/spy_motd_notice.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/spy_stats_notice.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/spy_stats_p_notice.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/spy_trace_notice.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/spy_whois_notice.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/m_die.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/m_join.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/m_kick.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/m_kill.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/m_message.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/m_mode.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/m_nick.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/m_part.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/m_quit.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/m_server.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/m_sjoin.so
+share/ircd-hybrid-%%PORTVERSION%%/modules/m_squit.so
 @dirrm share/ircd-hybrid-%%PORTVERSION%%/modules/autoload
 @dirrm share/ircd-hybrid-%%PORTVERSION%%/modules
-@dirrm share/ircd-hybrid-%%PORTVERSION%%/messages/custom/LC_MESSAGES
-@dirrm share/ircd-hybrid-%%PORTVERSION%%/messages/custom
-@dirrm share/ircd-hybrid-%%PORTVERSION%%/messages/ayb/LC_MESSAGES
-@dirrm share/ircd-hybrid-%%PORTVERSION%%/messages/ayb
 @dirrm share/ircd-hybrid-%%PORTVERSION%%/messages
 @dirrm share/ircd-hybrid-%%PORTVERSION%%/help/users
 @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