irc/inspircd: update to 3.2.0

PR:		239017
Submitted by:	Dmitri Goutnik <dg@syrec.org> (maintainer)

4 files changed, 48 insertions, 39 deletions

diff --git a/irc/inspircd/files/patch-configure b/irc/inspircd/files/patch-configure
index 3615046f139b..6dbe6e3e5fc1 100644
--- a/irc/inspircd/files/patch-configure
+++ b/irc/inspircd/files/patch-configure
@@ -1,7 +1,7 @@
---- configure.orig	2019-05-10 20:05:04 UTC
+--- configure.orig	2019-07-05 09:09:06 UTC
 +++ configure
-@@ -199,57 +199,10 @@ if (defined $opt_system) {
- 	$config{SCRIPT_DIR} = $opt_script_dir // $config{SCRIPT_DIR} // $config{BASE_DIR};
+@@ -207,57 +207,10 @@ if (defined $opt_system) {
+ 	$config{SCRIPT_DIR}  = $opt_script_dir  // $config{SCRIPT_DIR}  // $config{BASE_DIR};
  }
  
 -# Parse --gid=123 or --gid=foo and extract the group id.
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/files/pkg-deinstall.in b/irc/inspircd/files/pkg-deinstall.in
deleted file mode 100644
index 8646e9ca08a4..000000000000
--- a/irc/inspircd/files/pkg-deinstall.in
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-case $2 in
-POST-DEINSTALL)
-    cat <<EOMSG
-
-To completely remove %%PORTNAME%%, you may wish to
-remove its configuration, database and log directories:
-
-    # rm -rf %%ETCDIR%% \\
-        %%INSPIRCD_DBDIR%% \\
-        %%INSPIRCD_LOGDIR%% \\
-        %%INSPIRCD_RUNDIR%%
-
-To remove the %%INSPIRCD_USER%% user and the %%INSPIRCD_GROUP%% group, run:
-
-    # pw groupdel %%INSPIRCD_GROUP%%
-    # pw userdel %%INSPIRCD_USER%%
-
-EOMSG
-esac
diff --git a/irc/inspircd/files/pkg-message.in b/irc/inspircd/files/pkg-message.in
new file mode 100644
index 000000000000..27224df24b7d
--- /dev/null
+++ b/irc/inspircd/files/pkg-message.in
@@ -0,0 +1,29 @@
+[
+{
+  type: upgrade,
+  maximum_version: 3,
+  message: <<EOM
+InspIRCd v3 has many configuration changes that are not backwards
+compatible with InspIRCd v2. Please review
+https://docs.inspircd.org/3/configuration-changes/ and update your
+configuration files accrdingly.
+EOM
+}
+{
+  type: remove,
+  message: <<EOM
+To completely remove %%PORTNAME%%, you may wish to remove its
+configuration, database and log directories:
+
+    # rm -rf %%ETCDIR%% \\
+        %%INSPIRCD_DBDIR%% \\
+        %%INSPIRCD_LOGDIR%% \\
+        %%INSPIRCD_RUNDIR%%
+
+To remove the %%INSPIRCD_USER%% user and the %%INSPIRCD_GROUP%% group, run:
+
+    # pw groupdel %%INSPIRCD_GROUP%%
+    # pw userdel %%INSPIRCD_USER%%
+EOM
+}
+]