9 files changed, 70 insertions, 23 deletions

diff --git a/irc/ircd-hybrid/files/patch-ae b/irc/ircd-hybrid/files/patch-ae
deleted file mode 100644
index 98924a965f51..000000000000
--- a/irc/ircd-hybrid/files/patch-ae
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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@
- 
- DOLLAR = $$
- 
-@@ -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-aa b/irc/ircd-hybrid/files/patch-configure
index 964922f70150..964922f70150 100644
--- a/irc/ircd-hybrid/files/patch-aa
+++ b/irc/ircd-hybrid/files/patch-configure
diff --git a/irc/ircd-hybrid/files/patch-ab b/irc/ircd-hybrid/files/patch-help-Makefile
index f139d552d817..f139d552d817 100644
--- a/irc/ircd-hybrid/files/patch-ab
+++ b/irc/ircd-hybrid/files/patch-help-Makefile
diff --git a/irc/ircd-hybrid/files/patch-include-config.h b/irc/ircd-hybrid/files/patch-include-config.h
new file mode 100644
index 000000000000..a4cfe3f82353
--- /dev/null
+++ b/irc/ircd-hybrid/files/patch-include-config.h
@@ -0,0 +1,24 @@
+--- 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 @@
+ #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 @@
+ /* 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 LOGPATH IRCD_PREFIX "/logs"
diff --git a/irc/ircd-hybrid/files/patch-ad b/irc/ircd-hybrid/files/patch-messages-Makefile
index 04039c89ee40..04039c89ee40 100644
--- a/irc/ircd-hybrid/files/patch-ad
+++ b/irc/ircd-hybrid/files/patch-messages-Makefile
diff --git a/irc/ircd-hybrid/files/patch-ac b/irc/ircd-hybrid/files/patch-modules-Makefile
index 4ecc8966656a..4ecc8966656a 100644
--- a/irc/ircd-hybrid/files/patch-ac
+++ b/irc/ircd-hybrid/files/patch-modules-Makefile
diff --git a/irc/ircd-hybrid/files/patch-src-Makefile b/irc/ircd-hybrid/files/patch-src-Makefile
new file mode 100644
index 000000000000..45f8ac514404
--- /dev/null
+++ b/irc/ircd-hybrid/files/patch-src-Makefile
@@ -0,0 +1,33 @@
+--- 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@
+@@ -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-ircd.c b/irc/ircd-hybrid/files/patch-src-ircd.c
new file mode 100644
index 000000000000..aaaaebbf0b3b
--- /dev/null
+++ b/irc/ircd-hybrid/files/patch-src-ircd.c
@@ -0,0 +1,13 @@
+--- 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 */
diff --git a/irc/ircd-hybrid/files/patch-af b/irc/ircd-hybrid/files/patch-tools-Makefile
index ca25bf5c8a7b..ca25bf5c8a7b 100644
--- a/irc/ircd-hybrid/files/patch-af
+++ b/irc/ircd-hybrid/files/patch-tools-Makefile