Subject: CVS commit: pkgsrc/comms/asterisk18
From: John Nemeth
Date: 2021-06-13 09:57:53
Message id: 20210613075753.B032AFA95@cvs.NetBSD.org
Log Message:
resolve merge conflicts
Files:
RevisionActionfile
1.2modifypkgsrc/comms/asterisk18/patches/patch-Makefile
1.2modifypkgsrc/comms/asterisk18/patches/patch-addons_chan__ooh323.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-apps_app__adsiprog.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-apps_app__chanspy.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-apps_app__directory.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-apps_app__dumpchan.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-apps_app__followme.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-apps_app__minivm.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-apps_app__queue.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-apps_app__sms.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-apps_app__voicemail.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-build__tools_mkpkgconfig
1.2modifypkgsrc/comms/asterisk18/patches/patch-cdr_cdr__pgsql.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-cel_cel__pgsql.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-channels_chan__pjsip.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-channels_chan__sip.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-channels_pjsip_cli__commands.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-channels_pjsip_dialplan__functions.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-configure
1.2modifypkgsrc/comms/asterisk18/patches/patch-configure.ac
1.2modifypkgsrc/comms/asterisk18/patches/patch-contrib_scripts_vmail.cgi
1.2modifypkgsrc/comms/asterisk18/patches/patch-funcs_func__cdr.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-funcs_func__channel.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-funcs_func__env.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-funcs_func__pjsip__aor.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-funcs_func__pjsip__contact.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-funcs_func__pjsip__endpoint.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-funcs_func__strings.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-include_asterisk_autoconfig.h.in
1.2modifypkgsrc/comms/asterisk18/patches/patch-include_asterisk_lock.h
1.2modifypkgsrc/comms/asterisk18/patches/patch-include_asterisk_sha1.h
1.2modifypkgsrc/comms/asterisk18/patches/patch-include_asterisk_strings.h
1.2modifypkgsrc/comms/asterisk18/patches/patch-main_Makefile
1.2modifypkgsrc/comms/asterisk18/patches/patch-main_acl.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-main_app.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-main_ast__expr2.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-main_ast__expr2.y
1.2modifypkgsrc/comms/asterisk18/patches/patch-main_asterisk.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-main_astmm.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-main_bridge__basic.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-main_callerid.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-main_cdr.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-main_cel.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-main_cli.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-main_conversions.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-main_dns__naptr.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-main_enum.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-main_features.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-main_http.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-main_indications.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-main_logger.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-main_manager.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-main_pbx.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-main_pbx__builtins.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-main_pbx__timing.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-main_sched.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-main_stdtime_localtime.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-main_tdd.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-main_test.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-main_utils.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-menuselect_menuselect.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-pbx_pbx__config.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-pbx_pbx__dundi.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-res_ael_pval.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-res_res__calendar.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-res_res__calendar__caldav.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-res_res__calendar__icalendar.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-res_res__hep__pjsip.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-res_res__limit.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-res_res__musiconhold.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-res_res__pjproject.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-res_res__xmpp.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-sounds_Makefile
1.2modifypkgsrc/comms/asterisk18/patches/patch-tests_test__locale.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-tests_test__voicemail__api.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-utils_Makefile
1.2modifypkgsrc/comms/asterisk18/patches/patch-utils_db1-ast_include_db.h
1.2modifypkgsrc/comms/asterisk18/patches/patch-utils_extconf.c
1.2modifypkgsrc/comms/asterisk18/patches/patch-utils_smsq.c
1.3addpkgsrc/comms/asterisk18/DESCR
1.126addpkgsrc/comms/asterisk18/Makefile
1.27addpkgsrc/comms/asterisk18/PLIST
1.64addpkgsrc/comms/asterisk18/distinfo
1.15addpkgsrc/comms/asterisk18/options.mk
1.3addpkgsrc/comms/asterisk18/files/asterisk.sh