 @@ -1,20 +1,20 @@
-# $NetBSD: Makefile,v 1.66 2020/06/12 16:23:53 ryoon Exp $
+# $NetBSD: Makefile,v 1.67 2020/08/13 09:24:25 ryoon Exp $
+#
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile
 #       to find out the current sound file versions
-DISTNAME=	asterisk-16.11.0
+DISTNAME=	asterisk-16.12.0
 CATEGORIES=	comms net audio
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/
 MASTER_SITES+=	http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
 MASTER_SITES+=	http://downloads.asterisk.org/pub/telephony/sounds/releases/
 DIST_SUBDIR=	${PKGNAME_NOREV}
 DISTFILES=	${DEFAULT_DISTFILES}
 COMMENT=	The Asterisk Software PBX
 LICENSE=	gnu-gpl-v2
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
 MAINTAINER=	ryoon@NetBSD.org
 HOMEPAGE=	https://www.asterisk.org/
 @@ -147,27 +147,27 @@ PLIST_VARS+=		unbound
 # unbound 1.5 or later is required.`
 .if exists(/usr/include/unbound.h) && !empty(OS_VERSION:M9.*)
 PLIST.unbound=		yes
 .else
 CONFIGURE_ARGS+=	--without-unbound
 .endif
 .include "options.mk"
 # check sounds/Makefile for current version when upgrading package
 DISTFILES+=	asterisk-extra-sounds-en-gsm-1.5.2.tar.gz
 # pjproject
-PJPROJ_VERSION=	2.9
+PJPROJ_VERSION=	2.10
 SITES.pjproject-${PJPROJ_VERSION}.tar.bz2= \
 	-https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/${PJPROJ_VERSION}/pjproject-${PJPROJ_VERSION}.tar.bz2
 SITES.pjproject-${PJPROJ_VERSION}.md5= \
 	-https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/${PJPROJ_VERSION}/MD5SUM.TXT
 DISTFILES+=	pjproject-${PJPROJ_VERSION}.tar.bz2 pjproject-${PJPROJ_VERSION}.md5
 ALL_ENV+=	EXTERNALS_CACHE_DIR=${DISTDIR}/${DIST_SUBDIR}
 # Override default paths in config files
 SUBST_CLASSES+=		configs
 SUBST_STAGE.configs=	pre-configure
 SUBST_FILES.configs=	configs/samples/cli_aliases.conf.sample
 SUBST_FILES.configs+=	configs/samples/festival.conf.sample
 SUBST_FILES.configs+=	configs/samples/http.conf.sample

 @@ -1,36 +1,36 @@
-$NetBSD: distinfo,v 1.35 2020/06/12 16:23:53 ryoon Exp $
+$NetBSD: distinfo,v 1.36 2020/08/13 09:24:25 ryoon Exp $
-SHA1 (asterisk-16.11.0/asterisk-16.11.0.tar.gz) = 9a9d1c7a45210d94e266686462203405e5d34dda
+SHA1 (asterisk-16.12.0/asterisk-16.12.0.tar.gz) = 85f67fbba2401f45ace3d47eff6affa36521682c
-RMD160 (asterisk-16.11.0/asterisk-16.11.0.tar.gz) = 74036bece29f9865f1110d8f69621e6e8cb2d79f
+RMD160 (asterisk-16.12.0/asterisk-16.12.0.tar.gz) = 99779e3f6e977752c1e2a851ee5360c9b0215d04
-SHA512 (asterisk-16.11.0/asterisk-16.11.0.tar.gz) = 1b138c6a4ac442504d05c1f9a327cdc1396669a328f86678252fe578dc0e3cccf5b4d7856937862f7cc531a0618e3b7e6eebc041ab435efe676cd89e6d877ee6
+SHA512 (asterisk-16.12.0/asterisk-16.12.0.tar.gz) = 1fc41b92d070efd4a7ea5db1a36c83bdb6dbbe7d9b5087b0a887ba3d6875e81ba1b71a79b216138b242f0349a176baf6745480ff6fb7ed47c62dda4b09b6a891
-Size (asterisk-16.11.0/asterisk-16.11.0.tar.gz) = 27708591 bytes
+Size (asterisk-16.12.0/asterisk-16.12.0.tar.gz) = 27727347 bytes
-SHA1 (asterisk-16.11.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 0207e289404704c42941759db9660269599044f9
+SHA1 (asterisk-16.12.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 0207e289404704c42941759db9660269599044f9
-RMD160 (asterisk-16.11.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 5d660e7664a56086bd60ad49196e1b622a60f106
+RMD160 (asterisk-16.12.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 5d660e7664a56086bd60ad49196e1b622a60f106
-SHA512 (asterisk-16.11.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 3f2f7bf3d5bce3544bc013f913c352f0204a3ce96239987403eb9dce8bc87e64a61d437762323a422a87b2fad1f3bf3e7a5f3d0d340f912a1b1dbfea9479d41d
+SHA512 (asterisk-16.12.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 3f2f7bf3d5bce3544bc013f913c352f0204a3ce96239987403eb9dce8bc87e64a61d437762323a422a87b2fad1f3bf3e7a5f3d0d340f912a1b1dbfea9479d41d
-Size (asterisk-16.11.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 4253587 bytes
+Size (asterisk-16.12.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 4253587 bytes
-SHA1 (asterisk-16.11.0/pjproject-2.9.md5) = f8162e9ab7e4de130c166d9ac2f4271ded408ab0
+SHA1 (asterisk-16.12.0/pjproject-2.10.md5) = 1f91cf11ef1df14344817905e165cc1908668d18
-RMD160 (asterisk-16.11.0/pjproject-2.9.md5) = 71f1173138a806451480180ab4147bbddae259d8
+RMD160 (asterisk-16.12.0/pjproject-2.10.md5) = c33bbef404923860a41e34520871c0fa7533a01d
-SHA512 (asterisk-16.11.0/pjproject-2.9.md5) = bfc8fb4ecb6fcb6b9fe2c088e3236ccab74f09bda163c7f1a9b548b0c514228b20ca15c734ff53ed88810b32e904743b396fffdf5d1a6e0c8d66427f0216c0cd
+SHA512 (asterisk-16.12.0/pjproject-2.10.md5) = bd24048c9c2fdaf06468e44bceca92bd02848d759ef98285d20b50174f865b1aec2928f1ce6c092862397ba83dd1a74da4a7e479eca881df1e9f9d1c211a7054
-Size (asterisk-16.11.0/pjproject-2.9.md5) = 107 bytes
+Size (asterisk-16.12.0/pjproject-2.10.md5) = 110 bytes
-SHA1 (asterisk-16.11.0/pjproject-2.9.tar.bz2) = 4b7690e90a9fbe757ac7c5b0db9a2d3db8927824
+SHA1 (asterisk-16.12.0/pjproject-2.10.tar.bz2) = 0c691fa3562d4daad4b4374df61e8325ac15cc55
-RMD160 (asterisk-16.11.0/pjproject-2.9.tar.bz2) = 7333d158e05b4bee16af0a91d4432c6f9e570bf5
+RMD160 (asterisk-16.12.0/pjproject-2.10.tar.bz2) = 9ffe871976a67e4d29d45fdb2c1fc26b2925ef86
-SHA512 (asterisk-16.11.0/pjproject-2.9.tar.bz2) = a65823a86ad0cd76890cf7dd2485f7547fd90aea2ef631c5420c009b35f39eda3b78551a42fc2816c2470de9eb728c26497774a8494824472ecaa1d2889cc20b
+SHA512 (asterisk-16.12.0/pjproject-2.10.tar.bz2) = fe29edccc63a8e72323e1b6f955a8c3475e26aba9cb8f5125546da4409fecc19a09a7950eee6b8e4a3c908943bc043d95130f878ad52958c5eccc617e3bcfb4e
-Size (asterisk-16.11.0/pjproject-2.9.tar.bz2) = 5009546 bytes
+Size (asterisk-16.12.0/pjproject-2.10.tar.bz2) = 7339188 bytes
 SHA1 (patch-Makefile) = f7630acc724e1beb422226318611d5f3f79be82b
 SHA1 (patch-build__tools_mkpkgconfig) = 7fab8fcf46d9f8a3b98455674fec6307ec472b23
 SHA1 (patch-channels_Makefile) = b32bb8439ae07ed361ab7cb811b4766a27f09ec9
-SHA1 (patch-configure) = b25ac1178eb77a1d0ecb57f5b37813cf1a4ad5c6
+SHA1 (patch-configure) = 65da4b46faae700c39b316cc88f6757f8b023657
-SHA1 (patch-configure.ac) = 63a54b310ea38216861206f07116614ddfb90e20
+SHA1 (patch-configure.ac) = 91a080a5190eb397021676ba2f579990939b40e8
 SHA1 (patch-contrib_scripts_vmail.cgi) = 7935ce96ea319eb19cc2ce999813eb837d5357c0
 SHA1 (patch-include_asterisk_autoconfig.h.in) = 2f8a986bd3b35ebb384280f0dbf81c32d689ddd2
 SHA1 (patch-include_asterisk_sha1.h) = 9b233ef82b50b8d94177616e1382991656ce1ebf
 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) = ab85be3687dd7f39b742bd5e4036f9e297f3e272
 SHA1 (patch-pbx_pbx__dundi.c) = d2a50650a19463304c81fc19c460565b94f91b72
 SHA1 (patch-res_res__rtp__asterisk.c) = ea63841700ca31653c7ddcc8d296348b9ee68964
 SHA1 (patch-sounds_Makefile) = acc15088ae2545f2822246466bfe783b5215fc54
 SHA1 (patch-tests_test__locale.c) = f3f1edc86356f2a7b4d3493433c772e164c77f66
 SHA1 (patch-utils_Makefile) = 4b4be483c20768d640efae5c18fc6f6770eb8c0c

 @@ -1,49 +1,58 @@
-$NetBSD: patch-configure,v 1.2 2019/12/21 23:29:05 joerg Exp $
+$NetBSD: patch-configure,v 1.3 2020/08/13 09:24:25 ryoon Exp $
---- configure.orig	2019-07-25 09:38:14.000000000 +0000
+--- configure.orig	2020-07-16 16:00:28.000000000 +0000
 +++ configure
-@@ -9120,7 +9120,7 @@ $as_echo_n "checking for clang -fblocks.
+@@ -8960,7 +8960,7 @@ $as_echo_n "checking for clang -fblocks.
  				AST_CLANG_BLOCKS="-Wno-unknown-warning-option -fblocks"
  				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
 -			elif test "`echo 'int main(){return ^{return 42;}();}' | ${CC} -o /dev/null -fblocks -x c -lBlocksRuntime - 2>&1`" = ""; then
 +			elif test "`echo 'int main(){return ^{return 42;}();}' | ${CC} ${LDFLAGS} -o /dev/null -fblocks -x c -lBlocksRuntime - 2>&1`" = ""; then
  				AST_CLANG_BLOCKS_LIBS="-lBlocksRuntime"
  				AST_CLANG_BLOCKS="-fblocks"
  				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-@@ -14838,7 +14838,7 @@ fi
+@@ -9057,7 +9057,7 @@ if test "${with_pjproject_bundled+set}"
  fi
 -if test "${with_pjproject}" == "no" || test "${with_pjproject}" == "n" ; then
 +if test "${with_pjproject}" = "no" || test "${with_pjproject}" = "n" ; then
  	PJPROJECT_BUNDLED=no
  fi
@@ -14689,7 +14689,7 @@ fi
 -if test "${PERMANENT_DLOPEN}" == "yes"; then
 +if test "${PERMANENT_DLOPEN}" = "yes"; then
  $as_echo "#define HAVE_PERMANENT_DLOPEN 1" >>confdefs.h
-@@ -14872,7 +14872,7 @@ fi
+@@ -14723,7 +14723,7 @@ fi
  done
 -ac_fn_c_check_header_mongrel "$LINENO" "sys/poll.h" "ac_cv_header_sys_poll_h" "$ac_includes_default"
 +ac_fn_c_check_header_mongrel "$LINENO" "poll.h" "ac_cv_header_sys_poll_h" "$ac_includes_default"
  if test "x$ac_cv_header_sys_poll_h" = xyes; then :
  else
-@@ -16887,7 +16887,7 @@ fi
+@@ -16738,7 +16738,7 @@ fi
  done
 -for ac_func in asprintf atexit closefrom dup2 eaccess endpwent euidaccess ffsll ftruncate getcwd gethostbyname gethostname getloadavg gettimeofday glob ioperm inet_ntoa isascii memchr memmove memset mkdir mkdtemp munmap newlocale pipe2 ppoll putenv re_comp regcomp select setenv socket strcasecmp strcasestr strchr strcspn strdup strerror strlcat strlcpy strncasecmp strndup strnlen strrchr strsep strspn strstr strtod strtol strtold strtoq unsetenv uselocale utime vasprintf getpeereid sysctl swapctl malloc_trim
 +for ac_func in asprintf atexit closefrom dup2 eaccess endpwent euidaccess ffsll ftruncate getcwd gethostbyname gethostname getloadavg gettimeofday glob ioperm inet_ntoa isascii memchr memmove memset mkdir mkdtemp munmap newlocale pipe2 ppoll putenv re_comp regcomp select setenv socket strcasecmp strcasestr strchr strcspn strdup strerror strlcat strlcpy strncasecmp strndup strnlen strrchr strsep strspn strstr strtod strtol strtold strtoq unsetenv uselocale utime vasprintf getpeereid sysctl swapctl malloc_trim strftime_l strptime_l
  do :
    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
  ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-@@ -17122,7 +17122,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -16973,7 +16973,7 @@ rm -f core conftest.err conftest.$ac_obj
  LDFLAGS=${old_LDFLAGS}
  rm -f conftest.dynamics
 -ac_fn_c_check_header_mongrel "$LINENO" "sys/poll.h" "ac_cv_header_sys_poll_h" "$ac_includes_default"
 +ac_fn_c_check_header_mongrel "$LINENO" "poll.h" "ac_cv_header_sys_poll_h" "$ac_includes_default"
  if test "x$ac_cv_header_sys_poll_h" = xyes; then :
    HAS_POLL=1

 @@ -1,43 +1,52 @@
-$NetBSD: patch-configure.ac,v 1.1 2019/08/20 13:47:42 ryoon Exp $
+$NetBSD: patch-configure.ac,v 1.2 2020/08/13 09:24:25 ryoon Exp $
---- configure.ac.orig	2019-07-25 09:38:14.000000000 +0000
+--- configure.ac.orig	2020-07-16 16:00:28.000000000 +0000
 +++ configure.ac
-@@ -738,7 +738,7 @@ AC_ARG_ENABLE([permanent-dlopen],
+@@ -452,7 +452,7 @@ AC_ARG_WITH([pjproject-bundled],
  	      *) PJPROJECT_BUNDLED=yes ;;
  	esac])
 -if test "${with_pjproject}" == "no" || test "${with_pjproject}" == "n" ; then
 +if test "${with_pjproject}" = "no" || test "${with_pjproject}" = "n" ; then
  	PJPROJECT_BUNDLED=no
  fi
@@ -740,7 +740,7 @@ AC_ARG_ENABLE([permanent-dlopen],
  	esac], [PERMANENT_DLOPEN=no])
  AC_SUBST([PERMANENT_DLOPEN])
 -if test "${PERMANENT_DLOPEN}" == "yes"; then
 +if test "${PERMANENT_DLOPEN}" = "yes"; then
  	AC_DEFINE([HAVE_PERMANENT_DLOPEN], 1, [Define to support libc with permanent dlopen.])
  fi
-@@ -747,7 +747,7 @@ AC_CHECK_HEADERS([xlocale.h])
+@@ -749,7 +749,7 @@ AC_CHECK_HEADERS([xlocale.h])
  AC_CHECK_HEADERS([winsock.h winsock2.h])
 -AC_CHECK_HEADER([sys/poll.h],
 +AC_CHECK_HEADER([poll.h],
  	 [],
       AC_DEFINE([AST_POLL_COMPAT], 1, [Define to 1 if internal poll should be used.]))
-@@ -799,7 +799,7 @@ AC_FUNC_STRNLEN
+@@ -801,7 +801,7 @@ AC_FUNC_STRNLEN
  AC_FUNC_STRTOD
  AC_FUNC_UTIME_NULL
  AC_FUNC_VPRINTF
 -AC_CHECK_FUNCS([asprintf atexit closefrom dup2 eaccess endpwent euidaccess ffsll ftruncate getcwd gethostbyname gethostname getloadavg gettimeofday glob ioperm inet_ntoa isascii memchr memmove memset mkdir mkdtemp munmap newlocale pipe2 ppoll putenv re_comp regcomp select setenv socket strcasecmp strcasestr strchr strcspn strdup strerror strlcat strlcpy strncasecmp strndup strnlen strrchr strsep strspn strstr strtod strtol strtold strtoq unsetenv uselocale utime vasprintf getpeereid sysctl swapctl malloc_trim])
 +AC_CHECK_FUNCS([asprintf atexit closefrom dup2 eaccess endpwent euidaccess ffsll ftruncate getcwd gethostbyname gethostname getloadavg gettimeofday glob ioperm inet_ntoa isascii memchr memmove memset mkdir mkdtemp munmap newlocale pipe2 ppoll putenv re_comp regcomp select setenv socket strcasecmp strcasestr strchr strcspn strdup strerror strlcat strlcpy strncasecmp strndup strnlen strrchr strsep strspn strstr strtod strtol strtold strtoq unsetenv uselocale utime vasprintf getpeereid sysctl swapctl malloc_trim strftime_l strptime_l])
  AC_MSG_CHECKING(for htonll)
  AC_LINK_IFELSE(
-@@ -868,9 +868,9 @@ AC_SUBST(PBX_DYNAMIC_LIST)
+@@ -870,9 +870,9 @@ AC_SUBST(PBX_DYNAMIC_LIST)
  LDFLAGS=${old_LDFLAGS}
  rm -f conftest.dynamics
 -AC_CHECK_HEADER([sys/poll.h],
 +AC_CHECK_HEADER([poll.h],
     [HAS_POLL=1]
 -   AC_DEFINE([HAVE_SYS_POLL_H], 1, [Define to 1 if your system has working sys/poll.h]),
 +   AC_DEFINE([HAVE_SYS_POLL_H], 1, [Define to 1 if your system has working poll.h]),
+    )
  AC_ARG_ENABLE([internal-poll],