git: c5fa8f506838 - main - misc/dahdi-kmod: partially unbreak, change maintainer

The branch main has been updated by amdmi3:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c5fa8f50683865bc13c56422b8dd0b199537102e

commit c5fa8f50683865bc13c56422b8dd0b199537102e
Author:     Dmitry Marakasov <amdmi3@FreeBSD.org>
AuthorDate: 2021-11-09 21:06:51 +0000
Commit:     Dmitry Marakasov <amdmi3@FreeBSD.org>
CommitDate: 2021-11-10 10:55:06 +0000

    misc/dahdi-kmod: partially unbreak, change maintainer
    
    Partially unbreak build by adding missing header and disabling
    -Werror. The remaining complete fix may be trivial but requires testing.
    Pass maintainership to submitter due to current maintainer inactivity.
    
    PR:             252907
    Approved by:    maintainer timeout (fjoe, 9 months)
---
 misc/dahdi-kmod/Makefile                               |  6 +++---
 .../files/patch-freebsd-drivers-dahdi-dahdi-base.c     | 18 +++++++++++++-----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/misc/dahdi-kmod/Makefile b/misc/dahdi-kmod/Makefile
index e5ff5aba7946..d70392a25ec7 100644
--- a/misc/dahdi-kmod/Makefile
+++ b/misc/dahdi-kmod/Makefile
@@ -11,10 +11,10 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}\
 		oslec-linux-${OSLEC_VERSION}${EXTRACT_SUFX}\
 		zaphfc-${ZAPHFC_VERSION}${EXTRACT_SUFX}
 
-MAINTAINER=	fjoe@FreeBSD.org
+MAINTAINER=	dgilbert@eicat.ca
 COMMENT=	Digium/Asterisk Hardware Device Interface
 
-BROKEN=		does not compile: use of undeclared identifier 'thread_dtor'
+BROKEN=		does not compile: use of undeclared identifier 'SX_NOADAPTIVE'
 
 RUN_DEPENDS=	${LOCALBASE}/sbin/dahdi_cfg:misc/dahdi
 
@@ -39,7 +39,7 @@ EXTRA_PATCHES=	${WRKDIR}/zaphfc-${ZAPHFC_VERSION}
 PATCH_STRIP=	-p1
 MAKEFILE=	BSDmakefile
 USE_RC_SUBR=	dahdi
-MAKE_ARGS=	ADDITIONAL_DRIVERS="wcb1xxp" NO_FETCH=yes DEPEND_MP=
+MAKE_ARGS=	ADDITIONAL_DRIVERS="wcb1xxp" NO_FETCH=yes DEPEND_MP= WERROR=
 GROUPS=		dahdi
 
 CONFLICTS=	zaptel dahdi-kmod26-*
diff --git a/misc/dahdi-kmod/files/patch-freebsd-drivers-dahdi-dahdi-base.c b/misc/dahdi-kmod/files/patch-freebsd-drivers-dahdi-dahdi-base.c
index 6b928dff60e5..feebe1d03720 100644
--- a/misc/dahdi-kmod/files/patch-freebsd-drivers-dahdi-dahdi-base.c
+++ b/misc/dahdi-kmod/files/patch-freebsd-drivers-dahdi-dahdi-base.c
@@ -1,6 +1,14 @@
---- freebsd/drivers/dahdi/dahdi-base.c.orig	2015-03-22 00:41:01.893409000 +0600
-+++ freebsd/drivers/dahdi/dahdi-base.c	2015-03-22 00:47:34.870157000 +0600
-@@ -4344,8 +4344,7 @@
+--- freebsd/drivers/dahdi/dahdi-base.c.orig	2021-11-09 20:52:37 UTC
++++ freebsd/drivers/dahdi/dahdi-base.c
+@@ -48,6 +48,7 @@
+ #include <sys/module.h>
+ #include <sys/poll.h>
+ #include <net/ppp_defs.h>
++#include <sys/eventhandler.h>
+ 
+ #include "version.h"
+ 
+@@ -4344,8 +4345,7 @@ static int dahdi_common_ioctl(struct file *file, unsig
  		if (spans[i]->manufacturer)
  			dahdi_copy_string(stack.spaninfo.manufacturer, spans[i]->manufacturer,
  				sizeof(stack.spaninfo.manufacturer));
@@ -10,7 +18,7 @@
  		dahdi_copy_string(stack.spaninfo.location, spans[i]->location, sizeof(stack.spaninfo.location));
  		if (spans[i]->spantype)
  			dahdi_copy_string(stack.spaninfo.spantype, spans[i]->spantype, sizeof(stack.spaninfo.spantype));
-@@ -4406,10 +4405,9 @@
+@@ -4406,10 +4406,9 @@ static int dahdi_common_ioctl(struct file *file, unsig
  			dahdi_copy_string(stack.spaninfo_v1.manufacturer,
  				spans[i]->manufacturer,
  				sizeof(stack.spaninfo_v1.manufacturer));
@@ -24,7 +32,7 @@
  		dahdi_copy_string(stack.spaninfo_v1.location,
  				  spans[i]->location,
  				  sizeof(stack.spaninfo_v1.location));
-@@ -9263,7 +9261,9 @@
+@@ -9263,7 +9262,9 @@ static struct cdevsw dahdi_devsw = {
  	.d_poll		= dahdi_device_poll,
  	.d_mmap		= dahdi_device_mmap,
  	.d_name		= "dahdi",