summaryrefslogtreecommitdiffstats
path: root/irc/ircd-hybrid/files
diff options
context:
space:
mode:
authorpav <pav@FreeBSD.org>2005-09-16 08:22:53 +0000
committerpav <pav@FreeBSD.org>2005-09-16 08:22:53 +0000
commit71111ffd0193a6739e3b04463616169d94b66647 (patch)
treee13fa8a7f9a03f882edd14040d6aaeeaa1357dca /irc/ircd-hybrid/files
parent16cbec0b282162a04b08f11a0cb9507e01e0373e (diff)
downloadFreeBSD-ports-71111ffd0193a6739e3b04463616169d94b66647.zip
FreeBSD-ports-71111ffd0193a6739e3b04463616169d94b66647.tar.gz
- Update to 7.1.2
PR: ports/84777 Submitted by: Diane Bruce <db@db.net> Approved by: maintainer timeout (1 month) - Switch to rcNG startup script PR: ports/85564 Submitted by: hr <asher@raout.org>
Diffstat (limited to 'irc/ircd-hybrid/files')
-rw-r--r--irc/ircd-hybrid/files/include-config.h.pre-patch41
-rw-r--r--irc/ircd-hybrid/files/ircd-hybrid.sh19
-rw-r--r--irc/ircd-hybrid/files/ircd-hybrid.sh.in40
-rw-r--r--irc/ircd-hybrid/files/patch-Makefile.in11
-rw-r--r--irc/ircd-hybrid/files/patch-configure44
-rw-r--r--irc/ircd-hybrid/files/patch-contrib_Makefile.in22
-rw-r--r--irc/ircd-hybrid/files/patch-contrib_m_help.c11
-rw-r--r--irc/ircd-hybrid/files/patch-doc-Makefile.in11
-rw-r--r--irc/ircd-hybrid/files/patch-help-Makefile30
-rw-r--r--irc/ircd-hybrid/files/patch-include_defaults.h29
-rw-r--r--irc/ircd-hybrid/files/patch-include_setup.h.in25
-rw-r--r--irc/ircd-hybrid/files/patch-messages-Makefile11
-rw-r--r--irc/ircd-hybrid/files/patch-messages_Makefile.in19
-rw-r--r--irc/ircd-hybrid/files/patch-modules-Makefile13
-rw-r--r--irc/ircd-hybrid/files/patch-modules_Makefile.in13
-rw-r--r--irc/ircd-hybrid/files/patch-src-Makefile24
-rw-r--r--irc/ircd-hybrid/files/patch-src_Makefile.in20
-rw-r--r--irc/ircd-hybrid/files/patch-src_modules.c17
-rw-r--r--irc/ircd-hybrid/files/patch-tools-Makefile35
-rw-r--r--irc/ircd-hybrid/files/pkg-message.in16
20 files changed, 259 insertions, 192 deletions
diff --git a/irc/ircd-hybrid/files/include-config.h.pre-patch b/irc/ircd-hybrid/files/include-config.h.pre-patch
deleted file mode 100644
index d6c7794..0000000
--- a/irc/ircd-hybrid/files/include-config.h.pre-patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- include/config.h.orig Sun Oct 26 03:08:12 2003
-+++ include/config.h Thu Jul 7 11:27:45 2005
-@@ -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
-@@ -137,13 +139,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 */
-@@ -158,7 +160,7 @@
- #define RPATH ETCPATH "/ircd.rsa" /* ircd rsa private keyfile */
- #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.pid" /* pid file */
- #define OPATH ETCPATH "/opers.motd" /* oper MOTD file */
- #define LIPATH ETCPATH "/links.txt" /* cached links file */
- #endif /* !VMS */
diff --git a/irc/ircd-hybrid/files/ircd-hybrid.sh b/irc/ircd-hybrid/files/ircd-hybrid.sh
deleted file mode 100644
index 10751d9..0000000
--- a/irc/ircd-hybrid/files/ircd-hybrid.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-PIDFILE=/var/run/ircd.pid
-
-if [ $# -eq 0 -o x$1 = xstart ]; then
- if [ -x %PREFIX%/bin/ircd ]; then
- touch $PIDFILE
- chown ircd $PIDFILE
- su -fm ircd -c %PREFIX%/bin/ircd && echo ' ircd'
- fi
-fi
-if [ x$1 = xstop ]; then
- if [ -s $PIDFILE ]; then
- kill `cat $PIDFILE`
- else
- # oh well
- killall ircd
- fi
- rm -f $PIDFILE
-fi
diff --git a/irc/ircd-hybrid/files/ircd-hybrid.sh.in b/irc/ircd-hybrid/files/ircd-hybrid.sh.in
new file mode 100644
index 0000000..75acabd
--- /dev/null
+++ b/irc/ircd-hybrid/files/ircd-hybrid.sh.in
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+# PROVIDE: ircd-hybrid
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: FreeBSD shutdown
+
+# To get ircd-hybrid enabled at boot, add the following lines to /etc/rc.conf :
+# ircd_hybrid_enable (bool): Set to "NO" by default.
+# Set it to "YES" to enable ircd-hybrid.
+
+. /etc/rc.subr
+
+name="ircd_hybrid"
+rcvar=`set_rcvar`
+
+command=/usr/local/bin/ircd
+pidfile=/var/run/ircd/ircd.pid
+required_files=/usr/local/etc/ircd-hybrid/ircd.conf
+
+start_precmd=pid_touch
+stop_postcmd=pid_rm
+
+[ -z "$ircd_hybrid_enable" ] && ircd_hybrid_enable=NO
+[ -z "$ircd_hybrid_user" ] && ircd_hybrid_user=ircd
+
+load_rc_config $name
+
+pid_touch ()
+{
+ touch $pidfile
+ chown $ircd_hybrid_user $pidfile
+}
+
+pid_rm ()
+{
+ rm $pidfile
+}
+
+run_rc_command "$1"
diff --git a/irc/ircd-hybrid/files/patch-Makefile.in b/irc/ircd-hybrid/files/patch-Makefile.in
new file mode 100644
index 0000000..3dcb6b9
--- /dev/null
+++ b/irc/ircd-hybrid/files/patch-Makefile.in
@@ -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 --git a/irc/ircd-hybrid/files/patch-configure b/irc/ircd-hybrid/files/patch-configure
index 964922f..1ea1802 100644
--- a/irc/ircd-hybrid/files/patch-configure
+++ b/irc/ircd-hybrid/files/patch-configure
@@ -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 --git a/irc/ircd-hybrid/files/patch-contrib_Makefile.in b/irc/ircd-hybrid/files/patch-contrib_Makefile.in
new file mode 100644
index 0000000..318ea81
--- /dev/null
+++ b/irc/ircd-hybrid/files/patch-contrib_Makefile.in
@@ -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 --git a/irc/ircd-hybrid/files/patch-contrib_m_help.c b/irc/ircd-hybrid/files/patch-contrib_m_help.c
new file mode 100644
index 0000000..4c54241
--- /dev/null
+++ b/irc/ircd-hybrid/files/patch-contrib_m_help.c
@@ -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 --git a/irc/ircd-hybrid/files/patch-doc-Makefile.in b/irc/ircd-hybrid/files/patch-doc-Makefile.in
deleted file mode 100644
index 055a47a..0000000
--- a/irc/ircd-hybrid/files/patch-doc-Makefile.in
+++ /dev/null
@@ -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 --git a/irc/ircd-hybrid/files/patch-help-Makefile b/irc/ircd-hybrid/files/patch-help-Makefile
deleted file mode 100644
index f139d55..0000000
--- a/irc/ircd-hybrid/files/patch-help-Makefile
+++ /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-include_defaults.h b/irc/ircd-hybrid/files/patch-include_defaults.h
new file mode 100644
index 0000000..4bc6bb9
--- /dev/null
+++ b/irc/ircd-hybrid/files/patch-include_defaults.h
@@ -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 --git a/irc/ircd-hybrid/files/patch-include_setup.h.in b/irc/ircd-hybrid/files/patch-include_setup.h.in
new file mode 100644
index 0000000..7028f4f
--- /dev/null
+++ b/irc/ircd-hybrid/files/patch-include_setup.h.in
@@ -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 --git a/irc/ircd-hybrid/files/patch-messages-Makefile b/irc/ircd-hybrid/files/patch-messages-Makefile
deleted file mode 100644
index 04039c8..0000000
--- a/irc/ircd-hybrid/files/patch-messages-Makefile
+++ /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-messages_Makefile.in b/irc/ircd-hybrid/files/patch-messages_Makefile.in
new file mode 100644
index 0000000..49511d5
--- /dev/null
+++ b/irc/ircd-hybrid/files/patch-messages_Makefile.in
@@ -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 --git a/irc/ircd-hybrid/files/patch-modules-Makefile b/irc/ircd-hybrid/files/patch-modules-Makefile
deleted file mode 100644
index 4ecc896..0000000
--- a/irc/ircd-hybrid/files/patch-modules-Makefile
+++ /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-modules_Makefile.in b/irc/ircd-hybrid/files/patch-modules_Makefile.in
new file mode 100644
index 0000000..c12da5f
--- /dev/null
+++ b/irc/ircd-hybrid/files/patch-modules_Makefile.in
@@ -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 --git a/irc/ircd-hybrid/files/patch-src-Makefile b/irc/ircd-hybrid/files/patch-src-Makefile
deleted file mode 100644
index e16a51b..0000000
--- a/irc/ircd-hybrid/files/patch-src-Makefile
+++ /dev/null
@@ -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 --git a/irc/ircd-hybrid/files/patch-src_Makefile.in b/irc/ircd-hybrid/files/patch-src_Makefile.in
new file mode 100644
index 0000000..6b9c0c7
--- /dev/null
+++ b/irc/ircd-hybrid/files/patch-src_Makefile.in
@@ -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 --git a/irc/ircd-hybrid/files/patch-src_modules.c b/irc/ircd-hybrid/files/patch-src_modules.c
new file mode 100644
index 0000000..ae55c20
--- /dev/null
+++ b/irc/ircd-hybrid/files/patch-src_modules.c
@@ -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 --git a/irc/ircd-hybrid/files/patch-tools-Makefile b/irc/ircd-hybrid/files/patch-tools-Makefile
deleted file mode 100644
index ca25bf5..0000000
--- a/irc/ircd-hybrid/files/patch-tools-Makefile
+++ /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/pkg-message.in b/irc/ircd-hybrid/files/pkg-message.in
new file mode 100644
index 0000000..38935b9
--- /dev/null
+++ b/irc/ircd-hybrid/files/pkg-message.in
@@ -0,0 +1,16 @@
+ircd-hybrid has now been installed.
+
+*** IMPORTANT: ***
+Please read the INSTALL file for more information.
+
+You should now copy %%PREFIX%%/etc/ircd-hybrid/example.conf to
+%%PREFIX%%/etc/ircd-hybrid/ircd.conf, and then edit to suit your needs.
+ircd-hybrid will not start without %%PREFIX%%/etc/ircd-hybrid/ircd.conf
+
+Don't forget to add
+
+ircd_hybrid_enable="YES"
+
+into your /etc/rc.conf. You may then start the server by running:
+
+ %%PREFIX%%/etc/rc.d/ircd-hybrid.sh start
OpenPOWER on IntegriCloud