aboutsummaryrefslogtreecommitdiff
path: root/irc
diff options
context:
space:
mode:
authorYuri Victorovich <yuri@FreeBSD.org>2019-08-31 14:23:26 +0000
committerYuri Victorovich <yuri@FreeBSD.org>2019-08-31 14:23:26 +0000
commit734513d1ffc1f8900ca33128583adc26db67dd37 (patch)
tree859e51f96706018fa354dd96f05871e0a2a37b4f /irc
parent00c67c047ffafadcc92e88a443f1178da4a7f8ee (diff)
downloadports-734513d1ffc1f8900ca33128583adc26db67dd37.tar.gz
ports-734513d1ffc1f8900ca33128583adc26db67dd37.zip
irc/inspircd: Unbreak 2019Q3 by updating to 3.3.0
PR: 240129 Submitted by: Dmitri Goutnik <dg@syrec.org> Approved by: portmgr (unbreak)
Notes
Notes: svn path=/branches/2019Q3/; revision=510386
Diffstat (limited to 'irc')
-rw-r--r--irc/inspircd/files/patch-make_template_main.mk30
-rw-r--r--irc/inspircd/pkg-plist1
2 files changed, 16 insertions, 15 deletions
diff --git a/irc/inspircd/files/patch-make_template_main.mk b/irc/inspircd/files/patch-make_template_main.mk
index d2b788fecb50..674ad933e52c 100644
--- a/irc/inspircd/files/patch-make_template_main.mk
+++ b/irc/inspircd/files/patch-make_template_main.mk
@@ -1,15 +1,16 @@
---- make/template/main.mk.orig 2019-05-10 08:54:28 UTC
+--- make/template/main.mk.orig 2019-07-06 12:03:50 UTC
+++ make/template/main.mk
-@@ -203,32 +203,32 @@ finishmessage: target
+@@ -206,33 +206,33 @@ finishmessage: target
@echo "*************************************"
install: target
- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BASE)
+- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BINPATH)
+- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)
- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(DATPATH)
+- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/services
+- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/sql
- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(LOGPATH)
-- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BINPATH)
-- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/examples/services
-- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/examples/sql
- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MANPATH)
- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MODPATH)
- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(SCRPATH)
@@ -18,11 +19,12 @@
- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) @CONFIGURE_DIRECTORY@/inspircd $(SCRPATH) 2>/dev/null
- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) .gdbargs $(SCRPATH)/.gdbargs 2>/dev/null
+ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(BASE)
++ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(BINPATH)
++ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)
+ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(DATPATH)
++ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(EXAPATH)/services
++ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(EXAPATH)/sql
+ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(LOGPATH)
-+ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(BINPATH)
-+ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/services
-+ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/sql
+ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(MANPATH)
+ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(MODPATH)
+ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(SCRPATH)
@@ -39,16 +41,16 @@
- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd.1 $(MANPATH) 2>/dev/null
- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd-genssl.1 $(MANPATH) 2>/dev/null
- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) tools/genssl $(BINPATH)/inspircd-genssl 2>/dev/null
-- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.example $(CONPATH)/examples
-- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/*.example $(CONPATH)/examples/services
-- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(CONPATH)/examples/sql
+- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.example $(EXAPATH)
+- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/*.example $(EXAPATH)/services
+- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(EXAPATH)/sql
- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_PRV) *.pem $(CONPATH) 2>/dev/null
+ -$(INSTALL) -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd.1 $(MANPATH) 2>/dev/null
+ -$(INSTALL) -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd-genssl.1 $(MANPATH) 2>/dev/null
+ -$(INSTALL) -m $(INSTMODE_BIN) tools/genssl $(BINPATH)/inspircd-genssl 2>/dev/null
-+ -$(INSTALL) -m $(INSTMODE_TXT) docs/conf/*.example $(CONPATH)/examples
-+ -$(INSTALL) -m $(INSTMODE_TXT) docs/conf/services/*.example $(CONPATH)/examples/services
-+ -$(INSTALL) -m $(INSTMODE_TXT) docs/sql/*.sql $(CONPATH)/examples/sql
++ -$(INSTALL) -m $(INSTMODE_TXT) docs/conf/*.example $(EXAPATH)
++ -$(INSTALL) -m $(INSTMODE_TXT) docs/conf/services/*.example $(EXAPATH)/services
++ -$(INSTALL) -m $(INSTMODE_TXT) docs/sql/*.sql $(EXAPATH)/sql
+ -$(INSTALL) -m $(INSTMODE_PRV) *.pem $(CONPATH) 2>/dev/null
@echo ""
@echo "*************************************"
diff --git a/irc/inspircd/pkg-plist b/irc/inspircd/pkg-plist
index 1b2a08471645..5b3a59118553 100644
--- a/irc/inspircd/pkg-plist
+++ b/irc/inspircd/pkg-plist
@@ -190,7 +190,6 @@ libexec/inspircd/modules/m_sqlauth.so
libexec/inspircd/modules/m_sqloper.so
libexec/inspircd/modules/m_sslinfo.so
libexec/inspircd/modules/m_sslmodes.so
-libexec/inspircd/modules/m_sslrehashsignal.so
libexec/inspircd/modules/m_starttls.so
libexec/inspircd/modules/m_stripcolor.so
libexec/inspircd/modules/m_svshold.so