From 56921ad5ba57f5f43e1eac7f64b260007eaadd32 Mon Sep 17 00:00:00 2001 From: Erwin Lansing Date: Thu, 29 Jan 2004 18:21:06 +0000 Subject: Rename patch files. Port is still broken though. Submitted by: maintainer --- irc/ircd-hybrid/files/patch-aa | 63 --------------------------- irc/ircd-hybrid/files/patch-ab | 30 ------------- irc/ircd-hybrid/files/patch-ac | 13 ------ irc/ircd-hybrid/files/patch-ad | 11 ----- irc/ircd-hybrid/files/patch-ae | 23 ---------- irc/ircd-hybrid/files/patch-af | 35 --------------- irc/ircd-hybrid/files/patch-configure | 63 +++++++++++++++++++++++++++ irc/ircd-hybrid/files/patch-help-Makefile | 30 +++++++++++++ irc/ircd-hybrid/files/patch-include-config.h | 24 ++++++++++ irc/ircd-hybrid/files/patch-messages-Makefile | 11 +++++ irc/ircd-hybrid/files/patch-modules-Makefile | 13 ++++++ irc/ircd-hybrid/files/patch-src-Makefile | 33 ++++++++++++++ irc/ircd-hybrid/files/patch-src-ircd.c | 13 ++++++ irc/ircd-hybrid/files/patch-tools-Makefile | 35 +++++++++++++++ 14 files changed, 222 insertions(+), 175 deletions(-) delete mode 100644 irc/ircd-hybrid/files/patch-aa delete mode 100644 irc/ircd-hybrid/files/patch-ab delete mode 100644 irc/ircd-hybrid/files/patch-ac delete mode 100644 irc/ircd-hybrid/files/patch-ad delete mode 100644 irc/ircd-hybrid/files/patch-ae delete mode 100644 irc/ircd-hybrid/files/patch-af create mode 100644 irc/ircd-hybrid/files/patch-configure create mode 100644 irc/ircd-hybrid/files/patch-help-Makefile create mode 100644 irc/ircd-hybrid/files/patch-include-config.h create mode 100644 irc/ircd-hybrid/files/patch-messages-Makefile create mode 100644 irc/ircd-hybrid/files/patch-modules-Makefile create mode 100644 irc/ircd-hybrid/files/patch-src-Makefile create mode 100644 irc/ircd-hybrid/files/patch-src-ircd.c create mode 100644 irc/ircd-hybrid/files/patch-tools-Makefile (limited to 'irc/ircd-hybrid') diff --git a/irc/ircd-hybrid/files/patch-aa b/irc/ircd-hybrid/files/patch-aa deleted file mode 100644 index 964922f70150..000000000000 --- a/irc/ircd-hybrid/files/patch-aa +++ /dev/null @@ -1,63 +0,0 @@ ---- configure.orig Sat May 31 01:30:18 2003 -+++ configure Wed Jan 7 03:06:07 2004 -@@ -334,6 +334,12 @@ - oldincludedir='/usr/include' - infodir='${prefix}/info' - mandir='${prefix}/man' -+moduledir='${prefix}/modules' -+automoduledir='${prefix}/modules/autoload' -+uhelpdir='${prefix}/help/users' -+ohelpdir='${prefix}/help/opers' -+messagedir='${prefix}/messages' -+logsdir='/var/log/ircd' - - ac_prev= - for ac_option -@@ -462,6 +468,24 @@ - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir=$ac_optarg ;; - -+ -moduledir=* | --moduledir=*) -+ moduledir=$ac_optarg ;; -+ -+ -automoduledir=* | --automoduledir=*) -+ automoduledir=$ac_optarg ;; -+ -+ -uhelpdir=* | --uhelpdir=*) -+ uhelpdir=$ac_optarg ;; -+ -+ -ohelpdir=* | --ohelpdir=*) -+ ohelpdir=$ac_optarg ;; -+ -+ -logsdir=* | --logsdir=*) -+ logsdir=$ac_optarg ;; -+ -+ -messagedir=* | --messagedir=*) -+ messagedir=$ac_optarg ;; -+ - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; -@@ -653,7 +677,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 \ -+ moduledir automoduledir uhelpdir ohelpdir messagedir logsdir - do - eval ac_val=$`echo $ac_var` - case $ac_val in -@@ -8918,6 +8943,12 @@ - s,@oldincludedir@,$oldincludedir,;t t - s,@infodir@,$infodir,;t t - s,@mandir@,$mandir,;t t -+s,@moduledir@,$moduledir,;t t -+s,@automoduledir@,$automoduledir,;t t -+s,@uhelpdir@,$uhelpdir,;t t -+s,@ohelpdir@,$ohelpdir,;t t -+s,@logsdir@,$logsdir,;t t -+s,@messagedir@,$messagedir,;t t - s,@build_alias@,$build_alias,;t t - s,@host_alias@,$host_alias,;t t - s,@target_alias@,$target_alias,;t t diff --git a/irc/ircd-hybrid/files/patch-ab b/irc/ircd-hybrid/files/patch-ab deleted file mode 100644 index f139d552d817..000000000000 --- a/irc/ircd-hybrid/files/patch-ab +++ /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-ac b/irc/ircd-hybrid/files/patch-ac deleted file mode 100644 index 4ecc8966656a..000000000000 --- a/irc/ircd-hybrid/files/patch-ac +++ /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-ad b/irc/ircd-hybrid/files/patch-ad deleted file mode 100644 index 04039c89ee40..000000000000 --- a/irc/ircd-hybrid/files/patch-ad +++ /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-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-af b/irc/ircd-hybrid/files/patch-af deleted file mode 100644 index ca25bf5c8a7b..000000000000 --- a/irc/ircd-hybrid/files/patch-af +++ /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/patch-configure b/irc/ircd-hybrid/files/patch-configure new file mode 100644 index 000000000000..964922f70150 --- /dev/null +++ b/irc/ircd-hybrid/files/patch-configure @@ -0,0 +1,63 @@ +--- configure.orig Sat May 31 01:30:18 2003 ++++ configure Wed Jan 7 03:06:07 2004 +@@ -334,6 +334,12 @@ + oldincludedir='/usr/include' + infodir='${prefix}/info' + mandir='${prefix}/man' ++moduledir='${prefix}/modules' ++automoduledir='${prefix}/modules/autoload' ++uhelpdir='${prefix}/help/users' ++ohelpdir='${prefix}/help/opers' ++messagedir='${prefix}/messages' ++logsdir='/var/log/ircd' + + ac_prev= + for ac_option +@@ -462,6 +468,24 @@ + -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) + mandir=$ac_optarg ;; + ++ -moduledir=* | --moduledir=*) ++ moduledir=$ac_optarg ;; ++ ++ -automoduledir=* | --automoduledir=*) ++ automoduledir=$ac_optarg ;; ++ ++ -uhelpdir=* | --uhelpdir=*) ++ uhelpdir=$ac_optarg ;; ++ ++ -ohelpdir=* | --ohelpdir=*) ++ ohelpdir=$ac_optarg ;; ++ ++ -logsdir=* | --logsdir=*) ++ logsdir=$ac_optarg ;; ++ ++ -messagedir=* | --messagedir=*) ++ messagedir=$ac_optarg ;; ++ + -nfp | --nfp | --nf) + # Obsolete; use --without-fp. + with_fp=no ;; +@@ -653,7 +677,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 \ ++ moduledir automoduledir uhelpdir ohelpdir messagedir logsdir + do + eval ac_val=$`echo $ac_var` + case $ac_val in +@@ -8918,6 +8943,12 @@ + s,@oldincludedir@,$oldincludedir,;t t + s,@infodir@,$infodir,;t t + s,@mandir@,$mandir,;t t ++s,@moduledir@,$moduledir,;t t ++s,@automoduledir@,$automoduledir,;t t ++s,@uhelpdir@,$uhelpdir,;t t ++s,@ohelpdir@,$ohelpdir,;t t ++s,@logsdir@,$logsdir,;t t ++s,@messagedir@,$messagedir,;t t + s,@build_alias@,$build_alias,;t t + s,@host_alias@,$host_alias,;t t + s,@target_alias@,$target_alias,;t t diff --git a/irc/ircd-hybrid/files/patch-help-Makefile b/irc/ircd-hybrid/files/patch-help-Makefile new file mode 100644 index 000000000000..f139d552d817 --- /dev/null +++ b/irc/ircd-hybrid/files/patch-help-Makefile @@ -0,0 +1,30 @@ +--- 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-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-messages-Makefile b/irc/ircd-hybrid/files/patch-messages-Makefile new file mode 100644 index 000000000000..04039c89ee40 --- /dev/null +++ b/irc/ircd-hybrid/files/patch-messages-Makefile @@ -0,0 +1,11 @@ +--- 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-modules-Makefile b/irc/ircd-hybrid/files/patch-modules-Makefile new file mode 100644 index 000000000000..4ecc8966656a --- /dev/null +++ b/irc/ircd-hybrid/files/patch-modules-Makefile @@ -0,0 +1,13 @@ +--- 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-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-tools-Makefile b/irc/ircd-hybrid/files/patch-tools-Makefile new file mode 100644 index 000000000000..ca25bf5c8a7b --- /dev/null +++ b/irc/ircd-hybrid/files/patch-tools-Makefile @@ -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 -- cgit v1.2.3