inspircd3: Update to 3.0.1

This release contains minor bug fixes and documentation corrections.
Most notably:

* Fixed building on NetBSD.
* Fixed building on Windows.
* Fixed building with older libc implementations.
* Fixed setting a distribution label.
* Fixed higher <maxlist> values not being shown in MAXLIST.

(This mainly means workarounds can be deleted from pkgsrc).

4 files changed, 10 insertions, 99 deletions

diff --git a/chat/inspircd3/Makefile b/chat/inspircd3/Makefile
index 532621f4216..6aa4ba5ee39 100644
--- a/chat/inspircd3/Makefile
+++ b/chat/inspircd3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2019/05/05 10:44:50 nia Exp $
+# $NetBSD: Makefile,v 1.5 2019/05/10 09:40:01 nia Exp $
 
-DISTNAME=	inspircd-3.0.0
-PKGREVISION=	2
+DISTNAME=	inspircd-3.0.1
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_GITHUB:=inspircd/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -13,9 +12,10 @@ LICENSE=	gnu-gpl-v2
 
 EXTRACT_USING=	bsdtar
 USE_TOOLS+=	gmake perl pkg-config
-USE_LANGUAGES=	c c++11
+USE_LANGUAGES=	c c++03
 HAS_CONFIGURE=	yes
 MAKE_FILE=	GNUmakefile
+MAKE_ENV+=	INSTALL=${INSTALL:Q}
 
 BUILD_DEFS+=	PKG_SYSCONFDIR
 
@@ -27,6 +27,7 @@ CONFIGURE_ARGS+=	--module-dir=${PREFIX}/lib/inspircd/modules
 CONFIGURE_ARGS+=	--config-dir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--data-dir=${PREFIX}/inspircd/data
 CONFIGURE_ARGS+=	--log-dir=${PREFIX}/inspircd/logs
+CONFIGURE_ARGS+=	--script-dir=${PREFIX}/inspircd/scripts
 CONFIG_SHELL=		${PERL5}
 
 REPLACE_PERL+=		tools/genssl
@@ -93,11 +94,6 @@ INSPIRCD_EXTRAS_OFF+=	m_regex_tre.cpp
 
 CONFIGURE_ARGS+=	--distribution-label=pkgsrc
 
-# https://github.com/inspircd/inspircd/commit/044fa999680888267e07dc7b69028b18efbac818
-# this has no side-effects other than allowing the build to proceed with
-# distribution-label set
-CONFIGURE_ARGS+=	--development
-
 .include "options.mk"
 
 post-configure:
@@ -108,10 +104,6 @@ post-configure:
 post-install:
 	${MV} ${DESTDIR}${PKG_SYSCONFDIR}/examples/* ${DESTDIR}${EGDIR}
 	${RM} -rf ${DESTDIR}${PKG_SYSCONFDIR}/examples
-	${RM} -f ${DESTDIR}${PREFIX}/.gdbargs
-	${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/bin/inspircd
-	${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/bin/inspircd-genssl
-	${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/lib/inspircd/modules/*.so
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/inspircd3/distinfo b/chat/inspircd3/distinfo
index 8c752490ef9..da64b23aad3 100644
--- a/chat/inspircd3/distinfo
+++ b/chat/inspircd3/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.3 2019/05/06 17:40:16 nia Exp $
+$NetBSD: distinfo,v 1.4 2019/05/10 09:40:01 nia Exp $
 
-SHA1 (inspircd-3.0.0.tar.gz) = 8b2ba94966bea4918782aaef8923581d66ec8aec
-RMD160 (inspircd-3.0.0.tar.gz) = 660bbed10afa988102f1453f4613e409550c2717
-SHA512 (inspircd-3.0.0.tar.gz) = 3510a92cfdbc3500e39687a8fbf56616994e41be918e7f9a7081552faf06363db179aae24a8cecf75bc2b7ec53b84424e4033642438eb3e595deef04d208ea72
-Size (inspircd-3.0.0.tar.gz) = 793937 bytes
+SHA1 (inspircd-3.0.1.tar.gz) = 726fcc5f77c5f9d233a337de612ec27ff3f97348
+RMD160 (inspircd-3.0.1.tar.gz) = 4f72ee1f4c01bad5a04ecdb20fcba8ddcb4374f3
+SHA512 (inspircd-3.0.1.tar.gz) = 0c944719e5174fd1051ccd37569ee8fd2ce2ec53c4977219b72b1b74a014ac2406d4ef58bb72caf05db20fedd8345a50708067ddc86ab444269dc405f68d2892
+Size (inspircd-3.0.1.tar.gz) = 794215 bytes
 SHA1 (patch-docs_conf_inspircd.conf.example) = c6e9da54f81a2a5d34e933281d997b5ec687da52
 SHA1 (patch-docs_conf_modules.conf.example) = 4a4ef063ae1c908268a34f0407a00c1df70a6a18
 SHA1 (patch-docs_conf_services_anope.conf.example) = ab9078cf3bbe5e7393a8463c95b8db02bc5c019f
 SHA1 (patch-docs_conf_services_atheme.conf.example) = ad1dc932b17497ef49c6daf50984f566c402eb2b
-SHA1 (patch-make_template_main.mk) = 7fe18abf9b19d52ee8b90f61f463d6ce7ab11d99
-SHA1 (patch-src_socketengines_socketengine__kqueue.cpp) = fb1e02ec8dad42dab981980c6b56f3ed11495328
diff --git a/chat/inspircd3/patches/patch-make_template_main.mk b/chat/inspircd3/patches/patch-make_template_main.mk
deleted file mode 100644
index 198bdb25577..00000000000
--- a/chat/inspircd3/patches/patch-make_template_main.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-make_template_main.mk,v 1.2 2019/05/06 17:40:16 nia Exp $
-
-bmake: exec(ginstall) failed (No such file or directory)
-
---- make/template/main.mk.orig	2019-05-03 13:07:32.000000000 +0000
-+++ make/template/main.mk
-@@ -46,7 +46,7 @@ LOGPATH = "$(DESTDIR)@LOG_DIR@"
- DATPATH = "$(DESTDIR)@DATA_DIR@"
- BINPATH = "$(DESTDIR)@BINARY_DIR@"
- SCRPATH = "$(DESTDIR)@SCRIPT_DIR@"
--INSTALL = install
-+INSTALL = $(BSD_INSTALL)
- INSTMODE_DIR = 0750
- INSTMODE_BIN = 0750
- INSTMODE_LIB = 0640
-@@ -73,7 +73,6 @@ ifeq ($(SYSTEM), gnu)
- endif
- ifeq ($(SYSTEM), solaris)
-   LDLIBS += -lsocket -lnsl -lrt -lresolv
--  INSTALL = ginstall
- endif
- ifeq ($(SYSTEM), darwin)
-   LDLIBS += -ldl
diff --git a/chat/inspircd3/patches/patch-src_socketengines_socketengine__kqueue.cpp b/chat/inspircd3/patches/patch-src_socketengines_socketengine__kqueue.cpp
deleted file mode 100644
index d1fbc1b39c8..00000000000
--- a/chat/inspircd3/patches/patch-src_socketengines_socketengine__kqueue.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-src_socketengines_socketengine__kqueue.cpp,v 1.1 2019/05/03 17:14:28 nia Exp $
-
-udata is intptr_t in NetBSD.
-
-https://github.com/inspircd/inspircd/commit/0c992c5a3d6b30a6b14adf3181bf0b1e1fdeab48
-
---- src/socketengines/socketengine_kqueue.cpp.orig	2019-05-03 13:07:32.000000000 +0000
-+++ src/socketengines/socketengine_kqueue.cpp
-@@ -87,7 +87,11 @@ bool SocketEngine::AddFd(EventHandler* e
- 
- 	// We always want to read from the socket...
- 	struct kevent* ke = GetChangeKE();
-+#ifdef __NetBSD__
-+	EV_SET(ke, fd, EVFILT_READ, EV_ADD, 0, 0, reinterpret_cast<intptr_t>(eh));
-+#else
- 	EV_SET(ke, fd, EVFILT_READ, EV_ADD, 0, 0, static_cast<void*>(eh));
-+#endif
- 
- 	ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "New file descriptor: %d", fd);
- 
-@@ -128,7 +132,11 @@ void SocketEngine::OnSetEvent(EventHandl
- 	{
- 		// new poll-style write
- 		struct kevent* ke = GetChangeKE();
-+#ifdef __NetBSD__
-+		EV_SET(ke, eh->GetFd(), EVFILT_WRITE, EV_ADD, 0, 0, reinterpret_cast<intptr_t>(eh));
-+#else
- 		EV_SET(ke, eh->GetFd(), EVFILT_WRITE, EV_ADD, 0, 0, static_cast<void*>(eh));
-+#endif
- 	}
- 	else if ((old_mask & FD_WANT_POLL_WRITE) && !(new_mask & FD_WANT_POLL_WRITE))
- 	{
-@@ -139,7 +147,11 @@ void SocketEngine::OnSetEvent(EventHandl
- 	if ((new_mask & (FD_WANT_FAST_WRITE | FD_WANT_SINGLE_WRITE)) && !(old_mask & (FD_WANT_FAST_WRITE | FD_WANT_SINGLE_WRITE)))
- 	{
- 		struct kevent* ke = GetChangeKE();
-+#ifdef __NetBSD__
-+		EV_SET(ke, eh->GetFd(), EVFILT_WRITE, EV_ADD | EV_ONESHOT, 0, 0, reinterpret_cast<intptr_t>(eh));
-+#else
- 		EV_SET(ke, eh->GetFd(), EVFILT_WRITE, EV_ADD | EV_ONESHOT, 0, 0, static_cast<void*>(eh));
-+#endif
- 	}
- }
- 
-@@ -161,7 +173,11 @@ int SocketEngine::DispatchEvents()
- 	for (int j = 0; j < i; j++)
- 	{
- 		struct kevent& kev = ke_list[j];
-+#ifdef __NetBSD__
-+		EventHandler* eh = reinterpret_cast<EventHandler*>(kev.udata);
-+#else
- 		EventHandler* eh = static_cast<EventHandler*>(kev.udata);
-+#endif
- 		if (!eh)
- 			continue;
-