Update Freeswitch v1.6.5

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: Update Freeswitch v1.6.5
From: Kethzer Docteur <kethzer.dr%gmail.com@localhost>
Date: Wed, 29 Mar 2017 17:00:04 +0000
Module Name:	pkgsrc-wip
Committed By:	Kethzer Docteur <kethzer.dr%gmail.com@localhost>
Pushed By:	kethzer.dr
Date:		Wed Mar 29 13:00:04 2017 -0400
Changeset:	061fb4a2750281980810efc7a9fbe884dc690ca9

Modified Files:
	freeswitch-core/patches/patch-configure
	freeswitch-core/patches/patch-modules.conf
Added Files:
	freeswitch-core/options.mk
	freeswitch-core/patches/patch-src_mod_asr__tts_mod__flite_mod__flite.c
	freeswitch-core/patches/patch-src_mod_codecs_mod__codec2_mod__codec2.c
	freeswitch-core/patches/patch-src_mod_formats_mod__shout_mod__shout.c
Removed Files:
	freeswitch-core/patches/patch-Makefile.in
	freeswitch-core/patches/patch-build_Makefile.in
	freeswitch-core/patches/patch-build_modules.conf.in
	freeswitch-core/patches/patch-conf_insideout_autoload_configs_modules.conf.xml
	freeswitch-core/patches/patch-conf_vanilla_autoload_configs_modules.conf.xml
	freeswitch-core/patches/patch-configure.in
	freeswitch-core/patches/patch-docs_Doxygen.conf
	freeswitch-core/patches/patch-libs_spandsp_saturated.h
	freeswitch-core/patches/patch-src_Makefile.in
	freeswitch-core/patches/patch-src_mod_Makefile.in
	freeswitch-core/patches/patch-src_mod_applications_mod_expr_Makefile.in
	freeswitch-core/patches/patch-src_mod_applications_mod_hash_Makefile.in
	freeswitch-core/patches/patch-src_mod_applications_mod_osp_Makefile.in
	freeswitch-core/patches/patch-src_mod_applications_mod_spandsp_Makefile.in
	freeswitch-core/patches/patch-src_mod_applications_mod_stress_Makefile.in
	freeswitch-core/patches/patch-src_mod_asr_tts_mod_unimrcp_Makefile.in
	freeswitch-core/patches/patch-src_mod_codecs_mod_com_g729_Makefile.in
	freeswitch-core/patches/patch-src_mod_endpoints_mod_html5_Makefile.in
	freeswitch-core/patches/patch-src_mod_endpoints_mod_portaudio_Makefile.in
	freeswitch-core/patches/patch-src_mod_endpoints_mod_skinny_Makefile.in
	freeswitch-core/patches/patch-src_mod_endpoints_mod_skypopen_Makefile.in
	freeswitch-core/patches/patch-src_mod_endpoints_mod_sofia_Makefile.in
	freeswitch-core/patches/patch-src_mod_formats_mod_portaudio_stream_Makefile.in
	freeswitch-core/patches/patch-src_mod_languages_mod_lua_Makefile.in

Log Message:
 Update Freeswitch v1.6.5

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=061fb4a2750281980810efc7a9fbe884dc690ca9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 freeswitch-core/options.mk                         |  10 ++
 freeswitch-core/patches/patch-Makefile.in          |  84 -----------
 freeswitch-core/patches/patch-build_Makefile.in    |  16 --
 .../patches/patch-build_modules.conf.in            |  14 --
 ...onf_insideout_autoload_configs_modules.conf.xml |  14 --
 ...-conf_vanilla_autoload_configs_modules.conf.xml |  14 --
 freeswitch-core/patches/patch-configure            |  81 +++-------
 freeswitch-core/patches/patch-configure.in         |  43 ------
 freeswitch-core/patches/patch-docs_Doxygen.conf    |  15 --
 .../patches/patch-libs_spandsp_saturated.h         |  15 --
 freeswitch-core/patches/patch-modules.conf         | 167 +++++++++++++++++++--
 freeswitch-core/patches/patch-src_Makefile.in      |  16 --
 freeswitch-core/patches/patch-src_mod_Makefile.in  |  16 --
 ...patch-src_mod_applications_mod_expr_Makefile.in |  25 ---
 ...patch-src_mod_applications_mod_hash_Makefile.in |  25 ---
 .../patch-src_mod_applications_mod_osp_Makefile.in |  25 ---
 ...ch-src_mod_applications_mod_spandsp_Makefile.in |  25 ---
 ...tch-src_mod_applications_mod_stress_Makefile.in |  25 ---
 .../patch-src_mod_asr__tts_mod__flite_mod__flite.c |  13 ++
 .../patch-src_mod_asr_tts_mod_unimrcp_Makefile.in  |  25 ---
 .../patch-src_mod_codecs_mod__codec2_mod__codec2.c |  13 ++
 .../patch-src_mod_codecs_mod_com_g729_Makefile.in  |  16 --
 .../patch-src_mod_endpoints_mod_html5_Makefile.in  |  25 ---
 ...tch-src_mod_endpoints_mod_portaudio_Makefile.in |  25 ---
 .../patch-src_mod_endpoints_mod_skinny_Makefile.in |  25 ---
 ...atch-src_mod_endpoints_mod_skypopen_Makefile.in |  25 ---
 .../patch-src_mod_endpoints_mod_sofia_Makefile.in  |  25 ---
 .../patch-src_mod_formats_mod__shout_mod__shout.c  |  13 ++
 ...rc_mod_formats_mod_portaudio_stream_Makefile.in |  25 ---
 .../patch-src_mod_languages_mod_lua_Makefile.in    |  25 ---
 30 files changed, 230 insertions(+), 655 deletions(-)

diffs:
diff --git a/freeswitch-core/options.mk b/freeswitch-core/options.mk
new file mode 100644
index 0000000000..e24a02cb9d
--- /dev/null
+++ b/freeswitch-core/options.mk
@@ -0,0 +1,10 @@
+# $NetBSD: options.mk,v 1.35 2015/12/10 19:33:41 shattered Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.freeswitch
+PKG_SUPPORTED_OPTIONS=  zrtp	
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Zrtp)
+CONFIGURE_ARGS+=	--enable-system-xmlrpc-c --enable-zrtp	
+.endif
diff --git a/freeswitch-core/patches/patch-Makefile.in b/freeswitch-core/patches/patch-Makefile.in
deleted file mode 100644
index 96a5dad9a7..0000000000
--- a/freeswitch-core/patches/patch-Makefile.in
+++ /dev/null
@@ -1,84 +0,0 @@
-$NetBSD: patch-Makefile.in,v 1.1 2014/08/07 17:40:11 darcycain Exp $
-
-Remove references to xmlrpc-c
-
---- Makefile.in.orig	2013-06-06 12:29:10.000000000 +0000
-+++ Makefile.in
-@@ -83,16 +83,11 @@ subdir = .
- DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- 	$(top_srcdir)/configure $(am__configure_deps) \
- 	$(top_srcdir)/src/include/switch_private.h.in \
--	$(top_srcdir)/libs/xmlrpc-c/xmlrpc_amconfig.h.in \
- 	$(top_srcdir)/src/include/switch_version.h.template \
- 	$(top_srcdir)/src/mod/languages/mod_java/Makefile.in \
- 	$(top_srcdir)/src/mod/languages/mod_python/Makefile.in \
- 	$(top_srcdir)/src/mod/event_handlers/mod_erlang_event/Makefile.in \
- 	$(top_srcdir)/src/include/switch_am_config.h.in \
--	$(top_srcdir)/libs/xmlrpc-c/xmlrpc_config.h.in \
--	$(top_srcdir)/libs/xmlrpc-c/config.mk.in \
--	$(top_srcdir)/libs/xmlrpc-c/srcdir.mk.in \
--	$(top_srcdir)/libs/xmlrpc-c/stamp-h.in \
- 	$(top_srcdir)/scripts/gentls_cert.in \
- 	$(top_srcdir)/build/config/depcomp $(library_include_HEADERS) \
- 	AUTHORS COPYING ChangeLog INSTALL NEWS README \
-@@ -129,15 +124,13 @@ am__configure_deps = $(am__aclocal_m4_de
- am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-  configure.lineno config.status.lineno
- mkinstalldirs = $(install_sh) -d
--CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h \
--	$(top_builddir)/libs/xmlrpc-c/xmlrpc_amconfig.h
-+CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h
- CONFIG_CLEAN_FILES = src/include/switch_version.h.in \
- 	src/mod/languages/mod_java/Makefile \
- 	src/mod/languages/mod_python/Makefile \
- 	src/mod/event_handlers/mod_erlang_event/Makefile \
--	src/include/switch_am_config.h libs/xmlrpc-c/xmlrpc_config.h \
--	libs/xmlrpc-c/config.mk libs/xmlrpc-c/srcdir.mk \
--	libs/xmlrpc-c/stamp-h scripts/gentls_cert
-+	src/include/switch_am_config.h \
-+	scripts/gentls_cert
- CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
-@@ -340,7 +333,7 @@ AM_V_at = $(am__v_at_@AM_V@)
- am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
- am__v_at_0 = @
- am__v_at_1 = 
--DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include -I$(top_builddir)/libs/xmlrpc-c
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
- depcomp = $(SHELL) $(top_srcdir)/build/config/depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
-@@ -906,16 +899,8 @@ $(top_srcdir)/src/include/switch_private
- 	rm -f src/include/stamp-h1
- 	touch $@
- 
--libs/xmlrpc-c/xmlrpc_amconfig.h: libs/xmlrpc-c/stamp-h2
--	@if test ! -f $@; then rm -f libs/xmlrpc-c/stamp-h2; else :; fi
--	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) libs/xmlrpc-c/stamp-h2; else :; fi
--
--libs/xmlrpc-c/stamp-h2: $(top_srcdir)/libs/xmlrpc-c/xmlrpc_amconfig.h.in $(top_builddir)/config.status
--	@rm -f libs/xmlrpc-c/stamp-h2
--	cd $(top_builddir) && $(SHELL) ./config.status libs/xmlrpc-c/xmlrpc_amconfig.h
--
- distclean-hdr:
--	-rm -f src/include/switch_private.h src/include/stamp-h1 libs/xmlrpc-c/xmlrpc_amconfig.h libs/xmlrpc-c/stamp-h2
-+	-rm -f src/include/switch_private.h src/include/stamp-h1
- src/include/switch_version.h.in: $(top_builddir)/config.status $(top_srcdir)/src/include/switch_version.h.template
- 	cd $(top_builddir) && $(SHELL) ./config.status $@
- src/mod/languages/mod_java/Makefile: $(top_builddir)/config.status $(top_srcdir)/src/mod/languages/mod_java/Makefile.in
-@@ -926,14 +911,6 @@ src/mod/event_handlers/mod_erlang_event/
- 	cd $(top_builddir) && $(SHELL) ./config.status $@
- src/include/switch_am_config.h: $(top_builddir)/config.status $(top_srcdir)/src/include/switch_am_config.h.in
- 	cd $(top_builddir) && $(SHELL) ./config.status $@
--libs/xmlrpc-c/xmlrpc_config.h: $(top_builddir)/config.status $(top_srcdir)/libs/xmlrpc-c/xmlrpc_config.h.in
--	cd $(top_builddir) && $(SHELL) ./config.status $@
--libs/xmlrpc-c/config.mk: $(top_builddir)/config.status $(top_srcdir)/libs/xmlrpc-c/config.mk.in
--	cd $(top_builddir) && $(SHELL) ./config.status $@
--libs/xmlrpc-c/srcdir.mk: $(top_builddir)/config.status $(top_srcdir)/libs/xmlrpc-c/srcdir.mk.in
--	cd $(top_builddir) && $(SHELL) ./config.status $@
--libs/xmlrpc-c/stamp-h: $(top_builddir)/config.status $(top_srcdir)/libs/xmlrpc-c/stamp-h.in
--	cd $(top_builddir) && $(SHELL) ./config.status $@
- scripts/gentls_cert: $(top_builddir)/config.status $(top_srcdir)/scripts/gentls_cert.in
- 	cd $(top_builddir) && $(SHELL) ./config.status $@
- 
diff --git a/freeswitch-core/patches/patch-build_Makefile.in b/freeswitch-core/patches/patch-build_Makefile.in
deleted file mode 100644
index 89e4f11adc..0000000000
--- a/freeswitch-core/patches/patch-build_Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-build_Makefile.in,v 1.1 2014/08/07 17:40:11 darcycain Exp $
-
-Remove references to xmlrpc-c
-
---- build/Makefile.in.orig	2012-11-15 15:56:22.000000000 +0000
-+++ build/Makefile.in
-@@ -76,8 +76,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
--CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h \
--	$(top_builddir)/libs/xmlrpc-c/xmlrpc_amconfig.h
-+CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h
- CONFIG_CLEAN_FILES = getsounds.sh getlib.sh getg729.sh freeswitch.pc \
- 	modmake.rules
- CONFIG_CLEAN_VPATH_FILES =
diff --git a/freeswitch-core/patches/patch-build_modules.conf.in b/freeswitch-core/patches/patch-build_modules.conf.in
deleted file mode 100644
index ffe6a9f5e4..0000000000
--- a/freeswitch-core/patches/patch-build_modules.conf.in
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-build_modules.conf.in,v 1.1 2014/08/07 17:40:11 darcycain Exp $
-
-Remove reference to spidermonkey
-
---- build/modules.conf.in.orig	2012-11-15 15:52:29.000000000 +0000
-+++ build/modules.conf.in
-@@ -105,7 +105,6 @@ languages/mod_lua
- #languages/mod_managed
- #languages/mod_perl
- #languages/mod_python
--languages/mod_spidermonkey
- #languages/mod_yaml
- loggers/mod_console
- loggers/mod_logfile
diff --git a/freeswitch-core/patches/patch-conf_insideout_autoload_configs_modules.conf.xml b/freeswitch-core/patches/patch-conf_insideout_autoload_configs_modules.conf.xml
deleted file mode 100644
index 1c0d5a59d5..0000000000
--- a/freeswitch-core/patches/patch-conf_insideout_autoload_configs_modules.conf.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-conf_insideout_autoload_configs_modules.conf.xml,v 1.1 2014/08/07 17:40:11 darcycain Exp $
-
-Remove reference to spidermonkey
-
---- conf/insideout/autoload_configs/modules.conf.xml.orig	2012-11-15 15:52:29.000000000 +0000
-+++ conf/insideout/autoload_configs/modules.conf.xml
-@@ -78,7 +78,6 @@
-     <!-- Timers -->
- 
-     <!-- Languages -->
--    <load module="mod_spidermonkey"/>
-     <!-- <load module="mod_perl"/> -->
-     <!-- <load module="mod_python"/> -->
-     <!-- <load module="mod_java"/> -->
diff --git a/freeswitch-core/patches/patch-conf_vanilla_autoload_configs_modules.conf.xml b/freeswitch-core/patches/patch-conf_vanilla_autoload_configs_modules.conf.xml
deleted file mode 100644
index aeb21dc8ec..0000000000
--- a/freeswitch-core/patches/patch-conf_vanilla_autoload_configs_modules.conf.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-conf_vanilla_autoload_configs_modules.conf.xml,v 1.1 2014/08/07 17:40:11 darcycain Exp $
-
-Remove reference to spidermonkey
-
---- conf/vanilla/autoload_configs/modules.conf.xml.orig	2012-11-15 15:52:29.000000000 +0000
-+++ conf/vanilla/autoload_configs/modules.conf.xml
-@@ -106,7 +106,6 @@
-     <!-- <load module="mod_posix_timer"/> -->
- 
-     <!-- Languages -->
--    <load module="mod_spidermonkey"/>
-     <!-- <load module="mod_perl"/> -->
-     <!-- <load module="mod_python"/> -->
-     <!-- <load module="mod_java"/> -->
diff --git a/freeswitch-core/patches/patch-configure b/freeswitch-core/patches/patch-configure
index 8754d9f29f..af4feedf5b 100644
--- a/freeswitch-core/patches/patch-configure
+++ b/freeswitch-core/patches/patch-configure
@@ -1,61 +1,30 @@
-$NetBSD: patch-configure,v 1.1 2014/08/07 17:40:11 darcycain Exp $
+$NetBSD$
 
-Remove references to xmlrpc-c and spidermonkey
-
---- configure.orig	2012-11-15 15:56:19.000000000 +0000
+--- configure.orig	2016-01-11 23:52:15.000000000 +0000
 +++ configure
-@@ -3586,8 +3586,6 @@ am__tar='$${TAR-tar} chof - "$$tardir"' 
- 
- ac_config_headers="$ac_config_headers src/include/switch_private.h"
- 
--ac_config_headers="$ac_config_headers libs/xmlrpc-c/xmlrpc_amconfig.h"
--
- 
- 
- # AC_PREFIX_DEFAULT does not get expanded until too late so we need to do this to use prefix in this script
-@@ -20146,9 +20144,6 @@ then
- $as_echo "#define USE_SCHED_SETSCHEDULER 1" >>confdefs.h
- 
- fi
--#
--# xmlrpc-c checks
--#
- 
- for ac_func in setenv strtoll strtoull strtoq strtouq __strtoll __strtoull
- do :
-@@ -22880,7 +22875,7 @@ fi
- 
- 
- 
--ac_config_files="$ac_config_files Makefile build/Makefile src/Makefile src/mod/Makefile src/mod/applications/mod_expr/Makefile src/mod/applications/mod_spandsp/Makefile src/mod/applications/mod_osp/Makefile src/mod/applications/mod_stress/Makefile src/mod/applications/mod_hash/Makefile src/mod/codecs/mod_com_g729/Makefile src/mod/endpoints/mod_html5/Makefile src/mod/endpoints/mod_portaudio/Makefile src/mod/endpoints/mod_skinny/Makefile src/mod/endpoints/mod_skypopen/Makefile src/mod/endpoints/mod_sofia/Makefile src/mod/formats/mod_portaudio_stream/Makefile src/mod/asr_tts/mod_unimrcp/Makefile src/mod/languages/mod_java/Makefile src/mod/languages/mod_lua/Makefile src/mod/languages/mod_python/Makefile src/mod/languages/mod_spidermonkey/Makefile src/mod/event_handlers/mod_erlang_event/Makefile src/include/switch_am_config.h build/getsounds.sh build/getlib.sh build/getg729.sh build/freeswitch.pc build/modmake.rules libs/xmlrpc-c/xmlrpc_config.h libs/xmlrpc-c/config.mk libs/xmlr
pc-c/srcdir.mk libs/xmlrpc-c/stamp-h scripts/gentls_cert"
-+ac_config_files="$ac_config_files Makefile build/Makefile src/Makefile src/mod/Makefile src/mod/applications/mod_expr/Makefile src/mod/applications/mod_spandsp/Makefile src/mod/applications/mod_osp/Makefile src/mod/applications/mod_stress/Makefile src/mod/applications/mod_hash/Makefile src/mod/codecs/mod_com_g729/Makefile src/mod/endpoints/mod_html5/Makefile src/mod/endpoints/mod_portaudio/Makefile src/mod/endpoints/mod_skinny/Makefile src/mod/endpoints/mod_skypopen/Makefile src/mod/endpoints/mod_sofia/Makefile src/mod/formats/mod_portaudio_stream/Makefile src/mod/asr_tts/mod_unimrcp/Makefile src/mod/languages/mod_java/Makefile src/mod/languages/mod_lua/Makefile src/mod/languages/mod_python/Makefile src/mod/event_handlers/mod_erlang_event/Makefile src/include/switch_am_config.h build/getsounds.sh build/getlib.sh build/getg729.sh build/freeswitch.pc build/modmake.rules scripts/gentls_cert"
+@@ -1299,8 +1299,6 @@ CCC
+ CPP
+ CXXCPP'
+ ac_subdirs_all='libs/srtp
+-libs/apr
+-libs/apr-util
+ libs/iksemel
+ libs/libdingaling
+ libs/sofia-sip
+@@ -37732,7 +37730,7 @@ fi
+ # we never use this, and hard setting it will make cross compile work better
+ ac_cv_file_dbd_apr_dbd_mysql_c=no
+ 
+-ac_config_files="$ac_config_files Makefile build/Makefile src/Makefile src/mod/Makefile src/mod/applications/mod_abstraction/Makefile src/mod/applications/mod_avmd/Makefile src/mod/applications/mod_bert/Makefile src/mod/applications/mod_blacklist/Makefile src/mod/applications/mod_callcenter/Makefile src/mod/applications/mod_cidlookup/Makefile src/mod/applications/mod_cluechoo/Makefile src/mod/applications/mod_commands/Makefile src/mod/applications/mod_conference/Makefile src/mod/applications/mod_curl/Makefile src/mod/applications/mod_cv/Makefile src/mod/applications/mod_db/Makefile src/mod/applications/mod_directory/Makefile src/mod/applications/mod_distributor/Makefile src/mod/applications/mod_dptools/Makefile src/mod/applications/mod_easyroute/Makefile src/mod/applications/mod_enum/Makefile src/mod/applications/mod_esf/Makefile src/mod/applications/mod_esl/Makefile src/mod/applications/mod_expr/Makefile src/mod/applications/mod_fifo/Makefile src/mod/applications/mod_fsk/M
akefile src/mod/applications/mod_fsv/Makefile src/mod/applications/mod_hash/Makefile src/mod/applications/mod_hiredis/Makefile src/mod/applications/mod_httapi/Makefile src/mod/applications/mod_http_cache/Makefile src/mod/applications/mod_ladspa/Makefile src/mod/applications/mod_lcr/Makefile src/mod/applications/mod_limit/Makefile src/mod/applications/mod_memcache/Makefile src/mod/applications/mod_mongo/Makefile src/mod/applications/mod_mp4/Makefile src/mod/applications/mod_mp4v2/Makefile src/mod/applications/mod_nibblebill/Makefile src/mod/applications/mod_oreka/Makefile src/mod/applications/mod_osp/Makefile src/mod/applications/mod_prefix/Makefile src/mod/applications/mod_rad_auth/Makefile src/mod/applications/mod_random/Makefile src/mod/applications/mod_redis/Makefile src/mod/applications/mod_rss/Makefile src/mod/applications/mod_skel/Makefile src/mod/applications/mod_sms/Makefile src/mod/applications/mod_snapshot/Makefile src/mod/applications/mod_snom/Makefile src/mod/applications
 /mod_sonar/Makefile src/mod/applications/mod_soundtouch/Makefile src/mod/applications/mod_spandsp/Makefile src/mod/applications/mod_spy/Makefile src/mod/applications/mod_stress/Makefile src/mod/applications/mod_translate/Makefile src/mod/applications/mod_valet_parking/Makefile src/mod/applications/mod_vmd/Makefile src/mod/applications/mod_voicemail/Makefile src/mod/applications/mod_voicemail_ivr/Makefile src/mod/asr_tts/mod_cepstral/Makefile src/mod/asr_tts/mod_flite/Makefile src/mod/asr_tts/mod_pocketsphinx/Makefile src/mod/asr_tts/mod_tts_commandline/Makefile src/mod/asr_tts/mod_unimrcp/Makefile src/mod/codecs/mod_amr/Makefile src/mod/codecs/mod_amrwb/Makefile src/mod/codecs/mod_b64/Makefile src/mod/codecs/mod_bv/Makefile src/mod/codecs/mod_codec2/Makefile src/mod/codecs/mod_com_g729/Makefile src/mod/codecs/mod_dahdi_codec/Makefile src/mod/codecs/mod_g723_1/Makefile src/mod/codecs/mod_g729/Makefile src/mod/codecs/mod_h26x/Makefile src/mod/codecs/mod_ilbc/Makefile src/mod/codecs/mo
 d_isac/Makefile src/mod/codecs/mod_mp4v/Makefile src/mod/codecs/mod_opus/Makefile src/mod/codecs/mod_openh264/Makefile src/mod/codecs/mod_sangoma_codec/Makefile src/mod/codecs/mod_silk/Makefile src/mod/codecs/mod_siren/Makefile src/mod/codecs/mod_skel_codec/Makefile src/mod/codecs/mod_theora/Makefile src/mod/codecs/mod_vpx/Makefile src/mod/dialplans/mod_dialplan_asterisk/Makefile src/mod/dialplans/mod_dialplan_directory/Makefile src/mod/dialplans/mod_dialplan_xml/Makefile src/mod/directories/mod_ldap/Makefile src/mod/endpoints/mod_alsa/Makefile src/mod/endpoints/mod_dingaling/Makefile src/mod/endpoints/mod_gsmopen/Makefile src/mod/endpoints/mod_h323/Makefile src/mod/endpoints/mod_khomp/Makefile src/mod/endpoints/mod_loopback/Makefile src/mod/endpoints/mod_opal/Makefile src/mod/endpoints/mod_portaudio/Makefile src/mod/endpoints/mod_reference/Makefile src/mod/endpoints/mod_rtmp/Makefile src/mod/endpoints/mod_skinny/Makefile src/mod/endpoints/mod_skypopen/Makefile src/mod/endpoints/mod
 _sofia/Makefile src/mod/endpoints/mod_unicall/Makefile src/mod/endpoints/mod_rtc/Makefile src/mod/endpoints/mod_verto/Makefile src/mod/event_handlers/mod_amqp/Makefile src/mod/event_handlers/mod_cdr_csv/Makefile src/mod/event_handlers/mod_cdr_mongodb/Makefile src/mod/event_handlers/mod_cdr_pg_csv/Makefile src/mod/event_handlers/mod_cdr_sqlite/Makefile src/mod/event_handlers/mod_erlang_event/Makefile src/mod/event_handlers/mod_event_multicast/Makefile src/mod/event_handlers/mod_event_socket/Makefile src/mod/event_handlers/mod_event_test/Makefile src/mod/event_handlers/mod_format_cdr/Makefile src/mod/event_handlers/mod_json_cdr/Makefile src/mod/event_handlers/mod_kazoo/Makefile src/mod/event_handlers/mod_radius_cdr/Makefile src/mod/event_handlers/mod_odbc_cdr/Makefile src/mod/event_handlers/mod_rayo/Makefile src/mod/event_handlers/mod_smpp/Makefile src/mod/event_handlers/mod_snmp/Makefile src/mod/event_handlers/mod_event_zmq/Makefile src/mod/formats/mod_imagick/Makefile src/mod/format
 s/mod_local_stream/Makefile src/mod/formats/mod_native_file/Makefile src/mod/formats/mod_shell_stream/Makefile src/mod/formats/mod_shout/Makefile src/mod/formats/mod_sndfile/Makefile src/mod/formats/mod_ssml/Makefile src/mod/formats/mod_tone_stream/Makefile src/mod/formats/mod_vlc/Makefile src/mod/formats/mod_portaudio_stream/Makefile src/mod/languages/mod_java/Makefile src/mod/languages/mod_lua/Makefile src/mod/languages/mod_managed/Makefile src/mod/languages/mod_perl/Makefile src/mod/languages/mod_python/Makefile src/mod/languages/mod_v8/Makefile src/mod/languages/mod_yaml/Makefile src/mod/languages/mod_basic/Makefile src/mod/loggers/mod_console/Makefile src/mod/loggers/mod_graylog2/Makefile src/mod/loggers/mod_logfile/Makefile src/mod/loggers/mod_syslog/Makefile src/mod/say/mod_say_de/Makefile src/mod/say/mod_say_en/Makefile src/mod/say/mod_say_es/Makefile src/mod/say/mod_say_es_ar/Makefile src/mod/say/mod_say_fa/Makefile src/mod/say/mod_say_fr/Makefile src/mod/say/mod_say_he/Mak
 efile src/mod/say/mod_say_hr/Makefile src/mod/say/mod_say_hu/Makefile src/mod/say/mod_say_it/Makefile src/mod/say/mod_say_ja/Makefile src/mod/say/mod_say_nl/Makefile src/mod/say/mod_say_pl/Makefile src/mod/say/mod_say_pt/Makefile src/mod/say/mod_say_ru/Makefile src/mod/say/mod_say_sv/Makefile src/mod/say/mod_say_th/Makefile src/mod/say/mod_say_zh/Makefile src/mod/timers/mod_posix_timer/Makefile src/mod/timers/mod_timerfd/Makefile src/mod/xml_int/mod_xml_cdr/Makefile src/mod/xml_int/mod_xml_curl/Makefile src/mod/xml_int/mod_xml_ldap/Makefile src/mod/xml_int/mod_xml_radius/Makefile src/mod/xml_int/mod_xml_rpc/Makefile src/mod/xml_int/mod_xml_scgi/Makefile src/mod/applications/mod_av/Makefile src/include/switch_am_config.h build/getsounds.sh build/getlib.sh build/getg729.sh build/freeswitch.pc build/modmake.rules libs/esl/Makefile libs/esl/perl/Makefile libs/esl/php/Makefile libs/xmlrpc-c/include/xmlrpc-c/config.h libs/xmlrpc-c/xmlrpc_config.h libs/xmlrpc-c/config.mk libs/xmlrpc-c/srcd
 ir.mk libs/xmlrpc-c/stamp-h scripts/gentls_cert"
++ac_config_files="$ac_config_files Makefile build/Makefile src/Makefile src/mod/Makefile src/mod/applications/mod_abstraction/Makefile src/mod/applications/mod_avmd/Makefile src/mod/applications/mod_bert/Makefile src/mod/applications/mod_blacklist/Makefile src/mod/applications/mod_callcenter/Makefile src/mod/applications/mod_cidlookup/Makefile src/mod/applications/mod_cluechoo/Makefile src/mod/applications/mod_commands/Makefile src/mod/applications/mod_conference/Makefile src/mod/applications/mod_curl/Makefile src/mod/applications/mod_cv/Makefile src/mod/applications/mod_db/Makefile src/mod/applications/mod_directory/Makefile src/mod/applications/mod_distributor/Makefile src/mod/applications/mod_dptools/Makefile src/mod/applications/mod_easyroute/Makefile src/mod/applications/mod_enum/Makefile src/mod/applications/mod_esf/Makefile src/mod/applications/mod_esl/Makefile src/mod/applications/mod_expr/Makefile src/mod/applications/mod_fifo/Makefile src/mod/applications/mod_fsk/M
akefile src/mod/applications/mod_hash/Makefile src/mod/applications/mod_hiredis/Makefile src/mod/applications/mod_httapi/Makefile src/mod/applications/mod_http_cache/Makefile src/mod/applications/mod_ladspa/Makefile src/mod/applications/mod_lcr/Makefile src/mod/applications/mod_limit/Makefile src/mod/applications/mod_memcache/Makefile src/mod/applications/mod_mongo/Makefile src/mod/applications/mod_mp4/Makefile src/mod/applications/mod_mp4v2/Makefile src/mod/applications/mod_nibblebill/Makefile src/mod/applications/mod_oreka/Makefile src/mod/applications/mod_osp/Makefile src/mod/applications/mod_prefix/Makefile src/mod/applications/mod_rad_auth/Makefile src/mod/applications/mod_random/Makefile src/mod/applications/mod_redis/Makefile src/mod/applications/mod_rss/Makefile src/mod/applications/mod_skel/Makefile src/mod/applications/mod_sms/Makefile src/mod/applications/mod_snapshot/Makefile src/mod/applications/mod_snom/Makefile src/mod/applications/mod_sonar/Makefile src/mod/applicatio
 ns/mod_soundtouch/Makefile src/mod/applications/mod_spandsp/Makefile src/mod/applications/mod_spy/Makefile src/mod/applications/mod_stress/Makefile src/mod/applications/mod_translate/Makefile src/mod/applications/mod_valet_parking/Makefile src/mod/applications/mod_vmd/Makefile src/mod/applications/mod_voicemail/Makefile src/mod/applications/mod_voicemail_ivr/Makefile src/mod/asr_tts/mod_cepstral/Makefile src/mod/asr_tts/mod_flite/Makefile src/mod/asr_tts/mod_pocketsphinx/Makefile src/mod/asr_tts/mod_tts_commandline/Makefile src/mod/asr_tts/mod_unimrcp/Makefile src/mod/codecs/mod_amr/Makefile src/mod/codecs/mod_amrwb/Makefile src/mod/codecs/mod_b64/Makefile src/mod/codecs/mod_bv/Makefile src/mod/codecs/mod_codec2/Makefile src/mod/codecs/mod_com_g729/Makefile src/mod/codecs/mod_dahdi_codec/Makefile src/mod/codecs/mod_g723_1/Makefile src/mod/codecs/mod_g729/Makefile src/mod/codecs/mod_h26x/Makefile src/mod/codecs/mod_ilbc/Makefile src/mod/codecs/mod_isac/Makefile src/mod/codecs/mod_mp4
 v/Makefile src/mod/codecs/mod_opus/Makefile src/mod/codecs/mod_openh264/Makefile src/mod/codecs/mod_sangoma_codec/Makefile src/mod/codecs/mod_silk/Makefile src/mod/codecs/mod_siren/Makefile src/mod/codecs/mod_skel_codec/Makefile src/mod/codecs/mod_theora/Makefile src/mod/codecs/mod_vpx/Makefile src/mod/dialplans/mod_dialplan_asterisk/Makefile src/mod/dialplans/mod_dialplan_directory/Makefile src/mod/dialplans/mod_dialplan_xml/Makefile src/mod/directories/mod_ldap/Makefile src/mod/endpoints/mod_alsa/Makefile src/mod/endpoints/mod_dingaling/Makefile src/mod/endpoints/mod_gsmopen/Makefile src/mod/endpoints/mod_h323/Makefile src/mod/endpoints/mod_khomp/Makefile src/mod/endpoints/mod_loopback/Makefile src/mod/endpoints/mod_opal/Makefile src/mod/endpoints/mod_portaudio/Makefile src/mod/endpoints/mod_reference/Makefile src/mod/endpoints/mod_rtmp/Makefile src/mod/endpoints/mod_skinny/Makefile src/mod/endpoints/mod_skypopen/Makefile src/mod/endpoints/mod_sofia/Makefile src/mod/endpoints/mod_
 unicall/Makefile src/mod/endpoints/mod_rtc/Makefile src/mod/endpoints/mod_verto/Makefile src/mod/event_handlers/mod_amqp/Makefile src/mod/event_handlers/mod_cdr_csv/Makefile src/mod/event_handlers/mod_cdr_mongodb/Makefile src/mod/event_handlers/mod_cdr_pg_csv/Makefile src/mod/event_handlers/mod_cdr_sqlite/Makefile src/mod/event_handlers/mod_erlang_event/Makefile src/mod/event_handlers/mod_event_multicast/Makefile src/mod/event_handlers/mod_event_socket/Makefile src/mod/event_handlers/mod_event_test/Makefile src/mod/event_handlers/mod_format_cdr/Makefile src/mod/event_handlers/mod_json_cdr/Makefile src/mod/event_handlers/mod_kazoo/Makefile src/mod/event_handlers/mod_radius_cdr/Makefile src/mod/event_handlers/mod_odbc_cdr/Makefile src/mod/event_handlers/mod_rayo/Makefile src/mod/event_handlers/mod_smpp/Makefile src/mod/event_handlers/mod_snmp/Makefile src/mod/event_handlers/mod_event_zmq/Makefile src/mod/formats/mod_imagick/Makefile src/mod/formats/mod_local_stream/Makefile src/mod/fo
 rmats/mod_native_file/Makefile src/mod/formats/mod_shell_stream/Makefile src/mod/formats/mod_shout/Makefile src/mod/formats/mod_sndfile/Makefile src/mod/formats/mod_ssml/Makefile src/mod/formats/mod_tone_stream/Makefile src/mod/formats/mod_vlc/Makefile src/mod/formats/mod_portaudio_stream/Makefile src/mod/languages/mod_java/Makefile src/mod/languages/mod_lua/Makefile src/mod/languages/mod_managed/Makefile src/mod/languages/mod_perl/Makefile src/mod/languages/mod_python/Makefile src/mod/languages/mod_v8/Makefile src/mod/languages/mod_yaml/Makefile src/mod/languages/mod_basic/Makefile src/mod/loggers/mod_console/Makefile src/mod/loggers/mod_graylog2/Makefile src/mod/loggers/mod_logfile/Makefile src/mod/loggers/mod_syslog/Makefile src/mod/say/mod_say_de/Makefile src/mod/say/mod_say_en/Makefile src/mod/say/mod_say_es/Makefile src/mod/say/mod_say_es_ar/Makefile src/mod/say/mod_say_fa/Makefile src/mod/say/mod_say_fr/Makefile src/mod/say/mod_say_he/Makefile src/mod/say/mod_say_hr/Makefile 
 src/mod/say/mod_say_hu/Makefile src/mod/say/mod_say_it/Makefile src/mod/say/mod_say_ja/Makefile src/mod/say/mod_say_nl/Makefile src/mod/say/mod_say_pl/Makefile src/mod/say/mod_say_pt/Makefile src/mod/say/mod_say_ru/Makefile src/mod/say/mod_say_sv/Makefile src/mod/say/mod_say_th/Makefile src/mod/say/mod_say_zh/Makefile src/mod/timers/mod_posix_timer/Makefile src/mod/timers/mod_timerfd/Makefile src/mod/xml_int/mod_xml_cdr/Makefile src/mod/xml_int/mod_xml_curl/Makefile src/mod/xml_int/mod_xml_ldap/Makefile src/mod/xml_int/mod_xml_radius/Makefile src/mod/xml_int/mod_xml_rpc/Makefile src/mod/xml_int/mod_xml_scgi/Makefile src/mod/applications/mod_av/Makefile src/include/switch_am_config.h build/getsounds.sh build/getlib.sh build/getg729.sh build/freeswitch.pc build/modmake.rules libs/esl/Makefile libs/esl/perl/Makefile libs/esl/php/Makefile libs/xmlrpc-c/include/xmlrpc-c/config.h libs/xmlrpc-c/xmlrpc_config.h libs/xmlrpc-c/config.mk libs/xmlrpc-c/srcdir.mk libs/xmlrpc-c/stamp-h scripts/ge
 ntls_cert"
  
  
   if test `uname -s` = Linux; then
-@@ -24160,7 +24155,6 @@ do
-   case $ac_config_target in
-     "src/include/switch_version.h.in") CONFIG_FILES="$CONFIG_FILES src/include/switch_version.h.in:src/include/switch_version.h.template" ;;
-     "src/include/switch_private.h") CONFIG_HEADERS="$CONFIG_HEADERS src/include/switch_private.h" ;;
--    "libs/xmlrpc-c/xmlrpc_amconfig.h") CONFIG_HEADERS="$CONFIG_HEADERS libs/xmlrpc-c/xmlrpc_amconfig.h" ;;
-     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
-     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-@@ -24183,7 +24177,6 @@ do
-     "src/mod/languages/mod_java/Makefile") CONFIG_FILES="$CONFIG_FILES src/mod/languages/mod_java/Makefile" ;;
-     "src/mod/languages/mod_lua/Makefile") CONFIG_FILES="$CONFIG_FILES src/mod/languages/mod_lua/Makefile" ;;
-     "src/mod/languages/mod_python/Makefile") CONFIG_FILES="$CONFIG_FILES src/mod/languages/mod_python/Makefile" ;;
--    "src/mod/languages/mod_spidermonkey/Makefile") CONFIG_FILES="$CONFIG_FILES src/mod/languages/mod_spidermonkey/Makefile" ;;
-     "src/mod/event_handlers/mod_erlang_event/Makefile") CONFIG_FILES="$CONFIG_FILES src/mod/event_handlers/mod_erlang_event/Makefile" ;;
-     "src/include/switch_am_config.h") CONFIG_FILES="$CONFIG_FILES src/include/switch_am_config.h" ;;
-     "build/getsounds.sh") CONFIG_FILES="$CONFIG_FILES build/getsounds.sh" ;;
-@@ -24191,10 +24184,6 @@ do
-     "build/getg729.sh") CONFIG_FILES="$CONFIG_FILES build/getg729.sh" ;;
-     "build/freeswitch.pc") CONFIG_FILES="$CONFIG_FILES build/freeswitch.pc" ;;
-     "build/modmake.rules") CONFIG_FILES="$CONFIG_FILES build/modmake.rules" ;;
--    "libs/xmlrpc-c/xmlrpc_config.h") CONFIG_FILES="$CONFIG_FILES libs/xmlrpc-c/xmlrpc_config.h" ;;
--    "libs/xmlrpc-c/config.mk") CONFIG_FILES="$CONFIG_FILES libs/xmlrpc-c/config.mk" ;;
--    "libs/xmlrpc-c/srcdir.mk") CONFIG_FILES="$CONFIG_FILES libs/xmlrpc-c/srcdir.mk" ;;
--    "libs/xmlrpc-c/stamp-h") CONFIG_FILES="$CONFIG_FILES libs/xmlrpc-c/stamp-h" ;;
-     "scripts/gentls_cert") CONFIG_FILES="$CONFIG_FILES scripts/gentls_cert" ;;
-     "hacklibtool") CONFIG_COMMANDS="$CONFIG_COMMANDS hacklibtool" ;;
- 
+@@ -39646,7 +39644,6 @@ do
+     "src/mod/applications/mod_expr/Makefile") CONFIG_FILES="$CONFIG_FILES src/mod/applications/mod_expr/Makefile" ;;
+     "src/mod/applications/mod_fifo/Makefile") CONFIG_FILES="$CONFIG_FILES src/mod/applications/mod_fifo/Makefile" ;;
+     "src/mod/applications/mod_fsk/Makefile") CONFIG_FILES="$CONFIG_FILES src/mod/applications/mod_fsk/Makefile" ;;
+-    "src/mod/applications/mod_fsv/Makefile") CONFIG_FILES="$CONFIG_FILES src/mod/applications/mod_fsv/Makefile" ;;
+     "src/mod/applications/mod_hash/Makefile") CONFIG_FILES="$CONFIG_FILES src/mod/applications/mod_hash/Makefile" ;;
+     "src/mod/applications/mod_hiredis/Makefile") CONFIG_FILES="$CONFIG_FILES src/mod/applications/mod_hiredis/Makefile" ;;
+     "src/mod/applications/mod_httapi/Makefile") CONFIG_FILES="$CONFIG_FILES src/mod/applications/mod_httapi/Makefile" ;;
diff --git a/freeswitch-core/patches/patch-configure.in b/freeswitch-core/patches/patch-configure.in
deleted file mode 100644
index 26adb758af..0000000000
--- a/freeswitch-core/patches/patch-configure.in
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-configure.in,v 1.1 2014/08/07 17:40:11 darcycain Exp $
-
-Remove references to xmlrpc-c and spidermonkey
-
---- configure.in.orig	2012-11-15 15:52:39.000000000 +0000
-+++ configure.in
-@@ -16,7 +16,6 @@ AC_CONFIG_AUX_DIR(build/config)
- AM_INIT_AUTOMAKE(libfreeswitch,0.1)
- AC_CONFIG_SRCDIR([src/switch.c])
- AC_CONFIG_HEADER([src/include/switch_private.h])
--AC_CONFIG_HEADER([libs/xmlrpc-c/xmlrpc_amconfig.h])
- 
- AC_PREFIX_DEFAULT(/usr/local/freeswitch)
- # AC_PREFIX_DEFAULT does not get expanded until too late so we need to do this to use prefix in this script
-@@ -650,9 +649,6 @@ if test "x${ac_cv_func_sched_setschedule
- then
- 	AC_DEFINE([USE_SCHED_SETSCHEDULER],[1],[Enable round-robin scheduler using sched_setscheduler])
- fi
--#
--# xmlrpc-c checks
--#
- 
- AC_CHECK_FUNCS(setenv strtoll strtoull strtoq strtouq __strtoll __strtoull)
- 
-@@ -1093,7 +1089,6 @@ AC_CONFIG_FILES([Makefile
- 		src/mod/languages/mod_java/Makefile
- 		src/mod/languages/mod_lua/Makefile
- 		src/mod/languages/mod_python/Makefile
--		src/mod/languages/mod_spidermonkey/Makefile
- 		src/mod/event_handlers/mod_erlang_event/Makefile
- 		src/include/switch_am_config.h
- 		build/getsounds.sh
-@@ -1101,10 +1096,6 @@ AC_CONFIG_FILES([Makefile
- 		build/getg729.sh
- 		build/freeswitch.pc
- 		build/modmake.rules
--		libs/xmlrpc-c/xmlrpc_config.h
--		libs/xmlrpc-c/config.mk
--		libs/xmlrpc-c/srcdir.mk
--		libs/xmlrpc-c/stamp-h
- 		scripts/gentls_cert])
- 
- AM_CONDITIONAL(ISLINUX, [test `uname -s` = Linux])
diff --git a/freeswitch-core/patches/patch-docs_Doxygen.conf b/freeswitch-core/patches/patch-docs_Doxygen.conf
deleted file mode 100644
index 261e2f30f9..0000000000
--- a/freeswitch-core/patches/patch-docs_Doxygen.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-docs_Doxygen.conf,v 1.1 2014/08/07 17:40:11 darcycain Exp $
-
-Remove reference to xmlrpc-c.
-
---- docs/Doxygen.conf.orig	2012-11-15 15:52:29.000000000 +0000
-+++ docs/Doxygen.conf
-@@ -1248,7 +1248,7 @@ INCLUDE_PATH           =../libs/apr ../l
- 			../libs/speex ../libs/sqlite ../libs/srtp \
- 			../libs/stfu ../libs/tiff-4.0.2 ../libs/udns \
- 			../libs/unimrcp ../libs/voipcodecs ../libs/win32 \
--			../libs/xmlrpc-c ../libs/yaml 
-+			../libs/yaml 
- 
- # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
- # patterns (like *.h and *.hpp) to filter out the header-files in the
diff --git a/freeswitch-core/patches/patch-libs_spandsp_saturated.h b/freeswitch-core/patches/patch-libs_spandsp_saturated.h
deleted file mode 100644
index 7479d4a777..0000000000
--- a/freeswitch-core/patches/patch-libs_spandsp_saturated.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-libs_spandsp_saturated.h,v 1.1 2014/08/07 17:40:11 darcycain Exp $
-
-- Horrible kludge
-
---- libs/spandsp/src/spandsp/saturated.h.orig	2012-09-19 14:44:54.000000000 +0000
-+++ libs/spandsp/src/spandsp/saturated.h
-@@ -37,6 +37,8 @@
- 
- */
- 
-+long long lrintl(long double);
-+
- #if defined(__cplusplus)
- extern "C"
- {
diff --git a/freeswitch-core/patches/patch-modules.conf b/freeswitch-core/patches/patch-modules.conf
index 20cbe6edb2..1dcb4fc31c 100644
--- a/freeswitch-core/patches/patch-modules.conf
+++ b/freeswitch-core/patches/patch-modules.conf
@@ -1,14 +1,159 @@
-$NetBSD: patch-modules.conf,v 1.1 2014/08/07 17:40:11 darcycain Exp $
+$NetBSD$
 
-Remove reference to spidermonkey
-
---- modules.conf.orig	2012-11-15 15:52:39.000000000 +0000
+--- modules.conf.orig	2016-01-11 23:51:13.000000000 +0000
 +++ modules.conf
-@@ -105,7 +105,6 @@ languages/mod_lua
+@@ -1,23 +1,23 @@
+-#applications/mod_abstraction
++applications/mod_abstraction
+ #applications/mod_av
+ #applications/mod_avmd
+ #applications/mod_bert
+-#applications/mod_blacklist
+-#applications/mod_callcenter
+-#applications/mod_cidlookup
++applications/mod_blacklist
++applications/mod_callcenter
++applications/mod_cidlookup
+ #applications/mod_cluechoo
+ applications/mod_commands
+ applications/mod_conference
+-#applications/mod_curl
++applications/mod_curl
+ #applications/mod_cv
+ applications/mod_db
+-#applications/mod_directory
+-#applications/mod_distributor
++applications/mod_directory
++applications/mod_distributor
+ applications/mod_dptools
+-#applications/mod_easyroute
++applications/mod_easyroute
+ applications/mod_enum
+ applications/mod_esf
+-#applications/mod_esl
++applications/mod_esl
+ applications/mod_expr
+ applications/mod_fifo
+ #applications/mod_fsk
+@@ -25,17 +25,17 @@ applications/mod_fsv
+ applications/mod_hash
+ #applications/mod_hiredis
+ applications/mod_httapi
+-#applications/mod_http_cache
++applications/mod_http_cache
+ #applications/mod_ladspa
+ #applications/mod_lcr
+-#applications/mod_memcache
++applications/mod_memcache
+ #applications/mod_mongo
+ #applications/mod_mp4
+ #applications/mod_mp4v2
+ #applications/mod_nibblebill
+ #applications/mod_oreka
+ #applications/mod_osp
+-#applications/mod_prefix
++applications/mod_prefix
+ #applications/mod_rad_auth
+ #applications/mod_redis
+ #applications/mod_rss
+@@ -51,37 +51,37 @@ applications/mod_spandsp
+ applications/mod_valet_parking
+ #applications/mod_vmd
+ applications/mod_voicemail
+-#applications/mod_voicemail_ivr
++applications/mod_voicemail_ivr
+ #asr_tts/mod_cepstral
+ #asr_tts/mod_flite
+-#asr_tts/mod_pocketsphinx
+-#asr_tts/mod_tts_commandline
++asr_tts/mod_pocketsphinx
++asr_tts/mod_tts_commandline
+ #asr_tts/mod_unimrcp
+ codecs/mod_amr
+-#codecs/mod_amrwb
++codecs/mod_amrwb
+ codecs/mod_b64
+ #codecs/mod_bv
+ #codecs/mod_codec2
+ #codecs/mod_com_g729
+-#codecs/mod_dahdi_codec
++codecs/mod_dahdi_codec
+ codecs/mod_g723_1
+ codecs/mod_g729
+ codecs/mod_h26x
+ #codecs/mod_ilbc
+-#codecs/mod_isac
++codecs/mod_isac
+ #codecs/mod_mp4v
+ codecs/mod_opus
+ #codecs/mod_sangoma_codec
+ #codecs/mod_silk
+ #codecs/mod_siren
+-#codecs/mod_theora
++codecs/mod_theora
+ codecs/mod_vpx
+ dialplans/mod_dialplan_asterisk
+-#dialplans/mod_dialplan_directory
++dialplans/mod_dialplan_directory
+ dialplans/mod_dialplan_xml
+ #directories/mod_ldap
+ #endpoints/mod_alsa
+-#endpoints/mod_dingaling
++endpoints/mod_dingaling
+ #endpoints/mod_gsmopen
+ #endpoints/mod_h323
+ #endpoints/mod_khomp
+@@ -89,21 +89,21 @@ endpoints/mod_loopback
+ #endpoints/mod_opal
+ #endpoints/mod_portaudio
+ endpoints/mod_rtc
+-#endpoints/mod_rtmp
++endpoints/mod_rtmp
+ endpoints/mod_skinny
+-#endpoints/mod_skypopen
++endpoints/mod_skypopen
+ endpoints/mod_sofia
+ endpoints/mod_verto
+ #event_handlers/mod_amqp
+ event_handlers/mod_cdr_csv
+ #event_handlers/mod_cdr_mongodb
+-#event_handlers/mod_cdr_pg_csv
++event_handlers/mod_cdr_pg_csv
+ event_handlers/mod_cdr_sqlite
+ #event_handlers/mod_erlang_event
+ #event_handlers/mod_event_multicast
+ event_handlers/mod_event_socket
+ #event_handlers/mod_format_cdr
+-#event_handlers/mod_json_cdr
++event_handlers/mod_json_cdr
+ #event_handlers/mod_radius_cdr
+ #event_handlers/mod_odbc_cdr
+ #event_handlers/mod_kazoo
+@@ -117,12 +117,12 @@ formats/mod_native_file
+ formats/mod_png
+ #formats/mod_portaudio_stream
+ #formats/mod_shell_stream
+-#formats/mod_shout
++formats/mod_shout
+ formats/mod_sndfile
+ #formats/mod_ssml
+ formats/mod_tone_stream
+ #formats/mod_vlc
+-#languages/mod_basic
++languages/mod_basic
+ #languages/mod_java
+ languages/mod_lua
  #languages/mod_managed
- #languages/mod_perl
- #languages/mod_python
--languages/mod_spidermonkey
- #languages/mod_yaml
- loggers/mod_console
- loggers/mod_logfile
+@@ -152,10 +152,10 @@ say/mod_say_en
+ #say/mod_say_sv
+ #say/mod_say_th
+ #say/mod_say_zh
+-#timers/mod_posix_timer
++timers/mod_posix_timer
+ #timers/mod_timerfd
+ xml_int/mod_xml_cdr
+-#xml_int/mod_xml_curl
++xml_int/mod_xml_curl
+ #xml_int/mod_xml_ldap
+ #xml_int/mod_xml_radius
+ xml_int/mod_xml_rpc
diff --git a/freeswitch-core/patches/patch-src_Makefile.in b/freeswitch-core/patches/patch-src_Makefile.in
deleted file mode 100644
index 606af9b194..0000000000
--- a/freeswitch-core/patches/patch-src_Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_Makefile.in,v 1.1 2014/08/07 17:40:11 darcycain Exp $
-
-Remove references to xmlrpc-c
-
---- ./src/Makefile.in.orig	2013-06-06 12:29:10.000000000 +0000
-+++ ./src/Makefile.in
-@@ -73,8 +73,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
--CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h \
--	$(top_builddir)/libs/xmlrpc-c/xmlrpc_amconfig.h
-+CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
- AM_V_P = $(am__v_P_@AM_V@)
diff --git a/freeswitch-core/patches/patch-src_mod_Makefile.in b/freeswitch-core/patches/patch-src_mod_Makefile.in
deleted file mode 100644
index d96ce324b8..0000000000
--- a/freeswitch-core/patches/patch-src_mod_Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_mod_Makefile.in,v 1.1 2014/08/07 17:40:11 darcycain Exp $
-
-Remove references to xmlrpc-c
-
---- ./src/mod/Makefile.in.orig	2013-06-06 12:29:10.000000000 +0000
-+++ ./src/mod/Makefile.in
-@@ -73,8 +73,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
--CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h \
--	$(top_builddir)/libs/xmlrpc-c/xmlrpc_amconfig.h
-+CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
- AM_V_P = $(am__v_P_@AM_V@)
diff --git a/freeswitch-core/patches/patch-src_mod_applications_mod_expr_Makefile.in b/freeswitch-core/patches/patch-src_mod_applications_mod_expr_Makefile.in
deleted file mode 100644
index d5a8082b49..0000000000
--- a/freeswitch-core/patches/patch-src_mod_applications_mod_expr_Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-src_mod_applications_mod_expr_Makefile.in,v 1.1 2014/08/07 17:40:11 darcycain Exp $
-
-Remove referfences to xmlrpc-c
-
---- ./src/mod/applications/mod_expr/Makefile.in.orig	2013-06-06 12:29:10.000000000 +0000
-+++ ./src/mod/applications/mod_expr/Makefile.in
-@@ -76,8 +76,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
--CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h \
--	$(top_builddir)/libs/xmlrpc-c/xmlrpc_amconfig.h
-+CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-@@ -135,7 +134,7 @@ AM_V_at = $(am__v_at_@AM_V@)
- am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
- am__v_at_0 = @
- am__v_at_1 = 
--DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include -I$(top_builddir)/libs/xmlrpc-c
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
- depcomp = $(SHELL) $(top_srcdir)/build/config/depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
diff --git a/freeswitch-core/patches/patch-src_mod_applications_mod_hash_Makefile.in b/freeswitch-core/patches/patch-src_mod_applications_mod_hash_Makefile.in
deleted file mode 100644
index e6ba2b77d3..0000000000
--- a/freeswitch-core/patches/patch-src_mod_applications_mod_hash_Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-src_mod_applications_mod_hash_Makefile.in,v 1.1 2014/08/07 17:40:11 darcycain Exp $
-
-Remove references to xmlrpc-c
-
---- ./src/mod/applications/mod_hash/Makefile.in.orig	2013-06-06 12:29:10.000000000 +0000
-+++ ./src/mod/applications/mod_hash/Makefile.in
-@@ -76,8 +76,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
--CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h \
--	$(top_builddir)/libs/xmlrpc-c/xmlrpc_amconfig.h
-+CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-@@ -130,7 +129,7 @@ AM_V_at = $(am__v_at_@AM_V@)
- am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
- am__v_at_0 = @
- am__v_at_1 = 
--DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include -I$(top_builddir)/libs/xmlrpc-c
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
- depcomp = $(SHELL) $(top_srcdir)/build/config/depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
diff --git a/freeswitch-core/patches/patch-src_mod_applications_mod_osp_Makefile.in b/freeswitch-core/patches/patch-src_mod_applications_mod_osp_Makefile.in
deleted file mode 100644
index a611439e92..0000000000
--- a/freeswitch-core/patches/patch-src_mod_applications_mod_osp_Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-src_mod_applications_mod_osp_Makefile.in,v 1.1 2014/08/07 17:40:11 darcycain Exp $
-
-Remove references to xmlrpc-c
-
---- ./src/mod/applications/mod_osp/Makefile.in.orig	2013-06-06 12:29:11.000000000 +0000
-+++ ./src/mod/applications/mod_osp/Makefile.in
-@@ -76,8 +76,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
--CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h \
--	$(top_builddir)/libs/xmlrpc-c/xmlrpc_amconfig.h
-+CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-@@ -131,7 +130,7 @@ AM_V_at = $(am__v_at_@AM_V@)
- am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
- am__v_at_0 = @
- am__v_at_1 = 
--DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include -I$(top_builddir)/libs/xmlrpc-c
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
- depcomp = $(SHELL) $(top_srcdir)/build/config/depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
diff --git a/freeswitch-core/patches/patch-src_mod_applications_mod_spandsp_Makefile.in b/freeswitch-core/patches/patch-src_mod_applications_mod_spandsp_Makefile.in
deleted file mode 100644
index 3312633137..0000000000
--- a/freeswitch-core/patches/patch-src_mod_applications_mod_spandsp_Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-src_mod_applications_mod_spandsp_Makefile.in,v 1.1 2014/08/07 17:40:11 darcycain Exp $
-
-Remove references to xmlrpc-c
-
---- ./src/mod/applications/mod_spandsp/Makefile.in.orig	2013-06-06 12:29:11.000000000 +0000
-+++ ./src/mod/applications/mod_spandsp/Makefile.in
-@@ -76,8 +76,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
--CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h \
--	$(top_builddir)/libs/xmlrpc-c/xmlrpc_amconfig.h
-+CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-@@ -138,7 +137,7 @@ AM_V_at = $(am__v_at_@AM_V@)
- am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
- am__v_at_0 = @
- am__v_at_1 = 
--DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include -I$(top_builddir)/libs/xmlrpc-c
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
- depcomp = $(SHELL) $(top_srcdir)/build/config/depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
diff --git a/freeswitch-core/patches/patch-src_mod_applications_mod_stress_Makefile.in b/freeswitch-core/patches/patch-src_mod_applications_mod_stress_Makefile.in
deleted file mode 100644
index 69b96cbeb3..0000000000
--- a/freeswitch-core/patches/patch-src_mod_applications_mod_stress_Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-src_mod_applications_mod_stress_Makefile.in,v 1.1 2014/08/07 17:40:12 darcycain Exp $
-
-Remove references to xmlrpc-c
-
---- ./src/mod/applications/mod_stress/Makefile.in.orig	2013-06-06 12:29:11.000000000 +0000
-+++ ./src/mod/applications/mod_stress/Makefile.in
-@@ -76,8 +76,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
--CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h \
--	$(top_builddir)/libs/xmlrpc-c/xmlrpc_amconfig.h
-+CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-@@ -132,7 +131,7 @@ AM_V_at = $(am__v_at_@AM_V@)
- am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
- am__v_at_0 = @
- am__v_at_1 = 
--DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include -I$(top_builddir)/libs/xmlrpc-c
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
- depcomp = $(SHELL) $(top_srcdir)/build/config/depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
diff --git a/freeswitch-core/patches/patch-src_mod_asr__tts_mod__flite_mod__flite.c b/freeswitch-core/patches/patch-src_mod_asr__tts_mod__flite_mod__flite.c
new file mode 100644
index 0000000000..e29b1e2a42
--- /dev/null
+++ b/freeswitch-core/patches/patch-src_mod_asr__tts_mod__flite_mod__flite.c
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/mod/asr_tts/mod_flite/mod_flite.c.orig	2016-01-11 23:51:12.000000000 +0000
++++ src/mod/asr_tts/mod_flite/mod_flite.c
+@@ -31,7 +31,7 @@
+  */
+ 
+ #include <switch.h>
+-#include <flite.h>
++#include <flite/flite.h>
+ 
+ cst_voice *register_cmu_us_awb(void);
+ void unregister_cmu_us_awb(cst_voice * v);
diff --git a/freeswitch-core/patches/patch-src_mod_asr_tts_mod_unimrcp_Makefile.in b/freeswitch-core/patches/patch-src_mod_asr_tts_mod_unimrcp_Makefile.in
deleted file mode 100644
index 06e093f710..0000000000
--- a/freeswitch-core/patches/patch-src_mod_asr_tts_mod_unimrcp_Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-src_mod_asr_tts_mod_unimrcp_Makefile.in,v 1.1 2014/08/07 17:40:12 darcycain Exp $
-
-Remove references to xmlrpc-c
-
---- ./src/mod/asr_tts/mod_unimrcp/Makefile.in.orig	2013-06-06 12:29:11.000000000 +0000
-+++ ./src/mod/asr_tts/mod_unimrcp/Makefile.in
-@@ -77,8 +77,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
--CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h \
--	$(top_builddir)/libs/xmlrpc-c/xmlrpc_amconfig.h
-+CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-@@ -136,7 +135,7 @@ AM_V_at = $(am__v_at_@AM_V@)
- am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
- am__v_at_0 = @
- am__v_at_1 = 
--DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include -I$(top_builddir)/libs/xmlrpc-c
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
- depcomp = $(SHELL) $(top_srcdir)/build/config/depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
diff --git a/freeswitch-core/patches/patch-src_mod_codecs_mod__codec2_mod__codec2.c b/freeswitch-core/patches/patch-src_mod_codecs_mod__codec2_mod__codec2.c
new file mode 100644
index 0000000000..88f3f675dc
--- /dev/null
+++ b/freeswitch-core/patches/patch-src_mod_codecs_mod__codec2_mod__codec2.c
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/mod/codecs/mod_codec2/mod_codec2.c.orig	2016-01-11 23:51:12.000000000 +0000
++++ src/mod/codecs/mod_codec2/mod_codec2.c
+@@ -29,7 +29,7 @@
+  */
+ 
+ #include <switch.h>
+-#include <codec2.h>
++#include <codec2/codec2.h>
+ 
+ /* Uncomment to log input/output data for debugging 
+ #define LOG_DATA 
diff --git a/freeswitch-core/patches/patch-src_mod_codecs_mod_com_g729_Makefile.in b/freeswitch-core/patches/patch-src_mod_codecs_mod_com_g729_Makefile.in
deleted file mode 100644
index 617b2afdb9..0000000000
--- a/freeswitch-core/patches/patch-src_mod_codecs_mod_com_g729_Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_mod_codecs_mod_com_g729_Makefile.in,v 1.1 2014/08/07 17:40:12 darcycain Exp $
-
-Remove references to xmlrpc-c
-
---- ./src/mod/codecs/mod_com_g729/Makefile.in.orig	2013-06-06 12:29:11.000000000 +0000
-+++ ./src/mod/codecs/mod_com_g729/Makefile.in
-@@ -74,8 +74,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
--CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h \
--	$(top_builddir)/libs/xmlrpc-c/xmlrpc_amconfig.h
-+CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
- AM_V_P = $(am__v_P_@AM_V@)
diff --git a/freeswitch-core/patches/patch-src_mod_endpoints_mod_html5_Makefile.in b/freeswitch-core/patches/patch-src_mod_endpoints_mod_html5_Makefile.in
deleted file mode 100644
index 8867a1f638..0000000000
--- a/freeswitch-core/patches/patch-src_mod_endpoints_mod_html5_Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-src_mod_endpoints_mod_html5_Makefile.in,v 1.1 2014/08/07 17:40:12 darcycain Exp $
-
-Remove references to xmlrpc-c
-
---- ./src/mod/endpoints/mod_html5/Makefile.in.orig	2013-06-06 12:29:11.000000000 +0000
-+++ ./src/mod/endpoints/mod_html5/Makefile.in
-@@ -76,8 +76,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
--CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h \
--	$(top_builddir)/libs/xmlrpc-c/xmlrpc_amconfig.h
-+CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-@@ -132,7 +131,7 @@ AM_V_at = $(am__v_at_@AM_V@)
- am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
- am__v_at_0 = @
- am__v_at_1 = 
--DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include -I$(top_builddir)/libs/xmlrpc-c
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
- depcomp = $(SHELL) $(top_srcdir)/build/config/depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
diff --git a/freeswitch-core/patches/patch-src_mod_endpoints_mod_portaudio_Makefile.in b/freeswitch-core/patches/patch-src_mod_endpoints_mod_portaudio_Makefile.in
deleted file mode 100644
index 6d8a94e56a..0000000000
--- a/freeswitch-core/patches/patch-src_mod_endpoints_mod_portaudio_Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-src_mod_endpoints_mod_portaudio_Makefile.in,v 1.1 2014/08/07 17:40:12 darcycain Exp $
-
-Remove references to xmlrpc-c
-
---- ./src/mod/endpoints/mod_portaudio/Makefile.in.orig	2013-06-06 12:29:11.000000000 +0000
-+++ ./src/mod/endpoints/mod_portaudio/Makefile.in
-@@ -77,8 +77,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
--CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h \
--	$(top_builddir)/libs/xmlrpc-c/xmlrpc_amconfig.h
-+CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-@@ -135,7 +134,7 @@ AM_V_at = $(am__v_at_@AM_V@)
- am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
- am__v_at_0 = @
- am__v_at_1 = 
--DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include -I$(top_builddir)/libs/xmlrpc-c
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
- depcomp = $(SHELL) $(top_srcdir)/build/config/depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
diff --git a/freeswitch-core/patches/patch-src_mod_endpoints_mod_skinny_Makefile.in b/freeswitch-core/patches/patch-src_mod_endpoints_mod_skinny_Makefile.in
deleted file mode 100644
index 778bba6d0b..0000000000
--- a/freeswitch-core/patches/patch-src_mod_endpoints_mod_skinny_Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-src_mod_endpoints_mod_skinny_Makefile.in,v 1.1 2014/08/07 17:40:12 darcycain Exp $
-
-Remove references to xmlrpc-c
-
---- ./src/mod/endpoints/mod_skinny/Makefile.in.orig	2013-06-06 12:29:11.000000000 +0000
-+++ ./src/mod/endpoints/mod_skinny/Makefile.in
-@@ -76,8 +76,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
--CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h \
--	$(top_builddir)/libs/xmlrpc-c/xmlrpc_amconfig.h
-+CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-@@ -134,7 +133,7 @@ AM_V_at = $(am__v_at_@AM_V@)
- am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
- am__v_at_0 = @
- am__v_at_1 = 
--DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include -I$(top_builddir)/libs/xmlrpc-c
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
- depcomp = $(SHELL) $(top_srcdir)/build/config/depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
diff --git a/freeswitch-core/patches/patch-src_mod_endpoints_mod_skypopen_Makefile.in b/freeswitch-core/patches/patch-src_mod_endpoints_mod_skypopen_Makefile.in
deleted file mode 100644
index 278c61148f..0000000000
--- a/freeswitch-core/patches/patch-src_mod_endpoints_mod_skypopen_Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-src_mod_endpoints_mod_skypopen_Makefile.in,v 1.1 2014/08/07 17:40:12 darcycain Exp $
-
-Remove references to xmlrpc-c
-
---- ./src/mod/endpoints/mod_skypopen/Makefile.in.orig	2013-06-06 12:29:11.000000000 +0000
-+++ ./src/mod/endpoints/mod_skypopen/Makefile.in
-@@ -76,8 +76,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
--CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h \
--	$(top_builddir)/libs/xmlrpc-c/xmlrpc_amconfig.h
-+CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-@@ -134,7 +133,7 @@ AM_V_at = $(am__v_at_@AM_V@)
- am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
- am__v_at_0 = @
- am__v_at_1 = 
--DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include -I$(top_builddir)/libs/xmlrpc-c
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
- depcomp = $(SHELL) $(top_srcdir)/build/config/depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
diff --git a/freeswitch-core/patches/patch-src_mod_endpoints_mod_sofia_Makefile.in b/freeswitch-core/patches/patch-src_mod_endpoints_mod_sofia_Makefile.in
deleted file mode 100644
index a6822f3f63..0000000000
--- a/freeswitch-core/patches/patch-src_mod_endpoints_mod_sofia_Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-src_mod_endpoints_mod_sofia_Makefile.in,v 1.1 2014/08/07 17:40:12 darcycain Exp $
-
-Remove references to xmlrpc-c
-
---- ./src/mod/endpoints/mod_sofia/Makefile.in.orig	2013-06-06 12:29:11.000000000 +0000
-+++ ./src/mod/endpoints/mod_sofia/Makefile.in
-@@ -77,8 +77,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
--CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h \
--	$(top_builddir)/libs/xmlrpc-c/xmlrpc_amconfig.h
-+CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-@@ -137,7 +136,7 @@ AM_V_at = $(am__v_at_@AM_V@)
- am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
- am__v_at_0 = @
- am__v_at_1 = 
--DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include -I$(top_builddir)/libs/xmlrpc-c
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
- depcomp = $(SHELL) $(top_srcdir)/build/config/depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
diff --git a/freeswitch-core/patches/patch-src_mod_formats_mod__shout_mod__shout.c b/freeswitch-core/patches/patch-src_mod_formats_mod__shout_mod__shout.c
new file mode 100644
index 0000000000..58136456d1
--- /dev/null
+++ b/freeswitch-core/patches/patch-src_mod_formats_mod__shout_mod__shout.c
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/mod/formats/mod_shout/mod_shout.c.orig	2016-01-11 23:51:12.000000000 +0000
++++ src/mod/formats/mod_shout/mod_shout.c
+@@ -35,7 +35,7 @@
+ #include <switch.h>
+ #include "mpg123.h"
+ #include <shout/shout.h>
+-#include <lame.h>
++#include <lame/lame.h>
+ #include <switch_curl.h>
+ 
+ #define OUTSCALE 8192 * 2
diff --git a/freeswitch-core/patches/patch-src_mod_formats_mod_portaudio_stream_Makefile.in b/freeswitch-core/patches/patch-src_mod_formats_mod_portaudio_stream_Makefile.in
deleted file mode 100644
index 2056ba1abf..0000000000
--- a/freeswitch-core/patches/patch-src_mod_formats_mod_portaudio_stream_Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-src_mod_formats_mod_portaudio_stream_Makefile.in,v 1.1 2014/08/07 17:40:12 darcycain Exp $
-
-Remove references to xmlrpc-c
-
---- ./src/mod/formats/mod_portaudio_stream/Makefile.in.orig	2013-06-06 12:29:12.000000000 +0000
-+++ ./src/mod/formats/mod_portaudio_stream/Makefile.in
-@@ -77,8 +77,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
--CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h \
--	$(top_builddir)/libs/xmlrpc-c/xmlrpc_amconfig.h
-+CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-@@ -138,7 +137,7 @@ AM_V_at = $(am__v_at_@AM_V@)
- am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
- am__v_at_0 = @
- am__v_at_1 = 
--DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include -I$(top_builddir)/libs/xmlrpc-c
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
- depcomp = $(SHELL) $(top_srcdir)/build/config/depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
diff --git a/freeswitch-core/patches/patch-src_mod_languages_mod_lua_Makefile.in b/freeswitch-core/patches/patch-src_mod_languages_mod_lua_Makefile.in
deleted file mode 100644
index b7c83b9ea4..0000000000
--- a/freeswitch-core/patches/patch-src_mod_languages_mod_lua_Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-src_mod_languages_mod_lua_Makefile.in,v 1.1 2014/08/07 17:40:12 darcycain Exp $
-
-Remove references to xmlrpc-c
-
---- ./src/mod/languages/mod_lua/Makefile.in.orig	2013-06-06 12:29:12.000000000 +0000
-+++ ./src/mod/languages/mod_lua/Makefile.in
-@@ -76,8 +76,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
--CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h \
--	$(top_builddir)/libs/xmlrpc-c/xmlrpc_amconfig.h
-+CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-@@ -132,7 +131,7 @@ AM_V_at = $(am__v_at_@AM_V@)
- am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
- am__v_at_0 = @
- am__v_at_1 = 
--DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include -I$(top_builddir)/libs/xmlrpc-c
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
- depcomp = $(SHELL) $(top_srcdir)/build/config/depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
Prev by Date: lldb-git: Remove GIT_REVISION.lldb
Next by Date: 'Add vsearch: Versatile open-source tool for metagenomics'
Previous by Thread: lldb-git: Remove GIT_REVISION.lldb
Next by Thread: 'Add vsearch: Versatile open-source tool for metagenomics'
Indexes:
Home | Main Index | Thread Index | Old Index