From db4edca8991e9f8369a6db222078bda272f3b04c Mon Sep 17 00:00:00 2001
From: Mazi Lo <openwrt.mazilo@recursor.net>
Date: Sat, 29 Aug 2015 12:23:52 -0400
Subject: [PATCH] [FreeSWITCH]: Update to v1.5.final 1. Added an sqlite2 option
 for configure in apr-util 2. Moved bootstrap to Prepare stage. 3.
 Restructured patches directory to include CONFIG_LIBC 4. Fixed some modules
 dependency issues. 5. Reinstated mod_enum as not BROKEN. 6. Renamed mod_vp8
 to mod_vpx according to FS changes. 7. Added some new modules and some are
 flagged as BROKEN.    i.e. mod_cv, mod_hiredis (BROKEN), mod_kazoo, mod_smpp
 (BROKEN) 8. Flagged some modules as BROKEN due to insufficient libraries.   
 i.e. mod_bv, mod_codec2, mod_fsv, mod_ilbc, mod_silk, mod_siren 9. Removed
 mod_snipe_hunt (depricated by FS)

Signed-off-by: Mazi Lo <openwrt.mazilo@recursor.net>
---
 net/freeswitch/Config.in                      |   7 +-
 net/freeswitch/Makefile                       | 185 ++++++++----------
 net/freeswitch/patches/Makefile.am.patch      |  57 ------
 net/freeswitch/patches/configure_ac.patch     | 160 ---------------
 .../libs-libzrtp-include-zrtp_config.patch    |  20 --
 .../libs-sofia-sip-configure_gnu.patch        |   8 -
 ...s-spandsp-src-spandsp-fast_convert_h.patch |  11 --
 .../patches/libs-spandsp-src-t4_rx_c.patch    |  11 --
 .../patches/libs-spandsp-src-t4_tx_c.patch    |  11 --
 .../patches/libs-xmlrpc-c-config_mk_in.patch  |  13 --
 ...xmlrpc-c-lib-expat-gennmtab-Makefile.patch |  16 --
 .../{ => musl}/build-config-erlang_m4.patch   |  12 +-
 .../{ => musl}/build-modules_conf_in.patch    |   4 +-
 .../{ => musl}/build-openwrt_rules.mk.patch   |   0
 .../patches/musl/configure_ac.patch           |  65 ++++++
 .../{ => musl}/libs-apr-configure_ac.patch    |   0
 .../musl/libs-apr-util-configure_gnu.patch    |   8 +
 .../libs-srtp-configure_ac.patch}             |  11 +-
 .../patched-13ubuntu-configure_in.patch       |  24 ---
 net/freeswitch/patches/src-Makefile_am.patch  |  15 --
 .../src-mod-codecs-mod_celt-Makefile_am.patch |  11 --
 .../src-mod-codecs-mod_isac-typedefs_h.patch  |  11 --
 .../src-mod-codecs-mod_opus-Makefile_am.patch |  11 --
 ...mod-directories-mod_ldap-Makefile_am.patch |  11 --
 ...od-endpoints-mod_gsmopen-Makefile_am.patch |  11 --
 ...-mod-endpoints-mod_verto-Makefile_am.patch |  28 ---
 ...c-mod-languages-mod_perl-Makefile_am.patch |  32 ---
 net/freeswitch/patches/src-switch_rtp_c.patch |  20 --
 .../uClibc/build-config-erlang_m4.patch       |  97 +++++++++
 .../uClibc/build-modules_conf_in.patch        |  10 +
 .../uClibc/build-openwrt_rules.mk.patch       |  10 +
 .../patches/uClibc/configure_ac.patch         |  65 ++++++
 .../uClibc/libs-apr-configure_ac.patch        |  15 ++
 .../uClibc/libs-apr-util-configure_gnu.patch  |   8 +
 .../uClibc/libs-srtp-configure_ac.patch       |  13 ++
 35 files changed, 395 insertions(+), 596 deletions(-)
 delete mode 100644 net/freeswitch/patches/Makefile.am.patch
 delete mode 100644 net/freeswitch/patches/configure_ac.patch
 delete mode 100644 net/freeswitch/patches/libs-libzrtp-include-zrtp_config.patch
 delete mode 100644 net/freeswitch/patches/libs-sofia-sip-configure_gnu.patch
 delete mode 100644 net/freeswitch/patches/libs-spandsp-src-spandsp-fast_convert_h.patch
 delete mode 100644 net/freeswitch/patches/libs-spandsp-src-t4_rx_c.patch
 delete mode 100644 net/freeswitch/patches/libs-spandsp-src-t4_tx_c.patch
 delete mode 100644 net/freeswitch/patches/libs-xmlrpc-c-config_mk_in.patch
 delete mode 100644 net/freeswitch/patches/libs-xmlrpc-c-lib-expat-gennmtab-Makefile.patch
 rename net/freeswitch/patches/{ => musl}/build-config-erlang_m4.patch (95%)
 rename net/freeswitch/patches/{ => musl}/build-modules_conf_in.patch (75%)
 rename net/freeswitch/patches/{ => musl}/build-openwrt_rules.mk.patch (100%)
 create mode 100644 net/freeswitch/patches/musl/configure_ac.patch
 rename net/freeswitch/patches/{ => musl}/libs-apr-configure_ac.patch (100%)
 create mode 100644 net/freeswitch/patches/musl/libs-apr-util-configure_gnu.patch
 rename net/freeswitch/patches/{libs-srtp-configure-ac.patch => musl/libs-srtp-configure_ac.patch} (50%)
 delete mode 100644 net/freeswitch/patches/patched-13ubuntu-configure_in.patch
 delete mode 100644 net/freeswitch/patches/src-Makefile_am.patch
 delete mode 100644 net/freeswitch/patches/src-mod-codecs-mod_celt-Makefile_am.patch
 delete mode 100644 net/freeswitch/patches/src-mod-codecs-mod_isac-typedefs_h.patch
 delete mode 100644 net/freeswitch/patches/src-mod-codecs-mod_opus-Makefile_am.patch
 delete mode 100644 net/freeswitch/patches/src-mod-directories-mod_ldap-Makefile_am.patch
 delete mode 100644 net/freeswitch/patches/src-mod-endpoints-mod_gsmopen-Makefile_am.patch
 delete mode 100644 net/freeswitch/patches/src-mod-endpoints-mod_verto-Makefile_am.patch
 delete mode 100644 net/freeswitch/patches/src-mod-languages-mod_perl-Makefile_am.patch
 delete mode 100644 net/freeswitch/patches/src-switch_rtp_c.patch
 create mode 100644 net/freeswitch/patches/uClibc/build-config-erlang_m4.patch
 create mode 100644 net/freeswitch/patches/uClibc/build-modules_conf_in.patch
 create mode 100644 net/freeswitch/patches/uClibc/build-openwrt_rules.mk.patch
 create mode 100644 net/freeswitch/patches/uClibc/configure_ac.patch
 create mode 100644 net/freeswitch/patches/uClibc/libs-apr-configure_ac.patch
 create mode 100644 net/freeswitch/patches/uClibc/libs-apr-util-configure_gnu.patch
 create mode 100644 net/freeswitch/patches/uClibc/libs-srtp-configure_ac.patch

diff --git a/net/freeswitch/Config.in b/net/freeswitch/Config.in
index d6a67ab..21a61ea 100644
--- a/net/freeswitch/Config.in
+++ b/net/freeswitch/Config.in
@@ -77,6 +77,11 @@ menu "Configuration"
       help
 	Compile libs/apr-util with PostgreSQL support.
 
+    config FS_WITH_SQLITE2
+      bool "SQLITE2"
+      help
+	Compile libs/apr-util with SQLITE2 support.
+
     config FS_WITH_SQLITE3
       bool "SQLITE3"
       help
@@ -223,7 +228,7 @@ menu "Configuration"
 
   config FS_WITH_STUN
     bool "Enable stun module"
-    default n
+    default y
     help
 	Enable stun module.
 
diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile
index 9967f2b..c7fe02f 100644
--- a/net/freeswitch/Makefile
+++ b/net/freeswitch/Makefile
@@ -6,20 +6,21 @@
 #
 #
 include $(TOPDIR)/rules.mk
+-include perlmod.mk
 
 
 PKG_NAME:=freeswitch
 PKG_SOURCE_PROTO:=git
 PKG_DISTNAME:=$(PKG_NAME)_$(PKG_SOURCE_PROTO)
-PKG_VERSION:=1.5.14
+PKG_VERSION:=1.5.final
 
 
 #
 # The latest FS git hash in PKG_SOURCE_VERSION can be obtained from
 # http://fisheye.freeswitch.org
 #
-FS_WITH_DEFAULT_HEAD:=a4d877c189b331ea47bf3a75745006d4d873eee6
-PKG_SOURCE_URL:=https://stash.$(PKG_NAME).org/scm/fs/$(PKG_NAME).git
+FS_WITH_DEFAULT_HEAD:=bff9aab850a911e27b316b016c62f91f657719cd
+PKG_SOURCE_URL:=https://$(PKG_NAME).org/stash/scm/fs/$(PKG_NAME).git
 PKG_SOURCE_VERSION:=$(if $(CONFIG_FS_WITH_LATEST_HEAD),$(shell git ls-remote $(PKG_SOURCE_URL) HEAD|cut -f1),$(FS_WITH_DEFAULT_HEAD))
 FS_WITH_DEFAULT_HEAD_SHORT:=$(shell echo $(FS_WITH_DEFAULT_HEAD)|cut -b -7)
 PKG_SOURCE_VERSION_SHORT:=$(shell echo $(PKG_SOURCE_VERSION)|cut -b -7)
@@ -29,7 +30,10 @@ PKG_SOURCE:=$(PKG_SOURCE_SUBDIR)-$(if $(CONFIG_FS_WITH_LOCAL_SOURCE),$(FS_WITH_D
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 
-PKG_FIXUP:=libtool autoreconf
+PATCH_DIR=./patches/$(CONFIG_LIBC)
+
+
+PKG_FIXUP:=autoreconf
 PKG_BUILD_PARALLEL:=0
 
 PKG_LICENSE:=MPL-1.1
@@ -44,6 +48,7 @@ PKG_BUILD_DEPENDS:= \
 	FS_WITH_CORE_LIBEDIT_SUPPORT:libedit \
 	FS_WITH_MYSQL:libmysqlclient \
 	FS_WITH_POSTGRESQL:libpq \
+	FS_WITH_SQLITE2:libsqlite2 \
 	FS_WITH_SQLITE3:libsqlite3 \
 	FS_WITH_APR_SCTP:sctp \
 
@@ -75,6 +80,7 @@ FS_MOD_AVAILABLE:= \
 	conference \
 	console \
 	curl \
+	cv \
 	dahdi-codec \
 	db \
 	dialplan-asterisk \
@@ -105,6 +111,7 @@ FS_MOD_AVAILABLE:= \
 	h26x \
 	h323 \
 	hash \
+	hiredis \
 	html5 \
 	httapi \
 	http-cache \
@@ -112,6 +119,7 @@ FS_MOD_AVAILABLE:= \
 	isac \
 	java \
 	json-cdr \
+	kazoo \
 	lcr \
 	ldap \
 	local-stream \
@@ -157,9 +165,9 @@ FS_MOD_AVAILABLE:= \
 	skel \
 	skinny \
 	skypopen \
+	smpp \
 	sms \
 	snapshot \
-	snipe-hunt \
 	sndfile \
 	snmp \
 	snom \
@@ -185,7 +193,7 @@ FS_MOD_AVAILABLE:= \
 	vmd \
 	voicemail \
 	voicemail-ivr \
-	vp8 \
+	vpx \
 	xml-cdr \
 	xml-curl \
 	xml-ldap \
@@ -219,6 +227,7 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_FS_WITH_POSTGRESQL \
 	CONFIG_FS_WITH_PYTHON \
 	CONFIG_FS_WITH_SILENT_RULES \
+	CONFIG_FS_WITH_SQLITE2 \
 	CONFIG_FS_WITH_SQLITE3 \
 	CONFIG_FS_WITH_SRTP \
 	CONFIG_FS_WITH_SRTP_GENERIC_AESICM \
@@ -258,7 +267,7 @@ define Package/$(PKG_NAME)
 $(call Package/$(PKG_NAME)/Default)
   MENU:=1
   TITLE:=FreeSWITCH open source telephony platform ($(PKG_SOURCE_VERSION_SHORT))
-  DEPENDS:=+FS_WITH_CORE_LIBEDIT_SUPPORT:libedit +FS_WITH_OPENSSL:libopenssl +libcurl +libdb47 +libgdbm $(ICONV_DEPENDS) $(INTL_DEPENDS) +libjpeg +libncurses +libopenldap +libpcre +libpthread +librt +libspeex +libspeexdsp +FS_WITH_SQLITE3:libsqlite3 +FS_WITH_SRTP:libsrtp +SSP_SUPPORT:libssp +libstdcpp +libuuid +PACKAGE_$(PKG_NAME)-mod-perl:perl
+  DEPENDS:=+FS_WITH_CORE_LIBEDIT_SUPPORT:libedit +FS_WITH_OPENSSL:libopenssl +libcurl +libdb47 +libfreetype +libgdbm $(ICONV_DEPENDS) $(INTL_DEPENDS) +libjpeg +libncurses +libopenldap +libpcre +libpng +libpthread +librt +libspeex +libspeexdsp +FS_WITH_SQLITE2:libsqlite2 +FS_WITH_SQLITE3:libsqlite3 +FS_WITH_SRTP:libsrtp +SSP_SUPPORT:libssp +libstdcpp +libuuid +PACKAGE_$(PKG_NAME)-mod-perl:perl +libvpx
 endef
 
 
@@ -459,11 +468,6 @@ endef
 MAKE_INSTALL_TARGETS:=install
 
 
-ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-celt),)
- $(eval $(call Download/files,celt,celt-0.10.0.tar.gz,a656f6176e9be84027c0e51ceedd710f,,downloads/libs/,libs/))
-endif
-
-
 ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-curl),)
  $(eval $(call Download/files,json-cdr,json-c-0.9.tar.gz,4653b3b9c568bb9c782178abfaac128d,,downloads/libs/,libs/))
 endif
@@ -474,26 +478,11 @@ ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-event-zmq),)
 endif
 
 
-ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-flite),)
- $(eval $(call Download/files,flite,flite-2.0.0-release.tar.bz2,645db96ffc296cbb6d37f231cc1cc6b2,,downloads/libs/,libs/))
-endif
-
-
 ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-mongo),)
  $(eval $(call Download/files,mongo,mongo-c-driver-0.92.2.tar.gz,afab25a33abd3f1e0ba79c5a9da92651,,downloads/libs/,libs/))
 endif
 
 
-ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-opus),)
- $(eval $(call Download/files,opus,opus-1.1-p2.tar.gz,5da7cb39925bfb7dd60ea2e810f71357,,downloads/libs/,libs/))
-endif
-
-
-ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-ldap)|$(CONFIG_PACKAGE_$(PKG_NAME)-mod-xml-ldap),)
- $(eval $(call Download/files,ldap,openldap-2.4.19.tar.gz,4a6dab2711fcf141f19bb680bc335887,,downloads/libs/,libs/))
-endif
-
-
 ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-sounds-en-08KHz),)
  $(eval $(call Download/files,sounds-en-08KHz,$(PKG_NAME)-sounds-en-us-callie-8000-1.0.50.tar.gz,14cccba7b5c56f027fea391f1e0ee2d6,,,))
 	MAKE_INSTALL_TARGETS+= sounds-install
@@ -558,21 +547,24 @@ ifneq ($(CONFIG_USE_EGLIBC),)
 endif
 
 
-FS_TARGET_CFLAGS:= $(TARGET_CFLAGS) -DLUA_USE_LINUX $(FPIC) -std=gnu99 -Wno-format -Wno-unused-variable -Wno-unused-but-set-variable -Wno-implicit-function-declaration
-FS_TARGET_CXXFLAGS:= $(TARGET_CXXFLAGS)
-FS_TARGET_CPPFLAGS:= -I. -I./lua $(TARGET_CPPFLAGS) $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-json-cdr),-Wno-error) -I`ls -d $(PKG_BUILD_DIR)/libs/*|grep tiff`/libtiff -I$(PKG_BUILD_DIR)/libs/spandsp/src
+ifeq ($(CONFIG_LIBC),musl)
+	TARGET_CFLAGS += -D_GNU_SOURCE
+endif
+#FS_TARGET_CFLAGS:= $(TARGET_CFLAGS) -DLUA_USE_LINUX $(FPIC) -std=gnu99 -Wno-format -Wno-unused-variable -Wno-unused-but-set-variable -Wno-implicit-function-declaration
+#FS_TARGET_CXXFLAGS:= $(TARGET_CXXFLAGS)
+#FS_TARGET_CPPFLAGS:= -I. -I./lua $(TARGET_CPPFLAGS) $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-json-cdr),-Wno-error) -I`ls -d $(PKG_BUILD_DIR)/libs/*|grep tiff`/libtiff -I$(PKG_BUILD_DIR)/libs/spandsp/src
 
 
 #MAKE_FLAGS += \
 #	OPT_FLAGS+="$(TARGET_CFLAGS)"
 
 
-MAKE_VARS += \
-	AR="$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)ar" \
-	CC="$(TOOLCHAIN_DIR)/bin/$(TARGET_CC)" \
-	CXX="$(TOOLCHAIN_DIR)/bin/$(TARGET_CXX)" \
-	RANLIB="$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)ranlib" \
-	CC_FOR_BUILD="$(HOSTCC)" \
+#MAKE_VARS += \
+#	AR="$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)ar" \
+#	CC="$(TOOLCHAIN_DIR)/bin/$(TARGET_CC)" \
+#	CXX="$(TOOLCHAIN_DIR)/bin/$(TARGET_CXX)" \
+#	RANLIB="$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)ranlib" \
+#	CC_FOR_BUILD="$(HOSTCC)" \
 
 
 CONFIGURE_ARGS+= \
@@ -582,7 +574,7 @@ CONFIGURE_ARGS+= \
 	--bindir="/usr/bin" \
 	--libdir="/usr/lib" \
 	--srcdir="$(PKG_BUILD_DIR)" \
-	--sysconfdir="/etc/$(PKG_NAME)" \
+	--sysconfdir="/etc" \
 	--with-modinstdir="/usr/lib/$(PKG_NAME)" \
 	--with-random="/dev/urandom" \
 	$(call autoconf_bool,CONFIG_FS_WITH_BUILTIN_ZRTP,zrtp) \
@@ -609,59 +601,64 @@ CONFIGURE_ARGS+= \
 	$(if $(CONFIG_FS_WITH_ODBC),--with-odbc="$(STAGING_DIR)/usr") \
 	$(if $(CONFIG_FS_WITH_OGG),--with-ogg="$(STAGING_DIR)/usr") \
 	$(if $(CONFIG_FS_WITH_OPENSSL),--with-openssl="pkg-config") \
-	$(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-celt),--with-ogg="$(STAGING_DIR)/usr",--without-ogg) \
 	$(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-erlang-event),--with-erlang="$(CONFIG_FS_WITH_ERLANG)",--without-erlang) \
 	$(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-java),--with-java="$(STAGING_DIR)/usr",--without-java) \
 	$(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-python),--with-python="$(CONFIG_FS_WITH_PYTHON)",--without-python) \
 	$(if ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-curl)|$(CONFIG_PACKAGE_$(PKG_NAME)-mod-xml-cdr)|$(CONFIG_PACKAGE_$(PKG_NAME)-mod-xml-curl)),--with-libcurl="$(STAGING_DIR)/usr",--without-libcurl) \
 	--with$(if $(CONFIG_FS_WITH_MYSQL),,out)-mysql \
 	--with$(if $(CONFIG_FS_WITH_POSTGRESQL),,out)-pgsql \
+	--with$(if $(CONFIG_FS_WITH_SQLITE2),,out)-sqlite2 \
 	--with$(if $(CONFIG_FS_WITH_SQLITE3),,out)-sqlite3 \
 
 
-ifeq ($(ARCH),arm)
+ifeq ($(CONFIG_TARGET_ARCH_PACKAGES),"kirkwood")
 	CONFIGURE_ARGS+= --enable-arm5e-asm \
 
 endif
 
 
-CONFIGURE_VARS+= \
-	config_TARGET_CC="$(TOOLCHAIN_DIR)/bin/$(TARGET_CC)" \
-	config_TARGET_CXX="$(TOOLCHAIN_DIR)/bin/$(TARGET_CXX)" \
-	config_TARGET_CFLAGS="$(FS_TARGET_CPPFLAGS) $(FS_TARGET_CFLAGS)" \
-	config_TARGET_CXXFLAGS="$(FS_TARGET_CPPFLAGS) $(FS_TARGET_CXXFLAGS)" \
-	config_TARGET_CPPFLAGS="$(FS_TARGET_CPPFLAGS)" \
-	config_TARGET_READLINE_INC="$(FS_TARGET_CPPFLAGS)" \
-	config_TARGET_READLINE_LIBS="-lreadline -lncurses" \
-	config_TARGET_LIBS="-lpthread -ldl" \
-	config_BUILD_CC="$(HOSTCC)" \
-	CC_FOR_BUILD="$(HOSTCC)" \
-	BUILDTOOL_CC="$(HOSTCC)" \
-	BUILDTOOL_CCLD="$(HOSTCC)" \
-	CC="$(TOOLCHAIN_DIR)/bin/$(TARGET_CC)" \
-	CXX="$(TOOLCHAIN_DIR)/bin/$(TARGET_CXX)" \
-	AR="$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)ar" \
-	RANLIB="$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)ranlib" \
-	CFLAGS="$(FS_TARGET_CPPFLAGS) $(FS_TARGET_CFLAGS)" \
-	CXXFLAGS="$(FS_TARGET_CPPFLAGS) $(FS_TARGET_CXXFLAGS)" \
-	CPPFLAGS="$(FS_TARGET_CPPFLAGS)" \
-	LDFLAGS="-L$(STAGING_DIR)/usr/lib/perl5/5.20/CORE -Wl,-rpath-link=\"$(STAGING_DIR)/usr/lib\" -Wl,-rpath-link=\"$(STAGING_DIR)/usr/lib$(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-perl),/perl5/5.20/CORE)\" -Wl,-rpath,/usr/lib -Wl,-rpath,/usr/lib$(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-perl),/perl5/5.20/CORE -lperl -lpthread -lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc)" \
-	HOST_CC="/usr/bin/cc" \
-	HOST_CXX="/usr/bin/g++" \
-	CROSS_COMPILE="1" \
-	$(if $(CONFIG_FS_WITH_APR_SCTP),ac_cv_header_netinet_sctp_h="yes") \
-	ac_cv_file_dbd_apr_dbd_mysql_c="no" \
+#ifeq ($(CONFIG_LIBC),"uClibc")
+ifeq ($(CONFIG_ARCH),"mips")
+	CONFIGURE_VARS+= \
+		ac_cv_file_dbd_apr_dbd_mysql_c="no" \
+
+endif
+#endif
+
+
+#CONFIGURE_VARS+= \
+#	config_TARGET_CC="$(TOOLCHAIN_DIR)/bin/$(TARGET_CC)" \
+#	config_TARGET_CXX="$(TOOLCHAIN_DIR)/bin/$(TARGET_CXX)" \
+#	config_TARGET_CFLAGS="$(FS_TARGET_CPPFLAGS) $(FS_TARGET_CFLAGS)" \
+#	config_TARGET_CXXFLAGS="$(FS_TARGET_CPPFLAGS) $(FS_TARGET_CXXFLAGS)" \
+#	config_TARGET_CPPFLAGS="$(FS_TARGET_CPPFLAGS)" \
+#	config_TARGET_READLINE_INC="$(FS_TARGET_CPPFLAGS)" \
+#	config_TARGET_READLINE_LIBS="-lreadline -lncurses" \
+#	config_TARGET_LIBS="-lpthread -ldl" \
+#	config_BUILD_CC="$(HOSTCC)" \
+#	CC_FOR_BUILD="$(HOSTCC)" \
+#	BUILDTOOL_CC="$(HOSTCC)" \
+#	BUILDTOOL_CCLD="$(HOSTCC)" \
+#	CC="$(TOOLCHAIN_DIR)/bin/$(TARGET_CC)" \
+#	CXX="$(TOOLCHAIN_DIR)/bin/$(TARGET_CXX)" \
+#	AR="$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)ar" \
+#	RANLIB="$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)ranlib" \
+#	CFLAGS="$(FS_TARGET_CPPFLAGS) $(FS_TARGET_CFLAGS)" \
+#	CXXFLAGS="$(FS_TARGET_CPPFLAGS) $(FS_TARGET_CXXFLAGS)" \
+#	CPPFLAGS="$(FS_TARGET_CPPFLAGS)" \
+#	LDFLAGS="-L$(STAGING_DIR)/usr/lib/perl5/$(PERL_VERSION)/CORE -Wl,-rpath-link=\"$(STAGING_DIR)/usr/lib\" -Wl,-rpath-link=\"$(STAGING_DIR)/usr/lib$(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-perl),/perl5/$(PERL_VERSION)/CORE)\" -Wl,-rpath,/usr/lib -Wl,-rpath,/usr/lib$(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-perl),/perl5/$(PERL_VERSION)/CORE -lperl -lpthread -lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc)" \
+#	HOST_CC="/usr/bin/cc" \
+#	HOST_CXX="/usr/bin/g++" \
+#	CROSS_COMPILE="1" \
+#	$(if $(CONFIG_FS_WITH_APR_SCTP),ac_cv_header_netinet_sctp_h="yes") \
+#	ac_cv_file_dbd_apr_dbd_mysql_c="no" \
 
 
 define Build/Prepare
 	$(call Build/Prepare/Default)
-	$(call Prepare/celt)
 	$(call Prepare/event-zmq)
-	$(call Prepare/flite)
 	$(call Prepare/json-cdr)
-	$(call Prepare/ldap)
 	$(call Prepare/mongo)
-	$(call Prepare/opus)
 	$(if $(CONFIG_PACKAGE_$(PKG_NAME)-sounds-en-08KHz),$(call Prepare/sounds-en-08KHz))
 	$(if $(CONFIG_PACKAGE_$(PKG_NAME)-sounds-en-16KHz),$(call Prepare/sounds-en-16KHz))
 	$(if $(CONFIG_PACKAGE_$(PKG_NAME)-sounds-en-32KHz),$(call Prepare/sounds-en-32KHz))
@@ -673,12 +670,11 @@ define Build/Prepare
 ifeq ($(CONFIG_FS_WITH_LOCAL_SOURCE),y)
 	(cd $(PKG_BUILD_DIR); $(if $(CONFIG_FS_WITH_LATEST_HEAD),if $(QUILT_CMD) top > /dev/null 2>&1 && [ -f $(PKG_BUILD_DIR)/patches/series ]; then $(QUILT_CMD) pop -a; fi; git pull;) if $(QUILT_CMD) next > /dev/null 2>&1; then $(QUILT_CMD) push -a; fi)
 endif
+	(cd $(PKG_BUILD_DIR); $(AM_TOOL_PATHS) ./bootstrap.sh)
 endef
 
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); $(if $(CONFIG_FS_WITH_LATEST_HEAD),if $(QUILT_CMD) top > /dev/null 2>&1 && [ -f $(PKG_BUILD_DIR)/patches/series ]; then $(QUILT_CMD) pop -a; fi; git pull;) if $(QUILT_CMD) next > /dev/null 2>&1; then $(QUILT_CMD) push -a; fi)
-	(cd $(PKG_BUILD_DIR); $(AM_TOOL_PATHS) ./bootstrap.sh)
 	$(foreach m,$(FS_MOD_AVAILABLE),
 		$(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-$(m)),
 			$(SED) 's|^[ #]*\([^#]*/mod_$(subst -,_,$(m))\)$$$$|\1|g' $(PKG_BUILD_DIR)/modules.conf
@@ -700,14 +696,6 @@ define Build/Compile
 endef
 
 
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/include $(1)/usr
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib$(PKG_NAME).{a,so*} $(1)/usr/lib/
-endef
-
-
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/default
@@ -716,7 +704,6 @@ define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
 	$(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME)
@@ -724,7 +711,6 @@ define Package/$(PKG_NAME)/install
 	$(INSTALL_DATA) ./files/$(PKG_NAME).default $(1)/etc/default/$(PKG_NAME)
 	$(INSTALL_DATA) ./files/$(PKG_NAME).hotplug $(1)/etc/hotplug.d/iface/90-$(PKG_NAME)
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include $(1)/usr/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib$(PKG_NAME)* $(1)/usr/lib/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/$(PKG_NAME).pc $(1)/usr/lib/pkgconfig/
 	$(if $(1)/usr/lib/lib$(PKG_NAME).la,$(STAGING_DIR_HOST)/bin/sed -i -re 's|$(STAGING_DIR)||g;s|$(TOOLCHAIN_DIR)||g;s|$(TARGET_CROSS)|usr|g;s|$(REAL_GNU_TARGET_NAME)|usr|g;s|-L$(PKG_BUILD_DIR)(.*)libzrtp ||g;:a;s|((-[IL]/\S+\s).*)\2|\1|;ta' $(1)/usr/lib/lib$(PKG_NAME).la)
@@ -976,7 +962,7 @@ $(eval $(call BuildPlugin,avmd,Advanced Voice Mail Detection,vanilla,,,,))
 $(eval $(call BuildPlugin,basic,BASIC,vanilla,,,,))
 $(eval $(call BuildPlugin,bert,Naive Bit Error Rate Tester,vanilla,,,,))
 $(eval $(call BuildPlugin,blacklist,Blacklist,vanilla,,,,))
-$(eval $(call BuildPlugin,bv,BroadVoice 16/32-bit Audio Codec,vanilla,,,,))
+$(eval $(call BuildPlugin,bv,BroadVoice 16/32-bit Audio Codec,vanilla,,,,@BROKEN)) # Requires unsupported libbroadvoice
 $(eval $(call BuildPlugin,callcenter,Call Center,vanilla,,,,))
 $(eval $(call BuildPlugin,cdr-csv,CSV-CDR Handler,mod,,,,)) # ~/conf
 $(eval $(call BuildPlugin,cdr-mongodb,MongoDB CDR logger,vanilla,,,,))
@@ -986,11 +972,12 @@ $(eval $(call BuildPlugin,celt,CELT Ultra-Low Delay Codec,vanilla,,,,+libogg))
 $(eval $(call BuildPlugin,cepstral,Cepstral Interface,vanilla,,,,@BROKEN)) # needs <swift.h>
 $(eval $(call BuildPlugin,cidlookup,Data Query For CID->NAME Services,mod,,,,+libcurl)) # ~/conf
 $(eval $(call BuildPlugin,cluechoo,Framework Demo,vanilla,,,,))
-$(eval $(call BuildPlugin,codec2,CoDec 2,,,,,))
+$(eval $(call BuildPlugin,codec2,CoDec 2,,,,,@BROKEN)) # Requires unsupported libcodec2
 $(eval $(call BuildPlugin,commands,API Commands,vanilla,,,,))
 $(eval $(call BuildPlugin,conference,Conference Room,vanilla,,,,))
 $(eval $(call BuildPlugin,console,Console Logger,vanilla,,,,))
 $(eval $(call BuildPlugin,curl,HTTP Request,vanilla,,,,+libcurl))
+$(eval $(call BuildPlugin,cv,Detect Video motion,vanilla,,,,@BROKEN))
 $(eval $(call BuildPlugin,dahdi-codec,DAHDI Codecs,vanilla,,,,))
 $(eval $(call BuildPlugin,db,Database Backend,vanilla,,,,+libdb47))
 $(eval $(call BuildPlugin,dialplan-asterisk,Asterisk Dialplan Parser,vanilla,,,,))
@@ -1001,7 +988,7 @@ $(eval $(call BuildPlugin,directory,Search By Name Directory IVR,vanilla,,,,))
 $(eval $(call BuildPlugin,distributor,Simple Robin-Round Load,vanilla,,,,))
 $(eval $(call BuildPlugin,dptools,Dialplan Tools,vanilla,,,,))
 $(eval $(call BuildPlugin,easyroute,Simple DID Routing,vanilla,,,,))
-$(eval $(call BuildPlugin,enum,ENUM Routing,,,,,+libldns @BROKEN))
+$(eval $(call BuildPlugin,enum,ENUM Routing,,,,,+libldns))
 $(eval $(call BuildPlugin,erlang-event,Erlang Event Handler,vanilla,,,,+erlang))
 $(eval $(call BuildPlugin,esf,Extra SIP Functionality,vanilla,,,,))
 $(eval $(call BuildPlugin,event-multicast,Multicast Event Handler,vanilla,,,,))
@@ -1010,29 +997,31 @@ $(eval $(call BuildPlugin,event-zmq,Socket Event Handler By Zero MQ,vanilla,,,,+
 $(eval $(call BuildPlugin,expr,Expression Evaluation,vanilla,,,,))
 $(eval $(call BuildPlugin,fifo,FIFO,vanilla,,,,))
 $(eval $(call BuildPlugin,file-string,Streaming Multiple Sound Files Sequentially,vanilla,,,,@OBSOLETE)) # merged into dptools
-$(eval $(call BuildPlugin,flite,Festival TTS,vanilla,,,,@(!(armeb||avr32)||BROKEN)))
+$(eval $(call BuildPlugin,flite,Festival TTS,vanilla,,,,+flite @(!(armeb||avr32)||BROKEN))) # flite is from old package repo
 $(eval $(call BuildPlugin,format-cdr,XML CDR Module to files or curl,vanilla,,,,))
 $(eval $(call BuildPlugin,fsk,Bell-202 1200-Baud FSK Decoder,vanilla,,,,))
-$(eval $(call BuildPlugin,fsv,Video Player / Recorder,vanilla,,,,))
+$(eval $(call BuildPlugin,fsv,Video Player / Recorder,vanilla,,,,+libyuv @BROKEN)) # Requires unsupported libyuv.
 $(eval $(call BuildPlugin,g723-1,G.723.1 Codec,vanilla,,,,))
 $(eval $(call BuildPlugin,g729,G.729 Codec,vanilla,,,,))
 $(eval $(call BuildPlugin,gsmopen,GSM Modem compatible Endpoint,mod,,,alsa,+FS_WITH_ALSA:alsa-lib +FS_WITH_LZMA:liblzma @FS_WITH_ALSA @BROKEN)) # needs gsmlib
 $(eval $(call BuildPlugin,h26x,H26X Linear Codec,vanilla,,,,))
 $(eval $(call BuildPlugin,h323,H323 Endpoint,mod,,,,@BROKEN)) # Req. H323Plus v1.24.x or newer
 $(eval $(call BuildPlugin,hash,API For Manipulating A Hash Table,vanilla,,,,))
+$(eval $(call BuildPlugin,hiredis,Redis DB access,vanilla,,,,+hiredis @BROKEN))
 #$(eval $(call BuildPlugin,html5,HTML5 Endpoint Module,vanilla,,,,)) # defunct?
 $(eval $(call BuildPlugin,httapi,HT Telephony API and HTTP Caching,mod,,,,)) # ~/conf
 $(eval $(call BuildPlugin,http-cache,HTTP GET With Caching,mod,,,,+libcurl)) # ~/conf
-$(eval $(call BuildPlugin,ilbc,ILBC Codec,vanilla,,,,))
+$(eval $(call BuildPlugin,ilbc,ILBC Codec,vanilla,,,,+libilbc @BROKEN)) # Requires unsupported libilbc.
 $(eval $(call BuildPlugin,isac,iSAC Codec,vanilla,,,,))
 $(eval $(call BuildPlugin,java,Java Language Interface,vanilla,,,,@BROKEN)) # needs java
 $(eval $(call BuildPlugin,json-cdr,JSon-CDR Interface,mod,,,,+libcurl))
+$(eval $(call BuildPlugin,kazoo,Socket Controlled Event Handler,vanilla,,,,+erlang))
 $(eval $(call BuildPlugin,ldap,LDAP interface,vanilla,,,,+libopenldap))
 $(eval $(call BuildPlugin,lcr,Least Cost Routing,vanilla,,,,))
 $(eval $(call BuildPlugin,local-stream,Multi-Channel On Same Stream,vanilla,,,,))
 $(eval $(call BuildPlugin,logfile,File Logger,vanilla,,,,))
 $(eval $(call BuildPlugin,loopback,Loopback to Dialplan Endpoint,vanilla,,,,))
-$(eval $(call BuildPlugin,lua,LUA Language Interface,vanilla,,,,))
+$(eval $(call BuildPlugin,lua,LUA Language Interface,vanilla,,,,+liblua))
 $(eval $(call BuildPlugin,managed,Media Switching Software Library,vanilla,,,,+glib2 @BROKEN)) # needs Mono
 $(eval $(call BuildPlugin,memcache,MemCached Interface,vanilla,,,,+libmemcached @BROKEN)) # Req host libmemcached
 $(eval $(call BuildPlugin,mongo,A Document-Oriented Database,vanilla,,,,@BROKEN))
@@ -1040,16 +1029,16 @@ $(eval $(call BuildPlugin,mp4,MP4 File Format Support For Video,vanilla,,,,@BROK
 $(eval $(call BuildPlugin,mp4v,MP4 CoDec Support For Video,vanilla,,,,))
 $(eval $(call BuildPlugin,native-file,WAV Format Sound Player,vanilla,,,,))
 $(eval $(call BuildPlugin,nibblebill,Credit / Debit Billing,vanilla,,,,))
-$(eval $(call BuildPlugin,opus,Opus CoDec,vanilla,,,,))
+$(eval $(call BuildPlugin,opus,Opus CoDec,vanilla,,,,+libopus))
 $(eval $(call BuildPlugin,oreka,Media Recording with Oreka,vanilla,,,,))
-$(eval $(call BuildPlugin,perl,Perl Language Interface,vanilla,,lib/perl5/5.20/$(PKG_NAME).la lib/perl5/5.20/$(PKG_NAME).pm lib/perl5/5.20/$(PKG_NAME).so,,+perl +libdb47 +libgdbm @ROKEN))
+$(eval $(call BuildPlugin,perl,Perl Language Interface,vanilla,,lib/perl5/$(PERL_VERSION)/$(PKG_NAME).la lib/perl5/$(PERL_VERSION)/$(PKG_NAME).pm lib/perl5/$(PERL_VERSION)/$(PKG_NAME).so,,+perl +libdb47 +libgdbm @BROKEN))
 $(eval $(call BuildPlugin,portaudio,Portaudio To Sound Card Interface,vanilla,,,alsa,+FS_WITH_ALSA:alsa-lib @FS_WITH_ALSA @BROKEN)) # needs portaudio
 $(eval $(call BuildPlugin,portaudio-stream,Portaudio Streaming Interface,vanilla,,,alsa,+FS_WITH_ALSA:alsa-lib @FS_WITH_ALSA @BROKEN)) # needs portaudio
 $(eval $(call BuildPlugin,posix-timer,POSIX Compliant Soft Timer,vanilla,,,,))
 $(eval $(call BuildPlugin,python,Python Language Interface,vanilla,,,,python @BROKEN))
 $(eval $(call BuildPlugin,radius-cdr,Radius-CDR interface,vanilla,,,,@BROKEN)) # fails in freeradius-client
 $(eval $(call BuildPlugin,rayo,Rayo server & node implementation,vanilla,,,,))
-$(eval $(call BuildPlugin,redis,Redis Limited Backend,vanilla,,,,))
+$(eval $(call BuildPlugin,redis,Redis limit backend,vanilla,,,,))
 $(eval $(call BuildPlugin,rss,RRS Feeds via TTS,vanilla,,,,))
 $(eval $(call BuildPlugin,rtc,RTC endpoint,vanilla,,,,))
 $(eval $(call BuildPlugin,rtmp,RTMP Protocol Handler,vanilla,,,,))
@@ -1067,15 +1056,15 @@ $(eval $(call BuildPlugin,say-ru,Russian Say,vanilla,,,,))
 $(eval $(call BuildPlugin,say-th,Thai Say,vanilla,,,,))
 $(eval $(call BuildPlugin,say-zh,Chineese Say,vanilla,,,,))
 $(eval $(call BuildPlugin,shell-stream,Streaming Audio Through CLI,vanilla,,,,))
-$(eval $(call BuildPlugin,silk,Skype(TM) SILK Codec Module,vanilla,,,,))
-$(eval $(call BuildPlugin,siren,G.722.1 Codec,vanilla,,,,))
+$(eval $(call BuildPlugin,silk,Skype(TM) SILK Codec Module,vanilla,,,,+libsilk @BROKEN)) # Requires unsupported libsilk
+$(eval $(call BuildPlugin,siren,G.722.1 Codec,vanilla,,,,+libg7221 @BROKEN)) # Requires unsupported libg7221
 $(eval $(call BuildPlugin,skel,Template For New Module,vanilla,,,,))
 $(eval $(call BuildPlugin,skinny,Skinny Call Control Protocol (SCCP),vanilla,,,,))
 $(eval $(call BuildPlugin,skypopen,Skype Compatible Endpoint,mod,,,,@FEATURE_drawing-backend_libX11))
 $(eval $(call BuildPlugin,sms,SMS,vanilla,,,,))
+$(eval $(call BuildPlugin,smpp,smpp client and server implementation,vanilla,,,,@BROKEN))
 $(eval $(call BuildPlugin,snapshot,Record Audio Snapshot to File,vanilla,,,,))
-$(eval $(call BuildPlugin,sndfile,Multi-Format Sound File,vanilla,,,,))
-$(eval $(call BuildPlugin,snipe-hunt,Snipe Hunt (Simple Example Module),vanilla,,,,))
+$(eval $(call BuildPlugin,sndfile,Multi-Format Sound File,vanilla,,,,+libsndfile))
 $(eval $(call BuildPlugin,snmp,SNMP AgentX Subagent,vanilla,,,,+libnetsnmp))
 $(eval $(call BuildPlugin,snom,SNOM specific features,vanilla,,,,))
 $(eval $(call BuildPlugin,sofia,SOFIA SIP,mod,,,,)) # ~/conf
@@ -1096,15 +1085,15 @@ $(eval $(call BuildPlugin,tone-stream,Tone Generation Stream,vanilla,,,,))
 $(eval $(call BuildPlugin,tts-commandline,ASR TTS Command Interface,vanilla,,,,))
 $(eval $(call BuildPlugin,unimrcp,UniMRCP (MRCP Client),vanilla,,,,@BROKEN))
 $(eval $(call BuildPlugin,valet-parking,Valet Parking Application,vanilla,,,,))
-$(eval $(call BuildPlugin,verto,HTML5 Verto interface,vanilla,,lib/perl5/5.20/MCAST.so lib/perl5/5.20/MCAST.la lib/perl5/5.20/MCAST.pm,perl rtc,@BROKEN))
+$(eval $(call BuildPlugin,verto,HTML5 Verto interface,vanilla,,lib/perl5/$(PERL_VERSION)/MCAST.so lib/perl5/$(PERL_VERSION)/MCAST.la lib/perl5/$(PERL_VERSION)/MCAST.pm,perl rtc,+perl @BROKEN))
 $(eval $(call BuildPlugin,vmd,VoiceMail Beep Detection,vanilla,,,,))
 $(eval $(call BuildPlugin,voicemail,VoiceMail,vanilla,,,,))
 $(eval $(call BuildPlugin,voicemail-ivr,VoiceMail IVR,vanilla,,,,))
-$(eval $(call BuildPlugin,vp8,VP8 Video Codec,vanilla,,,,))
+$(eval $(call BuildPlugin,vpx,VP8/9 Video Codec with transcoding,vanilla,,,,+libvpx))
 $(eval $(call BuildPlugin,xml-cdr,XML-CDR Handler,vanilla,,,,+libcurl))
 $(eval $(call BuildPlugin,xml-curl,XML-Curl Gateway,vanilla,,,,+libcurl))
 $(eval $(call BuildPlugin,xml-ldap,LDAP-XML Gateway,vanilla,,,,+PACKAGE_$(PKG_NAME)-mod-ldap:libopenldap))
 $(eval $(call BuildPlugin,xml-rpc,XML-RPC Interface,vanilla,,,,))
 $(eval $(call BuildPlugin,xml-radius,Radius authentication and authorization,vanilla,,,,+freeradius-client @BROKEN)) # freeradius-client isn't yet supported by OpenWRT.
 $(eval $(call BuildPlugin,xml-scgi,SCGI XML Gateway,vanilla,,,,))
-$(eval $(call BuildPlugin,yaml,YAML language,vanilla,,,,+libyaml @BROKEN))
+$(eval $(call BuildPlugin,yaml,YAML language,vanilla,,,,+libyaml))
diff --git a/net/freeswitch/patches/Makefile.am.patch b/net/freeswitch/patches/Makefile.am.patch
deleted file mode 100644
index 00f5a31..0000000
--- a/net/freeswitch/patches/Makefile.am.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,3 +1,7 @@
-+BASE=.
-+
-+include $(BASE)/build/openwrt_rules.mk
-+
- EXTRA_DIST =
- SUBDIRS = . src build
- AUTOMAKE_OPTIONS = foreign subdir-objects
-@@ -172,7 +176,6 @@ ZRTP_LIBS = -lbn -lzrtp
- libfreeswitch_la_LDFLAGS += $(ZRTP_LDFLAGS)
- libfreeswitch_la_LIBADD += $(ZRTP_LIBS)
- CORE_LIBS += libs/libzrtp/libzrtp.a
--LIBS += libs/libzrtp/third_party/bnlib/libbn.a
- endif
- 
- library_includedir      = $(includedir)
-@@ -311,7 +314,7 @@ endif
- $(libfreeswitch_la_SOURCES): $(CORE_LIBS) $(switch_builddir)/modules.conf  
- 
- src/include/switch_swigable_cpp.h: $(switch_srcdir)/src/include/switch_cpp.h
--	cat $(switch_srcdir)/src/include/switch_cpp.h | perl $(switch_srcdir)/build/strip.pl > $(switch_srcdir)/src/include/switch_swigable_cpp.h
-+	cat $(switch_srcdir)/src/include/switch_cpp.h | $(STAGING_DIR)/../host/usr/bin/perl $(switch_srcdir)/build/strip.pl > $(switch_srcdir)/src/include/switch_swigable_cpp.h
- #	$(CC) -E $(switch_srcdir)/src/include/switch_cpp.h \
- #		-I$(switch_srcdir)/src/include -I$(switch_srcdir)/libs/libteletone/src \
- #		-DSWITCH_DECLARE_CLASS= -DSWITCH_DECLARE\(x\)=x -DSWITCH_DECLARE_CONSTRUCTOR= \
-@@ -374,7 +377,7 @@ fs_ivrd_LDFLAGS = $(AM_LDFLAGS) -lpthrea
- nodist_freeswitch_SOURCES = src/include/switch_version.h
- freeswitch_SOURCES = src/switch.c
- freeswitch_CFLAGS  = $(AM_CFLAGS) $(CORE_CFLAGS)
--freeswitch_LDFLAGS = $(AM_LDFLAGS) -lpthread -rpath $(libdir)
-+freeswitch_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS) $(LIBS) -lpthread
- freeswitch_LDADD   = libfreeswitch.la libs/apr/libapr-1.la
- 
- if HAVE_ODBC
-@@ -633,7 +636,9 @@ sndfile-reconf:
- 
- tiff-reconf:
- 	cd libs/tiff-4.0.2 && autoreconf -fi
--	cd libs/tiff-4.0.2 && sh ./configure.gnu $(MY_DEFAULT_ARGS)
-+	cd libs/tiff-4.0.2 && sh ./configure.gnu $(MY_DEFAULT_ARGS) --host="$(GNU_TARGET_NAME)" --prefix="/usr"
-+	cd libs/spandsp && autoreconf -fi
-+	cd libs/spandsp && sh ./configure.gnu $(MY_DEFAULT_ARGS) --host="$(GNU_TARGET_NAME)" --prefix="/usr"
- 	cd libs/tiff-4.0.2 && make
- 
- python-reconf:
-@@ -658,9 +663,6 @@ iks-reconf:
- 	$(MAKE) mod_dingaling-clean
- 
- spandsp-reconf: tiff-reconf
--	cd libs/spandsp && $(MAKE) clean || echo
--	cd libs/spandsp && autoreconf -fi
--	cd libs/spandsp && sh ./configure.gnu $(MY_DEFAULT_ARGS)
- 	cd libs/spandsp && $(MAKE)
- 
- sofia-reconf:
diff --git a/net/freeswitch/patches/configure_ac.patch b/net/freeswitch/patches/configure_ac.patch
deleted file mode 100644
index 86386ec..0000000
--- a/net/freeswitch/patches/configure_ac.patch
+++ /dev/null
@@ -1,160 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -229,13 +229,16 @@ AX_COMPILER_VENDOR
- if test "x${cross_compiling}" = "xyes"; then
-     CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
-     case "$host" in
--    	 arm*-linux-gnueabi*|arm*-*-linux-gnueabi*)
-+    	 arm*-linux-gnueabi*|arm*-*-linux-*)
- 		# spandsp modem
- 		ac_cv_file__dev_ptmx=yes
- 		# libjs
- 		export ac_cv_va_copy=yes
-+		# sofia-sip
-+		export ac_cv_dev_urandom=yes
- 		# srtp
- 		export ac_cv_file__dev_urandom=yes
-+		export ac_cv_file___dev_urandom_=yes
- 		# rpl_malloc
- 		export ac_cv_func_realloc_0_nonnull=yes
- 		export ac_cv_func_malloc_0_nonnull=yes
-@@ -248,7 +251,7 @@ if test "x${cross_compiling}" = "xyes";
- 		export apr_cv_mutex_recursive=yes
- 		export ac_cv_func_pthread_rwlock_init=yes
- 		export apr_cv_type_rwlock_t=yes
--		export apr_cv_process_shared_works=yes
-+		export apr_cv_process_shared_works=no
- 		export apr_cv_mutex_robust_shared=yes
- 	 ;;
-     esac
-@@ -379,9 +382,6 @@ elif test "x${ax_cv_c_compiler_vendor}"
- elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
-     APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC)
-     APR_ADDTO(SWITCH_AM_CXXFLAGS, -fPIC)
--    if test "$ac_cv_gcc_supports_w_no_unused_result" = yes; then
--      APR_ADDTO(SWITCH_AM_CFLAGS, -Werror)
--    fi
-     if test "${enable_64}" = "yes"; then
- 	case "$host" in
-              *darwin*)
-@@ -861,7 +861,6 @@ AC_CHECK_LIB(pthread, pthread_setschedpa
- 
- AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket))
- 
--AC_CHECK_FILE(/dev/ptmx, [AC_DEFINE(HAVE_DEV_PTMX, 1, [Define if you have /dev/ptmx])])
- AC_CHECK_LIB(util, openpty, [AC_DEFINE(HAVE_OPENPTY, 1, [Define if you have openpty()])])
- 
- AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[
-@@ -1177,14 +1176,14 @@ case $host in
-        ;;
- esac
- 
--if ! (test -x "$PKG_CONFIG" || test -x "$(which pkg-config)"); then
--  AC_MSG_ERROR([You need to install pkg-config to configure FreeSWITCH.])
-+if ! test -x "${STAGING_DIR}/../host/bin/pkg-config"; then
-+  AC_MSG_ERROR([Missing tools/pkg-config package needed to configure FreeSWITCH.])
- fi
- 
--# temporary workaround for Debian libldns-dev package bug
--if test "$cross_compiling" != "yes" && test -f /usr/lib/pkg-config/libldns.pc; then
--  path_push_unique PKG_CONFIG_PATH /usr/lib/pkg-config
--fi
-+#
-+# Workaround for OpenWRT pkg-config
-+#
-+path_push_unique PKG_CONFIG_PATH ${STAGING_DIR}/usr/lib/pkg-config
- 
- module_enabled() {
-   grep -v -e "\#" -e "^\$" modules.conf | sed -e "s|^.*/||" | grep "^${1}\$" >/dev/null
-@@ -1205,7 +1204,7 @@ PKG_CHECK_MODULES([LDNS], [libldns >= 1.
-   AC_CHECK_LIB([ldns], [ldns_str2rdf_a], [LDNS_LIBS=-lldns])
-   AS_IF([test -z "$LDNS_LIBS"],[
-     if module_enabled mod_enum; then
--      AC_MSG_ERROR([You need to either install libldns-dev or disable mod_enum in modules.conf])
-+      AC_MSG_ERROR([You need to either install libldns or disable mod_enum in modules.conf])
-     else
-       AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_LDNS],[false])
-     fi],[
-@@ -1287,18 +1286,18 @@ AM_CONDITIONAL([HAVE_MYSQL],[test "$foun
- # perl checks
- #
- 
--AC_CHECK_PROG(PERL,perl,[ac_cv_have_perl=yes],[ac_cv_have_perl=no])
--
--# -a "x$ac_cv_have_EXTERN_h" != "xno"
-+AC_CHECK_PROG([PERL],[perl],[ac_cv_have_perl=yes],[ac_cv_have_perl=no],[${STAGING_DIR}/../host/usr/bin])
-+PERL=$as_dir/$ac_word$ac_exec_ext
- 
- if test "x$ac_cv_have_perl" != "xno"; then
--   PERL=perl
--   PERL_SITEDIR="`$PERL -MConfig -e 'print $Config{archlib}'`"
--   PERL_LIBDIR="-L`$PERL -MConfig -e 'print $Config{archlib}'`/CORE"
--   PERL_LIBS="`$PERL -MConfig -e 'print $Config{libs}'`"
--   PERL_CFLAGS="-w -DMULTIPLICITY `$PERL -MExtUtils::Embed -e ccopts | sed -e 's|-arch x86_64 -arch i386||'` -DEMBED_PERL"
--   PERL_LDFLAGS="`$PERL -MExtUtils::Embed -e ldopts| sed -e 's|-arch x86_64 -arch i386||'`"
--   PERL_INC="`$PERL -MExtUtils::Embed -e perl_inc`"
-+   PERL_SITELIB="/usr/lib/perl5/5.20"
-+   PERL_SITEDIR="${STAGING_DIR}${PERL_SITELIB}"
-+   PERL_COREDIR="${PERL_SITEDIR}/CORE"
-+   PERL_INC="-I${PERL_COREDIR}"
-+   PERL_CFLAGS="-w -DMULTIPLICITY -fwrapv -fno-strict-aliasing -pipe -fstack-protector ${PERL_INC} -DEMBED_PERL"
-+   PERL_LIBDIR="-L${PERL_COREDIR}"
-+   PERL_LIBS="-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc "
-+   PERL_LDFLAGS="${LDFLAGS} -lpthread ${PERL_LIBS}"
- 
-    save_CFLAGS="$CFLAGS"
-    CFLAGS="$PERL_CFLAGS"
-@@ -1311,12 +1310,15 @@ if test "x$ac_cv_have_perl" != "xno"; th
-    AC_CHECK_LIB([perl], [perl_alloc], ac_cv_use_libperl=yes, ac_cv_use_libperl=no)
-    LDFLAGS="$save_LDFLAGS"
- 
--   AC_SUBST(PERL_SITEDIR)
--   AC_SUBST(PERL_LIBDIR)
--   AC_SUBST(PERL_LIBS)
-+   AC_SUBST(PERL)
-    AC_SUBST(PERL_CFLAGS)
--   AC_SUBST(PERL_LDFLAGS)
-+   AC_SUBST(PERL_COREDIR)
-    AC_SUBST(PERL_INC)
-+   AC_SUBST(PERL_LDFLAGS)
-+   AC_SUBST(PERL_LIBDIR)
-+   AC_SUBST(PERL_LIBS)
-+   AC_SUBST(PERL_SITEDIR)
-+   AC_SUBST(PERL_SITELIB)
- fi
- 
- AM_CONDITIONAL([HAVE_PERL],[test "x$ac_cv_have_perl" != "xno" -a "x$ac_cv_have_EXTERN_h" != "xno" -a "x$ac_cv_use_libperl" != "xno"])
-@@ -1325,17 +1327,19 @@ AM_CONDITIONAL([HAVE_PERL],[test "x$ac_c
- # php checks
- #
- 
--AC_CHECK_PROG(PHP,php,[ac_cv_have_php=yes],[ac_cv_have_php=no])
--AC_CHECK_PROG(PHP_CONFIG,php-config,[ac_cv_have_php_config=yes],[ac_cv_have_php_config=no])
-+AC_CHECK_PROG([PHP],[php],[ac_cv_have_php=yes],[ac_cv_have_php=no],[${STAGING_DIR}/../host/usr/bin:/usr/bin])
-+PHP=$as_dir/$ac_word$ac_exec_ext
-+
-+AC_CHECK_PROG([PHP_CONFIG],[php-config],[ac_cv_have_php_config=yes],[ac_cv_have_php_config=no],[${STAGING_DIR}/../host/usr/bin])
-+PHP_CONFIG=$as_dir/$ac_word$ac_exec_ext
-+
- AM_CONDITIONAL([HAVE_PHP],[test "x$ac_cv_have_php" != "xno" -a "x$ac_cv_have_php_config" != "xno"])
- 
- if test "x$ac_cv_have_php" != "xno" -a "x$ac_cv_have_php_config" != "xno"; then
--   PHP=php
--   PHP_CONFIG=php-config
-    PHP_LDFLAGS="`$PHP_CONFIG --ldflags`"
--   PHP_LIBS="`$PHP_CONFIG --libs | sed -r 's/ ?-l(bz2|pcre|xml2|gssapi_krb5|krb5|k5crypto|com_err|history|z|readline|gmp|ssl|crypto)//g'`"
-+   PHP_LIBS="`$PHP_CONFIG --libs | sed -r 's/ ?-l(bz2|pcre|xml2|gssapi_krb5|krb5|k5crypto|com_err|history|z|readline|gmp|ssl|crypt(o|))//g;s/^/-lcrypto/g'`"
-    PHP_EXT_DIR="`$PHP_CONFIG --extension-dir`"
--   PHP_INC_DIR="`$PHP -r 'echo ini_get("include_path");' | cut -d: -f2`"
-+   PHP_INC_DIR="`$PHP_CONFIG --include-dir`"
-    PHP_INI_DIR="`$PHP_CONFIG --configure-options | tr " " "\n" | grep -- --with-config-file-scan-dir | cut -f2 -d=`"
-    PHP_CFLAGS="`$PHP_CONFIG --includes`"
-    AC_SUBST(PHP_LDFLAGS)
-@@ -1443,6 +1447,7 @@ then
- 				AC_MSG_NOTICE([Your python seems OK, do not forget to enable mod_python in modules.conf])
- 				AC_SUBST([PYTHON_CFLAGS],  [$PYTHON_CFLAGS])
- 				AC_SUBST([PYTHON_LDFLAGS], [$PYTHON_LDFLAGS])
-+				AC_SUBST([PYTHON_LIB],     [$PYTHON_LIB])
- 			fi
- 		else
- 			AS_IF([test "$with_python" = "try"],
diff --git a/net/freeswitch/patches/libs-libzrtp-include-zrtp_config.patch b/net/freeswitch/patches/libs-libzrtp-include-zrtp_config.patch
deleted file mode 100644
index 0463885..0000000
--- a/net/freeswitch/patches/libs-libzrtp-include-zrtp_config.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/libs/libzrtp/include/zrtp_config.h
-+++ b/libs/libzrtp/include/zrtp_config.h
-@@ -68,8 +68,16 @@
-  * If the byte order is not specified manually in zrtp_config_user.h - try to detect it automatically
-  */
- #if !defined(ZRTP_BYTE_ORDER)
-+#if defined(linux) || defined(__linux)
- 
--#if defined(_i386_) || defined(i_386_) || defined(_X86_) || defined(x86) || defined(__i386__) || \
-+#include <endian.h>
-+#if __BYTE_ORDER == __LITTLE_ENDIAN
-+#define ZRTP_BYTE_ORDER ZBO_LITTLE_ENDIAN
-+#elif __BYTE_ORDER == __BIG_ENDIAN
-+#define ZRTP_BYTE_ORDER ZBO_BIG_ENDIAN
-+#endif
-+
-+#elif defined(_i386_) || defined(i_386_) || defined(_X86_) || defined(x86) || defined(__i386__) || \
- 	defined(__i386) || defined(_M_IX86) || defined(__I86__)
- /*
-  * Generic i386 processor family, little-endian
diff --git a/net/freeswitch/patches/libs-sofia-sip-configure_gnu.patch b/net/freeswitch/patches/libs-sofia-sip-configure_gnu.patch
deleted file mode 100644
index 73b6172..0000000
--- a/net/freeswitch/patches/libs-sofia-sip-configure_gnu.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/libs/sofia-sip/configure.gnu
-+++ b/libs/sofia-sip/configure.gnu
-@@ -1,4 +1,4 @@
- #! /bin/sh
- srcpath=$(dirname $0 2>/dev/null )  || srcpath="." 
--$srcpath/configure "$@" --with-pic --with-glib=no --disable-shared  --without-doxygen --disable-stun
-+$srcpath/configure "$@" --with-pic --with-glib=no --disable-shared  --without-doxygen
- 
diff --git a/net/freeswitch/patches/libs-spandsp-src-spandsp-fast_convert_h.patch b/net/freeswitch/patches/libs-spandsp-src-spandsp-fast_convert_h.patch
deleted file mode 100644
index e2fb3da..0000000
--- a/net/freeswitch/patches/libs-spandsp-src-spandsp-fast_convert_h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/libs/spandsp/src/spandsp/fast_convert.h
-+++ b/libs/spandsp/src/spandsp/fast_convert.h
-@@ -195,7 +195,7 @@ extern "C"
-     {
-         return (long int) (x);
-     }
--#elif defined(__ppc__)  ||   defined(__powerpc__)
-+#elif 0 /* defined(__ppc__)  ||   defined(__powerpc__) */
-     static __inline__ long int lfastrint(register double x)
-     {
-         int res[2];
diff --git a/net/freeswitch/patches/libs-spandsp-src-t4_rx_c.patch b/net/freeswitch/patches/libs-spandsp-src-t4_rx_c.patch
deleted file mode 100644
index 7fac540..0000000
--- a/net/freeswitch/patches/libs-spandsp-src-t4_rx_c.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/libs/spandsp/src/t4_rx.c
-+++ b/libs/spandsp/src/t4_rx.c
-@@ -50,7 +50,7 @@
- #include "spandsp/stdbool.h"
- #endif
- #include "floating_fudge.h"
--#include <tiffio.h>
-+#include <tiffiop.h>
- 
- #include "spandsp/telephony.h"
- #include "spandsp/alloc.h"
diff --git a/net/freeswitch/patches/libs-spandsp-src-t4_tx_c.patch b/net/freeswitch/patches/libs-spandsp-src-t4_tx_c.patch
deleted file mode 100644
index ed36237..0000000
--- a/net/freeswitch/patches/libs-spandsp-src-t4_tx_c.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/libs/spandsp/src/t4_tx.c
-+++ b/libs/spandsp/src/t4_tx.c
-@@ -50,7 +50,7 @@
- #include "spandsp/stdbool.h"
- #endif
- #include "floating_fudge.h"
--#include <tiffio.h>
-+#include <tiffiop.h>
- 
- #include "spandsp/telephony.h"
- #include "spandsp/alloc.h"
diff --git a/net/freeswitch/patches/libs-xmlrpc-c-config_mk_in.patch b/net/freeswitch/patches/libs-xmlrpc-c-config_mk_in.patch
deleted file mode 100644
index 79cb33e..0000000
--- a/net/freeswitch/patches/libs-xmlrpc-c-config_mk_in.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/libs/xmlrpc-c/config.mk.in
-+++ b/libs/xmlrpc-c/config.mk.in
-@@ -335,8 +335,8 @@ endif
- # The cross compiling user can update config.mk or override
- # BUILDTOOL_CC on a make command.
- 
--BUILDTOOL_CC = $(CC)
--BUILDTOOL_CCLD = $(CCLD)
-+BUILDTOOL_CC = $(HOSTCC)
-+BUILDTOOL_CCLD = $(HOSTCC)
- 
- # Here are the commands 'make install' uses to install various kinds of files:
- 
diff --git a/net/freeswitch/patches/libs-xmlrpc-c-lib-expat-gennmtab-Makefile.patch b/net/freeswitch/patches/libs-xmlrpc-c-lib-expat-gennmtab-Makefile.patch
deleted file mode 100644
index d50d200..0000000
--- a/net/freeswitch/patches/libs-xmlrpc-c-lib-expat-gennmtab-Makefile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/libs/xmlrpc-c/lib/expat/gennmtab/Makefile
-+++ b/libs/xmlrpc-c/lib/expat/gennmtab/Makefile
-@@ -1,3 +1,5 @@
-+TOPDIR=$(shell (cd $(SRCDIR)/../../../../..; pwd))
-+
- ifeq ($(SRCDIR),)
-   updir = $(shell echo $(dir $(1)) | sed 's/.$$//')
-   EXPATDIR := $(call updir,$(CURDIR))
-@@ -7,6 +9,7 @@ ifeq ($(SRCDIR),)
- endif
- SUBDIR := lib/expat/gennmtab
- 
-+include $(TOPDIR)/rules.mk
- include $(BLDDIR)/config.mk
- 
- LDFLAGS = $(LADD)
diff --git a/net/freeswitch/patches/build-config-erlang_m4.patch b/net/freeswitch/patches/musl/build-config-erlang_m4.patch
similarity index 95%
rename from net/freeswitch/patches/build-config-erlang_m4.patch
rename to net/freeswitch/patches/musl/build-config-erlang_m4.patch
index ebf79b7..5d744f7 100644
--- a/net/freeswitch/patches/build-config-erlang_m4.patch
+++ b/net/freeswitch/patches/musl/build-config-erlang_m4.patch
@@ -8,7 +8,7 @@
  #
  AC_ARG_WITH(
  	[erlang],
-@@ -19,22 +19,23 @@ then
+@@ -20,22 +20,23 @@ then
  		if test ! -x "$with_erlang" ; then
  			AC_MSG_ERROR([Specified erlang does not exist or is not executable: $with_erlang])
  		fi
@@ -39,7 +39,7 @@
  		AC_MSG_CHECKING([erlang libdir])
  		if test -z "`echo $ERLANG_LIBDIR`" ; then
  			AC_MSG_ERROR([failed])
-@@ -42,9 +43,16 @@ then
+@@ -43,9 +44,16 @@ then
  			ERLANG_LDFLAGS="-L$ERLANG_LIBDIR $ERLANG_LDFLAGS"
  			LIBS="-L$ERLANG_LIBDIR $LIBS"
  		fi
@@ -57,7 +57,7 @@
  		AC_MSG_CHECKING([erlang incdir])
  		if test -z "`echo $ERLANG_INCDIR`" ; then
  			AC_MSG_ERROR([failed])
-@@ -58,10 +66,11 @@ then
+@@ -59,10 +67,11 @@ then
  
  		ERLANG_LIB="ei"
  
@@ -71,7 +71,7 @@
  
  		if test "$has_libei" = "no" ; then
  			AS_IF([test "$with_erlang" = "try"],
-@@ -75,7 +84,7 @@ then
+@@ -76,7 +85,7 @@ then
  			)
  		else
  			ERLANG_LDFLAGS="$ERLANG_LDFLAGS -lei"
@@ -79,8 +79,8 @@
 +			AC_MSG_NOTICE([Your erlang seems OK. You can now use ErLang in your codes.])
  			AC_SUBST([ERLANG_CFLAGS],  [$ERLANG_CFLAGS])
  			AC_SUBST([ERLANG_LDFLAGS], [$ERLANG_LDFLAGS])
- 		fi
-@@ -85,12 +94,12 @@ then
+ 			AM_CONDITIONAL([HAVE_ERLANG],[true])
+@@ -87,12 +96,12 @@ then
  
  	else
  		AS_IF([test "$with_erlang" = "try"],
diff --git a/net/freeswitch/patches/build-modules_conf_in.patch b/net/freeswitch/patches/musl/build-modules_conf_in.patch
similarity index 75%
rename from net/freeswitch/patches/build-modules_conf_in.patch
rename to net/freeswitch/patches/musl/build-modules_conf_in.patch
index 26aad5b..9db0e8e 100644
--- a/net/freeswitch/patches/build-modules_conf_in.patch
+++ b/net/freeswitch/patches/musl/build-modules_conf_in.patch
@@ -1,10 +1,10 @@
 --- a/build/modules.conf.in
 +++ b/build/modules.conf.in
-@@ -35,6 +35,7 @@ applications/mod_httapi
+@@ -38,6 +38,7 @@ applications/mod_httapi
  #applications/mod_rad_auth
  #applications/mod_redis
  #applications/mod_rss
 +#applications/mod_skel
- #applications/mod_sonar
  applications/mod_sms
  #applications/mod_snapshot
+ #applications/mod_snom
diff --git a/net/freeswitch/patches/build-openwrt_rules.mk.patch b/net/freeswitch/patches/musl/build-openwrt_rules.mk.patch
similarity index 100%
rename from net/freeswitch/patches/build-openwrt_rules.mk.patch
rename to net/freeswitch/patches/musl/build-openwrt_rules.mk.patch
diff --git a/net/freeswitch/patches/musl/configure_ac.patch b/net/freeswitch/patches/musl/configure_ac.patch
new file mode 100644
index 0000000..9bd513d
--- /dev/null
+++ b/net/freeswitch/patches/musl/configure_ac.patch
@@ -0,0 +1,65 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -254,7 +254,7 @@ AX_COMPILER_VENDOR
+ if test "x${cross_compiling}" = "xyes"; then
+     CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
+     case "$host" in
+-    	 arm*-linux-gnueabi*|arm*-*-linux-gnueabi*)
++    	 arm*-linux-gnueabi*|arm*-*-linux-*)
+ 		# spandsp modem
+ 		ac_cv_file__dev_ptmx=yes
+ 		# libjs
+@@ -273,7 +273,7 @@ if test "x${cross_compiling}" = "xyes";
+ 		export apr_cv_mutex_recursive=yes
+ 		export ac_cv_func_pthread_rwlock_init=yes
+ 		export apr_cv_type_rwlock_t=yes
+-		export apr_cv_process_shared_works=yes
++		export apr_cv_process_shared_works=no
+ 		export apr_cv_mutex_robust_shared=yes
+ 	 ;;
+     esac
+@@ -405,9 +405,6 @@ elif test "x${ax_cv_c_compiler_vendor}"
+ elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
+     APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC)
+     APR_ADDTO(SWITCH_AM_CXXFLAGS, -fPIC)
+-    if test "$ac_cv_gcc_supports_w_no_unused_result" = yes; then
+-      APR_ADDTO(SWITCH_AM_CFLAGS, -Werror)
+-    fi
+     if test "${enable_64}" = "yes"; then
+ 	case "$host" in
+              *darwin*)
+@@ -901,7 +898,6 @@ AC_CHECK_LIB(pthread, pthread_setschedpa
+ 
+ AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket))
+ 
+-AC_CHECK_FILE(/dev/ptmx, [AC_DEFINE(HAVE_DEV_PTMX, 1, [Define if you have /dev/ptmx])])
+ AC_CHECK_LIB(util, openpty, [AC_DEFINE(HAVE_OPENPTY, 1, [Define if you have openpty()])])
+ 
+ AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[
+@@ -1474,14 +1470,14 @@ AM_CONDITIONAL([HAVE_MYSQL],[test "$foun
+ # perl checks
+ #
+ 
+-AC_CHECK_PROG(PERL,perl,[ac_cv_have_perl=yes],[ac_cv_have_perl=no])
++AC_CHECK_PROG(PERL,[perl],[ac_cv_have_perl=yes],[ac_cv_have_perl=no],[${STAGING_DIR}/../host/usr/bin])
++PERL=$as_dir/$ac_word$ac_exec_ext
+ 
+ # -a "x$ac_cv_have_EXTERN_h" != "xno"
+ 
+ if test "x$ac_cv_have_perl" != "xno"; then
+-   PERL=perl
+-   PERL_SITEDIR="`$PERL -MConfig -e 'print $Config{archlib}'`"
+-   PERL_LIBDIR="-L`$PERL -MConfig -e 'print $Config{archlib}'`/CORE"
++   PERL_SITEDIR="`$PERL -MConfig -e 'print $Config{archlibexp}'`"
++   PERL_LIBDIR="-L`$PERL -MConfig -e 'print $Config{archlibexp}'`/CORE"
+    PERL_LIBS="`$PERL -MConfig -e 'print $Config{libs}'`"
+    PERL_CFLAGS="-w -DMULTIPLICITY `$PERL -MExtUtils::Embed -e ccopts | sed -e 's|-arch x86_64 -arch i386||'` -DEMBED_PERL"
+    PERL_LDFLAGS="`$PERL -MExtUtils::Embed -e ldopts| sed -e 's|-arch x86_64 -arch i386||'`"
+@@ -1498,6 +1494,7 @@ if test "x$ac_cv_have_perl" != "xno"; th
+    AC_CHECK_LIB([perl], [perl_alloc], ac_cv_use_libperl=yes, ac_cv_use_libperl=no)
+    LDFLAGS="$save_LDFLAGS"
+ 
++   AC_SUBST(PERL)
+    AC_SUBST(PERL_SITEDIR)
+    AC_SUBST(PERL_LIBDIR)
+    AC_SUBST(PERL_LIBS)
diff --git a/net/freeswitch/patches/libs-apr-configure_ac.patch b/net/freeswitch/patches/musl/libs-apr-configure_ac.patch
similarity index 100%
rename from net/freeswitch/patches/libs-apr-configure_ac.patch
rename to net/freeswitch/patches/musl/libs-apr-configure_ac.patch
diff --git a/net/freeswitch/patches/musl/libs-apr-util-configure_gnu.patch b/net/freeswitch/patches/musl/libs-apr-util-configure_gnu.patch
new file mode 100644
index 0000000..b933b3c
--- /dev/null
+++ b/net/freeswitch/patches/musl/libs-apr-util-configure_gnu.patch
@@ -0,0 +1,8 @@
+--- a/libs/apr-util/configure.gnu
++++ b/libs/apr-util/configure.gnu
+@@ -1,4 +1,4 @@
+ #! /bin/sh
+ srcpath=$(dirname $0 2>/dev/null )  || srcpath="." 
+-$srcpath/configure "$@" --with-apr=../apr --disable-shared --with-pic --without-sqlite2 --without-sqlite3 --with-expat=builtin
++$srcpath/configure "$@" --with-apr=../apr --disable-shared --with-expat=builtin
+ 
diff --git a/net/freeswitch/patches/libs-srtp-configure-ac.patch b/net/freeswitch/patches/musl/libs-srtp-configure_ac.patch
similarity index 50%
rename from net/freeswitch/patches/libs-srtp-configure-ac.patch
rename to net/freeswitch/patches/musl/libs-srtp-configure_ac.patch
index 6fbfeb5..56c1691 100644
--- a/net/freeswitch/patches/libs-srtp-configure-ac.patch
+++ b/net/freeswitch/patches/musl/libs-srtp-configure_ac.patch
@@ -1,18 +1,13 @@
 --- a/libs/srtp/configure.ac
 +++ b/libs/srtp/configure.ac
-@@ -130,9 +130,12 @@ if test "$enable_kernel_linux" = "yes";
+@@ -130,10 +130,6 @@ if test "$enable_kernel_linux" = "yes";
  fi
  AC_MSG_RESULT($enable_kernel_linux)
  
 -dnl Check for /dev/urandom
 -AC_CHECK_FILE(/dev/urandom, DEV_URANDOM=/dev/urandom,
 -   [AC_CHECK_FILE(/dev/random, DEV_URANDOM=/dev/random)])
-+
-+dnl Check for /dev/urandom ONLY when NOT cross compiling
-+if test "$cross_compiling" != yes; then
-+  AC_CHECK_FILE(/dev/urandom, DEV_URANDOM=/dev/urandom,
-+     [AC_CHECK_FILE(/dev/random, DEV_URANDOM=/dev/random)])
-+fi
- 
+-
  dnl Checks for header files.
  AC_HEADER_STDC
+ AC_CHECK_HEADERS(stdlib.h)
diff --git a/net/freeswitch/patches/patched-13ubuntu-configure_in.patch b/net/freeswitch/patches/patched-13ubuntu-configure_in.patch
deleted file mode 100644
index 1c397c0..0000000
--- a/net/freeswitch/patches/patched-13ubuntu-configure_in.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/configure.in
-+++ b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/configure.in
-@@ -56,21 +56,6 @@ dnl Checks for programs.
- AC_PROG_CPP
- AC_PROG_CXX
- 
--dnl check for gcc 2.95.x
--AC_TRY_RUN([
--#include <unistd.h>
--main()
--{
--#if defined(__GNUC__) && \
--    ! (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95))
--    return 1;
--#endif
--  return 0;
--}
--],,
--[echo "need at least gcc 2.95 to compile correctly"
--exit 1])
--
- dnl check for alloca
- AC_FUNC_ALLOCA
- 
diff --git a/net/freeswitch/patches/src-Makefile_am.patch b/net/freeswitch/patches/src-Makefile_am.patch
deleted file mode 100644
index cb7e3a6..0000000
--- a/net/freeswitch/patches/src-Makefile_am.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/libs/libcodec2/src/Makefile.am
-+++ b/libs/libcodec2/src/Makefile.am
-@@ -88,6 +88,12 @@ codebookge.$(OBJEXT): codebookge.c
- 
- codebook.lo: codebook.c
- 
-+generate_codebook:
-+	$(CC_FOR_BUILD) -o generate_codebook generate_codebook.c -lm
-+
-+genlspdtcb:
-+	$(CC_FOR_BUILD) -o genlspdtcb genlspdtcb.c -lm
-+
- codebook.c: generate_codebook $(CODEBOOKS)
- 	./generate_codebook lsp_cb $(CODEBOOKS) > codebook.c
- 
diff --git a/net/freeswitch/patches/src-mod-codecs-mod_celt-Makefile_am.patch b/net/freeswitch/patches/src-mod-codecs-mod_celt-Makefile_am.patch
deleted file mode 100644
index 55d349a..0000000
--- a/net/freeswitch/patches/src-mod-codecs-mod_celt-Makefile_am.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/mod/codecs/mod_celt/Makefile.am
-+++ b/src/mod/codecs/mod_celt/Makefile.am
-@@ -19,7 +19,7 @@ $(CELT_DIR):
- 
- $(CELT_BUILDDIR)/Makefile: $(CELT_DIR)
- 	mkdir -p $(CELT_BUILDDIR)
--	cd $(CELT_BUILDDIR) && $(DEFAULT_VARS) $(CELT_DIR)/configure $(DEFAULT_ARGS) --disable-shared --with-pic --srcdir=$(CELT_DIR)
-+	cd $(CELT_BUILDDIR) && $(DEFAULT_VARS) $(CELT_DIR)/configure $(DEFAULT_ARGS) --disable-shared --with-pic --srcdir=$(CELT_DIR) --with-ogg=$(STAGING_DIR)/usr
- 	$(TOUCH_TARGET)
- 
- $(CELT_LA): $(CELT_BUILDDIR)/Makefile
diff --git a/net/freeswitch/patches/src-mod-codecs-mod_isac-typedefs_h.patch b/net/freeswitch/patches/src-mod-codecs-mod_isac-typedefs_h.patch
deleted file mode 100644
index 84de2af..0000000
--- a/net/freeswitch/patches/src-mod-codecs-mod_isac-typedefs_h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/mod/codecs/mod_isac/typedefs.h
-+++ b/src/mod/codecs/mod_isac/typedefs.h
-@@ -66,7 +66,7 @@
- #define WEBRTC_ARCH_X86
- #define WEBRTC_ARCH_32_BITS
- #define WEBRTC_ARCH_LITTLE_ENDIAN
--#elif defined(__ARMEL__)
-+#elif defined(__ARMEL__) || defined(__mips__)
- // TODO(andrew): We'd prefer to control platform defines here, but this is
- // currently provided by the Android makefiles. Commented to avoid duplicate
- // definition warnings.
diff --git a/net/freeswitch/patches/src-mod-codecs-mod_opus-Makefile_am.patch b/net/freeswitch/patches/src-mod-codecs-mod_opus-Makefile_am.patch
deleted file mode 100644
index bedf1df..0000000
--- a/net/freeswitch/patches/src-mod-codecs-mod_opus-Makefile_am.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/mod/codecs/mod_opus/Makefile.am
-+++ b/src/mod/codecs/mod_opus/Makefile.am
-@@ -19,7 +19,7 @@ $(OPUS_DIR)/configure:
- 
- $(OPUS_BUILDDIR)/Makefile: $(OPUS_DIR)/configure
- 	mkdir -p $(OPUS_BUILDDIR)
--	cd $(OPUS_BUILDDIR) && $(DEFAULT_VARS) $(OPUS_DIR)/configure $(MY_DEFAULT_ARGS)
-+	cd $(OPUS_BUILDDIR) && $(DEFAULT_VARS) $(OPUS_DIR)/configure $(MY_DEFAULT_ARGS) --host=$(host) --disable-shared --with-pic --srcdir=$(OPUS_DIR)
- 	$(TOUCH_TARGET)
- 
- $(OPUS_LA): $(OPUS_BUILDDIR)/Makefile
diff --git a/net/freeswitch/patches/src-mod-directories-mod_ldap-Makefile_am.patch b/net/freeswitch/patches/src-mod-directories-mod_ldap-Makefile_am.patch
deleted file mode 100644
index 2872754..0000000
--- a/net/freeswitch/patches/src-mod-directories-mod_ldap-Makefile_am.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/mod/directories/mod_ldap/Makefile.am
-+++ b/src/mod/directories/mod_ldap/Makefile.am
-@@ -13,7 +13,7 @@ mod_ldap_la_CFLAGS   = $(AM_CFLAGS) -DWI
- mod_ldap_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(LDAPLA) $(LIBLBERLA)
- mod_ldap_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
- 
--MY_DEFAULT_ARGS= --build=$(build) --host=$(host) --target=$(target) --prefix="$(prefix)" --exec_prefix="$(exec_prefix)" --libdir="$(libdir)" --disable-slapd --disable-bdb --disable-hdb
-+MY_DEFAULT_ARGS= --build=$(build) --host=$(host) --target=$(target) --prefix="$(prefix)" --exec_prefix="$(exec_prefix)" --libdir="$(libdir)" --with-yielding_select=yes --disable-slapd --disable-bdb --disable-hdb
- 
- $(MODNAME).lo: $(LDAPLA) $(LIBLBERLA)
- 
diff --git a/net/freeswitch/patches/src-mod-endpoints-mod_gsmopen-Makefile_am.patch b/net/freeswitch/patches/src-mod-endpoints-mod_gsmopen-Makefile_am.patch
deleted file mode 100644
index 1d74422..0000000
--- a/net/freeswitch/patches/src-mod-endpoints-mod_gsmopen-Makefile_am.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/mod/endpoints/mod_gsmopen/Makefile.am
-+++ b/src/mod/endpoints/mod_gsmopen/Makefile.am
-@@ -12,7 +12,7 @@ SPANDSP_LA=$(SPANDSP_BUILDDIR)/src/libsp
- mod_LTLIBRARIES = mod_gsmopen.la
- mod_gsmopen_la_SOURCES  = mod_gsmopen.cpp gsmopen_protocol.cpp 
- mod_gsmopen_la_CXXFLAGS = $(SWITCH_AM_CXXFLAGS)
--mod_gsmopen_la_CPPFLAGS = -I$(SPANDSP_DIR)/src -I$(TIFF_DIR)/libtiff -I$(SPANDSP_BUILDDIR)/src -I$(TIFF_BUILDDIR)/libtiff -I.
-+mod_gsmopen_la_CPPFLAGS = -I$(SPANDSP_DIR)/src -I$(TIFF_DIR)/libtiff -I$(SPANDSP_BUILDDIR)/src -I$(TIFF_BUILDDIR)/libtiff -I. -fpermissive
- mod_gsmopen_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(SPANDSP_LA) $(TIFF_LA)
- mod_gsmopen_la_LDFLAGS  = -avoid-version -module -no-undefined -lctb-0.16 -lgsmme
- 
diff --git a/net/freeswitch/patches/src-mod-endpoints-mod_verto-Makefile_am.patch b/net/freeswitch/patches/src-mod-endpoints-mod_verto-Makefile_am.patch
deleted file mode 100644
index e1411aa..0000000
--- a/net/freeswitch/patches/src-mod-endpoints-mod_verto-Makefile_am.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/src/mod/endpoints/mod_verto/Makefile.am
-+++ b/src/mod/endpoints/mod_verto/Makefile.am
-@@ -9,19 +9,19 @@ mod_verto_la_LIBADD   = $(switch_builddi
- mod_verto_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
- 
- if HAVE_PERL
--#perldir = $(PERL_SITEDIR)
--noinst_LTLIBRARIES = MCAST.la
-+perldir            = "$(PERL_SITELIB)"
-+perl_LTLIBRARIES   = MCAST.la
- MCAST_la_SOURCES   = mcast/mcast_wrap.cpp mcast/perlxsi.c mcast/mcast.c mcast/mcast_cpp.cpp
- MCAST_la_CFLAGS    = $(CC_CFLAGS) $(CFLAGS) $(SWITCH_AM_CFLAGS) $(PERL_CFLAGS)
- MCAST_la_CXXFLAGS  = $(SWITCH_AM_CXXFLAGS) $(CXXFLAGS) -w $(PERL_INC)
- MCAST_la_CPPFLAGS  = -I$(switch_srcdir)/src/mod/endpoints/mod_verto/mcast
- MCAST_la_LDFLAGS   = -avoid-version -module -no-undefined -shared $(PERL_LDFLAGS)
- 
--#install-data-local: perlmod-install
-+install-data-local: perlmod-install
- 
--#perlmod-install: install-perlLTLIBRARIES
--#	install -d -m 755 $(DESTDIR)$(PERL_SITEDIR)
--#	install -m 755 mcast/MCAST.pm $(DESTDIR)$(PERL_SITEDIR)
-+perlmod-install: install-perlLTLIBRARIES
-+	install -d -m 755 $(DESTDIR)$(perldir)
-+	install -m 755 mcast/MCAST.pm $(DESTDIR)$(perldir)
- endif
- 
- mcast/esl_wrap.cpp:
diff --git a/net/freeswitch/patches/src-mod-languages-mod_perl-Makefile_am.patch b/net/freeswitch/patches/src-mod-languages-mod_perl-Makefile_am.patch
deleted file mode 100644
index c6a1588..0000000
--- a/net/freeswitch/patches/src-mod-languages-mod_perl-Makefile_am.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/src/mod/languages/mod_perl/Makefile.am
-+++ b/src/mod/languages/mod_perl/Makefile.am
-@@ -1,22 +1,22 @@
- include $(top_srcdir)/build/modmake.rulesam
- MODNAME=mod_perl
--PERL        = perl
--PERL_LIBDIR =-L`perl -MConfig -e 'print $$Config{archlib}'`/CORE
--PERL_LIBS   =`perl -MConfig -e 'print $$Config{libs}'`
- 
--perldir=$(prefix)/perl
-+perldir="$(PERL_SITELIB)"
-+
- mod_LTLIBRARIES = mod_perl.la
- perl_LTLIBRARIES = freeswitch.la
- mod_perl_la_SOURCES  = mod_perl.c freeswitch_perl.cpp mod_perl_wrap.cpp perlxsi.c
- mod_perl_la_CFLAGS   = $(AM_CFLAGS)
- mod_perl_la_CXXFLAGS = $(AM_CXXFLAGS)
--mod_perl_la_CPPFLAGS = -w -DMULTIPLICITY `$(PERL) -MExtUtils::Embed -e ccopts` -DEMBED_PERL -I$(switch_srcdir)/libs/libteletone/src/ 
-+mod_perl_la_CPPFLAGS = ${PERL_CFLAGS} -I$(switch_srcdir)/libs/libteletone/src/
- mod_perl_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
--mod_perl_la_LDFLAGS  = -avoid-version -module -no-undefined -shared `$(PERL) -MExtUtils::Embed -e ldopts` `$(PERL) -MConfig -e 'print $$Config{libs}'`
-+#mod_perl_la_LDFLAGS  = -avoid-version -module -no-undefined -shared `$(PERL) -MExtUtils::Embed -e ldopts` `$(PERL) -MConfig -e 'print $$Config{libs}'`
-+mod_perl_la_LDFLAGS  = -avoid-version -module -no-undefined -shared ${PERL_LDFLAGS}
- 
- freeswitch_la_SOURCES = freeswitch_perl.cpp mod_perl_wrap.cpp perlxsi.c
- freeswitch_la_LDFLAGS = -avoid-version -module -no-undefined -shared $(LDFLAGS)
--freeswitch_la_CPPFLAGS = -w -DMULTIPLICITY `$(PERL) -MExtUtils::Embed -e ccopts` -DEMBED_PERL -I$(switch_srcdir)/libs/libteletone/src/ 
-+freeswitch_la_CPPFLAGS = ${PERL_CFLAGS} -I$(switch_srcdir)/libs/libteletone/src/
-+
- reswig:	swigclean mod_perl_wrap.cpp
- 
- swigclean: clean
diff --git a/net/freeswitch/patches/src-switch_rtp_c.patch b/net/freeswitch/patches/src-switch_rtp_c.patch
deleted file mode 100644
index 343e4d9..0000000
--- a/net/freeswitch/patches/src-switch_rtp_c.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/switch_rtp.c
-+++ b/src/switch_rtp.c
-@@ -1535,7 +1535,7 @@ static void send_fir(switch_rtp_t *rtp_s
- 		}
- 	}
- 
--#ifdef ENABLE_SRTP
-+#ifdef ENABLE_ZRTP
-  end:
- #endif
- 
-@@ -1630,7 +1630,7 @@ static void send_pli(switch_rtp_t *rtp_s
- 		}
- 	}
- 
--#ifdef ENABLE_SRTP
-+#ifdef ENABLE_ZRTP
-  end:
- #endif
- 	return;
diff --git a/net/freeswitch/patches/uClibc/build-config-erlang_m4.patch b/net/freeswitch/patches/uClibc/build-config-erlang_m4.patch
new file mode 100644
index 0000000..5d744f7
--- /dev/null
+++ b/net/freeswitch/patches/uClibc/build-config-erlang_m4.patch
@@ -0,0 +1,97 @@
+--- a/build/config/erlang.m4
++++ b/build/config/erlang.m4
+@@ -1,6 +1,6 @@
+ AC_DEFUN([CHECK_ERLANG], [
+ #
+-# Erlang checks for mod_erlang_event
++# Erlang check
+ #
+ AC_ARG_WITH(
+ 	[erlang],
+@@ -20,22 +20,23 @@ then
+ 		if test ! -x "$with_erlang" ; then
+ 			AC_MSG_ERROR([Specified erlang does not exist or is not executable: $with_erlang])
+ 		fi
+-		AC_MSG_RESULT([$with_erlang])
+-		AC_SUBST([ERLANG], ["$with_erlang"])
++		AC_MSG_RESULT(["$with_erlang/bin/erl"])
++		AC_SUBST([ERL],["$with_erlang/bin/erl"])
+ 	else
+-		AC_PATH_PROG([ERLANG], ["erl"], ["no"], ["$PATH:/usr/bin:/usr/local/bin"])
++		AC_ERLANG_NEED_ERL(["$with_erlang/bin"])
+ 	fi
+ 
+-	if test "$ERLANG" != "no" ; then
++	if test "$ERL" != "no" ; then
+ 		AC_MSG_CHECKING([erlang version])
+-		ERLANG_VER="`$ERLANG -version 2>&1 | cut -d' ' -f6`"
++		ERLANG_VER="`$ERL -version 2>&1 | cut -d' ' -f6`"
+ 
+ 		if test -z "$ERLANG_VER" ; then
+ 			AC_MSG_ERROR([Unable to detect erlang version])
++		else
++			AC_MSG_RESULT([$ERLANG_VER])
+ 		fi
+-		AC_MSG_RESULT([$ERLANG_VER])
+ 
+-		ERLANG_LIBDIR=`$ERLANG -noshell -eval 'io:format("~n~s/lib~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt | tail -n 1`
++		ERLANG_LIBDIR=`$ERL -noshell -eval 'io:format("~n~s/lib~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt | tail -n 1`
+ 		AC_MSG_CHECKING([erlang libdir])
+ 		if test -z "`echo $ERLANG_LIBDIR`" ; then
+ 			AC_MSG_ERROR([failed])
+@@ -43,9 +44,16 @@ then
+ 			ERLANG_LDFLAGS="-L$ERLANG_LIBDIR $ERLANG_LDFLAGS"
+ 			LIBS="-L$ERLANG_LIBDIR $LIBS"
+ 		fi
++
++		#
++		# Don't use the above ERLANG_LDFLAGS
++		#
++		ERLANG_LIBDIR="${STAGING_DIR}/usr/lib"
++		ERLANG_LDFLAGS="-L$ERLANG_LIBDIR"
++		LIBS="-L$ERLANG_LIBDIR $LIBS"
+ 		AC_MSG_RESULT([$ERLANG_LIBDIR])
+ 
+-		ERLANG_INCDIR=`$ERLANG -noshell -eval 'io:format("~n~s/include~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt | tail -n 1`
++		ERLANG_INCDIR=`$ERL -noshell -eval 'io:format("~n~s/include~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt | tail -n 1`
+ 		AC_MSG_CHECKING([erlang incdir])
+ 		if test -z "`echo $ERLANG_INCDIR`" ; then
+ 			AC_MSG_ERROR([failed])
+@@ -59,10 +67,11 @@ then
+ 
+ 		ERLANG_LIB="ei"
+ 
+-		# check liei
++		# check libei
+ 		AC_CHECK_LIB([$ERLANG_LIB], [ei_encode_version], [has_libei="yes"], [has_libei="no"])
+ 		# maybe someday ei will actually expose this?
+-		AC_CHECK_LIB([$ERLANG_LIB], [ei_link_unlink], [ERLANG_CFLAGS="$ERLANG_CFLAGS -DEI_LINK_UNLINK"])
++		# until then, we comment it out
++		#AC_CHECK_LIB([$ERLANG_LIB], [ei_link_unlink], [ERLANG_CFLAGS="$ERLANG_CFLAGS -DEI_LINK_UNLINK"])
+ 
+ 		if test "$has_libei" = "no" ; then
+ 			AS_IF([test "$with_erlang" = "try"],
+@@ -76,7 +85,7 @@ then
+ 			)
+ 		else
+ 			ERLANG_LDFLAGS="$ERLANG_LDFLAGS -lei"
+-			AC_MSG_NOTICE([Your erlang seems OK, do not forget to enable mod_erlang_event in modules.conf])
++			AC_MSG_NOTICE([Your erlang seems OK. You can now use ErLang in your codes.])
+ 			AC_SUBST([ERLANG_CFLAGS],  [$ERLANG_CFLAGS])
+ 			AC_SUBST([ERLANG_LDFLAGS], [$ERLANG_LDFLAGS])
+ 			AM_CONDITIONAL([HAVE_ERLANG],[true])
+@@ -87,12 +96,12 @@ then
+ 
+ 	else
+ 		AS_IF([test "$with_erlang" = "try"],
+-			[AC_MSG_WARN([Could not find erlang, mod_erlang_event will not build, use --with-erlang to specify the location])],
++			[AC_MSG_WARN([Could not find erlang, codes depend on erlang will not build, use --with-erlang to specify the location])],
+ 			[AC_MSG_ERROR([Could not find erlang, use --with-erlang to specify the location])]
+ 		)
+ 	fi
+ else
+-	AC_MSG_WARN([erlang support disabled, building mod_erlang_event will fail!])
++	AC_MSG_WARN([erlang support disabled!])
+ fi
+ 
+ ])
diff --git a/net/freeswitch/patches/uClibc/build-modules_conf_in.patch b/net/freeswitch/patches/uClibc/build-modules_conf_in.patch
new file mode 100644
index 0000000..86aad26
--- /dev/null
+++ b/net/freeswitch/patches/uClibc/build-modules_conf_in.patch
@@ -0,0 +1,10 @@
+--- a/build/modules.conf.in
++++ b/build/modules.conf.in
+@@ -39,6 +39,7 @@ applications/mod_httapi
+ #applications/mod_rad_auth
+ #applications/mod_redis
+ #applications/mod_rss
++#applications/mod_skel
+ applications/mod_sms
+ #applications/mod_snapshot
+ #applications/mod_snom
diff --git a/net/freeswitch/patches/uClibc/build-openwrt_rules.mk.patch b/net/freeswitch/patches/uClibc/build-openwrt_rules.mk.patch
new file mode 100644
index 0000000..31fb16f
--- /dev/null
+++ b/net/freeswitch/patches/uClibc/build-openwrt_rules.mk.patch
@@ -0,0 +1,10 @@
+--- /dev/null
++++ b/build/openwrt_rules.mk
+@@ -0,0 +1,7 @@
++OPENWRT_DIR=$(shell (cd $(BASE)/../../..;pwd))
++STAGING_PREFIX=$(OPENWRT_DIR)/staging_dir/host
++STAGING_DIR=$(OPENWRT_DIR)/staging_dir/$(shell (cd $(BASE)/..;basename `pwd`))
++ARCH="$(shell grep CONFIG_ARCH $(OPENWRT_DIR)/.config|cut -d= -d'"' -f2)"
++GNU_TARGET_NAME=$(ARCH)-openwrt-linux
++
++include $(OPENWRT_DIR)/rules.mk
diff --git a/net/freeswitch/patches/uClibc/configure_ac.patch b/net/freeswitch/patches/uClibc/configure_ac.patch
new file mode 100644
index 0000000..85a2788
--- /dev/null
+++ b/net/freeswitch/patches/uClibc/configure_ac.patch
@@ -0,0 +1,65 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -254,7 +254,7 @@ AX_COMPILER_VENDOR
+ if test "x${cross_compiling}" = "xyes"; then
+     CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
+     case "$host" in
+-    	 arm*-linux-gnueabi*|arm*-*-linux-gnueabi*)
++    	 arm*-linux-gnueabi*|arm*-*-linux-*)
+ 		# spandsp modem
+ 		ac_cv_file__dev_ptmx=yes
+ 		# libjs
+@@ -273,7 +273,7 @@ if test "x${cross_compiling}" = "xyes";
+ 		export apr_cv_mutex_recursive=yes
+ 		export ac_cv_func_pthread_rwlock_init=yes
+ 		export apr_cv_type_rwlock_t=yes
+-		export apr_cv_process_shared_works=yes
++		export apr_cv_process_shared_works=no
+ 		export apr_cv_mutex_robust_shared=yes
+ 	 ;;
+     esac
+@@ -405,9 +405,6 @@ elif test "x${ax_cv_c_compiler_vendor}"
+ elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
+     APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC)
+     APR_ADDTO(SWITCH_AM_CXXFLAGS, -fPIC)
+-    if test "$ac_cv_gcc_supports_w_no_unused_result" = yes; then
+-      APR_ADDTO(SWITCH_AM_CFLAGS, -Werror)
+-    fi
+     if test "${enable_64}" = "yes"; then
+ 	case "$host" in
+              *darwin*)
+@@ -901,7 +898,6 @@ AC_CHECK_LIB(pthread, pthread_setschedpa
+ 
+ AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket))
+ 
+-AC_CHECK_FILE(/dev/ptmx, [AC_DEFINE(HAVE_DEV_PTMX, 1, [Define if you have /dev/ptmx])])
+ AC_CHECK_LIB(util, openpty, [AC_DEFINE(HAVE_OPENPTY, 1, [Define if you have openpty()])])
+ 
+ AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[
+@@ -1478,14 +1474,14 @@ AM_CONDITIONAL([HAVE_MYSQL],[test "$foun
+ # perl checks
+ #
+ 
+-AC_CHECK_PROG(PERL,perl,[ac_cv_have_perl=yes],[ac_cv_have_perl=no])
++AC_CHECK_PROG(PERL,[perl],[ac_cv_have_perl=yes],[ac_cv_have_perl=no],[${STAGING_DIR}/../host/usr/bin])
++PERL=$as_dir/$ac_word$ac_exec_ext
+ 
+ # -a "x$ac_cv_have_EXTERN_h" != "xno"
+ 
+ if test "x$ac_cv_have_perl" != "xno"; then
+-   PERL=perl
+-   PERL_SITEDIR="`$PERL -MConfig -e 'print $Config{archlib}'`"
+-   PERL_LIBDIR="-L`$PERL -MConfig -e 'print $Config{archlib}'`/CORE"
++   PERL_SITEDIR="`$PERL -MConfig -e 'print $Config{archlibexp}'`"
++   PERL_LIBDIR="-L`$PERL -MConfig -e 'print $Config{archlibexp}'`/CORE"
+    PERL_LIBS="`$PERL -MConfig -e 'print $Config{libs}'`"
+    PERL_CFLAGS="-w -DMULTIPLICITY `$PERL -MExtUtils::Embed -e ccopts | sed -e 's|-arch x86_64 -arch i386||'` -DEMBED_PERL"
+    PERL_LDFLAGS="`$PERL -MExtUtils::Embed -e ldopts| sed -e 's|-arch x86_64 -arch i386||'`"
+@@ -1502,6 +1498,7 @@ if test "x$ac_cv_have_perl" != "xno"; th
+    AC_CHECK_LIB([perl], [perl_alloc], ac_cv_use_libperl=yes, ac_cv_use_libperl=no)
+    LDFLAGS="$save_LDFLAGS"
+ 
++   AC_SUBST(PERL)
+    AC_SUBST(PERL_SITEDIR)
+    AC_SUBST(PERL_LIBDIR)
+    AC_SUBST(PERL_LIBS)
diff --git a/net/freeswitch/patches/uClibc/libs-apr-configure_ac.patch b/net/freeswitch/patches/uClibc/libs-apr-configure_ac.patch
new file mode 100644
index 0000000..c4667dd
--- /dev/null
+++ b/net/freeswitch/patches/uClibc/libs-apr-configure_ac.patch
@@ -0,0 +1,15 @@
+--- a/libs/apr/configure.ac
++++ b/libs/apr/configure.ac
+@@ -1956,7 +1956,11 @@ fi
+ 
+ APR_CHECK_TCP_NODELAY_INHERITED
+ APR_CHECK_O_NONBLOCK_INHERITED
+-APR_CHECK_TCP_NODELAY_WITH_CORK
++
++dnl Check TCP_NODELAY_WITH_CORK ONLY when NOT cross compiling
++if test "$cross_compiling" != yes; then
++	APR_CHECK_TCP_NODELAY_WITH_CORK
++fi
+ 
+ # Look for a way of corking TCP...
+ APR_CHECK_DEFINE(TCP_CORK, netinet/tcp.h)
diff --git a/net/freeswitch/patches/uClibc/libs-apr-util-configure_gnu.patch b/net/freeswitch/patches/uClibc/libs-apr-util-configure_gnu.patch
new file mode 100644
index 0000000..b933b3c
--- /dev/null
+++ b/net/freeswitch/patches/uClibc/libs-apr-util-configure_gnu.patch
@@ -0,0 +1,8 @@
+--- a/libs/apr-util/configure.gnu
++++ b/libs/apr-util/configure.gnu
+@@ -1,4 +1,4 @@
+ #! /bin/sh
+ srcpath=$(dirname $0 2>/dev/null )  || srcpath="." 
+-$srcpath/configure "$@" --with-apr=../apr --disable-shared --with-pic --without-sqlite2 --without-sqlite3 --with-expat=builtin
++$srcpath/configure "$@" --with-apr=../apr --disable-shared --with-expat=builtin
+ 
diff --git a/net/freeswitch/patches/uClibc/libs-srtp-configure_ac.patch b/net/freeswitch/patches/uClibc/libs-srtp-configure_ac.patch
new file mode 100644
index 0000000..56c1691
--- /dev/null
+++ b/net/freeswitch/patches/uClibc/libs-srtp-configure_ac.patch
@@ -0,0 +1,13 @@
+--- a/libs/srtp/configure.ac
++++ b/libs/srtp/configure.ac
+@@ -130,10 +130,6 @@ if test "$enable_kernel_linux" = "yes";
+ fi
+ AC_MSG_RESULT($enable_kernel_linux)
+ 
+-dnl Check for /dev/urandom
+-AC_CHECK_FILE(/dev/urandom, DEV_URANDOM=/dev/urandom,
+-   [AC_CHECK_FILE(/dev/random, DEV_URANDOM=/dev/random)])
+-
+ dnl Checks for header files.
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS(stdlib.h)
-- 
2.30.2