aboutsummaryrefslogtreecommitdiff
path: root/irc
diff options
context:
space:
mode:
authorMartin Wilke <miwi@FreeBSD.org>2007-02-08 22:32:06 +0000
committerMartin Wilke <miwi@FreeBSD.org>2007-02-08 22:32:06 +0000
commit2ad1ee7e800292f4894cdbb8b9d37510f8653fc9 (patch)
tree93f9920ddbf0ed2f5f76512a6903ed750835f33b /irc
parent91f82043908ae95a0214b0cc3aac555eb0ed4335 (diff)
Notes
Diffstat (limited to 'irc')
-rw-r--r--irc/tr-ircd/Makefile106
-rw-r--r--irc/tr-ircd/distinfo6
-rw-r--r--irc/tr-ircd/files/patch-Makefile.in21
-rw-r--r--irc/tr-ircd/files/patch-autoconf-ircpathgen7
-rw-r--r--irc/tr-ircd/files/patch-configure38
-rw-r--r--irc/tr-ircd/files/patch-doc-Makefile.in24
-rw-r--r--irc/tr-ircd/files/patch-doc::Makefile.in15
-rw-r--r--irc/tr-ircd/files/patch-help::Makefile.in13
-rw-r--r--irc/tr-ircd/files/patch-include-config.h26
-rw-r--r--irc/tr-ircd/files/patch-include-logtype.h25
-rw-r--r--irc/tr-ircd/files/patch-include::config.h18
-rw-r--r--irc/tr-ircd/files/patch-lib-md5-Makefile.in11
-rw-r--r--irc/tr-ircd/files/patch-newconf-Makefile.in11
-rw-r--r--irc/tr-ircd/files/patch-src-Makefile.in48
-rw-r--r--irc/tr-ircd/files/patch-src-ircsprintf.c (renamed from irc/tr-ircd/files/patch-ircsprintf.c)6
-rw-r--r--irc/tr-ircd/files/patch-wordfilter-Makefile.in11
-rw-r--r--irc/tr-ircd/files/pkg-deinstall.in22
-rw-r--r--irc/tr-ircd/files/pkg-install.in35
-rw-r--r--irc/tr-ircd/files/pkg-message.in22
-rw-r--r--irc/tr-ircd/files/tr-ircd.sh20
-rw-r--r--irc/tr-ircd/files/trircd.in51
-rw-r--r--irc/tr-ircd/pkg-descr3
-rw-r--r--irc/tr-ircd/pkg-plist391
23 files changed, 668 insertions, 262 deletions
diff --git a/irc/tr-ircd/Makefile b/irc/tr-ircd/Makefile
index 2e69bd41d703..f98a873cf18c 100644
--- a/irc/tr-ircd/Makefile
+++ b/irc/tr-ircd/Makefile
@@ -6,58 +6,112 @@
#
PORTNAME= tr-ircd
-PORTVERSION= 5.1.7
-PORTREVISION= 1
+PORTVERSION= 5.7.3
CATEGORIES= irc ipv6
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ${PORTNAME:S/-//}-release-${PORTVERSION}-r
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= martin@matuska.org
COMMENT= An irc daeemon based on Bahamut and hybrid-7
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --localstatedir=/var \
- --libdir=${PREFIX}/lib/tr-ircd \
- --includedir=${PREFIX}/include/tr-ircd \
- --enable-kqueue \
- --enable-root \
- --with-fakehost-postfix=COM
-MAN1= md5sum.1
-MAN5= ircd.conf.5
-MAN8= ircd.8
+TRIRCD_MAXCLIENTS?= 128
+
+TRIRCD_USER?= trircd
+TRIRCD_GROUP?= trircd
+TRIRCD_RUNDIR?= /var/run/tr-ircd
+TRIRCD_LOGDIR?= /var/log/tr-ircd
+TRIRCD_CONFDIR?= ${TARGETDIR}/etc/tr-ircd
+TRIRCD_LIBDIR= ${TARGETDIR}/lib/tr-ircd
+TRIRCD_INCLUDEDIR= ${TARGETDIR}/include/tr-ircd
+
+CONFIGURE_ARGS= --prefix=${TARGETDIR} \
+ --localstatedir=${TRIRCD_RUNDIR} \
+ --sysconfdir=${TRIRCD_CONFDIR} \
+ --libdir=${TRIRCD_LIBDIR} \
+ --includedir=${TRIRCD_INCLUDEDIR} \
+ --datadir=${DATADIR} \
+ --enable-network-loop=kqueue \
+ --with-fakehost-postfix=COM \
+ --with-maxclients=${TRIRCD_MAXCLIENTS}
+
+CONFIGURE_ENV+= MD5SUMS="\"${MD5} -r\""
+
+USE_RC_SUBR= trircd
+
+SUB_LIST+= TRIRCD_USER="${TRIRCD_USER}" TRIRCD_GROUP="${TRIRCD_GROUP}" \
+ TRIRCD_RUNDIR="${TRIRCD_RUNDIR}" TRIRCD_LOGDIR="${TRIRCD_LOGDIR}" \
+ TRIRCD_CONFDIR="${TRIRCD_CONFDIR}"
+
+SUB_FILES+= pkg-install pkg-deinstall pkg-message
+PKGINSTALL= ${WRKDIR}/pkg-install
+PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
+PKGMESSAGE= ${WRKDIR}/pkg-message
+
+.if !defined(NO_INSTALL_MANPAGES)
+MAN8= tr-ircd.8
+.endif
+
+DOCS= AUTHORS ChangeLog INSTALL LICENSE README.FIRST README.HTTPD \
+ README.OPM RELNOTES TODO
.if !defined(WITHOUT_SSL)
USE_OPENSSL= yes
CONFIGURE_ARGS+=--enable-openssl=${OPENSSLBASE}
.endif
-.if defined(SMALL_NET)
-CONFIGURE_ARGS+=--enable-small-nets
-.endif
-
.include <bsd.port.pre.mk>
-.if ${OSVERSION} >= 700019
-BROKEN= Does not compile on FreeBSD >= 7.0
+PW?= /usr/sbin/pw
+SUB_LIST+= MKDIR="${MKDIR}" PW="${PW}" CHMOD="${CHMOD}" CHOWN="${CHOWN}"
+
+.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
+CFLAGS+= -fPIC
.endif
.if ${OSVERSION} < 500000
USE_GCC= 3.4 # Needs va_copy
.endif
-.if ${OSVERSION} >= 400014 && !defined(WITHOUT_IPV6)
-CONFIGURE_ARGS+=--enable-ipv6
-.endif
-
post-patch:
- ${REINPLACE_CMD} -e "s,-O2,${CFLAGS}," ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e "s,-O2,${CFLAGS}," ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e "s, ircpasswd,tr-ircpasswd," \
+ -e "s,/home/ircd/lib,${TRIRCD_LIBDIR}," \
+ -e "s,/home/ircd/ircd5/lib/,${TRIRCD_LIBDIR}," \
+ -e "s,/home/ircd/ircd5/etc/,${TRIRCD_CONFDIR}," \
+ -e "s,/home/ircd/var/run/tr-ircd,${TRIRCD_RUNDIR}," \
+ ${WRKSRC}/doc/configuration/example.conf
+ @${REINPLACE_CMD} -e "s,@localstatedir@/lib/tr-ircd,${TRIRCD_RUNDIR}," \
+ ${WRKSRC}/tools/irandom.sh.in ${WRKSRC}/tools/isslconfig.sh.in
+ @${REINPLACE_CMD} -e "s,@bindir@,${DATADIR}/tools," ${WRKSRC}/tools/Makefile.in
+
+post-configure:
+ @${REINPLACE_CMD} -e "s,/var/log/tr-ircd,${TRIRCD_LOGDIR}," ${WRKSRC}/include/ircpath.h
+
+pre-install:
+ @${SH} ${PKGINSTALL}
post-install:
- @${ECHO} "Installing ${PREFIX}/etc/rc.d/tr-ircd.sh.sample startup file."
- @${INSTALL_SCRIPT} ${FILESDIR}/tr-ircd.sh \
- ${PREFIX}/etc/rc.d/tr-ircd.sh.sample
+ @${MKDIR} ${TRIRCD_CONFDIR}
+ @${INSTALL_DATA} ${WRKSRC}/doc/configuration/example.conf ${TRIRCD_CONFDIR}/ircd.conf.sample
+ @${INSTALL_DATA} ${WRKSRC}/doc/configuration/example-ihttpd.conf ${TRIRCD_CONFDIR}/ihttpd.conf.sample
+ @${INSTALL_DATA} ${WRKSRC}/doc/configuration/example-maskfile.conf ${TRIRCD_CONFDIR}/maskfile.conf.sample
+ @${INSTALL_DATA} ${WRKSRC}/doc/configuration/example-socks.conf ${TRIRCD_CONFDIR}/socks.conf.sample
+ @${INSTALL_DATA} ${WRKSRC}/doc/configuration/ircdssl.conf ${TRIRCD_CONFDIR}/ircdssl.conf.sample
+ @${INSTALL_DATA} ${WRKSRC}/doc/configuration/ircd.motd ${TRIRCD_CONFDIR}/ircd.motd.sample
+ @${MKDIR} ${TRIRCD_RUNDIR}
+.if !defined(NO_INSTALL_MANPAGES)
+ @${INSTALL_MAN} ${WRKSRC}/doc/man/ircd.8 ${MANPREFIX}/man/man8/tr-ircd.8
+.endif
+.if !defined(NOPORTDOCS)
+ @${MKDIR} ${DOCSDIR}
+.for FILE in ${DOCS}
+ @${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}/${FILE}
+.endfor
+.endif
+ @${CAT} ${PKGMESSAGE}
.include <bsd.port.post.mk>
diff --git a/irc/tr-ircd/distinfo b/irc/tr-ircd/distinfo
index 089d6be2d4ed..195ba8dfcaa3 100644
--- a/irc/tr-ircd/distinfo
+++ b/irc/tr-ircd/distinfo
@@ -1,3 +1,3 @@
-MD5 (trircd-release-5.1.7-r.tar.gz) = 3b4839b40dede6ed0e86cd99a075e930
-SHA256 (trircd-release-5.1.7-r.tar.gz) = b6682e50aa15babf76366969361bfcd11470643ec867409233509880386d0cfb
-SIZE (trircd-release-5.1.7-r.tar.gz) = 754395
+MD5 (trircd-release-5.7.3-r.tar.gz) = 88a24465665ece55c249cba1ea3fa077
+SHA256 (trircd-release-5.7.3-r.tar.gz) = b984609431f51f2a275f1b5160f6a289fd0c5b2fe0829e77264a010523ca08aa
+SIZE (trircd-release-5.7.3-r.tar.gz) = 1085507
diff --git a/irc/tr-ircd/files/patch-Makefile.in b/irc/tr-ircd/files/patch-Makefile.in
new file mode 100644
index 000000000000..f497a7c2d113
--- /dev/null
+++ b/irc/tr-ircd/files/patch-Makefile.in
@@ -0,0 +1,21 @@
+--- Makefile.in.orig Tue Feb 6 13:56:27 2007
++++ Makefile.in Tue Feb 6 13:57:25 2007
+@@ -126,18 +126,6 @@
+ echo "install ==> $$i";\
+ ${MAKE} -C $$i install ;\
+ done
+- @${bindir}/irandom.sh
+- @echo "***********************************************"
+- @echo "Please do not forget to check your example.conf"
+- @echo "When creating ircd.conf configuration file"
+- @echo "***********************************************"
+- @echo "If you have enabled the SSL option, you would"
+- @echo "Need creating an SSL Certificate. Please check"
+- @echo "out the ircdssl.conf for this."
+- @echo "The certificate can be created with the"
+- @echo "isslconfig.sh utility provided"
+- @echo "***********************************************"
+- @echo "Finished Installation"
+
+ uninstall_begin:
+ @echo "Removing binaries"
diff --git a/irc/tr-ircd/files/patch-autoconf-ircpathgen b/irc/tr-ircd/files/patch-autoconf-ircpathgen
new file mode 100644
index 000000000000..91509ba1bd05
--- /dev/null
+++ b/irc/tr-ircd/files/patch-autoconf-ircpathgen
@@ -0,0 +1,7 @@
+--- autoconf/ircpathgen.orig Tue Apr 29 15:52:16 2003
++++ autoconf/ircpathgen Tue Feb 6 15:09:50 2007
+@@ -87,3 +87,4 @@
+ echo "#define IRCD_PREFIX_VAR \"$localstatedir\"" >> $1/include/ircpath.h
+ echo "#define IRCD_PREFIX_LIB \"$libdir\"" >> $1/include/ircpath.h
+ echo "#define IRCD_PREFIX_DOC \"$datadir\"" >> $1/include/ircpath.h
++echo "#define IRCD_PREFIX_LOG \"/var/log/tr-ircd\"" >> $1/include/ircpath.h
diff --git a/irc/tr-ircd/files/patch-configure b/irc/tr-ircd/files/patch-configure
index 157de53458da..19982744e625 100644
--- a/irc/tr-ircd/files/patch-configure
+++ b/irc/tr-ircd/files/patch-configure
@@ -1,11 +1,29 @@
---- configure.orig Sat Oct 26 10:25:29 2002
-+++ configure Sat Oct 26 10:26:46 2002
-@@ -3129,7 +3129,7 @@
- ;;
- esac
- fi
--MD5SUMS=$ac_cv_path_MD5SUMS
-+MD5SUMS=../md5/$ac_cv_path_MD5SUMS
+--- configure.orig Tue Jan 18 17:06:36 2005
++++ configure Wed Feb 7 12:27:41 2007
+@@ -2688,7 +2688,7 @@
+ echo "$as_me:$LINENO: result: Detected FreeBSD: -pthread" >&5
+ echo "${ECHO_T}Detected FreeBSD: -pthread" >&6
+ IRC_CFLAGS="$IRC_CFLAGS -pthread"
+- PROG_IRCD="ircd"
++ PROG_IRCD="tr-ircd"
+ PROG_MD5SUM="md5sum"
+ PROG_TOOLS="ircpasswd"
+ ;;
+@@ -3665,7 +3665,7 @@
- if test -n "$MD5SUMS"; then
- echo "$as_me:$LINENO: result: $MD5SUMS" >&5
+
+ INSTALL="$PWD/autoconf/install-sh -c"
+-INSTALL_PROGRAM="$INSTALL -m 4755"
++INSTALL_PROGRAM="$INSTALL -m 0755"
+ INSTALL_DATA="$INSTALL -m 0644"
+
+ make_is_gmake=0
+@@ -9865,7 +9865,7 @@
+ #include <openssl/opensslv.h>
+ #include <stdlib.h>
+ int main(void) {
+- if ( (OPENSSL_VERSION_NUMBER & 0x00906000) == 0x00906000)
++ if ( OPENSSL_VERSION_NUMBER >= 0x00906000 )
+ {
+ exit(0);
+ }
diff --git a/irc/tr-ircd/files/patch-doc-Makefile.in b/irc/tr-ircd/files/patch-doc-Makefile.in
new file mode 100644
index 000000000000..8148827122e9
--- /dev/null
+++ b/irc/tr-ircd/files/patch-doc-Makefile.in
@@ -0,0 +1,24 @@
+--- doc/Makefile.in.orig Tue Feb 6 12:59:57 2007
++++ doc/Makefile.in Tue Feb 6 13:00:29 2007
+@@ -56,15 +56,21 @@
+ clean:
+
+ install: build
++
++install-conf: build
+ @echo "Installing config files"
+ $(INSTALL) -d ${sysconfdir}
+ ${INSTALL} $(DEFAULTCONFS) ${sysconfdir}
+ @touch ${sysconfdir}/kline.conf
++
++install-man: build
+ @echo "Installing manpages"
+ $(INSTALL) -d ${mandir}
+ $(INSTALL) -d ${md5mandir}
+ $(INSTALL_DATA) man/$(MANPAGE) ${mandir}
+ $(INSTALL_DATA) man/$(MD5MANPAGE) ${md5mandir}
++
++install-doc: build
+ @echo "Installing documentation"
+ $(INSTALL) -d ${datadir}/doc
+ $(INSTALL_DATA) $(DOCUMENTATION) ${datadir}/doc/
diff --git a/irc/tr-ircd/files/patch-doc::Makefile.in b/irc/tr-ircd/files/patch-doc::Makefile.in
deleted file mode 100644
index 022f172d2ae0..000000000000
--- a/irc/tr-ircd/files/patch-doc::Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- doc/Makefile.in.orig Sat Oct 26 10:10:17 2002
-+++ doc/Makefile.in Sat Oct 26 10:11:51 2002
-@@ -77,9 +77,9 @@
- $(INSTALL_DATA) $(CONFMANPAGE) ${confmandir}
- $(INSTALL_DATA) $(MD5MANPAGE) ${md5mandir}
- @echo "Installing documentation"
-- $(INSTALL) -d ${datadir}
-- $(INSTALL_DATA) $(DOCUMENTATION) ${datadir}
-- $(INSTALL_DATA) $(CONFS) ${datadir}
-+ $(INSTALL) -d ${datadir}/doc/tr-ircd
-+ $(INSTALL_DATA) $(DOCUMENTATION) ${datadir}/doc/tr-ircd
-+ $(INSTALL_DATA) $(CONFS) ${datadir}/doc/tr-ircd
-
- uninstall:
- @echo "Removing manpages"
diff --git a/irc/tr-ircd/files/patch-help::Makefile.in b/irc/tr-ircd/files/patch-help::Makefile.in
deleted file mode 100644
index 6870aa2b7c7e..000000000000
--- a/irc/tr-ircd/files/patch-help::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- help/Makefile.in.orig Sat Oct 26 10:12:16 2002
-+++ help/Makefile.in Sat Oct 26 10:13:01 2002
-@@ -53,8 +53,8 @@
-
- install:
- @echo "Installing help files"
-- $(INSTALL) -d ${datadir}/help
-- ${CP} -R en_us ${datadir}/help/
-+ $(INSTALL) -d ${datadir}/tr-ircd/help
-+ ${CP} -R en_us ${datadir}/tr-ircd/help/
-
- uninstall:
- @echo "Removing help files"
diff --git a/irc/tr-ircd/files/patch-include-config.h b/irc/tr-ircd/files/patch-include-config.h
new file mode 100644
index 000000000000..cc3f6287546c
--- /dev/null
+++ b/irc/tr-ircd/files/patch-include-config.h
@@ -0,0 +1,26 @@
+--- include/config.h.orig Tue Jul 1 11:01:18 2003
++++ include/config.h Tue Feb 6 15:08:49 2007
+@@ -36,10 +36,10 @@
+ #define SSL_CERTIFICATE IRCD_PREFIX_ETC "/ircd.cert"
+ #define SSL_KEY IRCD_PREFIX_ETC "/ircd.key"
+
+-#define RANDFILE IRCD_PREFIX_VAR "/lib/" BASENAME "/ircd.rand" /* used to make openssl keygen faster */
+-#define ENTROPYFILE IRCD_PREFIX_VAR "/lib/" BASENAME "/ircd.entropy"
+-#define LINKSFILE IRCD_PREFIX_VAR "/lib/" BASENAME "/ircd.links"
+-#define IRCD_PIDFILE IRCD_PREFIX_VAR "/run/" BASENAME "/ircd.pid"
++#define RANDFILE IRCD_PREFIX_VAR "/ircd.rand" /* used to make openssl keygen faster */
++#define ENTROPYFILE IRCD_PREFIX_VAR "/ircd.entropy"
++#define LINKSFILE IRCD_PREFIX_VAR "/ircd.links"
++#define IRCD_PIDFILE IRCD_PREFIX_VAR "/ircd.pid"
+
+ #define MODPATH IRCD_PREFIX_LIB "/modules"
+ #define LANGPATH IRCD_PREFIX_LIB "/languages"
+@@ -47,7 +47,7 @@
+ #define CONTRIBPATH IRCD_PREFIC_LIB "/contrib"
+ #define TOOLMODPATH IRCD_PREFIX_LIB "/tools"
+
+-#define HELPPATH IRCD_PREFIX_DOC "/help"
++#define HELPPATH IRCD_PREFIX_DOC "/" BASENAME "/help"
+
+ #define CLIENTS_PREALLOCATE 2048
+ #define CHANNELS_PREALLOCATE 2048
diff --git a/irc/tr-ircd/files/patch-include-logtype.h b/irc/tr-ircd/files/patch-include-logtype.h
new file mode 100644
index 000000000000..fc387d216802
--- /dev/null
+++ b/irc/tr-ircd/files/patch-include-logtype.h
@@ -0,0 +1,25 @@
+--- include/logtype.h.orig Tue Feb 6 14:48:29 2007
++++ include/logtype.h Tue Feb 6 14:49:21 2007
+@@ -34,14 +34,14 @@
+ #define LOG_PROXYLOG 0x40 /* Element is logged to the proxy logfile */
+ #define LOG_HTTPLOG 0x80 /* Element is logged to the http logfile */
+
+-#define LOG_FN_LOGFILE IRCD_PREFIX_VAR "/log/" BASENAME "/events.log"
+-#define LOG_FN_IRCLOG IRCD_PREFIX_VAR "/log/" BASENAME "/ircd.log"
+-#define LOG_FN_DEBUGLOG IRCD_PREFIX_VAR "/log/" BASENAME "/debug.log"
+-#define LOG_FN_ERRORLOG IRCD_PREFIX_VAR "/log/" BASENAME "/error.log"
+-#define LOG_FN_STDERR IRCD_PREFIX_VAR "/log/" BASENAME "/stderr.log"
+-#define LOG_FN_STDOUT IRCD_PREFIX_VAR "/log/" BASENAME "/stdout.log"
+-#define LOG_FN_PROXY IRCD_PREFIX_VAR "/log/" BASENAME "/proxy.log"
+-#define LOG_FN_HTTPD IRCD_PREFIX_VAR "/log/" BASENAME "/httpd.log"
++#define LOG_FN_LOGFILE IRCD_PREFIX_LOG "/events.log"
++#define LOG_FN_IRCLOG IRCD_PREFIX_LOG "/ircd.log"
++#define LOG_FN_DEBUGLOG IRCD_PREFIX_LOG "/debug.log"
++#define LOG_FN_ERRORLOG IRCD_PREFIX_LOG "/error.log"
++#define LOG_FN_STDERR IRCD_PREFIX_LOG "/stderr.log"
++#define LOG_FN_STDOUT IRCD_PREFIX_LOG "/stdout.log"
++#define LOG_FN_PROXY IRCD_PREFIX_LOG "/proxy.log"
++#define LOG_FN_HTTPD IRCD_PREFIX_LOG "/httpd.log"
+
+ #define LOG_FATAL -2 /* Element is to be logged always */
+ #define LOG_ERROR -1 /* Element has error level logging */
diff --git a/irc/tr-ircd/files/patch-include::config.h b/irc/tr-ircd/files/patch-include::config.h
deleted file mode 100644
index 796e61e06c3e..000000000000
--- a/irc/tr-ircd/files/patch-include::config.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- include/config.h.orig Sat Oct 26 10:03:41 2002
-+++ include/config.h Sat Oct 26 10:13:43 2002
-@@ -38,11 +38,11 @@
- #define LANGPATH IRCD_PREFIX_LIB "/languages"
- #define CHANMODEPATH IRCD_PREFIX_LIB "/chanmodes"
-
--#define LOGFILE IRCD_PREFIX_VAR "/logfiles/ircd.log"
--#define IRCD_PIDFILE IRCD_PREFIX_VAR "/ircd.pid"
--#define LINKSFILE IRCD_PREFIX_VAR "/ircd.links"
-+#define LOGFILE IRCD_PREFIX_VAR "/log/ircd.log"
-+#define IRCD_PIDFILE IRCD_PREFIX_VAR "/run/ircd.pid"
-+#define LINKSFILE IRCD_PREFIX_VAR "/run/ircd.links"
-
--#define HELPPATH IRCD_PREFIX_DOC "/help/en_us"
-+#define HELPPATH IRCD_PREFIX_DOC "/tr-ircd/help/en_us"
-
- #define USE_FAKEHOST 1
-
diff --git a/irc/tr-ircd/files/patch-lib-md5-Makefile.in b/irc/tr-ircd/files/patch-lib-md5-Makefile.in
new file mode 100644
index 000000000000..d14f22d8f1af
--- /dev/null
+++ b/irc/tr-ircd/files/patch-lib-md5-Makefile.in
@@ -0,0 +1,11 @@
+--- lib/md5/Makefile.in.orig Tue Feb 6 13:07:31 2007
++++ lib/md5/Makefile.in Tue Feb 6 13:07:47 2007
+@@ -53,6 +53,8 @@
+ depend:
+
+ install:
++
++install-md5:
+ @echo "Installing md5 utilities"
+ $(INSTALL) -d ${libexecdir}
+ $(INSTALL) $(PROGS) ${libexecdir}
diff --git a/irc/tr-ircd/files/patch-newconf-Makefile.in b/irc/tr-ircd/files/patch-newconf-Makefile.in
new file mode 100644
index 000000000000..51ac44063d53
--- /dev/null
+++ b/irc/tr-ircd/files/patch-newconf-Makefile.in
@@ -0,0 +1,11 @@
+--- newconf/Makefile.in.orig Tue Feb 6 12:54:59 2007
++++ newconf/Makefile.in Tue Feb 6 12:55:16 2007
+@@ -71,7 +71,7 @@
+ .l.c:
+ ${LEX} -i -o$@ -P`echo "$@" | awk -F_ {'print $$1'}` $<
+ .y.c:
+- ${YACC} -d $< -o $@ -p `echo "$@" | awk -F_ {'print $$1'}`
++ ${YACC} -d -o $@ -p `echo "$@" | awk -F_ {'print $$1'}` $<
+
+ .c.o:
+ ${CC} ${CFLAGS} $(INCLUDES) -I. -c $< -o $@
diff --git a/irc/tr-ircd/files/patch-src-Makefile.in b/irc/tr-ircd/files/patch-src-Makefile.in
new file mode 100644
index 000000000000..a1d01abae990
--- /dev/null
+++ b/irc/tr-ircd/files/patch-src-Makefile.in
@@ -0,0 +1,48 @@
+--- src/Makefile.in.orig Mon Jun 2 14:42:19 2003
++++ src/Makefile.in Tue Feb 6 15:10:58 2007
+@@ -61,7 +61,7 @@
+
+ OBJECTS = $(SOURCES:.c=.o) version.o
+
+-all: ircd
++all: $(IRCD_EXE)
+
+ build: all
+
+@@ -117,7 +117,7 @@
+ fi
+ $(CC) $(CFLAGS) $(INCLUDES) -c static.c -o static.o
+
+-ircd: $(OBJECTS)
++$(IRCD_EXE): $(OBJECTS)
+ ${MAKE} static-objects
+ ${MAKE} -C ../lib/zlib -f Makefile.tr-ircd build
+ ${MAKE} -C interproc build
+@@ -127,24 +127,21 @@
+ if test -n "`grep "STATIC_MODULES\ 1" ../include/setup.h`" ; then \
+ if test -n "`grep "USE_OPM\ 1" ../include/setup.h`" ; then \
+ ${MAKE} -C proxymon build ; \
+- $(CC) ${LDFLAGS} ${BITFLAGS} -o ircd $(OBJECTS) static.o httpd/httpd.so proxymon/proxymon.so $(IRCDLIBS) ; \
++ $(CC) ${LDFLAGS} ${BITFLAGS} -o $(IRCD_EXE) $(OBJECTS) static.o httpd/httpd.so proxymon/proxymon.so $(IRCDLIBS) ; \
+ else \
+- $(CC) ${LDFLAGS} ${BITFLAGS} -o ircd $(OBJECTS) static.o httpd/httpd.so $(IRCDLIBS) ; \
++ $(CC) ${LDFLAGS} ${BITFLAGS} -o $(IRCD_EXE) $(OBJECTS) static.o httpd/httpd.so $(IRCDLIBS) ; \
+ fi \
+ else \
+ if test -n "`grep "USE_OPM\ 1" ../include/setup.h`" ; then \
+ ${MAKE} -C proxymon build ; \
+ fi ; \
+- $(CC) ${LDFLAGS} ${BITFLAGS} -o ircd $(OBJECTS) static.o $(IRCDLIBS) ; \
++ $(CC) ${LDFLAGS} ${BITFLAGS} -o $(IRCD_EXE) $(OBJECTS) static.o $(IRCDLIBS) ; \
+ fi
+ $(MV) version.c version.c.last
+
+ install:
+ @echo "Installing ircd"
+ $(INSTALL) -d ${bindir}
+- $(INSTALL) -d ${localstatedir}/log/$(BN1)$(BN2)$(BN3)
+- $(INSTALL) -d ${localstatedir}/run/$(BN1)$(BN2)$(BN3)
+- $(INSTALL) -d ${localstatedir}/lib/$(BN1)$(BN2)$(BN3)
+ $(INSTALL_BIN) $(PROGS) ${bindir}
+ if test -z "`grep "STATIC_MODULES\ 1" ../include/setup.h`" ; then \
+ if test -n "`grep "USE_OPM\ 1" ../include/setup.h`" ; then \
diff --git a/irc/tr-ircd/files/patch-ircsprintf.c b/irc/tr-ircd/files/patch-src-ircsprintf.c
index b988c2d2df40..0e1010ce38ef 100644
--- a/irc/tr-ircd/files/patch-ircsprintf.c
+++ b/irc/tr-ircd/files/patch-src-ircsprintf.c
@@ -1,6 +1,6 @@
---- src/ircsprintf.c.orig Sat Aug 21 13:36:50 2004
-+++ src/ircsprintf.c Sat Aug 21 13:37:15 2004
-@@ -316,7 +316,8 @@
+--- src/ircsprintf.c.orig Tue Feb 6 12:54:02 2007
++++ src/ircsprintf.c Tue Feb 6 12:54:20 2007
+@@ -336,7 +336,8 @@
const char *format = pattern;
char *buf = str;
int len = 0;
diff --git a/irc/tr-ircd/files/patch-wordfilter-Makefile.in b/irc/tr-ircd/files/patch-wordfilter-Makefile.in
deleted file mode 100644
index 3b727453d226..000000000000
--- a/irc/tr-ircd/files/patch-wordfilter-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/wordfilter/Makefile.in.orig Sat Aug 21 13:34:23 2004
-+++ contrib/wordfilter/Makefile.in Sat Aug 21 13:34:39 2004
-@@ -16,7 +16,7 @@
- RANLIB = @RANLIB@
- MD5SUMS = @MD5SUMS@
- LEXLIB = @LEXLIB@
--CFLAGS = @IRC_CFLAGS@ -DBASENAME=\"$(BN1)$(BN2)$(BN3)\" -DIRCD_PREFIX=\"@prefix@\"
-+CFLAGS = @IRC_CFLAGS@ -DBASENAME=\"$(BN1)$(BN2)$(BN3)\" -DIRCD_PREFIX=\"@prefix@\" -fPIC
- LDFLAGS = @LDFLAGS@
- MKDEP = @MKDEP@ -DBASENAME=\"$(BN1)$(BN2)$(BN3)\" -DIRCD_PREFIX=\"@prefix@\"
- MV = @MV@
diff --git a/irc/tr-ircd/files/pkg-deinstall.in b/irc/tr-ircd/files/pkg-deinstall.in
new file mode 100644
index 000000000000..e78a33e049fe
--- /dev/null
+++ b/irc/tr-ircd/files/pkg-deinstall.in
@@ -0,0 +1,22 @@
+#! /bin/sh
+
+if [ "$2" != "POST-DEINSTALL" ]; then
+ exit 0
+fi
+
+TRIRCD_USER="%%TRIRCD_USER%%"
+TRIRCD_GROUP="%%TRIRCD_GROUP%%"
+TRIRCD_RUNDIR="%%TRIRCD_RUNDIR%%"
+TRIRCD_LOGDIR="%%TRIRCD_LOGDIR%%"
+PW="%%PW%%"
+
+if pw usershow "${TRIRCD_USER}" 2>/dev/null 1>&2; then
+ echo "This port may have created the user: ${TRIRCD_USER}"
+ echo "To delete this user, use '${PW} userdel \"${TRIRCD_USER}\"'"
+fi
+if pw usershow "${TRIRCD_GROUP}" 2>/dev/null 1>&2; then
+ echo "This port may have created the group: ${TRIRCD_GROUP}"
+ echo "To delete this group, use '${PW} groupdel \"${TRIRCD_GROUP}\"'"
+fi
+ echo "You may need to remove ${TRIRCD_RUNDIR} and ${TRIRCD_LOGDIR} manually."
+exit 0
diff --git a/irc/tr-ircd/files/pkg-install.in b/irc/tr-ircd/files/pkg-install.in
new file mode 100644
index 000000000000..47c0593fd172
--- /dev/null
+++ b/irc/tr-ircd/files/pkg-install.in
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+TRIRCD_USER="%%TRIRCD_USER%%"
+TRIRCD_GROUP="%%TRIRCD_GROUP%%"
+TRIRCD_RUNDIR="%%TRIRCD_RUNDIR%%"
+TRIRCD_LOGDIR="%%TRIRCD_LOGDIR%%"
+TRIRCD_CONFDIR="%%TRIRCD_CONFDIR%%"
+
+MKDIR="%%MKDIR%%"
+PW="%%PW%%"
+
+if ! ${PW} groupshow "${TRIRCD_GROUP}" 2>/dev/null 1>&2; then
+ if pw groupadd ${TRIRCD_GROUP}; then
+ echo "Added group \"${TRIRCD_GROUP}\"."
+ else
+ echo "Adding group \"${TRIRCD_GROUP}\" failed..."
+ exit 1
+ fi
+else
+ echo "You already have a group \"${TRIRCD_GROUP}\"."
+fi
+
+if ! ${PW} usershow "${TRIRCD_USER}" 2>/dev/null 1>&2; then
+ if pw useradd ${TRIRCD_USER} -g ${TRIRCD_GROUP} -h - \
+ -s "/usr/sbin/nologin" -d "%%TRIRCD_CONFDIR%%" \
+ -c "TR-IRCD pseudo-user"; \
+ then
+ echo "Added user \"${TRIRCD_USER}\"."
+ else
+ echo "Adding user \"${TRIRCD_USER}\" failed..."
+ exit 1
+ fi
+else
+ echo "You already have a user \"${TRIRCD_USER}\"."
+fi
diff --git a/irc/tr-ircd/files/pkg-message.in b/irc/tr-ircd/files/pkg-message.in
new file mode 100644
index 000000000000..9a9f74257a10
--- /dev/null
+++ b/irc/tr-ircd/files/pkg-message.in
@@ -0,0 +1,22 @@
+************************************************************************
+
+Congratulations,
+you have installed the tr-ircd irc server.
+
+You can find example configuration files in the configuration directory:
+%%TRIRCD_CONFDIR%%
+
+Please copy ircd.conf.sample to ircd.conf and edit to suit your needs.
+
+You might need to create the following additional files in the
+configuration directory: kline.conf gline.conf
+
+Tool for generating IRC password hashes:
+%%DATADIR%%/tools/ircpasswd
+
+If you want SSL enabled, you might need to create a SSL Certificate.
+Please check out "ircdssl.conf.sample" in the configuration directory.
+The certificate can be created with the following script:
+%%DATADIR%%/tools/isslconfig.sh
+
+************************************************************************
diff --git a/irc/tr-ircd/files/tr-ircd.sh b/irc/tr-ircd/files/tr-ircd.sh
deleted file mode 100644
index 9fc9fcf027d0..000000000000
--- a/irc/tr-ircd/files/tr-ircd.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
- echo "$0: Cannot determine the PREFIX" >&2
- exit 1
-fi
-
-case "$1" in
-start)
- [ -x ${PREFIX}/bin/ircd ] && ${PREFIX}/bin/ircd > /dev/null && echo -n ' tr-ircd'
- ;;
-stop)
- [ -r /var/run/ircd.pid ] && kill `cat /var/run/ircd.pid` && rm /var/run/ircd.pid && echo -n ' tr-ircd'
- ;;
-*)
- echo "Usage: `basename $0` {start|stop}" >&2
- ;;
-esac
-
-exit 0
diff --git a/irc/tr-ircd/files/trircd.in b/irc/tr-ircd/files/trircd.in
new file mode 100644
index 000000000000..165a2ec11818
--- /dev/null
+++ b/irc/tr-ircd/files/trircd.in
@@ -0,0 +1,51 @@
+#! /bin/sh
+#
+# PROVIDE: trircd
+# REQUIRE: DAEMON NETWORKING SERVERS
+#
+# Add the following line to /etc/rc.conf to enable trircd:
+#
+# trircd_enable="YES"
+#
+# Tweakable parameters for users to override in rc.conf
+
+. "%%RC_SUBR%%"
+
+name=trircd
+
+load_rc_config ${name}
+: ${trircd_enable="NO"}
+: ${trircd_user="%%TRIRCD_USER%%"}
+: ${trircd_group="%%TRIRCD_GROUP%%"}
+: ${trircd_confdir=%%TRIRCD_CONFDIR%%}
+: ${trircd_conf=${trircd_confdir}/ircd.conf}
+: ${trircd_pidfile=%%TRIRCD_RUNDIR%%/ircd.pid}
+: ${trircd_flags="-d ${trircd_confdir} -c ${trircd_conf} >/dev/null 2>&1"}
+
+rcvar=`set_rcvar`
+command=%%PREFIX%%/bin/tr-ircd
+pidfile=${trircd_pidfile}
+required_files="${trircd_conf}"
+start_precmd="start_precmd"
+
+irandom=%%DATADIR%%/tools/irandom.sh
+trircd_rundir=%%TRIRCD_RUNDIR%%
+trircd_logdir=%%TRIRCD_LOGDIR%%
+trircd_randfile=${trircd_rundir}/ircd.rand
+
+start_precmd()
+{
+ [ -d "${trircd_logdir}" ] || {
+ %%MKDIR%% ${trircd_logdir}
+ %%CHOWN%% ${trircd_user}:${trircd_group} ${trircd_logdir}
+ %%CHMOD%% 770 ${trircd_logdir}
+ }
+ [ -d "${trircd_rundir}" ] || {
+ %%MKDIR%% ${trircd_rundir}
+ %%CHOWN%% ${trircd_user}:${trircd_group} ${trircd_rundir}
+ %%CHMOD%% 770 ${trircd_rundir}
+ }
+ [ -f "${trircd_randfile}" ] || ${irandom}
+}
+
+run_rc_command "$1"
diff --git a/irc/tr-ircd/pkg-descr b/irc/tr-ircd/pkg-descr
index c9adbee8db4f..3b74eff44aa0 100644
--- a/irc/tr-ircd/pkg-descr
+++ b/irc/tr-ircd/pkg-descr
@@ -4,3 +4,6 @@ WWW: http://tr-ircd.sourceforge.net/
- Alex Dupre
ale@FreeBSD.org
+
+- Martin Matuska
+martin@matuska.org
diff --git a/irc/tr-ircd/pkg-plist b/irc/tr-ircd/pkg-plist
index 71334cbb112b..4656012193a8 100644
--- a/irc/tr-ircd/pkg-plist
+++ b/irc/tr-ircd/pkg-plist
@@ -1,20 +1,10 @@
-bin/converter.sh
-bin/ircd
-bin/ircpasswd
-etc/ircd.motd
-etc/kline.conf
-etc/rc.d/tr-ircd.sh.sample
-include/tr-ircd/md5/closeout.h
-include/tr-ircd/md5/config.h
-include/tr-ircd/md5/error.h
-include/tr-ircd/md5/getline.h
-include/tr-ircd/md5/getopt.h
-include/tr-ircd/md5/gnukludge.h
-include/tr-ircd/md5/md5.h
-include/tr-ircd/md5/sys2.h
-include/tr-ircd/md5/system.h
-include/tr-ircd/md5/version-etc.h
-include/tr-ircd/md5/xalloc.h
+bin/tr-ircd
+etc/tr-ircd/ircd.motd.sample
+etc/tr-ircd/ircdssl.conf.sample
+etc/tr-ircd/ircd.conf.sample
+etc/tr-ircd/ihttpd.conf.sample
+etc/tr-ircd/maskfile.conf.sample
+etc/tr-ircd/socks.conf.sample
include/tr-ircd/blalloc.h
include/tr-ircd/capabflag.h
include/tr-ircd/chanmode.h
@@ -32,10 +22,8 @@ include/tr-ircd/dh.h
include/tr-ircd/event.h
include/tr-ircd/fd.h
include/tr-ircd/fileio.h
-include/tr-ircd/find.h
include/tr-ircd/floodspam.h
include/tr-ircd/h.h
-include/tr-ircd/hash.h
include/tr-ircd/hook.h
include/tr-ircd/hostmask.h
include/tr-ircd/identity.h
@@ -45,18 +33,21 @@ include/tr-ircd/ircsprintf.h
include/tr-ircd/language.h
include/tr-ircd/linebuf.h
include/tr-ircd/listener.h
+include/tr-ircd/logtype.h
+include/tr-ircd/maskitem.h
include/tr-ircd/memory.h
-include/tr-ircd/modulelist.h
include/tr-ircd/modules.h
include/tr-ircd/motditem.h
include/tr-ircd/msg.h
include/tr-ircd/msgtok1.h
include/tr-ircd/numeric.h
+include/tr-ircd/optparse.h
include/tr-ircd/packet.h
include/tr-ircd/parse.h
include/tr-ircd/patchlevel.h
include/tr-ircd/protocol.h
include/tr-ircd/protodef.h
+include/tr-ircd/proxy.h
include/tr-ircd/queue.h
include/tr-ircd/resnew.h
include/tr-ircd/s_auth.h
@@ -71,6 +62,7 @@ include/tr-ircd/sys.h
include/tr-ircd/sysvar.h
include/tr-ircd/throttle.h
include/tr-ircd/tools.h
+include/tr-ircd/usermode.h
include/tr-ircd/zlink.h
lib/tr-ircd/chanmodes/cm_ban.so
lib/tr-ircd/chanmodes/cm_chanban.so
@@ -79,15 +71,19 @@ lib/tr-ircd/chanmodes/cm_excepts.so
lib/tr-ircd/chanmodes/cm_flood.so
lib/tr-ircd/chanmodes/cm_halfops.so
lib/tr-ircd/chanmodes/cm_invites.so
+lib/tr-ircd/chanmodes/cm_joindelay.so
lib/tr-ircd/chanmodes/cm_key.so
lib/tr-ircd/chanmodes/cm_limit.so
+lib/tr-ircd/chanmodes/cm_link.so
lib/tr-ircd/chanmodes/cm_modhost.so
lib/tr-ircd/chanmodes/cm_owner.so
lib/tr-ircd/chanmodes/cm_protect.so
lib/tr-ircd/chanmodes/cm_singles.so
lib/tr-ircd/chanmodes/cm_voice.so
lib/tr-ircd/contrib/m_admins.so
+lib/tr-ircd/contrib/m_ewhois.so
lib/tr-ircd/contrib/m_locops.so
+lib/tr-ircd/contrib/m_restart.so
lib/tr-ircd/contrib/m_rnotice.so
lib/tr-ircd/contrib/m_sadmins.so
lib/tr-ircd/contrib/m_topic.so
@@ -95,7 +91,10 @@ lib/tr-ircd/contrib/rehash_more.so
lib/tr-ircd/contrib/wordfilter.so
lib/tr-ircd/languages/lang_eng_funny.so
lib/tr-ircd/languages/lang_eng_old.so
+lib/tr-ircd/languages/lang_greek.so
+lib/tr-ircd/languages/lang_greeklish.so
lib/tr-ircd/languages/lang_turkish.so
+lib/tr-ircd/modules/m_accept.so
lib/tr-ircd/modules/m_admin.so
lib/tr-ircd/modules/m_akill.so
lib/tr-ircd/modules/m_away.so
@@ -103,13 +102,13 @@ lib/tr-ircd/modules/m_burst.so
lib/tr-ircd/modules/m_capab.so
lib/tr-ircd/modules/m_close.so
lib/tr-ircd/modules/m_connect.so
+lib/tr-ircd/modules/m_core.so
lib/tr-ircd/modules/m_dccallow.so
lib/tr-ircd/modules/m_die.so
lib/tr-ircd/modules/m_display.so
lib/tr-ircd/modules/m_dkey.so
lib/tr-ircd/modules/m_error.so
lib/tr-ircd/modules/m_exclude.so
-lib/tr-ircd/modules/m_fakeip.so
lib/tr-ircd/modules/m_globops.so
lib/tr-ircd/modules/m_gnotice.so
lib/tr-ircd/modules/m_goper.so
@@ -124,6 +123,7 @@ lib/tr-ircd/modules/m_jupiter.so
lib/tr-ircd/modules/m_kick.so
lib/tr-ircd/modules/m_kill.so
lib/tr-ircd/modules/m_kline.so
+lib/tr-ircd/modules/m_knock.so
lib/tr-ircd/modules/m_links.so
lib/tr-ircd/modules/m_list.so
lib/tr-ircd/modules/m_lusers.so
@@ -136,7 +136,11 @@ lib/tr-ircd/modules/m_myid.so
lib/tr-ircd/modules/m_names.so
lib/tr-ircd/modules/m_nick.so
lib/tr-ircd/modules/m_oper.so
-lib/tr-ircd/modules/m_operdo.so
+lib/tr-ircd/modules/m_operdo_help.so
+lib/tr-ircd/modules/m_operdo_join.so
+lib/tr-ircd/modules/m_operdo_kick.so
+lib/tr-ircd/modules/m_operdo_mode.so
+lib/tr-ircd/modules/m_operdo_topic.so
lib/tr-ircd/modules/m_part.so
lib/tr-ircd/modules/m_pass.so
lib/tr-ircd/modules/m_ping.so
@@ -145,8 +149,8 @@ lib/tr-ircd/modules/m_post.so
lib/tr-ircd/modules/m_quit.so
lib/tr-ircd/modules/m_rakill.so
lib/tr-ircd/modules/m_rehash.so
-lib/tr-ircd/modules/m_restart.so
lib/tr-ircd/modules/m_rexclude.so
+lib/tr-ircd/modules/m_rexcom.so
lib/tr-ircd/modules/m_rping.so
lib/tr-ircd/modules/m_samode.so
lib/tr-ircd/modules/m_server.so
@@ -173,6 +177,7 @@ lib/tr-ircd/modules/m_szline.so
lib/tr-ircd/modules/m_time.so
lib/tr-ircd/modules/m_topic.so
lib/tr-ircd/modules/m_trace.so
+lib/tr-ircd/modules/m_ucheck.so
lib/tr-ircd/modules/m_unjupiter.so
lib/tr-ircd/modules/m_unkline.so
lib/tr-ircd/modules/m_unsgline.so
@@ -188,131 +193,231 @@ lib/tr-ircd/modules/m_watch.so
lib/tr-ircd/modules/m_who.so
lib/tr-ircd/modules/m_whois.so
lib/tr-ircd/modules/m_whowas.so
-lib/tr-ircd/protocol/compat.so
-lib/tr-ircd/protocol/halcyon.so
+lib/tr-ircd/modules/r_gecos.so
+lib/tr-ircd/modules/r_jupiter.so
+lib/tr-ircd/modules/r_kline.so
+lib/tr-ircd/modules/r_quarantine.so
lib/tr-ircd/protocol/native.so
-lib/tr-ircd/protocol/pelennor.so
-libexec/md5sum
-share/doc/tr-ircd/ChangeLog
-share/doc/tr-ircd/Changes
-share/doc/tr-ircd/INSTALL
-share/doc/tr-ircd/LICENSE
-share/doc/tr-ircd/Manual
-share/doc/tr-ircd/Operators
-share/doc/tr-ircd/README.TSora
-share/doc/tr-ircd/README.small_nets
-share/doc/tr-ircd/TR-Ircd-Team
-share/doc/tr-ircd/example.conf
-share/doc/tr-ircd/operguide.txt
-share/doc/tr-ircd/opermyth.txt
-share/doc/tr-ircd/opers.txt
-share/doc/tr-ircd/serverhide.txt
-share/tr-ircd/help/en_us/admin
-share/tr-ircd/help/en_us/akill
-share/tr-ircd/help/en_us/away
-share/tr-ircd/help/en_us/burst
-share/tr-ircd/help/en_us/capab
-share/tr-ircd/help/en_us/channelmodes
-share/tr-ircd/help/en_us/close
-share/tr-ircd/help/en_us/connect
-share/tr-ircd/help/en_us/dccallow
-share/tr-ircd/help/en_us/die
-share/tr-ircd/help/en_us/display
-share/tr-ircd/help/en_us/dkey
-share/tr-ircd/help/en_us/error
-share/tr-ircd/help/en_us/exclude
-share/tr-ircd/help/en_us/gline
-share/tr-ircd/help/en_us/globops
-share/tr-ircd/help/en_us/gnotice
-share/tr-ircd/help/en_us/goper
-share/tr-ircd/help/en_us/hash
-share/tr-ircd/help/en_us/help
-share/tr-ircd/help/en_us/index
-share/tr-ircd/help/en_us/info
-share/tr-ircd/help/en_us/invite
-share/tr-ircd/help/en_us/ircops
-share/tr-ircd/help/en_us/ison
-share/tr-ircd/help/en_us/join
-share/tr-ircd/help/en_us/jupiter
-share/tr-ircd/help/en_us/kick
-share/tr-ircd/help/en_us/kill
-share/tr-ircd/help/en_us/kline
-share/tr-ircd/help/en_us/links
-share/tr-ircd/help/en_us/list
-share/tr-ircd/help/en_us/lusers
-share/tr-ircd/help/en_us/map
-share/tr-ircd/help/en_us/mkpasswd
-share/tr-ircd/help/en_us/mode
-share/tr-ircd/help/en_us/modules
-share/tr-ircd/help/en_us/motd
-share/tr-ircd/help/en_us/myid
-share/tr-ircd/help/en_us/names
-share/tr-ircd/help/en_us/netset
-share/tr-ircd/help/en_us/nick
-share/tr-ircd/help/en_us/notice
-share/tr-ircd/help/en_us/oper
-share/tr-ircd/help/en_us/operdo
-share/tr-ircd/help/en_us/part
-share/tr-ircd/help/en_us/pass
-share/tr-ircd/help/en_us/ping
-share/tr-ircd/help/en_us/pong
-share/tr-ircd/help/en_us/privmsg
-share/tr-ircd/help/en_us/quit
-share/tr-ircd/help/en_us/rakill
-share/tr-ircd/help/en_us/rehash
-share/tr-ircd/help/en_us/restart
-share/tr-ircd/help/en_us/rexclude
-share/tr-ircd/help/en_us/samode
-share/tr-ircd/help/en_us/server
-share/tr-ircd/help/en_us/service
-share/tr-ircd/help/en_us/services
-share/tr-ircd/help/en_us/servlist
-share/tr-ircd/help/en_us/servset
-share/tr-ircd/help/en_us/set
-share/tr-ircd/help/en_us/setlang
-share/tr-ircd/help/en_us/sgline
-share/tr-ircd/help/en_us/silence
-share/tr-ircd/help/en_us/sjoin
-share/tr-ircd/help/en_us/sqline
-share/tr-ircd/help/en_us/squery
-share/tr-ircd/help/en_us/squit
-share/tr-ircd/help/en_us/stats
-share/tr-ircd/help/en_us/svinfo
-share/tr-ircd/help/en_us/svsjoin
-share/tr-ircd/help/en_us/svskill
-share/tr-ircd/help/en_us/svsmode
-share/tr-ircd/help/en_us/svsnick
-share/tr-ircd/help/en_us/svsnoop
-share/tr-ircd/help/en_us/szline
-share/tr-ircd/help/en_us/time
-share/tr-ircd/help/en_us/topic
-share/tr-ircd/help/en_us/trace
-share/tr-ircd/help/en_us/ungline
-share/tr-ircd/help/en_us/unjupiter
-share/tr-ircd/help/en_us/unkline
-share/tr-ircd/help/en_us/unsgline
-share/tr-ircd/help/en_us/unsqline
-share/tr-ircd/help/en_us/unszline
-share/tr-ircd/help/en_us/user
-share/tr-ircd/help/en_us/userhost
-share/tr-ircd/help/en_us/userip
-share/tr-ircd/help/en_us/usermodes
-share/tr-ircd/help/en_us/users
-share/tr-ircd/help/en_us/version
-share/tr-ircd/help/en_us/wallops
-share/tr-ircd/help/en_us/watch
-share/tr-ircd/help/en_us/who
-share/tr-ircd/help/en_us/whois
-share/tr-ircd/help/en_us/whowas
-@dirrm include/tr-ircd/md5
+lib/tr-ircd/tools/httpd.so
+%%DATADIR%%/help/en_us/admin
+%%DATADIR%%/help/en_us/accept
+%%DATADIR%%/help/en_us/akill
+%%DATADIR%%/help/en_us/away
+%%DATADIR%%/help/en_us/burst
+%%DATADIR%%/help/en_us/capab
+%%DATADIR%%/help/en_us/channelmodes
+%%DATADIR%%/help/en_us/close
+%%DATADIR%%/help/en_us/connect
+%%DATADIR%%/help/en_us/dccallow
+%%DATADIR%%/help/en_us/die
+%%DATADIR%%/help/en_us/display
+%%DATADIR%%/help/en_us/dkey
+%%DATADIR%%/help/en_us/error
+%%DATADIR%%/help/en_us/exclude
+%%DATADIR%%/help/en_us/gline
+%%DATADIR%%/help/en_us/globops
+%%DATADIR%%/help/en_us/gnotice
+%%DATADIR%%/help/en_us/goper
+%%DATADIR%%/help/en_us/hash
+%%DATADIR%%/help/en_us/help
+%%DATADIR%%/help/en_us/index
+%%DATADIR%%/help/en_us/info
+%%DATADIR%%/help/en_us/invite
+%%DATADIR%%/help/en_us/ircops
+%%DATADIR%%/help/en_us/ison
+%%DATADIR%%/help/en_us/join
+%%DATADIR%%/help/en_us/jupiter
+%%DATADIR%%/help/en_us/kick
+%%DATADIR%%/help/en_us/kill
+%%DATADIR%%/help/en_us/kline
+%%DATADIR%%/help/en_us/links
+%%DATADIR%%/help/en_us/list
+%%DATADIR%%/help/en_us/localchans
+%%DATADIR%%/help/en_us/lusers
+%%DATADIR%%/help/en_us/map
+%%DATADIR%%/help/en_us/mkpasswd
+%%DATADIR%%/help/en_us/mode
+%%DATADIR%%/help/en_us/modules
+%%DATADIR%%/help/en_us/motd
+%%DATADIR%%/help/en_us/myid
+%%DATADIR%%/help/en_us/names
+%%DATADIR%%/help/en_us/netset
+%%DATADIR%%/help/en_us/nick
+%%DATADIR%%/help/en_us/notice
+%%DATADIR%%/help/en_us/oper
+%%DATADIR%%/help/en_us/operdo
+%%DATADIR%%/help/en_us/part
+%%DATADIR%%/help/en_us/pass
+%%DATADIR%%/help/en_us/ping
+%%DATADIR%%/help/en_us/pong
+%%DATADIR%%/help/en_us/privmsg
+%%DATADIR%%/help/en_us/quit
+%%DATADIR%%/help/en_us/rakill
+%%DATADIR%%/help/en_us/rehash
+%%DATADIR%%/help/en_us/restart
+%%DATADIR%%/help/en_us/rexclude
+%%DATADIR%%/help/en_us/rexcom
+%%DATADIR%%/help/en_us/samode
+%%DATADIR%%/help/en_us/server
+%%DATADIR%%/help/en_us/service
+%%DATADIR%%/help/en_us/services
+%%DATADIR%%/help/en_us/servlist
+%%DATADIR%%/help/en_us/servset
+%%DATADIR%%/help/en_us/set
+%%DATADIR%%/help/en_us/setlang
+%%DATADIR%%/help/en_us/sgline
+%%DATADIR%%/help/en_us/silence
+%%DATADIR%%/help/en_us/sjoin
+%%DATADIR%%/help/en_us/sqline
+%%DATADIR%%/help/en_us/squery
+%%DATADIR%%/help/en_us/squit
+%%DATADIR%%/help/en_us/stats
+%%DATADIR%%/help/en_us/svinfo
+%%DATADIR%%/help/en_us/svsjoin
+%%DATADIR%%/help/en_us/svskill
+%%DATADIR%%/help/en_us/svsmode
+%%DATADIR%%/help/en_us/svsnick
+%%DATADIR%%/help/en_us/svsnoop
+%%DATADIR%%/help/en_us/szline
+%%DATADIR%%/help/en_us/time
+%%DATADIR%%/help/en_us/topic
+%%DATADIR%%/help/en_us/trace
+%%DATADIR%%/help/en_us/ungline
+%%DATADIR%%/help/en_us/unjupiter
+%%DATADIR%%/help/en_us/unkline
+%%DATADIR%%/help/en_us/unsgline
+%%DATADIR%%/help/en_us/unsqline
+%%DATADIR%%/help/en_us/unszline
+%%DATADIR%%/help/en_us/user
+%%DATADIR%%/help/en_us/userhost
+%%DATADIR%%/help/en_us/userip
+%%DATADIR%%/help/en_us/usermodes
+%%DATADIR%%/help/en_us/users
+%%DATADIR%%/help/en_us/version
+%%DATADIR%%/help/en_us/wallops
+%%DATADIR%%/help/en_us/watch
+%%DATADIR%%/help/en_us/who
+%%DATADIR%%/help/en_us/whois
+%%DATADIR%%/help/en_us/whowas
+%%DATADIR%%/help/tr/admin
+%%DATADIR%%/help/tr/accept
+%%DATADIR%%/help/tr/akill
+%%DATADIR%%/help/tr/away
+%%DATADIR%%/help/tr/burst
+%%DATADIR%%/help/tr/capab
+%%DATADIR%%/help/tr/channelmodes
+%%DATADIR%%/help/tr/close
+%%DATADIR%%/help/tr/connect
+%%DATADIR%%/help/tr/dccallow
+%%DATADIR%%/help/tr/die
+%%DATADIR%%/help/tr/dkey
+%%DATADIR%%/help/tr/error
+%%DATADIR%%/help/tr/exclude
+%%DATADIR%%/help/tr/gline
+%%DATADIR%%/help/tr/globops
+%%DATADIR%%/help/tr/gnotice
+%%DATADIR%%/help/tr/goper
+%%DATADIR%%/help/tr/hash
+%%DATADIR%%/help/tr/help
+%%DATADIR%%/help/tr/index
+%%DATADIR%%/help/tr/info
+%%DATADIR%%/help/tr/invite
+%%DATADIR%%/help/tr/ircops
+%%DATADIR%%/help/tr/ison
+%%DATADIR%%/help/tr/join
+%%DATADIR%%/help/tr/jupiter
+%%DATADIR%%/help/tr/kick
+%%DATADIR%%/help/tr/kill
+%%DATADIR%%/help/tr/kline
+%%DATADIR%%/help/tr/links
+%%DATADIR%%/help/tr/list
+%%DATADIR%%/help/tr/localchans
+%%DATADIR%%/help/tr/lusers
+%%DATADIR%%/help/tr/map
+%%DATADIR%%/help/tr/mkpasswd
+%%DATADIR%%/help/tr/mode
+%%DATADIR%%/help/tr/modules
+%%DATADIR%%/help/tr/motd
+%%DATADIR%%/help/tr/myid
+%%DATADIR%%/help/tr/names
+%%DATADIR%%/help/tr/nick
+%%DATADIR%%/help/tr/notice
+%%DATADIR%%/help/tr/oper
+%%DATADIR%%/help/tr/operdo
+%%DATADIR%%/help/tr/part
+%%DATADIR%%/help/tr/pass
+%%DATADIR%%/help/tr/ping
+%%DATADIR%%/help/tr/pong
+%%DATADIR%%/help/tr/privmsg
+%%DATADIR%%/help/tr/quit
+%%DATADIR%%/help/tr/rakill
+%%DATADIR%%/help/tr/rehash
+%%DATADIR%%/help/tr/restart
+%%DATADIR%%/help/tr/rexclude
+%%DATADIR%%/help/tr/samode
+%%DATADIR%%/help/tr/server
+%%DATADIR%%/help/tr/service
+%%DATADIR%%/help/tr/services
+%%DATADIR%%/help/tr/servlist
+%%DATADIR%%/help/tr/setlang
+%%DATADIR%%/help/tr/sgline
+%%DATADIR%%/help/tr/silence
+%%DATADIR%%/help/tr/sjoin
+%%DATADIR%%/help/tr/sqline
+%%DATADIR%%/help/tr/squery
+%%DATADIR%%/help/tr/squit
+%%DATADIR%%/help/tr/stats
+%%DATADIR%%/help/tr/svsjoin
+%%DATADIR%%/help/tr/svskill
+%%DATADIR%%/help/tr/svsmode
+%%DATADIR%%/help/tr/svsnick
+%%DATADIR%%/help/tr/svsnoop
+%%DATADIR%%/help/tr/szline
+%%DATADIR%%/help/tr/time
+%%DATADIR%%/help/tr/topic
+%%DATADIR%%/help/tr/trace
+%%DATADIR%%/help/tr/ungline
+%%DATADIR%%/help/tr/unjupiter
+%%DATADIR%%/help/tr/unkline
+%%DATADIR%%/help/tr/unsgline
+%%DATADIR%%/help/tr/unsqline
+%%DATADIR%%/help/tr/unszline
+%%DATADIR%%/help/tr/user
+%%DATADIR%%/help/tr/userhost
+%%DATADIR%%/help/tr/userip
+%%DATADIR%%/help/tr/usermodes
+%%DATADIR%%/help/tr/users
+%%DATADIR%%/help/tr/version
+%%DATADIR%%/help/tr/wallops
+%%DATADIR%%/help/tr/watch
+%%DATADIR%%/help/tr/who
+%%DATADIR%%/help/tr/whois
+%%DATADIR%%/help/tr/whowas
+%%DATADIR%%/tools/irandom.sh
+%%DATADIR%%/tools/ircpasswd
+%%DATADIR%%/tools/isslconfig.sh
+%%DATADIR%%/tools/iupdt.sh
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/README.FIRST
+%%PORTDOCS%%%%DOCSDIR%%/README.HTTPD
+%%PORTDOCS%%%%DOCSDIR%%/README.OPM
+%%PORTDOCS%%%%DOCSDIR%%/RELNOTES
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%@dirrm %%PORTDOCS%%%%DOCSDIR%%
+@dirrm %%DATADIR%%/help/en_us
+@dirrm %%DATADIR%%/help/tr
+@dirrm %%DATADIR%%/help
+@dirrm %%DATADIR%%/tools
+@dirrm %%DATADIR%%
@dirrm include/tr-ircd
@dirrm lib/tr-ircd/chanmodes
@dirrm lib/tr-ircd/contrib
@dirrm lib/tr-ircd/languages
@dirrm lib/tr-ircd/modules
@dirrm lib/tr-ircd/protocol
+@dirrm lib/tr-ircd/tools
@dirrm lib/tr-ircd
-@dirrm share/doc/tr-ircd
-@dirrm share/tr-ircd/help/en_us
-@dirrm share/tr-ircd/help
-@dirrm share/tr-ircd
+@dirrmtry etc/tr-ircd