diff options
Diffstat (limited to 'irc/charybdis/files')
-rw-r--r-- | irc/charybdis/files/charybdis.in | 36 | ||||
-rw-r--r-- | irc/charybdis/files/patch-configure | 28 | ||||
-rw-r--r-- | irc/charybdis/files/patch-extensions_Makefile.in | 19 | ||||
-rw-r--r-- | irc/charybdis/files/patch-help_Makefile.in | 15 | ||||
-rw-r--r-- | irc/charybdis/files/patch-modules_Makefile.in | 23 | ||||
-rw-r--r-- | irc/charybdis/files/patch-tools_Makefile.in | 30 |
6 files changed, 0 insertions, 151 deletions
diff --git a/irc/charybdis/files/charybdis.in b/irc/charybdis/files/charybdis.in deleted file mode 100644 index fbb5de99f28d..000000000000 --- a/irc/charybdis/files/charybdis.in +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# PROVIDE: charybdis -# REQUIRE: LOGIN -# KEYWORD: shutdown -# -# Add the following lines to /etc/rc.conf or /etc/rc.conf.local to -# enable charybdis: -# charybdis_enable (bool): Set to "NO" by default. -# - -. /etc/rc.subr - -name=charybdis -rcvar=charybdis_enable - -load_rc_config $name - -: ${charybdis_enable:=NO} -: ${charybdis_user=ircd} -: ${charybdis_group=ircd} - -command=%%PREFIX%%/bin/ircd -pidfile=/var/run/${name}/${name}.pid -command_args="-configfile %%ETCDIR%%/ircd.conf -pidfile ${pidfile}" - -start_precmd=${name}_prestart - -charybdis_prestart() -{ - chown -R ircd %%ETCDIR%% /var/run/${name} /var/log/${name} /var/db/${name} -} - -run_rc_command $1 diff --git a/irc/charybdis/files/patch-configure b/irc/charybdis/files/patch-configure deleted file mode 100644 index 5e91f7b0b049..000000000000 --- a/irc/charybdis/files/patch-configure +++ /dev/null @@ -1,28 +0,0 @@ ---- configure.orig 2016-09-05 22:33:24 UTC -+++ configure -@@ -677,6 +677,7 @@ MV - CP - RM - INSTALL_DATA -+INSTALL_LIB - INSTALL_SCRIPT - INSTALL_PROGRAM - SET_MAKE -@@ -4833,6 +4834,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR - - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - -+test -z "$INSTALL_LIB" && INSTALL_LIB='${INSTALL} -s -m 644' -+ - # Extract the first word of "rm", so it can be a program name with args. - set dummy rm; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -@@ -5424,7 +5427,7 @@ if test "x$enable_fhs_paths" = "xyes"; t - pkglibexecdir='${libexecdir}/${PACKAGE_TARNAME}' - rundir=${rundir-'${prefix}/run'} - pkgrundir='${rundir}/${PACKAGE_TARNAME}' -- pkglocalstatedir='${localstatedir}/${PACKAGE_TARNAME}' -+ pkglocalstatedir='${localstatedir}/db/${PACKAGE_TARNAME}' - else - libexecdir='${bindir}' - pkglibexecdir='${libexecdir}' diff --git a/irc/charybdis/files/patch-extensions_Makefile.in b/irc/charybdis/files/patch-extensions_Makefile.in deleted file mode 100644 index fb5a0b1aafc8..000000000000 --- a/irc/charybdis/files/patch-extensions_Makefile.in +++ /dev/null @@ -1,19 +0,0 @@ ---- extensions/Makefile.in.orig 2016-12-13 14:45:17 UTC -+++ extensions/Makefile.in -@@ -14,6 +14,7 @@ MKDEP = @MKDEP@ - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_LIB = @INSTALL_LIB@ - INSTALL_SUID = @INSTALL_PROGRAM@ -o root -m 4755 - SHELL = /bin/sh - -@@ -104,7 +105,7 @@ install: all - fi - @echo "Installing modules into $(DESTDIR)$(AUTOMODULEDIR) .." - @for file in $(OBJS); do \ -- $(INSTALL_DATA) $$file $(DESTDIR)$(AUTOMODULEDIR); \ -+ $(INSTALL_LIB) $$file $(DESTDIR)$(AUTOMODULEDIR); \ - done - - .SUFFIXES: .so diff --git a/irc/charybdis/files/patch-help_Makefile.in b/irc/charybdis/files/patch-help_Makefile.in deleted file mode 100644 index 6a992fd21d68..000000000000 --- a/irc/charybdis/files/patch-help_Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ ---- help/Makefile.in.orig 2016-12-13 14:45:17 UTC -+++ help/Makefile.in -@@ -88,9 +88,10 @@ install: - $(INSTALL_DATA) $$help $(DESTDIR)$(uhelpdir); \ - fi \ - done -- @for link in $(SYMLINKS); do \ -+ @cd $(DESTDIR)$(uhelpdir); \ -+ for link in $(SYMLINKS); do \ - rm -f $(DESTDIR)$(uhelpdir)/$$link; \ -- ln -s $(ohelpdir)/$$link $(DESTDIR)$(uhelpdir); \ -+ ln -s ../opers/$$link $$link; \ - done - - diff --git a/irc/charybdis/files/patch-modules_Makefile.in b/irc/charybdis/files/patch-modules_Makefile.in deleted file mode 100644 index 1ea7557778ad..000000000000 --- a/irc/charybdis/files/patch-modules_Makefile.in +++ /dev/null @@ -1,23 +0,0 @@ ---- modules/Makefile.in.orig 2016-12-13 14:45:17 UTC -+++ modules/Makefile.in -@@ -16,6 +16,7 @@ MKDEP = @MKDEP@ -DIRCD_PREFIX=\"@prefix - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_LIB = @INSTALL_LIB@ - INSTALL_SUID = @INSTALL_PROGRAM@ -o root -m 4755 - SEDOBJ = @SEDOBJ@ - SHELL = /bin/sh -@@ -179,10 +180,10 @@ install_libmodules.a: libmodules.a - install_shared_modules: install-mkdirs - @echo "ircd: installing modules" - @for file in $(SH_CORE_OBJS); do \ -- $(INSTALL_DATA) $$file $(DESTDIR)$(moduledir); \ -+ $(INSTALL_LIB) $$file $(DESTDIR)$(moduledir); \ - done - @for file in $(SH_OBJS); do \ -- $(INSTALL_DATA) $$file $(DESTDIR)$(automoduledir); \ -+ $(INSTALL_LIB) $$file $(DESTDIR)$(automoduledir); \ - done - - install_hpux_shared: install-mkdirs diff --git a/irc/charybdis/files/patch-tools_Makefile.in b/irc/charybdis/files/patch-tools_Makefile.in deleted file mode 100644 index 82d076948f65..000000000000 --- a/irc/charybdis/files/patch-tools_Makefile.in +++ /dev/null @@ -1,30 +0,0 @@ ---- tools/Makefile.in.orig 2016-12-13 14:45:17 UTC -+++ tools/Makefile.in -@@ -4,6 +4,7 @@ CC = @CC@ - INSTALL = @INSTALL@ - INSTALL_BIN = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_SUID = @INSTALL_PROGRAM@ -o root -m 4755 - RM = @RM@ - LEX = @LEX@ -@@ -29,9 +30,9 @@ libexecdir = @libexecdir@ - sysconfdir = @sysconfdir@ - localstatedir = @localstatedir@ - --PROGS = viconf mkpasswd genssl -+PROGS = viconf mkpasswd - --all: $(PROGS) -+all: $(PROGS) genssl - - build: all - -@@ -93,6 +94,7 @@ install: install-mkdirs build - fi; \ - $(INSTALL_BIN) $$i $(DESTDIR)$(bindir)/$(PROGRAM_PREFIX)$$i; \ - done; \ -+ $(INSTALL_SCRIPT) genssl $(DESTDIR)$(bindir); \ - $(RM) -f $(DESTDIR)$(bindir)/$(PROGRAM_PREFIX)vimotd - $(LN) $(DESTDIR)$(bindir)/$(PROGRAM_PREFIX)viconf $(DESTDIR)$(bindir)/$(PROGRAM_PREFIX)vimotd - |