asterisk16: fix L§inux packaging issues

4 files changed, 17 insertions, 9 deletions

diff --git a/comms/asterisk16/Makefile b/comms/asterisk16/Makefile
index 3e01dda8e8a..359136b5b69 100644
--- a/comms/asterisk16/Makefile
+++ b/comms/asterisk16/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2020/03/22 22:36:51 tnn Exp $
+# $NetBSD: Makefile,v 1.60 2020/03/22 23:09:24 tnn Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile
@@ -135,10 +135,15 @@ PLIST.mgcp=	yes
 .  endif
 .endfor
 
-.if ${OPSYS} == "SunOS"
+.if ${OPSYS} == "SunOS" || ${OPSYS} == "Linux"
 PLIST.mgcp=	yes
 .endif
 
+PLIST_VARS+=	timerfd
+.if ${OPSYS} == "Linux"
+PLIST.timerfd=	yes
+.endif
+
 PLIST_VARS+=		unbound
 # unbound 1.5 or later is required.`
 .if exists(/usr/include/unbound.h) && !empty(OS_VERSION:M9.*)
diff --git a/comms/asterisk16/PLIST b/comms/asterisk16/PLIST
index 8980874f8d7..23d8d9a343e 100644
--- a/comms/asterisk16/PLIST
+++ b/comms/asterisk16/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2020/01/11 08:36:13 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.24 2020/03/22 23:09:24 tnn Exp $
 include/asterisk.h
 include/asterisk/_private.h
 include/asterisk/abstract_jb.h
@@ -526,6 +526,7 @@ lib/asterisk/modules/res_statsd.so
 lib/asterisk/modules/res_stun_monitor.so
 ${PLIST.kqueue}lib/asterisk/modules/res_timing_kqueue.so
 lib/asterisk/modules/res_timing_pthread.so
+${PLIST.timerfd}lib/asterisk/modules/res_timing_timerfd.so
 ${PLIST.jabber}lib/asterisk/modules/res_xmpp.so
 lib/libasteriskssl.so
 lib/libasteriskssl.so.1
diff --git a/comms/asterisk16/distinfo b/comms/asterisk16/distinfo
index 25427d5d981..f7c15d389be 100644
--- a/comms/asterisk16/distinfo
+++ b/comms/asterisk16/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32 2020/01/11 08:36:13 ryoon Exp $
+$NetBSD: distinfo,v 1.33 2020/03/22 23:09:24 tnn Exp $
 
 SHA1 (asterisk-16.7.0/asterisk-16.7.0.tar.gz) = cc49b389eecb28583fd996cd9bf1aa7ed4318aa4
 RMD160 (asterisk-16.7.0/asterisk-16.7.0.tar.gz) = 2ff4c97fc2a17e172617e6abb028ac9cb82327e0
@@ -28,7 +28,7 @@ SHA1 (patch-main_Makefile) = d8b2cdd76dbf4dfa3ae082ce39cc0f8396b368aa
 SHA1 (patch-main_acl.c) = 06a9d247b19d648e9ff54ac2a234dc8ac8c023bb
 SHA1 (patch-main_pbx__builtins.c) = 7c1d518f05afc1523b247f50b0363e25832c8636
 SHA1 (patch-main_stdtime_localtime.c) = d530bea8f93667a07b707e6fb01c6744aa264d40
-SHA1 (patch-main_utils.c) = 3f409e21473599930e6899acd8ada3409df0c295
+SHA1 (patch-main_utils.c) = ab85be3687dd7f39b742bd5e4036f9e297f3e272
 SHA1 (patch-pbx_pbx__dundi.c) = d2a50650a19463304c81fc19c460565b94f91b72
 SHA1 (patch-res_res__rtp__asterisk.c) = 08082085ff697598e3ca14eef6569eb72790d858
 SHA1 (patch-sounds_Makefile) = acc15088ae2545f2822246466bfe783b5215fc54
diff --git a/comms/asterisk16/patches/patch-main_utils.c b/comms/asterisk16/patches/patch-main_utils.c
index 72da83b8eff..48baeeb4a52 100644
--- a/comms/asterisk16/patches/patch-main_utils.c
+++ b/comms/asterisk16/patches/patch-main_utils.c
@@ -1,19 +1,21 @@
-$NetBSD: patch-main_utils.c,v 1.1 2019/08/20 13:47:42 ryoon Exp $
+$NetBSD: patch-main_utils.c,v 1.2 2020/03/22 23:09:24 tnn Exp $
 
---- main/utils.c.orig	2018-05-01 20:12:26.000000000 +0000
+--- main/utils.c.orig	2019-12-23 16:43:56.000000000 +0000
 +++ main/utils.c
-@@ -39,6 +39,10 @@
+@@ -39,6 +39,12 @@
  #elif defined(HAVE_SYS_THR_H)
  #include <sys/thr.h>
  #endif
 +#if defined(HAVE_GETIFADDRS)
 +#include <ifaddrs.h>
++#if !defined(__linux__)
 +#include <net/if_dl.h>
 +#endif
++#endif
  
  #include "asterisk/network.h"
  #include "asterisk/ast_version.h"
-@@ -612,7 +616,7 @@ const char *ast_inet_ntoa(struct in_addr
+@@ -612,7 +618,7 @@ const char *ast_inet_ntoa(struct in_addr
  
  static int dev_urandom_fd = -1;