Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 23 Jul 2005 16:58:59 -0400 (EDT)
From:      Diane Bruce <db@db.net>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/83963: [PATCH] irc/ircd-hybrid: update to 7.1.0, take maintainership
Message-ID:  <200507232058.j6NKwxjv001712@night.db.net>
Resent-Message-ID: <200507232100.j6NL0Y7w046488@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         83963
>Category:       ports
>Synopsis:       [PATCH] irc/ircd-hybrid: update to 7.1.0, take maintainership
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jul 23 21:00:34 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Diane Bruce
>Release:        FreeBSD 5.4-RELEASE-p3 i386
>Organization:
>Environment:
System: FreeBSD night.db.net 5.4-RELEASE-p3 FreeBSD 5.4-RELEASE-p3 #0: Tue Jul  5 10:31:25 EDT
>Description:
- Update to 7.1.0
- Take maintainership
- /var/run is unwritable by ircd since it runs as ircd not as root
  moved ircd.pid to /var/run/ircd/ircd.pid

Added file(s):
- files/patch-Makefile.in
- files/patch-contrib_Makefile.in
- files/patch-contrib_m_help.c
- files/patch-include_defaults.h
- files/patch-include_setup.h.in
- files/patch-messages_Makefile.in
- files/patch-modules_Makefile.in
- files/patch-src_Makefile.in
- files/patch-src_modules.c

Removed file(s):
- README.html
- files/include-config.h.pre-patch
- files/patch-doc-Makefile.in
- files/patch-help-Makefile
- files/patch-messages-Makefile
- files/patch-modules-Makefile
- files/patch-src-Makefile
- files/patch-tools-Makefile

Port maintainer (so14k@so14k.com) is cc'd.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- ircd-hybrid-7.1.0.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/irc/ircd-hybrid/Makefile /usr/home/db/ircd-hybrid/Makefile
--- /usr/ports/irc/ircd-hybrid/Makefile	Fri Jan 21 11:18:59 2005
+++ /usr/home/db/ircd-hybrid/Makefile	Sat Jul 23 14:03:05 2005
@@ -6,15 +6,14 @@
 #

 PORTNAME=	ircd-hybrid
-PORTVERSION=	7.0.2
-PORTREVISION=	1
+PORTVERSION=	7.1.0
 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
+MAINTAINER=	db@db.net
+COMMENT=	A fast irc daemon with a number of new features

 MAN8=		ircd.8

@@ -23,15 +22,12 @@
 USE_REINPLACE=	yes

 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 +38,11 @@
 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 +74,20 @@
 	--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

 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/irc/ircd-hybrid/README.html /usr/home/db/ircd-hybrid/README.html
--- /usr/ports/irc/ircd-hybrid/README.html	Mon Feb 23 13:55:40 2004
+++ /usr/home/db/ircd-hybrid/README.html	Wed Dec 31 19:00:00 1969
@@ -1,43 +0,0 @@
-<!DOCTYPE html PUBLIC "-//IETF//DTD HTML 2.0//EN">
-
-<html>
-  <head>
-    <title>The FreeBSD Ports Collection (irc/ircd-hybrid)</title>
-  </head>
-
-  <body>
-    <h1>The FreeBSD Ports Collection (irc/ircd-hybrid)</h1>
-    <hr>
-
-    <p>You are now in the directory for the port "irc/ircd-hybrid".</p>
-
-    <p>The package name of this port is "ircd-hybrid-6.3.1".</p>
-
-    <p>This is the one-line description for this port:</p>
-    <hr>
-
-    <p>
-An irc daemon with a number of new features
-    </p>
-    <hr>
-
-    <p>Please read the "<a href="pkg-descr">description file</a>" for a
-    longer description and/or visit the <a href="http://www.ircd-hybrid.org/">web site</a> for futher informations.</p>
-
-    <p>If needed, you may contact the <a href=
-    "mailto:so14k@so14k.com">maintainer</a> of this port or the port <a href=
-    "mailto:ports@FreeBSD.org">mailing-list</a>.</p>
-
-    <p>This port requires package(s) "expat-1.95.6_1 gettext-0.12.1 gmake-3.80_1 libiconv-1.9.1_3" to build.</p>
-
-    <p></p>
-
-    <p>Go to the <a href="../../README.html">top of the ports tree</a> for
-    a summary on how to use the ports collection.</p>
-    <hr>
-
-    <p><a href="../README.html">Go up one level</a> | <a href=
-    "../../README.html">Go to top of ports tree</a></p>
-  </body>
-</html>
-
diff -ruN --exclude=CVS /usr/ports/irc/ircd-hybrid/distinfo /usr/home/db/ircd-hybrid/distinfo
--- /usr/ports/irc/ircd-hybrid/distinfo	Tue Sep 14 17:26:47 2004
+++ /usr/home/db/ircd-hybrid/distinfo	Thu Jul 21 11:16:52 2005
@@ -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.0.tgz) = 87a6f28706584cebdd4e5ed2c315c9dc
+SIZE (ircd-hybrid-7.1.0.tgz) = 1218466
diff -ruN --exclude=CVS /usr/ports/irc/ircd-hybrid/files/include-config.h.pre-patch /usr/home/db/ircd-hybrid/files/include-config.h.pre-patch
--- /usr/ports/irc/ircd-hybrid/files/include-config.h.pre-patch	Fri Jul  2 02:51:46 2004
+++ /usr/home/db/ircd-hybrid/files/include-config.h.pre-patch	Wed Dec 31 19:00:00 1969
@@ -1,32 +0,0 @@
---- include/config.h.orig	Thu Feb  6 01:46:11 2003
-+++ include/config.h	Thu Jan 29 20:16:13 2004
-@@ -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
-@@ -134,13 +136,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 */
diff -ruN --exclude=CVS /usr/ports/irc/ircd-hybrid/files/ircd-hybrid.sh /usr/home/db/ircd-hybrid/files/ircd-hybrid.sh
--- /usr/ports/irc/ircd-hybrid/files/ircd-hybrid.sh	Wed Jan  7 06:04:11 2004
+++ /usr/home/db/ircd-hybrid/files/ircd-hybrid.sh	Sat Jul 23 15:22:53 2005
@@ -5,8 +5,8 @@
   fi
 fi
 if [ x$1 = xstop ]; then
-  if [ -f %PREFIX%/etc/ircd.pid ]; then
-    kill `cat %PREFIX%/etc/ircd.pid`
+  if [ -f /var/run/ircd/ircd.pid ]; then
+    kill `cat /var/run/ircd/ircd.pid`
   else
     # oh well
     killall ircd
diff -ruN --exclude=CVS /usr/ports/irc/ircd-hybrid/files/patch-Makefile.in /usr/home/db/ircd-hybrid/files/patch-Makefile.in
--- /usr/ports/irc/ircd-hybrid/files/patch-Makefile.in	Wed Dec 31 19:00:00 1969
+++ /usr/home/db/ircd-hybrid/files/patch-Makefile.in	Sat Jul 23 12:07:05 2005
@@ -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 -ruN --exclude=CVS /usr/ports/irc/ircd-hybrid/files/patch-configure /usr/home/db/ircd-hybrid/files/patch-configure
--- /usr/ports/irc/ircd-hybrid/files/patch-configure	Thu Jan 29 13:21:06 2004
+++ /usr/home/db/ircd-hybrid/files/patch-configure	Sat Jul 23 16:23:52 2005
@@ -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 -ruN --exclude=CVS /usr/ports/irc/ircd-hybrid/files/patch-contrib_Makefile.in /usr/home/db/ircd-hybrid/files/patch-contrib_Makefile.in
--- /usr/ports/irc/ircd-hybrid/files/patch-contrib_Makefile.in	Wed Dec 31 19:00:00 1969
+++ /usr/home/db/ircd-hybrid/files/patch-contrib_Makefile.in	Sat Jul 23 10:42:09 2005
@@ -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 -ruN --exclude=CVS /usr/ports/irc/ircd-hybrid/files/patch-contrib_m_help.c /usr/home/db/ircd-hybrid/files/patch-contrib_m_help.c
--- /usr/ports/irc/ircd-hybrid/files/patch-contrib_m_help.c	Wed Dec 31 19:00:00 1969
+++ /usr/home/db/ircd-hybrid/files/patch-contrib_m_help.c	Sat Jul 23 15:53:12 2005
@@ -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 -ruN --exclude=CVS /usr/ports/irc/ircd-hybrid/files/patch-doc-Makefile.in /usr/home/db/ircd-hybrid/files/patch-doc-Makefile.in
--- /usr/ports/irc/ircd-hybrid/files/patch-doc-Makefile.in	Tue Mar 30 15:09:00 2004
+++ /usr/home/db/ircd-hybrid/files/patch-doc-Makefile.in	Wed Dec 31 19:00:00 1969
@@ -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 -ruN --exclude=CVS /usr/ports/irc/ircd-hybrid/files/patch-help-Makefile /usr/home/db/ircd-hybrid/files/patch-help-Makefile
--- /usr/ports/irc/ircd-hybrid/files/patch-help-Makefile	Thu Jan 29 13:21:06 2004
+++ /usr/home/db/ircd-hybrid/files/patch-help-Makefile	Wed Dec 31 19:00:00 1969
@@ -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 -ruN --exclude=CVS /usr/ports/irc/ircd-hybrid/files/patch-include_defaults.h /usr/home/db/ircd-hybrid/files/patch-include_defaults.h
--- /usr/ports/irc/ircd-hybrid/files/patch-include_defaults.h	Wed Dec 31 19:00:00 1969
+++ /usr/home/db/ircd-hybrid/files/patch-include_defaults.h	Sat Jul 23 14:02:07 2005
@@ -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 -ruN --exclude=CVS /usr/ports/irc/ircd-hybrid/files/patch-include_setup.h.in /usr/home/db/ircd-hybrid/files/patch-include_setup.h.in
--- /usr/ports/irc/ircd-hybrid/files/patch-include_setup.h.in	Wed Dec 31 19:00:00 1969
+++ /usr/home/db/ircd-hybrid/files/patch-include_setup.h.in	Sat Jul 23 16:35:13 2005
@@ -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 -ruN --exclude=CVS /usr/ports/irc/ircd-hybrid/files/patch-messages-Makefile /usr/home/db/ircd-hybrid/files/patch-messages-Makefile
--- /usr/ports/irc/ircd-hybrid/files/patch-messages-Makefile	Thu Jan 29 13:21:06 2004
+++ /usr/home/db/ircd-hybrid/files/patch-messages-Makefile	Wed Dec 31 19:00:00 1969
@@ -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 -ruN --exclude=CVS /usr/ports/irc/ircd-hybrid/files/patch-messages_Makefile.in /usr/home/db/ircd-hybrid/files/patch-messages_Makefile.in
--- /usr/ports/irc/ircd-hybrid/files/patch-messages_Makefile.in	Wed Dec 31 19:00:00 1969
+++ /usr/home/db/ircd-hybrid/files/patch-messages_Makefile.in	Sat Jul 23 12:40:06 2005
@@ -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 -ruN --exclude=CVS /usr/ports/irc/ircd-hybrid/files/patch-modules-Makefile /usr/home/db/ircd-hybrid/files/patch-modules-Makefile
--- /usr/ports/irc/ircd-hybrid/files/patch-modules-Makefile	Thu Jan 29 13:21:06 2004
+++ /usr/home/db/ircd-hybrid/files/patch-modules-Makefile	Wed Dec 31 19:00:00 1969
@@ -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 -ruN --exclude=CVS /usr/ports/irc/ircd-hybrid/files/patch-modules_Makefile.in /usr/home/db/ircd-hybrid/files/patch-modules_Makefile.in
--- /usr/ports/irc/ircd-hybrid/files/patch-modules_Makefile.in	Wed Dec 31 19:00:00 1969
+++ /usr/home/db/ircd-hybrid/files/patch-modules_Makefile.in	Sat Jul 23 08:59:42 2005
@@ -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 -ruN --exclude=CVS /usr/ports/irc/ircd-hybrid/files/patch-src-Makefile /usr/home/db/ircd-hybrid/files/patch-src-Makefile
--- /usr/ports/irc/ircd-hybrid/files/patch-src-Makefile	Fri Jan 30 02:09:26 2004
+++ /usr/home/db/ircd-hybrid/files/patch-src-Makefile	Wed Dec 31 19:00:00 1969
@@ -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 -ruN --exclude=CVS /usr/ports/irc/ircd-hybrid/files/patch-src_Makefile.in /usr/home/db/ircd-hybrid/files/patch-src_Makefile.in
--- /usr/ports/irc/ircd-hybrid/files/patch-src_Makefile.in	Wed Dec 31 19:00:00 1969
+++ /usr/home/db/ircd-hybrid/files/patch-src_Makefile.in	Sat Jul 23 13:14:27 2005
@@ -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 -ruN --exclude=CVS /usr/ports/irc/ircd-hybrid/files/patch-src_modules.c /usr/home/db/ircd-hybrid/files/patch-src_modules.c
--- /usr/ports/irc/ircd-hybrid/files/patch-src_modules.c	Wed Dec 31 19:00:00 1969
+++ /usr/home/db/ircd-hybrid/files/patch-src_modules.c	Sat Jul 23 14:07:14 2005
@@ -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 -ruN --exclude=CVS /usr/ports/irc/ircd-hybrid/files/patch-tools-Makefile /usr/home/db/ircd-hybrid/files/patch-tools-Makefile
--- /usr/ports/irc/ircd-hybrid/files/patch-tools-Makefile	Thu Jan 29 13:21:06 2004
+++ /usr/home/db/ircd-hybrid/files/patch-tools-Makefile	Wed Dec 31 19:00:00 1969
@@ -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 -ruN --exclude=CVS /usr/ports/irc/ircd-hybrid/pkg-descr /usr/home/db/ircd-hybrid/pkg-descr
--- /usr/ports/irc/ircd-hybrid/pkg-descr	Tue Feb  4 17:09:50 2003
+++ /usr/home/db/ircd-hybrid/pkg-descr	Sat Jul 23 16:52:39 2005
@@ -1,9 +1,10 @@
 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
+- Diane Bruce
+db@db.net
diff -ruN --exclude=CVS /usr/ports/irc/ircd-hybrid/pkg-message /usr/home/db/ircd-hybrid/pkg-message
--- /usr/ports/irc/ircd-hybrid/pkg-message	Tue Sep 14 17:26:47 2004
+++ /usr/home/db/ircd-hybrid/pkg-message	Sat Jul 23 10:30:55 2005
@@ -1,17 +1,11 @@
 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 should now copy /usr/local/etc/ircd-hybrid/example.conf to
+/usr/local/etc/ircd-hybrid/ircd.conf, and then edit to suit your needs.
+ircd-hybrid will not start without /usr/local/etc/ircd-hybrid/ircd.conf

 You may then start the server by running:

diff -ruN --exclude=CVS /usr/ports/irc/ircd-hybrid/pkg-plist /usr/home/db/ircd-hybrid/pkg-plist
--- /usr/ports/irc/ircd-hybrid/pkg-plist	Fri Jan 21 11:18:59 2005
+++ /usr/home/db/ircd-hybrid/pkg-plist	Sat Jul 23 15:55:30 2005
@@ -9,20 +9,81 @@
 bin/viklines
 bin/vimotd
 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/ircd-hybrid/simple.conf
 etc/rc.d/ircd-hybrid.sh
-include/ircd-hybrid-7
+include/ircd-hybrid-7/balloc.h
+include/ircd-hybrid-7/channel.h
+include/ircd-hybrid-7/channel_mode.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/inet_misc.h
+include/ircd-hybrid-7/io.h
+include/ircd-hybrid-7/irc_getaddrinfo.h
+include/ircd-hybrid-7/irc_getnameinfo.h
+include/ircd-hybrid-7/irc_res.h
+include/ircd-hybrid-7/irc_reslib.h
+include/ircd-hybrid-7/irc_string.h
+include/ircd-hybrid-7/ircd.h
+include/ircd-hybrid-7/ircd_defs.h
+include/ircd-hybrid-7/ircd_getopt.h
+include/ircd-hybrid-7/ircd_handler.h
+include/ircd-hybrid-7/ircd_signal.h
+include/ircd-hybrid-7/ircdauth.h
+include/ircd-hybrid-7/list.h
+include/ircd-hybrid-7/listener.h
+include/ircd-hybrid-7/m_info.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/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/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/send.h
+include/ircd-hybrid-7/serno.h
+include/ircd-hybrid-7/servlink.h
+include/ircd-hybrid-7/setup.h
+include/ircd-hybrid-7/sprintf_irc.h
+include/ircd-hybrid-7/stdinc.h
+include/ircd-hybrid-7/supported.h
+include/ircd-hybrid-7/tools.h
+include/ircd-hybrid-7/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
@@ -90,6 +151,7 @@
 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,11 +160,11 @@
 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
@@ -139,28 +201,44 @@
 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
+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
 %%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_capture.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_change.so
+%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_classlist.so
+%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_clearchan.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_ctrace.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_etrace.so
+%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_flags.so
+%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_force.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_jupe.so
+%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_killhost.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
@@ -168,12 +246,19 @@
 %%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_ltrace.so
 %%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_lusers.so
+%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_map.so
+%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_mkpasswd.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_ojoin.so
+%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_omotd.so
 %%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_oper.so
+%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_operspy.so
 %%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_operwall.so
+%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_opme.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
@@ -182,13 +267,15 @@
 %%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_spoof.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_tburst.so
 %%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_testline.so
+%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/m_testmask.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
@@ -198,7 +285,16 @@
 %%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/autoload/spy_admin_notice.so
+%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/spy_info_notice.so
+%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/spy_links_notice.so
+%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/spy_motd_notice.so
+%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/spy_stats_notice.so
+%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/spy_stats_p_notice.so
+%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/spy_trace_notice.so
+%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/autoload/spy_whois_notice.so
 %%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/m_die.so
+%%SHAREDMODULES%%share/ircd-hybrid-%%PORTVERSION%%/modules/m_join.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
@@ -211,12 +307,9 @@
 %%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
+@dirrm include/ircd-hybrid-7
 @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
--- ircd-hybrid-7.1.0.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200507232058.j6NKwxjv001712>