Index: irc/inspircd/Makefile =================================================================== --- irc/inspircd/Makefile +++ irc/inspircd/Makefile @@ -3,7 +3,7 @@ PORTNAME= inspircd DISTVERSIONPREFIX= v -DISTVERSION= 3.3.0 +DISTVERSION= 3.4.0 CATEGORIES= irc MAINTAINER= dmgk@FreeBSD.org Index: irc/inspircd/distinfo =================================================================== --- irc/inspircd/distinfo +++ irc/inspircd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1566835663 -SHA256 (inspircd-inspircd-v3.3.0_GH0.tar.gz) = 9bdf10e5b8f4488c0e9f6870a16d5befe029aea8d31dbf89aa856e532d7b41f2 -SIZE (inspircd-inspircd-v3.3.0_GH0.tar.gz) = 803449 +TIMESTAMP = 1572098327 +SHA256 (inspircd-inspircd-v3.4.0_GH0.tar.gz) = 8372295f24f4f92606029cdabd16f244f6ccddc3dbfd84d625408827495e3245 +SIZE (inspircd-inspircd-v3.4.0_GH0.tar.gz) = 809845 Index: irc/inspircd/files/patch-make_template_main.mk =================================================================== --- irc/inspircd/files/patch-make_template_main.mk +++ irc/inspircd/files/patch-make_template_main.mk @@ -1,6 +1,6 @@ ---- make/template/main.mk.orig 2019-07-06 12:03:50 UTC +--- make/template/main.mk.orig 2019-10-25 10:40:44 UTC +++ make/template/main.mk -@@ -206,33 +206,33 @@ finishmessage: target +@@ -206,34 +206,34 @@ finishmessage: target @echo "*************************************" install: target @@ -8,6 +8,7 @@ - @-$(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)/providers - @-$(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) @@ -17,11 +18,11 @@ - -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) "$(BUILDPATH)/bin/inspircd" $(BINPATH) - -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) "$(BUILDPATH)/modules/"*.so $(MODPATH) - -$(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)/providers + @-$(INSTALL) -d -m $(INSTMODE_DIR) $(EXAPATH)/services + @-$(INSTALL) -d -m $(INSTMODE_DIR) $(EXAPATH)/sql + @-$(INSTALL) -d -m $(INSTMODE_DIR) $(LOGPATH) @@ -31,7 +32,6 @@ + -$(INSTALL) -m $(INSTMODE_BIN) "$(BUILDPATH)/bin/inspircd" $(BINPATH) + -$(INSTALL) -m $(INSTMODE_BIN) "$(BUILDPATH)/modules/"*.so $(MODPATH) + -$(INSTALL) -m $(INSTMODE_BIN) @CONFIGURE_DIRECTORY@/inspircd $(SCRPATH) 2>/dev/null -+ -$(INSTALL) -m $(INSTMODE_TXT) .gdbargs $(SCRPATH)/.gdbargs 2>/dev/null ifeq ($(SYSTEM), darwin) -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) @CONFIGURE_DIRECTORY@/org.inspircd.plist $(SCRPATH) 2>/dev/null endif @@ -42,6 +42,7 @@ - -$(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 $(EXAPATH) +- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/providers/*.example $(EXAPATH)/providers - -$(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 @@ -49,6 +50,7 @@ + -$(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 $(EXAPATH) ++ -$(INSTALL) -m $(INSTMODE_TXT) docs/conf/providers/*.example $(EXAPATH)/providers + -$(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 Index: irc/inspircd/pkg-plist =================================================================== --- irc/inspircd/pkg-plist +++ irc/inspircd/pkg-plist @@ -9,13 +9,14 @@ @sample %%ETCDIR%%/examples/opermotd.txt.example %%ETCDIR%%/opermotd.txt @sample %%ETCDIR%%/examples/opers.conf.example %%ETCDIR%%/opers.conf @sample %%ETCDIR%%/examples/quotes.txt.example %%ETCDIR%%/quotes.txt +%%ETCDIR%%/examples/providers/irccloud.conf.example +%%ETCDIR%%/examples/providers/kiwiirc-com.conf.example %%ETCDIR%%/examples/services/anope.conf.example %%ETCDIR%%/examples/services/atheme.conf.example %%ETCDIR%%/examples/services/generic.conf.example %%ETCDIR%%/examples/sql/sqloper.mysql.sql %%ETCDIR%%/examples/sql/sqloper.pgsql.sql %%ETCDIR%%/examples/sql/sqloper.sqlite3.sql -libexec/inspircd/.gdbargs libexec/inspircd/inspircd libexec/inspircd/modules/core_channel.so libexec/inspircd/modules/core_dns.so