4 files changed, 25 insertions, 41 deletions
diff --git a/irc/ircd-hybrid/Makefile b/irc/ircd-hybrid/Makefile
index f9d9c8cc26ec..66fea632468f 100644
--- a/irc/ircd-hybrid/Makefile
+++ b/irc/ircd-hybrid/Makefile
@@ -21,8 +21,6 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 
-BROKEN=		Does not run
-
 #
 # User Configurable Variables
 #
diff --git a/irc/ircd-hybrid/files/patch-include-config.h b/irc/ircd-hybrid/files/patch-include-config.h
index a4cfe3f82353..440943eed349 100644
--- a/irc/ircd-hybrid/files/patch-include-config.h
+++ b/irc/ircd-hybrid/files/patch-include-config.h
@@ -1,24 +1,32 @@
---- include/config.h.ori	Wed Jan 28 01:57:26 2004
-+++ include/config.h	Wed Jan 28 02:03:47 2004
-@@ -93,8 +93,10 @@
+--- 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
- #undef  AUTOMODPATH
-+*/
- #undef  MSGPATH
- 
- #define SPATH   BINPATH "IRCD.EXE"              /* server executable */
-@@ -134,8 +136,10 @@
+@@ -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 "/modules/"
+-#define AUTOMODPATH IRCD_PREFIX "/modules/autoload/"
+-#define MSGPATH IRCD_PREFIX "/messages/"
+-#define ETCPATH IRCD_PREFIX "/etc"
++#define MODPATH IRCD_PREFIX "/share/ircd-hybrid-7.0/modules/"
++#define AUTOMODPATH IRCD_PREFIX "/share/ircd-hybrid-7.0/modules/autoload/"
++#define MSGPATH IRCD_PREFIX "/share/ircd-hybrid-7.0/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-7.0/help/users"
++#define HPATH  IRCD_PREFIX "/share/ircd-hybrid-7.0/help/opers"
+ 
+ /* files */
+ #define SPATH   BINPATH "/ircd"                 /* ircd executable */
diff --git a/irc/ircd-hybrid/files/patch-src-Makefile b/irc/ircd-hybrid/files/patch-src-Makefile
index 45f8ac514404..e16a51b8d724 100644
--- a/irc/ircd-hybrid/files/patch-src-Makefile
+++ b/irc/ircd-hybrid/files/patch-src-Makefile
@@ -1,14 +1,5 @@
 --- src/Makefile.in.orig	Wed May 28 21:02:15 2003
-+++ src/Makefile.in	Wed Jan 28 01:19:55 2004
-@@ -11,7 +11,7 @@
- RM		= @RM@
- LEX		= @LEX@
- LEXLIB		= @LEXLIB@
--CFLAGS		= @IRC_CFLAGS@ -DIRCD_PREFIX=\"@prefix@\"
-+CFLAGS		= @IRC_CFLAGS@ -DIRCD_PREFIX=\"@prefix@\" -DMODPATH=\"@moduledir@\" -DAUTOMODPATH=\"@moduledir@/autoload\"
- LDFLAGS   	= @LDFLAGS@
- MKDEP		= @MKDEP@ -DIRCD_PREFIX=\"@prefix@\"
- MV		= @MV@
++++ src/Makefile.in	Thu Jan 29 19:54:25 2004
 @@ -23,6 +23,8 @@
  libexecdir	= @libexecdir@
  sysconfdir	= @sysconfdir@
diff --git a/irc/ircd-hybrid/files/patch-src-ircd.c b/irc/ircd-hybrid/files/patch-src-ircd.c
deleted file mode 100644
index aaaaebbf0b3b..000000000000
--- a/irc/ircd-hybrid/files/patch-src-ircd.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/ircd.c.orig	Wed May 28 23:13:26 2003
-+++ src/ircd.c	Wed Jan 28 01:50:45 2004
-@@ -662,8 +662,8 @@
-   read_conf_files(YES);         /* cold start init conf files */
- #ifndef STATIC_MODULES
- 
--  mod_add_path(IRCD_PREFIX "/modules");
--  mod_add_path(IRCD_PREFIX "/modules/autoload");
-+  mod_add_path(MODPATH);
-+  mod_add_path(AUTOMODPATH);
- #endif
-    
-   initialize_server_capabs();   /* Set up default_server_capabs */