10 files changed, 388 insertions, 257 deletions

diff --git a/irc/ircd-hybrid/Makefile b/irc/ircd-hybrid/Makefile
index ca4fad8a47d2..66fea632468f 100644
--- a/irc/ircd-hybrid/Makefile
+++ b/irc/ircd-hybrid/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	ircd-hybrid
-PORTVERSION=	6.3.1
-CATEGORIES=	irc
+PORTVERSION=	7.0
+CATEGORIES=	irc ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ircd-hybrid
 EXTRACT_SUFX=	.tgz
@@ -19,36 +19,79 @@ MAN8=		ircd.8
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+USE_REINPLACE=	yes
 
-CPIO?=		/usr/bin/cpio --quiet -pdum -R
+#
+# 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.
+# NICKLEN		- Nick length. Default is 9. Must be consistant across the network.
+# MAXCLIENTS		- Set this to the maximum number of clients supported by this server. Default is 200
 
-.if !defined(PACKAGE_BUILDING) && !defined(BATCH)
-IS_INTERACTIVE=	yes
+.if defined(PREFIX)
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
 .endif
 
-post-extract:
-	@${MV} ${WRKSRC}/include/config.h ${WRKSRC}/include/config.h.in
-	@${MV} ${WRKSRC}/tools/install_ircd ${WRKSRC}/tools/install_ircd.in
+.if defined(WITH_KQUEUE)
+CONFIGURE_ARGS+=	--enable-kqueue
+.endif
 
-post-configure:
-	${CHMOD} +x ${WRKSRC}/tools/install_ircd
+.if defined(WITH_OPENSSL)
+USE_OPENSSL=	yes
+CONFIGURE_ARGS+=	--enable-openssl=/usr/include/openssl
+.endif
 
-pre-install:
-.if !defined(PACKAGE_BUILDING) && !defined(BATCH)
-	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+.if defined(WITH_IPV6)
+CONFIGURE_ARGS+=	--enable-ipv6
 .endif
 
+.if defined(WITHOUT_SHARED_MODULES)
+CONFIGURE_ARGS+=	--disable-shared-modules
+PLIST_SUB+=		SHAREDMODULES="@comment "
+.else
+PLIST_SUB+=		SHAREDMODULES=""
+.endif
+
+.if defined(WITHOUT_ASSERT)
+CONFIGURE_ARGS+=	--disable-assert
+.endif
+
+.if defined(WITH_SMALL_NET)
+CONFIGURE_ARGS+=	--enable-small-net
+.endif
+
+.if defined(NICKLEN)
+CONFIGURE_ARGS+=	--with-nicklen=${NICKLEN}
+.endif
+
+.if defined(MAXCLIENTS)
+CONFIGURE_ARGS+=	--with-maxclients=${MAXCLIENTS}
+.endif
+
+CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc/ircd-hybrid
+CONFIGURE_ARGS+=	--moduledir=${PREFIX}/share/${PORTNAME}-${PORTVERSION}/modules
+CONFIGURE_ARGS+=	--automoduledir=${PREFIX}/share/${PORTNAME}-${PORTVERSION}/modules/autoload
+CONFIGURE_ARGS+=	--mandir=${PREFIX}/man
+CONFIGURE_ARGS+=	--uhelpdir=${PREFIX}/share/${PORTNAME}-${PORTVERSION}/help/users
+CONFIGURE_ARGS+=	--ohelpdir=${PREFIX}/share/${PORTNAME}-${PORTVERSION}/help/opers
+CONFIGURE_ARGS+=	--messagedir=${PREFIX}/share/${PORTNAME}-${PORTVERSION}/messages
+
+post-patch:
+	@${REINPLACE_CMD} -e "s#man8#man/man8#" ${WRKSRC}/doc/Makefile.in
+
+pre-install:
+	${MKDIR} ${PREFIX}/etc/ircd-hybrid ${PREFIX}/share/${PORTNAME}-${PORTVERSION}
+	${MKDIR} ${PREFIX}/share/${PORTNAME}-${PORTVERSION}/help/
+
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@cd ${WRKSRC}/doc && ${FIND} * -type f -print \
-		| ${CPIO} ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
-	@${CHMOD} -R ${SHAREMODE} ${DOCSDIR}
-	@${CHMOD} -R a+X ${DOCSDIR}
-.endif
-	@${SED} -e "s#%PREFIX%#${PREFIX}#" ${FILESDIR}/ircd.sh \
-		> ${WRKDIR}/ircd.sh
-	@${INSTALL_SCRIPT} ${WRKDIR}/ircd.sh ${PREFIX}/etc/rc.d
-	@${SED} -e "s#/usr/local/#${PREFIX}/#" ${PKGMESSAGE}
+	@${SED} -e "s#%PREFIX%#${PREFIX}#" ${FILESDIR}/ircd-hybrid.sh > ${WRKDIR}/ircd-hybrid.sh
+	@${INSTALL_SCRIPT} ${WRKDIR}/ircd-hybrid.sh ${LOCALBASE}/etc/rc.d
+	@${SED} -e "s#/usr/local/#${LOCALBASE}/#" ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/irc/ircd-hybrid/distinfo b/irc/ircd-hybrid/distinfo
index 4f4c12a2d83d..b37d2f3bd5ac 100644
--- a/irc/ircd-hybrid/distinfo
+++ b/irc/ircd-hybrid/distinfo
@@ -1 +1 @@
-MD5 (ircd-hybrid-6.3.1.tgz) = 117bb857b165a2a92e7f43eeac3e78d6
+MD5 (ircd-hybrid-7.0.tgz) = bee69c994c70fb29a711614150587cd4
diff --git a/irc/ircd-hybrid/files/ircd.sh b/irc/ircd-hybrid/files/ircd-hybrid.sh
index 4e2918d5b67d..4e2918d5b67d 100644
--- a/irc/ircd-hybrid/files/ircd.sh
+++ b/irc/ircd-hybrid/files/ircd-hybrid.sh
diff --git a/irc/ircd-hybrid/files/patch-ab b/irc/ircd-hybrid/files/patch-ab
index 13c95d63e522..f139d552d817 100644
--- a/irc/ircd-hybrid/files/patch-ab
+++ b/irc/ircd-hybrid/files/patch-ab
@@ -1,20 +1,30 @@
---- configure.orig	Thu Mar 21 16:58:58 2002
-+++ configure	Thu Mar 21 17:00:54 2002
-@@ -2517,7 +2517,7 @@
- ac_given_srcdir=$srcdir
- ac_given_INSTALL="$INSTALL"
+--- 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 @@
  
--trap 'rm -fr `echo "Makefile adns/Makefile src/Makefile tools/Makefile include/setup.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-+trap 'rm -fr `echo "Makefile adns/Makefile src/Makefile tools/Makefile include/setup.h include/config.h tools/install_ircd" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
- EOF
- cat >> $CONFIG_STATUS <<EOF
+ prefix=		@prefix@
+ exec_prefix=	@execprefix@
+-uhelpdir=	${prefix}/help/users
+-ohelpdir=	${prefix}/help/opers
++uhelpdir=	@uhelpdir@
++ohelpdir=	@ohelpdir@
  
-@@ -2615,7 +2615,7 @@
- 
- cat >> $CONFIG_STATUS <<EOF
- 
--CONFIG_FILES=\${CONFIG_FILES-"Makefile adns/Makefile src/Makefile tools/Makefile"}
-+CONFIG_FILES=\${CONFIG_FILES-"Makefile adns/Makefile src/Makefile tools/Makefile include/config.h tools/install_ircd"}
- EOF
- cat >> $CONFIG_STATUS <<\EOF
- for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
+ 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-ac b/irc/ircd-hybrid/files/patch-ac
index d49d309f06b7..4ecc8966656a 100644
--- a/irc/ircd-hybrid/files/patch-ac
+++ b/irc/ircd-hybrid/files/patch-ac
@@ -1,25 +1,13 @@
---- include/config.h.in.orig	Thu Mar 21 16:37:57 2002
-+++ include/config.h.in	Thu Mar 21 16:41:01 2002
-@@ -100,8 +100,9 @@
-  *
-  */
+--- 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 @@
  
--#define DPATH   "/usr/local/ircd/"
--#define SPATH   "/usr/local/ircd/ircd"
-+#define BPATH   "@prefix@/bin/"
-+#define DPATH   "@prefix@/etc/ircd/"
-+#define SPATH   "@prefix@/bin/ircd"
- #define CPATH   "ircd.conf"
- #define KPATH   "kline.conf"
- #define DLPATH  "kline.conf"
-@@ -208,8 +209,8 @@
-  *
-  * These need to be defined if you want to use SYSLOG logging, too.
-  */
--#define FNAME_USERLOG "/usr/local/ircd/users"
--#define FNAME_OPERLOG "/usr/local/ircd/opers"
-+#define FNAME_USERLOG "@prefix@/share/ircd/users"
-+#define FNAME_OPERLOG "@prefix@/share/ircd/opers"
+ prefix          = @prefix@
+ # Change this later! -- adrian
+-moduledir       = @prefix@/modules
+-automoduledir   = @prefix@/modules/autoload
++moduledir       = @moduledir@
++automoduledir   = @automoduledir@
  
- /* RFC1035_ANAL
-  * Defining this causes ircd to reject hostnames with non-compliant chars.
+ INCLUDES	= -I../include -I../adns $(SSL_INCLUDES)
+ CPPFLAGS	= ${INCLUDES} @CPPFLAGS@
diff --git a/irc/ircd-hybrid/files/patch-ad b/irc/ircd-hybrid/files/patch-ad
index 45a9c35715ac..04039c89ee40 100644
--- a/irc/ircd-hybrid/files/patch-ad
+++ b/irc/ircd-hybrid/files/patch-ad
@@ -1,151 +1,11 @@
---- tools/install_ircd.in.orig	Thu Mar 21 16:41:59 2002
-+++ tools/install_ircd.in	Thu Mar 21 16:47:07 2002
-@@ -7,6 +7,14 @@
- # Fixed.
- #
+--- 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@
  
-+if [ "x@prefix@" != "x${PREFIX}" ]; then
-+  echo "ERROR: Different prefix used to install than for configure/build."
-+  echo "The prefix is compiled into the binary, thus this will not work."
-+  echo "Please be sure to use the same \$PREFIX throughout building of"
-+  echo "this port."
-+  exit 1
-+fi
-+
- # Path to install-sh
- INSTALL_SH="autoconf/install-sh"
  
-@@ -39,6 +47,7 @@
-   fi
- }
- 
-+BPATH=`grep '#define.BPATH' include/config.h|awk '{print $3}'|tr -d \"`;
- DPATH=`grep '#define.DPATH' include/config.h|awk '{print $3}'|tr -d \"`;
- SPATH=`grep '#define.SPATH' include/config.h|awk '{print $3}'|tr -d \"`;
- CPATH=`grep '#define.CPATH' include/config.h|awk '{print $3}'|tr -d \"`;
-@@ -48,6 +57,7 @@
- PPATH=`grep '#define.PPATH' include/config.h|awk '{print $3}'|tr -d \"`;
- HPATH=`grep '#define.HPATH' include/config.h|awk '{print $3}'|tr -d \"`;
- 
-+BPATH=`dir_concat ${BPATH}`;
- SPATH=`dir_concat ${SPATH}`;
- CPATH=`dir_concat ${CPATH}`;
- KPATH=`dir_concat ${KPATH}`;
-@@ -56,6 +66,7 @@
- PPATH=`dir_concat ${PPATH}`;
- HPATH=`dir_concat ${HPATH}`;
- 
-+#   BPATH = binary directory
- #   DPATH = directory,
- #   SPATH = server executable,
- #   CPATH = conf file,
-@@ -76,86 +87,46 @@
- # try to install their ircd.conf file, unless it already exists.
- # install ircd, save old one as ircd.old
- dir_make `dirname ${SPATH}`
--if [ ! -f ${SPATH}${EXESUFFIX} ]; then
--  echo installing ircd as ${SPATH}${EXESUFFIX}
--  $INSTALL_SH -c src/ircd${EXESUFFIX} ${SPATH}${EXESUFFIX};
--else
--  echo installing ircd as ${SPATH}${EXESUFFIX}
--  echo previous ircd saved as ircd${EXESUFFIX}.old
--  mv ${SPATH}${EXESUFFIX} ${SPATH}${EXESUFFIX}.old
--  $INSTALL_SH -c src/ircd${EXESUFFIX} ${SPATH}${EXESUFFIX};
--fi
-+echo installing ircd as ${SPATH}${EXESUFFIX}
-+$INSTALL_SH -o 72 -g 72 -c src/ircd${EXESUFFIX} ${SPATH}${EXESUFFIX};
-+strip ${SPATH}${EXESUFFIX};
- 
- dir_make `dirname ${CPATH}`
--if [ ! -f ${CPATH} ]; then
--  echo installing example.conf as ${CPATH}
--  $INSTALL_SH -c doc/example.conf ${CPATH};
--else
--  echo You already have ${CPATH}.;
--fi
-+echo installing example.conf as ${CPATH}.sample
-+$INSTALL_SH -o 72 -g 72 -c doc/example.conf ${CPATH}.sample;
- 
- # try to install their motd file, unless it already exists.
- dir_make `dirname ${MPATH}`
--if [ ! -f ${MPATH} ]; then
--  echo installing a sample MOTD in ${MPATH}
--  echo "This is ircd-hybrid MOTD replace it with something better" > ${MPATH};
--else
--  echo You already have an MOTD in ${MPATH}.;
--fi
-+echo installing a sample MOTD in ${MPATH}.sample
-+echo "This is ircd-hybrid MOTD replace it with something better" \
-+       > ${MPATH}.sample;
-+chown 72:72 ${MPATH}.sample;
- 
- # try to install their kpath file unless it already exists.
- dir_make `dirname ${KPATH}`
--if [ ! -f ${KPATH} ]; then
--  echo touching K-line file ${KPATH}
--  touch ${KPATH};
--else
--  echo You already have a K-line file in ${KPATH}.;
--fi
-+touch ${KPATH}.sample;
-+chown 72:72 ${KPATH}.sample;
- 
- # try to install their opers.txt file, in all cases 
- dir_make `dirname ${HPATH}`
--if [ ! -f ${HPATH} ]; then
--  echo installing opers.txt as ${HPATH}
--  $INSTALL_SH -c opers.txt ${HPATH};
--else
--   echo installing opers.txt as ${HPATH}
--   echo previous opers.txt saved as opers.txt.old
--   mv ${HPATH} ${HPATH}.old
--   $INSTALL_SH -c opers.txt ${HPATH};
--fi
-+echo installing opers.txt as ${HPATH}.sample
-+$INSTALL_SH -o 72 -g 72 -c opers.txt ${HPATH}.sample;
- 
- # install mkpasswd
--if [ ! -f ${DPATH}mkpasswd ]; then
--  echo installing mkpasswd as ${DPATH}mkpasswd${EXESUFFIX}
--  $INSTALL_SH -c tools/mkpasswd${EXESUFFIX} ${DPATH}mkpasswd${EXESUFFIX};
--else
--   echo installing mkpasswd as ${DPATH}mkpasswd${EXESUFFIX}
--   echo previous mkpasswd saved as mkpasswd${EXESUFFIX}.old
--   mv ${DPATH}mkpasswd${EXESUFFIX} ${DPATH}mkpasswd${EXESUFFIX}.old
--   $INSTALL_SH -c tools/mkpasswd${EXESUFFIX} ${DPATH}mkpasswd${EXESUFFIX};
--fi 
-+echo installing mkpasswd as ${BPATH}mkpasswd${EXESUFFIX}
-+$INSTALL_SH  -o 72 -g 72 -c tools/mkpasswd${EXESUFFIX} ${BPATH}mkpasswd${EXESUFFIX};
- 
- # install viconf
--if [ ! -f ${DPATH}viconf ]; then
--  echo installing viconf as ${DPATH}viconf${EXESUFFIX}
--  $INSTALL_SH -c tools/viconf${EXESUFFIX} ${DPATH}viconf${EXESUFFIX}
--  rm -f ${DPATH}vimotd${EXESUFFIX} ${DPATH}viklines${EXESUFFIX}
--  ln ${DPATH}viconf${EXESUFFIX} ${DPATH}vimotd${EXESUFFIX}
--  ln ${DPATH}viconf${EXESUFFIX} ${DPATH}viklines${EXESUFFIX};
--else
--   echo installing viconf as ${DPATH}viconf${EXESUFFIX}
--   echo previous viconf saved as viconf${EXESUFFIX}.old
--   mv ${DPATH}viconf${EXESUFFIX} ${DPATH}viconf${EXESUFFIX}.old
--   $INSTALL_SH -c tools/viconf${EXESUFFIX} ${DPATH}viconf${EXESUFFIX}
--   rm -f ${DPATH}vimotd${EXESUFFIX} ${DPATH}viklines${EXESUFFIX}
--   ln ${DPATH}viconf${EXESUFFIX} ${DPATH}vimotd${EXESUFFIX}
--   ln ${DPATH}viconf${EXESUFFIX} ${DPATH}viklines${EXESUFFIX};
--fi
-+echo installing viconf as ${BPATH}viconf${EXESUFFIX}
-+$INSTALL_SH -o 72 -g 72 -c tools/viconf${EXESUFFIX} ${BPATH}viconf${EXESUFFIX}
-+rm -f ${BPATH}vimotd${EXESUFFIX} ${BPATH}viklines${EXESUFFIX}
-+ln ${BPATH}viconf${EXESUFFIX} ${BPATH}vimotd${EXESUFFIX}
-+ln ${BPATH}viconf${EXESUFFIX} ${BPATH}viklines${EXESUFFIX};
- 
- # install ircd.8
--dir_make ${DPATH}man8
--echo installing ircd.8 as ${DPATH}man8/ircd.8
--$INSTALL_SH -c doc/ircd.8 ${DPATH}man8/ircd.8
-+dir_make ${PREFIX}/man/man8
-+echo installing ircd.8 as ${PREFIX}/man/man8/ircd.8
-+$INSTALL_SH -o 72 -g 72 -c doc/ircd.8 ${PREFIX}/man/man8/ircd.8
- 
- # finished.
- echo install complete!
+ all: ${OBJS}
diff --git a/irc/ircd-hybrid/files/patch-ae b/irc/ircd-hybrid/files/patch-ae
index 67ba1b5a114d..98924a965f51 100644
--- a/irc/ircd-hybrid/files/patch-ae
+++ b/irc/ircd-hybrid/files/patch-ae
@@ -1,11 +1,23 @@
---- Makefile.in.orig	Thu Mar 21 16:47:44 2002
-+++ Makefile.in	Thu Mar 21 16:47:57 2002
-@@ -22,7 +22,7 @@
- RM=@RM@
+--- src/Makefile.in.ori	Wed Jan  7 02:57:37 2004
++++ src/Makefile.in	Wed Jan  7 03:02:12 2004
+@@ -23,6 +23,7 @@
+ libexecdir	= @libexecdir@
+ sysconfdir	= @sysconfdir@
+ localstatedir	= @localstatedir@
++logsdir		= @logsdir@
  
- # Default CFLAGS
--CFLAGS = -g -O2 -DNDEBUG
-+CFLAGS += -DNDEBUG
+ DOLLAR = $$
  
- # Default make flags - you may want to uncomment this on a multicpu machine
- #MFLAGS = -j 4
+@@ -140,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 $(logsdir); then \
++		echo "mkdir $(logsdir)"; \
++		mkdir $(logsdir); \
+ 	fi
+ 
+ install: install-mkdirs build
diff --git a/irc/ircd-hybrid/files/patch-af b/irc/ircd-hybrid/files/patch-af
new file mode 100644
index 000000000000..ca25bf5c8a7b
--- /dev/null
+++ b/irc/ircd-hybrid/files/patch-af
@@ -0,0 +1,35 @@
+--- 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/pkg-message b/irc/ircd-hybrid/pkg-message
index 8acba36152a9..9d5f242bbc5c 100644
--- a/irc/ircd-hybrid/pkg-message
+++ b/irc/ircd-hybrid/pkg-message
@@ -1,5 +1,10 @@
 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/*.sample to
 /usr/local/etc/ircd/*, and them to suit your needs.
 
@@ -10,4 +15,4 @@ to start.
 
 You may then start the server by running:
 
-	/usr/local/etc/rc.d/ircd.sh start
+	/usr/local/etc/rc.d/ircd-hybrid.sh start
diff --git a/irc/ircd-hybrid/pkg-plist b/irc/ircd-hybrid/pkg-plist
index be5884380646..80d3807c1459 100644
--- a/irc/ircd-hybrid/pkg-plist
+++ b/irc/ircd-hybrid/pkg-plist
@@ -1,37 +1,215 @@
+bin/convertconf
+bin/convertilines
+bin/convertklines
+bin/encspeed
 bin/ircd
 bin/mkpasswd
+bin/servlink
 bin/viconf
 bin/viklines
 bin/vimotd
-etc/ircd/ircd.conf.sample
-etc/ircd/ircd.motd.sample
-etc/ircd/kline.conf.sample
-etc/ircd/opers.txt.sample
-etc/rc.d/ircd.sh
-%%PORTDOCS%%share/doc/ircd-hybrid/CIDR.txt
-%%PORTDOCS%%share/doc/ircd-hybrid/INDEX
-%%PORTDOCS%%share/doc/ircd-hybrid/Makefile
-%%PORTDOCS%%share/doc/ircd-hybrid/README.TSora
-%%PORTDOCS%%share/doc/ircd-hybrid/Tao-of-IRC.940110
-%%PORTDOCS%%share/doc/ircd-hybrid/blalloc.txt
-%%PORTDOCS%%share/doc/ircd-hybrid/example.conf
-%%PORTDOCS%%share/doc/ircd-hybrid/example.conf.trillian
-%%PORTDOCS%%share/doc/ircd-hybrid/ircd.8
-%%PORTDOCS%%share/doc/ircd-hybrid/mtrie.txt
-%%PORTDOCS%%share/doc/ircd-hybrid/old/Authors
-%%PORTDOCS%%share/doc/ircd-hybrid/old/Etiquette
-%%PORTDOCS%%share/doc/ircd-hybrid/old/README
-%%PORTDOCS%%share/doc/ircd-hybrid/old/US-Admin/Networking
-%%PORTDOCS%%share/doc/ircd-hybrid/old/US-Admin/Operators
-%%PORTDOCS%%share/doc/ircd-hybrid/old/US-Admin/README
-%%PORTDOCS%%share/doc/ircd-hybrid/operguide.txt
-%%PORTDOCS%%share/doc/ircd-hybrid/opermyth.txt
-%%PORTDOCS%%share/doc/ircd-hybrid/rfc1459.txt
-%%PORTDOCS%%share/doc/ircd-hybrid/server-version-info
-%%PORTDOCS%%share/doc/ircd-hybrid/simple.conf
-%%PORTDOCS%%share/doc/ircd-hybrid/ts5.txt
-%%PORTDOCS%%share/doc/ircd-hybrid/yline.txt
-%%PORTDOCS%%@dirrm share/doc/ircd-hybrid/old/US-Admin
-%%PORTDOCS%%@dirrm share/doc/ircd-hybrid/old
-%%PORTDOCS%%@dirrm share/doc/ircd-hybrid
-@unexec rmdir %D/etc/ircd 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf ${PKG_PREFIX}/etc/ircd`` to remove any configuration files left." | fmt
+include/ircd-hybrid-7
+share/ircd-hybrid-7.0/help/opers/accept
+share/ircd-hybrid-7.0/help/opers/admin
+share/ircd-hybrid-7.0/help/opers/away
+share/ircd-hybrid-7.0/help/opers/capab
+share/ircd-hybrid-7.0/help/opers/cburst
+share/ircd-hybrid-7.0/help/opers/challenge
+share/ircd-hybrid-7.0/help/opers/cjoin
+share/ircd-hybrid-7.0/help/opers/client
+share/ircd-hybrid-7.0/help/opers/close
+share/ircd-hybrid-7.0/help/opers/cmode
+share/ircd-hybrid-7.0/help/opers/connect
+share/ircd-hybrid-7.0/help/opers/credits
+share/ircd-hybrid-7.0/help/opers/cryptlink
+share/ircd-hybrid-7.0/help/opers/die
+share/ircd-hybrid-7.0/help/opers/dline
+share/ircd-hybrid-7.0/help/opers/dmem
+share/ircd-hybrid-7.0/help/opers/drop
+share/ircd-hybrid-7.0/help/opers/eob
+share/ircd-hybrid-7.0/help/opers/error
+share/ircd-hybrid-7.0/help/opers/gline
+share/ircd-hybrid-7.0/help/opers/help
+share/ircd-hybrid-7.0/help/opers/index
+share/ircd-hybrid-7.0/help/opers/info
+share/ircd-hybrid-7.0/help/opers/invite
+share/ircd-hybrid-7.0/help/opers/ison
+share/ircd-hybrid-7.0/help/opers/join
+share/ircd-hybrid-7.0/help/opers/kick
+share/ircd-hybrid-7.0/help/opers/kill
+share/ircd-hybrid-7.0/help/opers/kline
+share/ircd-hybrid-7.0/help/opers/knock
+share/ircd-hybrid-7.0/help/opers/knockll
+share/ircd-hybrid-7.0/help/opers/links
+share/ircd-hybrid-7.0/help/opers/list
+share/ircd-hybrid-7.0/help/opers/lljoin
+share/ircd-hybrid-7.0/help/opers/llnick
+share/ircd-hybrid-7.0/help/opers/locops
+share/ircd-hybrid-7.0/help/opers/lusers
+share/ircd-hybrid-7.0/help/opers/modlist
+share/ircd-hybrid-7.0/help/opers/modload
+share/ircd-hybrid-7.0/help/opers/modrestart
+share/ircd-hybrid-7.0/help/opers/modunload
+share/ircd-hybrid-7.0/help/opers/motd
+share/ircd-hybrid-7.0/help/opers/names
+share/ircd-hybrid-7.0/help/opers/nburst
+share/ircd-hybrid-7.0/help/opers/nick
+share/ircd-hybrid-7.0/help/opers/notice
+share/ircd-hybrid-7.0/help/opers/oper
+share/ircd-hybrid-7.0/help/opers/operwall
+share/ircd-hybrid-7.0/help/opers/part
+share/ircd-hybrid-7.0/help/opers/pass
+share/ircd-hybrid-7.0/help/opers/ping
+share/ircd-hybrid-7.0/help/opers/pong
+share/ircd-hybrid-7.0/help/opers/post
+share/ircd-hybrid-7.0/help/opers/privmsg
+share/ircd-hybrid-7.0/help/opers/quit
+share/ircd-hybrid-7.0/help/opers/rehash
+share/ircd-hybrid-7.0/help/opers/restart
+share/ircd-hybrid-7.0/help/opers/resv
+share/ircd-hybrid-7.0/help/opers/server
+share/ircd-hybrid-7.0/help/opers/set
+share/ircd-hybrid-7.0/help/opers/sjoin
+share/ircd-hybrid-7.0/help/opers/squit
+share/ircd-hybrid-7.0/help/opers/stats
+share/ircd-hybrid-7.0/help/opers/svinfo
+share/ircd-hybrid-7.0/help/opers/testline
+share/ircd-hybrid-7.0/help/opers/time
+share/ircd-hybrid-7.0/help/opers/topic
+share/ircd-hybrid-7.0/help/opers/trace
+share/ircd-hybrid-7.0/help/opers/uhelp
+share/ircd-hybrid-7.0/help/opers/umode
+share/ircd-hybrid-7.0/help/opers/undline
+share/ircd-hybrid-7.0/help/opers/ungline
+share/ircd-hybrid-7.0/help/opers/unkline
+share/ircd-hybrid-7.0/help/opers/unresv
+share/ircd-hybrid-7.0/help/opers/user
+share/ircd-hybrid-7.0/help/opers/userhost
+share/ircd-hybrid-7.0/help/opers/users
+share/ircd-hybrid-7.0/help/opers/version
+share/ircd-hybrid-7.0/help/opers/wallops
+share/ircd-hybrid-7.0/help/opers/who
+share/ircd-hybrid-7.0/help/opers/whois
+share/ircd-hybrid-7.0/help/opers/whowas
+share/ircd-hybrid-7.0/help/users/accept
+share/ircd-hybrid-7.0/help/users/admin
+share/ircd-hybrid-7.0/help/users/away
+share/ircd-hybrid-7.0/help/users/challenge
+share/ircd-hybrid-7.0/help/users/cjoin
+share/ircd-hybrid-7.0/help/users/cmode
+share/ircd-hybrid-7.0/help/users/credits
+share/ircd-hybrid-7.0/help/users/error
+share/ircd-hybrid-7.0/help/users/help
+share/ircd-hybrid-7.0/help/users/index
+share/ircd-hybrid-7.0/help/users/info
+share/ircd-hybrid-7.0/help/users/invite
+share/ircd-hybrid-7.0/help/users/ison
+share/ircd-hybrid-7.0/help/users/join
+share/ircd-hybrid-7.0/help/users/kick
+share/ircd-hybrid-7.0/help/users/knock
+share/ircd-hybrid-7.0/help/users/links
+share/ircd-hybrid-7.0/help/users/list
+share/ircd-hybrid-7.0/help/users/lusers
+share/ircd-hybrid-7.0/help/users/motd
+share/ircd-hybrid-7.0/help/users/names
+share/ircd-hybrid-7.0/help/users/nick
+share/ircd-hybrid-7.0/help/users/notice
+share/ircd-hybrid-7.0/help/users/oper
+share/ircd-hybrid-7.0/help/users/part
+share/ircd-hybrid-7.0/help/users/pass
+share/ircd-hybrid-7.0/help/users/ping
+share/ircd-hybrid-7.0/help/users/pong
+share/ircd-hybrid-7.0/help/users/privmsg
+share/ircd-hybrid-7.0/help/users/quit
+share/ircd-hybrid-7.0/help/users/stats
+share/ircd-hybrid-7.0/help/users/time
+share/ircd-hybrid-7.0/help/users/topic
+share/ircd-hybrid-7.0/help/users/umode
+share/ircd-hybrid-7.0/help/users/user
+share/ircd-hybrid-7.0/help/users/userhost
+share/ircd-hybrid-7.0/help/users/users
+share/ircd-hybrid-7.0/help/users/version
+share/ircd-hybrid-7.0/help/users/who
+share/ircd-hybrid-7.0/help/users/whois
+share/ircd-hybrid-7.0/help/users/whowas
+share/ircd-hybrid-7.0/messages/ayb/LC_MESSAGES/ircd-hybrid.mo
+share/ircd-hybrid-7.0/messages/custom/LC_MESSAGES/ircd-hybrid.mo
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_accept.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_admin.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_away.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_capab.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_cburst.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_challenge.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_cjoin.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_close.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_connect.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_cryptlink.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_dmem.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_drop.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_eob.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_gline.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_help.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_info.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_invite.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_ison.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_join.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_kline.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_knock.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_links.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_list.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_lljoin.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_llnick.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_locops.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_lusers.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_motd.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_names.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_nburst.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_oper.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_operwall.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_pass.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_ping.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_pong.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_post.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_rehash.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_restart.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_resv.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_set.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_stats.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_svinfo.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_testline.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_time.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_topic.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_trace.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_unkline.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_user.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_userhost.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_users.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_version.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_wallops.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_who.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_whois.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/autoload/m_whowas.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/m_die.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/m_kick.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/m_kill.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/m_message.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/m_mode.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/m_nick.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/m_part.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/m_quit.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/m_server.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/m_sjoin.so
+%%SHAREDMODULES%%share/ircd-hybrid-7.0/modules/m_squit.so
+@unexec rmdir %D/etc/ircd-hybrid-7 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
+@dirrm share/ircd-hybrid-7.0/modules/autoload
+@dirrm share/ircd-hybrid-7.0/modules
+@dirrm share/ircd-hybrid-7.0/messages/custom/LC_MESSAGES
+@dirrm share/ircd-hybrid-7.0/messages/custom
+@dirrm share/ircd-hybrid-7.0/messages/ayb/LC_MESSAGES
+@dirrm share/ircd-hybrid-7.0/messages/ayb
+@dirrm share/ircd-hybrid-7.0/messages
+@dirrm share/ircd-hybrid-7.0/help/users
+@dirrm share/ircd-hybrid-7.0/help/opers
+@dirrm share/ircd-hybrid-7.0/help
+@dirrm share/ircd-hybrid-7.0