Received: by mail.netbsd.org (Postfix, from userid 605) id 259DE84E32; Sat, 21 Dec 2019 23:29:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A2A2584E31 for ; Sat, 21 Dec 2019 23:29:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id HZImQIHQyfyG for ; Sat, 21 Dec 2019 23:29:05 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 6693D84C2B for ; Sat, 21 Dec 2019 23:29:05 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 647B7FA97; Sat, 21 Dec 2019 23:29:05 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1576970945267210" MIME-Version: 1.0 Date: Sat, 21 Dec 2019 23:29:05 +0000 From: "Joerg Sonnenberger" Subject: CVS commit: pkgsrc/comms To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org X-Mailer: log_accum Message-Id: <20191221232905.647B7FA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1576970945267210 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: joerg Date: Sat Dec 21 23:29:05 UTC 2019 Modified Files: pkgsrc/comms/asterisk13: Makefile distinfo pkgsrc/comms/asterisk13/patches: patch-configure pkgsrc/comms/asterisk14: Makefile distinfo pkgsrc/comms/asterisk14/patches: patch-configure pkgsrc/comms/asterisk15: Makefile pkgsrc/comms/asterisk16: Makefile distinfo pkgsrc/comms/asterisk16/patches: patch-configure Log Message: Look into ${PREFIX}/lib when checking for libBlocksRuntime. To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 pkgsrc/comms/asterisk13/Makefile cvs rdiff -u -r1.15 -r1.16 pkgsrc/comms/asterisk13/distinfo cvs rdiff -u -r1.2 -r1.3 pkgsrc/comms/asterisk13/patches/patch-configure cvs rdiff -u -r1.36 -r1.37 pkgsrc/comms/asterisk14/Makefile cvs rdiff -u -r1.7 -r1.8 pkgsrc/comms/asterisk14/distinfo cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/comms/asterisk14/patches/patch-configure cvs rdiff -u -r1.16 -r1.17 pkgsrc/comms/asterisk15/Makefile cvs rdiff -u -r1.50 -r1.51 pkgsrc/comms/asterisk16/Makefile cvs rdiff -u -r1.30 -r1.31 pkgsrc/comms/asterisk16/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/comms/asterisk16/patches/patch-configure Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1576970945267210 Content-Disposition: inline Content-Length: 14371 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/comms/asterisk13/Makefile diff -u pkgsrc/comms/asterisk13/Makefile:1.52 pkgsrc/comms/asterisk13/Makefile:1.53 --- pkgsrc/comms/asterisk13/Makefile:1.52 Thu Aug 22 12:22:54 2019 +++ pkgsrc/comms/asterisk13/Makefile Sat Dec 21 23:29:04 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2019/08/22 12:22:54 ryoon Exp $ +# $NetBSD: Makefile,v 1.53 2019/12/21 23:29:04 joerg Exp $ # # NOTE: when updating this package, there are two places that sound # tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile @@ -272,6 +272,11 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/api-1.6.2-changes.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} cp -r ${WRKSRC}/doc/Asterisk-Admin-Guide ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}/Asterisk-Admin-Guide +.if ${OPSYS} != "Darwin" && ${PKGSRC_COMPILER} == "clang" +.include "../../lang/libBlocksRuntime/buildlink3.mk" +LDFLAGS+= -L${PREFIX}/lib +.endif + .include "../../databases/sqlite3/buildlink3.mk" .include "../../devel/libuuid/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" Index: pkgsrc/comms/asterisk13/distinfo diff -u pkgsrc/comms/asterisk13/distinfo:1.15 pkgsrc/comms/asterisk13/distinfo:1.16 --- pkgsrc/comms/asterisk13/distinfo:1.15 Tue Jan 23 08:26:08 2018 +++ pkgsrc/comms/asterisk13/distinfo Sat Dec 21 23:29:04 2019 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.15 2018/01/23 08:26:08 jnemeth Exp $ +$NetBSD: distinfo,v 1.16 2019/12/21 23:29:04 joerg Exp $ SHA1 (asterisk-13.19.0/asterisk-13.19.0.tar.gz) = b519e16016a8e07230a16159d88aa06280d70ddb RMD160 (asterisk-13.19.0/asterisk-13.19.0.tar.gz) = 2d448476e2a9a52e8aa30361c5091e72f06bf58d @@ -20,7 +20,7 @@ SHA1 (patch-cdr_cdr__pgsql.c) = 02dc6771 SHA1 (patch-cel_cel__pgsql.c) = b280efab2b035ce60be268bac9bc8824910b2b8f SHA1 (patch-channels_chan__oss.c) = 8a1c32462097f4a58f48a1a994aff5a8ab4c9fb2 SHA1 (patch-channels_chan__sip.c) = a4abe1dcdec3db719a7fd0e5dbefb9c12f6a37db -SHA1 (patch-configure) = 53e5ea06ba9796eb6621193364b1131e895944a1 +SHA1 (patch-configure) = bec979040b515444f0bbc823c92e6e4a0b0365a3 SHA1 (patch-configure.ac) = fa68fb905ceb8d1ee399d01f60ae70c4b11e77e0 SHA1 (patch-contrib_scripts_vmail.cgi) = 672827eedf315a82a289c82d1ae8b935166e9319 SHA1 (patch-funcs_func__env.c) = 0faf9eafe2a5f1701924973a54d0ab49ba62a3b3 Index: pkgsrc/comms/asterisk13/patches/patch-configure diff -u pkgsrc/comms/asterisk13/patches/patch-configure:1.2 pkgsrc/comms/asterisk13/patches/patch-configure:1.3 --- pkgsrc/comms/asterisk13/patches/patch-configure:1.2 Fri Sep 23 17:50:19 2016 +++ pkgsrc/comms/asterisk13/patches/patch-configure Sat Dec 21 23:29:04 2019 @@ -1,8 +1,17 @@ -$NetBSD: patch-configure,v 1.2 2016/09/23 17:50:19 jnemeth Exp $ +$NetBSD: patch-configure,v 1.3 2019/12/21 23:29:04 joerg Exp $ ---- configure.orig 2015-10-09 21:48:48.000000000 +0000 +--- configure.orig 2018-01-11 16:44:54.000000000 +0000 +++ configure -@@ -12920,7 +12920,7 @@ fi +@@ -9214,7 +9214,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 +@@ -14030,7 +14030,7 @@ fi @@ -11,7 +20,7 @@ $NetBSD: patch-configure,v 1.2 2016/09/2 as_fn_error $? "*** JSON support not found (this typically means the libjansson development package is missing)" "$LINENO" 5 fi -@@ -13441,7 +13441,7 @@ fi +@@ -14611,7 +14611,7 @@ fi done @@ -20,7 +29,7 @@ $NetBSD: patch-configure,v 1.2 2016/09/2 if test "x$ac_cv_header_sys_poll_h" = xyes; then : else -@@ -15496,7 +15496,7 @@ fi +@@ -16626,7 +16626,7 @@ fi done @@ -29,7 +38,7 @@ $NetBSD: patch-configure,v 1.2 2016/09/2 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" -@@ -15731,7 +15731,7 @@ rm -f core conftest.err conftest.$ac_obj +@@ -16861,7 +16861,7 @@ rm -f core conftest.err conftest.$ac_obj LDFLAGS=${old_LDFLAGS} rm -f conftest.dynamics @@ -38,7 +47,7 @@ $NetBSD: patch-configure,v 1.2 2016/09/2 if test "x$ac_cv_header_sys_poll_h" = xyes; then : HAS_POLL=1 -@@ -18063,6 +18063,148 @@ fi +@@ -19071,6 +19071,148 @@ fi @@ -187,7 +196,7 @@ $NetBSD: patch-configure,v 1.2 2016/09/2 # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -@@ -19313,6 +19455,8 @@ $as_echo_n "checking if \"struct ifaddrs +@@ -20266,6 +20408,8 @@ $as_echo_n "checking for getifaddrs() su cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ Index: pkgsrc/comms/asterisk14/Makefile diff -u pkgsrc/comms/asterisk14/Makefile:1.36 pkgsrc/comms/asterisk14/Makefile:1.37 --- pkgsrc/comms/asterisk14/Makefile:1.36 Thu Aug 22 12:22:54 2019 +++ pkgsrc/comms/asterisk14/Makefile Sat Dec 21 23:29:04 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2019/08/22 12:22:54 ryoon Exp $ +# $NetBSD: Makefile,v 1.37 2019/12/21 23:29:04 joerg Exp $ # # NOTE: when updating this package, there are two places that sound # tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile @@ -283,6 +283,11 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/api-1.6.2-changes.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} cp -r ${WRKSRC}/doc/Asterisk-Admin-Guide ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}/Asterisk-Admin-Guide +.if ${OPSYS} != "Darwin" && ${PKGSRC_COMPILER} == "clang" +.include "../../lang/libBlocksRuntime/buildlink3.mk" +LDFLAGS+= -L${PREFIX}/lib +.endif + .include "../../databases/sqlite3/buildlink3.mk" .include "../../devel/libuuid/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" Index: pkgsrc/comms/asterisk14/distinfo diff -u pkgsrc/comms/asterisk14/distinfo:1.7 pkgsrc/comms/asterisk14/distinfo:1.8 --- pkgsrc/comms/asterisk14/distinfo:1.7 Wed Jan 24 05:51:40 2018 +++ pkgsrc/comms/asterisk14/distinfo Sat Dec 21 23:29:04 2019 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2018/01/24 05:51:40 jnemeth Exp $ +$NetBSD: distinfo,v 1.8 2019/12/21 23:29:04 joerg Exp $ SHA1 (asterisk-14.7.5/asterisk-14.7.5.tar.gz) = b378be5598e76f2385298bab346bf489796cefa7 RMD160 (asterisk-14.7.5/asterisk-14.7.5.tar.gz) = 1cd1ac72c758bebe54d7fdefe2a7fd59640d7863 @@ -20,7 +20,7 @@ SHA1 (patch-cdr_cdr__pgsql.c) = 82b002a1 SHA1 (patch-cel_cel__pgsql.c) = b280efab2b035ce60be268bac9bc8824910b2b8f SHA1 (patch-channels_chan__oss.c) = 8a1c32462097f4a58f48a1a994aff5a8ab4c9fb2 SHA1 (patch-channels_chan__sip.c) = a4abe1dcdec3db719a7fd0e5dbefb9c12f6a37db -SHA1 (patch-configure) = 53e5ea06ba9796eb6621193364b1131e895944a1 +SHA1 (patch-configure) = fe6389a05f6b1d58148c54521cdd4b341f416bea SHA1 (patch-configure.ac) = fa68fb905ceb8d1ee399d01f60ae70c4b11e77e0 SHA1 (patch-contrib_scripts_vmail.cgi) = 672827eedf315a82a289c82d1ae8b935166e9319 SHA1 (patch-funcs_func__env.c) = 0faf9eafe2a5f1701924973a54d0ab49ba62a3b3 Index: pkgsrc/comms/asterisk14/patches/patch-configure diff -u pkgsrc/comms/asterisk14/patches/patch-configure:1.1.1.1 pkgsrc/comms/asterisk14/patches/patch-configure:1.2 --- pkgsrc/comms/asterisk14/patches/patch-configure:1.1.1.1 Tue Oct 25 08:17:07 2016 +++ pkgsrc/comms/asterisk14/patches/patch-configure Sat Dec 21 23:29:04 2019 @@ -1,8 +1,17 @@ -$NetBSD: patch-configure,v 1.1.1.1 2016/10/25 08:17:07 jnemeth Exp $ +$NetBSD: patch-configure,v 1.2 2019/12/21 23:29:04 joerg Exp $ ---- configure.orig 2015-10-09 21:48:48.000000000 +0000 +--- configure.orig 2017-12-22 22:26:07.000000000 +0000 +++ configure -@@ -12920,7 +12920,7 @@ fi +@@ -9192,7 +9192,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 +@@ -14129,7 +14129,7 @@ fi @@ -11,7 +20,7 @@ $NetBSD: patch-configure,v 1.1.1.1 2016/ as_fn_error $? "*** JSON support not found (this typically means the libjansson development package is missing)" "$LINENO" 5 fi -@@ -13441,7 +13441,7 @@ fi +@@ -14756,7 +14756,7 @@ fi done @@ -20,7 +29,7 @@ $NetBSD: patch-configure,v 1.1.1.1 2016/ if test "x$ac_cv_header_sys_poll_h" = xyes; then : else -@@ -15496,7 +15496,7 @@ fi +@@ -16771,7 +16771,7 @@ fi done @@ -29,7 +38,7 @@ $NetBSD: patch-configure,v 1.1.1.1 2016/ 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" -@@ -15731,7 +15731,7 @@ rm -f core conftest.err conftest.$ac_obj +@@ -17006,7 +17006,7 @@ rm -f core conftest.err conftest.$ac_obj LDFLAGS=${old_LDFLAGS} rm -f conftest.dynamics @@ -38,7 +47,7 @@ $NetBSD: patch-configure,v 1.1.1.1 2016/ if test "x$ac_cv_header_sys_poll_h" = xyes; then : HAS_POLL=1 -@@ -18063,6 +18063,148 @@ fi +@@ -19545,6 +19545,148 @@ fi @@ -187,7 +196,7 @@ $NetBSD: patch-configure,v 1.1.1.1 2016/ # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -@@ -19313,6 +19455,8 @@ $as_echo_n "checking if \"struct ifaddrs +@@ -20797,6 +20939,8 @@ $as_echo_n "checking if \"struct ifaddrs cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ Index: pkgsrc/comms/asterisk15/Makefile diff -u pkgsrc/comms/asterisk15/Makefile:1.16 pkgsrc/comms/asterisk15/Makefile:1.17 --- pkgsrc/comms/asterisk15/Makefile:1.16 Sun Nov 3 12:04:12 2019 +++ pkgsrc/comms/asterisk15/Makefile Sat Dec 21 23:29:04 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2019/11/03 12:04:12 rillig Exp $ +# $NetBSD: Makefile,v 1.17 2019/12/21 23:29:04 joerg Exp $ # # NOTE: when updating this package, there are two places that sound # tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile @@ -292,6 +292,7 @@ post-install: .if ${OPSYS} != "Darwin" && ${PKGSRC_COMPILER} == "clang" .include "../../lang/libBlocksRuntime/buildlink3.mk" +LDFLAGS+= -L${PREFIX}/lib .endif .include "../../databases/sqlite3/buildlink3.mk" Index: pkgsrc/comms/asterisk16/Makefile diff -u pkgsrc/comms/asterisk16/Makefile:1.50 pkgsrc/comms/asterisk16/Makefile:1.51 --- pkgsrc/comms/asterisk16/Makefile:1.50 Sun Nov 24 01:14:10 2019 +++ pkgsrc/comms/asterisk16/Makefile Sat Dec 21 23:29:05 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2019/11/24 01:14:10 gdt Exp $ +# $NetBSD: Makefile,v 1.51 2019/12/21 23:29:05 joerg Exp $ # # NOTE: when updating this package, there are two places that sound # tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile @@ -287,8 +287,9 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/IAX2-security.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} ${INSTALL_DATA} ${WRKSRC}/doc/README.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} -.if ${OPSYS} != "Darwin" && ${PKGSRC_COMPILER:Mclang} +.if ${OPSYS} != "Darwin" && ${PKGSRC_COMPILER} == "clang" .include "../../lang/libBlocksRuntime/buildlink3.mk" +LDFLAGS+= -L${PREFIX}/lib .endif .include "../../databases/sqlite3/buildlink3.mk" Index: pkgsrc/comms/asterisk16/distinfo diff -u pkgsrc/comms/asterisk16/distinfo:1.30 pkgsrc/comms/asterisk16/distinfo:1.31 --- pkgsrc/comms/asterisk16/distinfo:1.30 Tue Aug 20 13:47:42 2019 +++ pkgsrc/comms/asterisk16/distinfo Sat Dec 21 23:29:05 2019 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.30 2019/08/20 13:47:42 ryoon Exp $ +$NetBSD: distinfo,v 1.31 2019/12/21 23:29:05 joerg Exp $ SHA1 (asterisk-16.5.0/asterisk-16.5.0.tar.gz) = 1cddd614029cdbb7ee4321b44d93f855d95e10dc RMD160 (asterisk-16.5.0/asterisk-16.5.0.tar.gz) = a683018660bfb733a785fef569a8a2b7849c28a6 @@ -19,7 +19,7 @@ Size (asterisk-16.5.0/pjproject-2.9.tar. SHA1 (patch-Makefile) = 232cacb5a6ceaa88eaf6f2db126b1899e1bb1be0 SHA1 (patch-build__tools_mkpkgconfig) = 7fab8fcf46d9f8a3b98455674fec6307ec472b23 SHA1 (patch-channels_Makefile) = b32bb8439ae07ed361ab7cb811b4766a27f09ec9 -SHA1 (patch-configure) = ce2a262b048b7bab0d94b99d0334330c2db3ab27 +SHA1 (patch-configure) = b25ac1178eb77a1d0ecb57f5b37813cf1a4ad5c6 SHA1 (patch-configure.ac) = 63a54b310ea38216861206f07116614ddfb90e20 SHA1 (patch-contrib_scripts_vmail.cgi) = 7935ce96ea319eb19cc2ce999813eb837d5357c0 SHA1 (patch-include_asterisk_autoconfig.h.in) = 2f8a986bd3b35ebb384280f0dbf81c32d689ddd2 Index: pkgsrc/comms/asterisk16/patches/patch-configure diff -u pkgsrc/comms/asterisk16/patches/patch-configure:1.1 pkgsrc/comms/asterisk16/patches/patch-configure:1.2 --- pkgsrc/comms/asterisk16/patches/patch-configure:1.1 Tue Aug 20 13:47:42 2019 +++ pkgsrc/comms/asterisk16/patches/patch-configure Sat Dec 21 23:29:05 2019 @@ -1,7 +1,16 @@ -$NetBSD: patch-configure,v 1.1 2019/08/20 13:47:42 ryoon Exp $ +$NetBSD: patch-configure,v 1.2 2019/12/21 23:29:05 joerg Exp $ --- configure.orig 2019-07-25 09:38:14.000000000 +0000 +++ configure +@@ -9120,7 +9120,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 --_----------=_1576970945267210--