update to v1.0.7 (a daily snapshot of git version)

git-svn-id: svn://svn.openwrt.org/openwrt/packages@26935 3c298f89-4303-0410-b956-a3cf2f4a3e73

net/freeswitch/Makefile

@@ -8,15 +8,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=freeswitch
-PKG_VERSION:=1.0.6
+PKG_VERSION:=1.0.7
-PKG_RELEASE:=11
+PKG_RELEASE:=$(PKG_SOURCE_VERSION)
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=git://git.$(PKG_NAME).org/$(PKG_NAME).git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=86d757d61bd82a73a13fbc387f788c33436c295d
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_URL:=http://files.freeswitch.org/
-PKG_MD5SUM:=388effee587887a81fe7f411b7350590
 
-PKG_FIXUP:=libtool no-autoreconf
+PKG_FIXUP:=libtool
 
 FS_MOD_AVAILABLE:= \
 	alsa \
@@ -28,6 +30,7 @@ FS_MOD_AVAILABLE:= \
 	cepstral \
 	cidlookup \
 	cluechoo \
+	codec2 \
 	commands \
 	conference \
 	console \
@@ -47,7 +50,6 @@ FS_MOD_AVAILABLE:= \
 	event-multicast \
 	event-socket \
 	expr \
-	fax \
 	fifo \
 	file-string \
 	flite \
@@ -56,10 +58,10 @@ FS_MOD_AVAILABLE:= \
 	g729 \
 	h26x \
 	h323 \
+	hash \
 	ilbc \
 	lcr \
 	ldap \
-	limit \
 	local-stream \
 	logfile \
 	loopback \
@@ -99,6 +101,7 @@ FS_MOD_AVAILABLE:= \
 	snom \
 	sofia \
 	soundtouch \
+	spandsp \
 	speex \
 	spidermonkey \
 	spidermonkey-core-db \
@@ -114,7 +117,6 @@ FS_MOD_AVAILABLE:= \
 	valet-parking \
 	vmd \
 	voicemail \
-	voipcodecs \
 	xml-cdr \
 	xml-curl \
 	xml-ldap \
@@ -122,167 +124,170 @@ FS_MOD_AVAILABLE:= \
 	yaml \
 
 PKG_CONFIG_DEPENDS:= \
-	$(patsubst %,CONFIG_PACKAGE_freeswitch-mod-%,$(FS_MOD_AVAILABLE)) \
+	$(patsubst %,CONFIG_PACKAGE_$(PKG_NAME)-mod-%,$(FS_MOD_AVAILABLE)) \
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/freeswitch/Default
+define Package/$(PKG_NAME)/Default
   SECTION:=net
   CATEGORY:=Network
   SUBMENU:=Telephony
-  URL:=http://www.freeswitch.org/
+  URL:=http://www.$(PKG_NAME).org/
+  MAINTAINER:=Mazilo <OpenWRT@slickdeals.endjunk.com>
 endef
 
 
-define Package/freeswitch
+define Package/$(PKG_NAME)
-$(call Package/freeswitch/Default)
+$(call Package/$(PKG_NAME)/Default)
   TITLE:=FreeSWITCH open source telephony platform
   DEPENDS:= +libopenssl +libreadline +libncurses +libpthread +libstdcpp
   MENU:=1
 endef
 
-define Package/freeswitch/description
+define Package/$(PKG_NAME)/description
   FreeSWITCH is an open source telephony platform designed to 
   facilitate the creation of voice and chat driven products scaling 
-  from a soft-phone up to a soft-switch.  See http://wiki.freeswitch.org
+  from a soft-phone up to a soft-switch.  See http://wiki.$(PKG_NAME).org
 endef
 
-define Package/freeswitch-example-config
+define Package/$(PKG_NAME)-example-config
-$(call Package/freeswitch/Default)
+$(call Package/$(PKG_NAME)/Default)
   TITLE:=FreeSWITCH example config (commented)
-  DEPENDS:= freeswitch
+  DEPENDS:= $(PKG_NAME)
 endef
 
-define Package/freeswitch-example-config/description
+define Package/$(PKG_NAME)-example-config/description
   The default configuration included with FreeSWITCH. It is not intended to be
-  a final product, and is thus moved to /usr/share/freeswitch/examples/conf to
+  a final product, and is thus moved to /usr/share/$(PKG_NAME)/examples/conf to
   be an example of how FreeSWITCH can be configured.
 endef
 
-define Package/freeswitch-config-upstream-defaults
+define Package/$(PKG_NAME)-config-upstream-defaults
-$(call Package/freeswitch/Default)
+$(call Package/$(PKG_NAME)/Default)
   TITLE:=FreeSWITCH upstream config
-  DEPENDS:= freeswitch
+  DEPENDS:= $(PKG_NAME)
 endef
 
-define Package/freeswitch-config-upstream-defaults/description
+define Package/$(PKG_NAME)-config-upstream-defaults/description
   The default configuration included with FreeSWITCH. It is not intended to be
   a final product, and but is included for those who don't want to use the 
   OpenWRT configuration and/or want to try things as prepared by upstream.
 endef
 
-define Package/freeswitch-config-minimal
+define Package/$(PKG_NAME)-config-minimal
-$(call Package/freeswitch/Default)
+$(call Package/$(PKG_NAME)/Default)
   TITLE:=FreeSWITCH a minimal FS config
-  DEPENDS:= freeswitch
+  DEPENDS:= $(PKG_NAME)
 endef
 
-define Package/freeswitch-config-minimal/description
+define Package/$(PKG_NAME)-config-minimal/description
   A minimal configuration of FreeSWITCH for OpenWRT devices.  Is what the UCI 
   configuration began with.
 endef
 
-define Package/freeswitch-collection-upstream-defaults
+define Package/$(PKG_NAME)-collection-upstream-defaults
-$(call Package/freeswitch/Default)
+$(call Package/$(PKG_NAME)/Default)
   TITLE:=FreeSWITCH upstream default (sample) config
-  DEPENDS:= freeswitch \
+  DEPENDS:= $(PKG_NAME) \
-		+freeswitch-config-upstream-defaults \
+		+$(PKG_NAME)-config-upstream-defaults \
-		+freeswitch-mod-commands \
+		+$(PKG_NAME)-mod-callcenter \
-		+freeswitch-mod-conference \
+		+$(PKG_NAME)-mod-codec2 \
-		+freeswitch-mod-syslog \
+		+$(PKG_NAME)-mod-commands \
-		+freeswitch-mod-curl \
+		+$(PKG_NAME)-mod-conference \
-		+freeswitch-mod-dialplan-xml \
+		+$(PKG_NAME)-mod-syslog \
-		+freeswitch-mod-dptools \
+		+$(PKG_NAME)-mod-curl \
-		+freeswitch-mod-event-socket \
+		+$(PKG_NAME)-mod-dialplan-xml \
-		+freeswitch-mod-g723-1 \
+		+$(PKG_NAME)-mod-dptools \
-		+freeswitch-mod-ilbc \
+		+$(PKG_NAME)-mod-event-socket \
-		+freeswitch-mod-limit \
+		+$(PKG_NAME)-mod-g723-1 \
-		+freeswitch-mod-local-stream \
+		+$(PKG_NAME)-mod-hash \
-		+freeswitch-mod-logfile \
+		+$(PKG_NAME)-mod-ilbc \
-		+freeswitch-mod-lua \
+		+$(PKG_NAME)-mod-local-stream \
-		+freeswitch-mod-native-file \
+		+$(PKG_NAME)-mod-logfile \
-		+freeswitch-mod-sndfile \
+		+$(PKG_NAME)-mod-lua \
-		+freeswitch-mod-sofia \
+		+$(PKG_NAME)-mod-native-file \
-		+freeswitch-mod-speex \
+		+$(PKG_NAME)-mod-sndfile \
-		+freeswitch-mod-tone-stream \
+		+$(PKG_NAME)-mod-sofia \
-		+freeswitch-mod-voipcodecs \
+		+$(PKG_NAME)-mod-speex \
-		+freeswitch-mod-xml-curl \
+		+$(PKG_NAME)-mod-tone-stream \
-		+freeswitch-mod-xml-rpc \
+		+$(PKG_NAME)-mod-xml-curl \
-		+freeswitch-tools
+		+$(PKG_NAME)-mod-xml-rpc \
+		+$(PKG_NAME)-tools
 endef
 
-define Package/freeswitch-collection-minimal
+define Package/$(PKG_NAME)-collection-minimal
-$(call Package/freeswitch/Default)
+$(call Package/$(PKG_NAME)/Default)
   TITLE:=A FreeSWITCH minimal package collection
-  DEPENDS:= freeswitch \
+  DEPENDS:= $(PKG_NAME) \
-		+freeswitch-config-minimal \
+		+$(PKG_NAME)-config-minimal \
-		+freeswitch-mod-commands \
+		+$(PKG_NAME)-mod-codec2 \
-		+freeswitch-mod-syslog \
+		+$(PKG_NAME)-mod-commands \
-		+freeswitch-mod-dialplan-xml \
+		+$(PKG_NAME)-mod-syslog \
-		+freeswitch-mod-dptools \
+		+$(PKG_NAME)-mod-dialplan-xml \
-		+freeswitch-mod-event-socket \
+		+$(PKG_NAME)-mod-dptools \
-		+freeswitch-mod-local-stream \
+		+$(PKG_NAME)-mod-event-socket \
-		+freeswitch-mod-sndfile \
+		+$(PKG_NAME)-mod-hash \
-		+freeswitch-mod-sofia \
+		+$(PKG_NAME)-mod-local-stream \
-		+freeswitch-mod-tone-stream \
+		+$(PKG_NAME)-mod-sndfile \
-		+freeswitch-mod-voipcodecs \
+		+$(PKG_NAME)-mod-sofia \
-		+freeswitch-tools
+		+$(PKG_NAME)-mod-tone-stream \
+		+$(PKG_NAME)-tools
 endef
 
-define Package/freeswitch-sounds-en
+define Package/$(PKG_NAME)-sounds-en
-$(call Package/freeswitch/Default)
+$(call Package/$(PKG_NAME)/Default)
   TITLE:=FreeSWITCH english sounds
-  DEPENDS:= freeswitch
+  DEPENDS:= $(PKG_NAME)
 endef
 
 
-define Package/freeswitch-sounds-moh
+define Package/$(PKG_NAME)-sounds-moh
-$(call Package/freeswitch/Default)
+$(call Package/$(PKG_NAME)/Default)
   TITLE:=FreeSWITCH music-on-hold sounds
-  DEPENDS:= freeswitch
+  DEPENDS:= $(PKG_NAME)
 endef
 
 
-define Package/freeswitch-tools
+define Package/$(PKG_NAME)-tools
-$(call Package/freeswitch/Default)
+$(call Package/$(PKG_NAME)/Default)
   TITLE:=FreeSWITCH control tools
-  DEPENDS:= freeswitch
+  DEPENDS:= $(PKG_NAME)
 endef
 
 
 define Download/files
  define Download/$(1)
   FILE:=$(2)
-  URL:=http://files.freeswitch.org/$(4)
+  URL:=http://files.$(PKG_NAME).org/$(4)
   MD5SUM:=$(3)
  endef
  define Prepare/$(1)
-  $(CP) $(DL_DIR)/$(2) $(PKG_BUILD_DIR)/$(5)
+  $(LN) $(DL_DIR)/$(2) $(PKG_BUILD_DIR)/$(5)
  endef
  $$(eval $$(call Download,$(1)))
 endef
 
 MAKE_INSTALL_TARGETS:=install
 
-ifneq ($(CONFIG_PACKAGE_freeswitch-mod-celt),)
+ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-celt),)
- $(eval $(call Download/files,celt,celt-0.7.1.tar.gz,c7f6b8346e132b1a48dae0eff77ea9f0,downloads/libs/,libs/))
+ $(eval $(call Download/files,celt,celt-0.10.0.tar.gz,a656f6176e9be84027c0e51ceedd710f,downloads/libs/,libs/))
 endif
 
-ifneq ($(CONFIG_PACKAGE_freeswitch-mod-curl),)
+ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-curl),)
  $(eval $(call Download/files,json-c,json-c-0.9.tar.gz,4653b3b9c568bb9c782178abfaac128d,downloads/libs/,libs/))
 endif
 
-ifneq ($(CONFIG_PACKAGE_freeswitch-mod-flite),)
+ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-flite),)
- $(eval $(call Download/files,flite,flite-1.3.99-latest.tar.gz,,downloads/libs/,libs/))
+ $(eval $(call Download/files,flite,flite-1.3.99-latest.tar.gz,365b60881715c5e13c0d8bc37d9be6ff,downloads/libs/,libs/))
 endif
 
-ifneq ($(CONFIG_PACKAGE_freeswitch-sounds-en),)
+ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-sounds-en),)
- $(eval $(call Download/files,sounds-en,freeswitch-sounds-en-us-callie-8000-1.0.12.tar.gz,d700439027dd95dd118e5e85f38e4d81,,))
+ $(eval $(call Download/files,sounds-en,$(PKG_NAME)-sounds-en-us-callie-8000-1.0.15.tar.gz,80738b255c89c5f4b229946f03d921c1,,))
 	MAKE_INSTALL_TARGETS+= sounds-install
 endif
 
-ifneq ($(CONFIG_PACKAGE_freeswitch-sounds-moh),)
+ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-sounds-moh),)
- $(eval $(call Download/files,sounds-moh,freeswitch-sounds-music-8000-1.0.8.tar.gz,f63ef3cc3507af079ae5c7b8b8a01e42,,))
+ $(eval $(call Download/files,sounds-moh,$(PKG_NAME)-sounds-music-8000-1.0.8.tar.gz,f63ef3cc3507af079ae5c7b8b8a01e42,,))
 	MAKE_INSTALL_TARGETS+= moh-install
 endif
 
@@ -303,22 +308,22 @@ FS_TARGET_CXXFLAGS:= ${TARGET_CXXFLAGS} -DLUA_USE_LINUX $(FPIC) -Wno-format
 FS_TARGET_CPPFLAGS:= -I. -I./lua ${TARGET_CPPFLAGS}
 
 CONFIGURE_ARGS+= \
-	--prefix="/usr/share/freeswitch" \
+	--prefix="/usr/share/$(PKG_NAME)" \
 	--bindir="/usr/bin" \
 	--libdir="/usr/lib" \
-	--sysconfdir="/etc/freeswitch" \
+	--sysconfdir="/etc/$(PKG_NAME)" \
-	--with-modinstdir="/usr/lib/freeswitch" \
+	--with-modinstdir="/usr/lib/$(PKG_NAME)" \
 	--enable-ipv6 \
-	\
-	--with-libcurl="$(STAGING_DIR)/usr" \
-	--with-openssl="$(STAGING_DIR)/usr" \
-	--with-random="/dev/urandom" \
-	--without-erlang \
-	--without-java \
-	--without-mysql \
-	--without-pgsql \
-	--without-python \
 	--disable-zrtp \
+	--with-random="/dev/urandom" \
+	--without-mysql \
+	$(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-cdr-pg-csv),--with-pgsql="$(STAGING_DIR)/usr",--without-pgsql) \
+	$(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-celt),--with-ogg="$(STAGING_DIR)/usr",--without-iogg) \
+	$(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-curl),--with-libcurl="$(STAGING_DIR)/usr",--without-libcurl) \
+	$(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-dingaling),--with-openssl="$(STAGING_DIR)/usr",--without-openssl) \
+	$(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-java),--with-java="$(STAGING_DIR)/usr",--without-java) \
+	$(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-xml-cdr),--with-libcurl="$(STAGING_DIR)/usr",--without-libcurl) \
+	$(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-xml-curl),--with-libcurl="$(STAGING_DIR)/usr",--without-libcurl) \
 
 CONFIGURE_VARS+= \
 	config_TARGET_CC="${TARGET_CC}" \
@@ -354,18 +359,20 @@ CONFIGURE_VARS+= \
 
 
 define Build/Prepare
-$(call Build/Prepare/Default)
+	$(call Build/Prepare/Default)
 	$(call Prepare/celt)
 	$(call Prepare/flite)
 	$(call Prepare/json-c)
 	$(call Prepare/sounds-en)
 	$(call Prepare/sounds-moh)
+	(cd $(PKG_BUILD_DIR); [ -h noreg ] || touch noreg)	# Just to shut up Cluecon reg.
+	(cd $(PKG_BUILD_DIR); $(AM_TOOL_PATHS) ./bootstrap.sh)
 endef
 
 define Build/Configure
-$(call Build/Configure/Default)
+	$(call Build/Configure/Default,)
 	$(foreach m,$(FS_MOD_AVAILABLE),
-		$(if $(CONFIG_PACKAGE_freeswitch-mod-$(m)),
+		$(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-$(m)),
 			$(SED) 's|^[ #]*\([^#]*/mod_$(subst -,_,$(m))\)$$$$|\1|g' $(PKG_BUILD_DIR)/modules.conf
 		,
 			$(SED) 's|^\([^#]*/mod_$(subst -,_,$(m))\)$$$$|#\1|g' $(PKG_BUILD_DIR)/modules.conf
@@ -375,76 +382,83 @@ endef
 
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
+		AR="$(TARGET_CROSS)ar" \
+		RANLIB="$(TARGET_CROSS)ranlib" \
+		CC="$(TARGET_CC)" \
+		CXX="$(TARGET_CXX)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \
 		all $(MAKE_INSTALL_TARGETS)
-	$(SED) 's|^\([ \t]*\)\(.*\)"mod_console"\(.*\)$$$$|\1<!-- \2"mod_console"\3 -->|' $(PKG_INSTALL_DIR)/etc/freeswitch/autoload_configs/modules.conf.xml
+	$(SED) 's|^\([ \t]*\)\(.*\)"mod_console"\(.*\)$$$$|\1<!-- \2"mod_console"\3 -->|' $(PKG_INSTALL_DIR)/etc/$(PKG_NAME)/autoload_configs/modules.conf.xml
-	$(SED) 's|^\([ \t]*\)<!-- *\(.*\)"mod_syslog"\(.*\) *-->\(.*\)$$$$|\1\2"mod_syslog"\3\4|' $(PKG_INSTALL_DIR)/etc/freeswitch/autoload_configs/modules.conf.xml
+	$(SED) 's|^\([ \t]*\)<!-- *\(.*\)"mod_syslog"\(.*\) *-->\(.*\)$$$$|\1\2"mod_syslog"\3\4|' $(PKG_INSTALL_DIR)/etc/$(PKG_NAME)/autoload_configs/modules.conf.xml
 endef
 
 define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/freeswitch
+	$(INSTALL_DIR) $(1)/usr/include/$(PKG_NAME)
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/freeswitch/include/* $(1)/usr/include/freeswitch/
+	$(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/include/* $(1)/usr/include/$(PKG_NAME)/
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfreeswitch.{a,so*} $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib$(PKG_NAME).{a,so*} $(1)/usr/lib/
 endef
 
-define Package/freeswitch/install
+define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/freeswitch $(1)/usr/bin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfreeswitch.so.* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib$(PKG_NAME).so.* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/freeswitch
+	$(INSTALL_DIR) $(1)/usr/lib/$(PKG_NAME)
 	$(INSTALL_DIR) $(1)/etc/default
-	$(INSTALL_DATA) ./files/freeswitch.default $(1)/etc/default/freeswitch
+	$(INSTALL_DATA) ./files/$(PKG_NAME).default $(1)/etc/default/$(PKG_NAME)
 	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/freeswitch.init $(1)/etc/init.d/freeswitch
+	$(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME)
 	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
-	$(INSTALL_DATA) ./files/freeswitch.hotplug $(1)/etc/hotplug.d/iface/90-freeswitch
+	$(INSTALL_DATA) ./files/$(PKG_NAME).hotplug $(1)/etc/hotplug.d/iface/90-$(PKG_NAME)
 	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DATA) ./files/freeswitch.config $(1)/etc/config/freeswitch
+	$(INSTALL_DATA) ./files/$(PKG_NAME).config $(1)/etc/config/$(PKG_NAME)
 endef
 
-define Package/freeswitch-collection-upstream-defaults/install
+define Package/$(PKG_NAME)-collection-upstream-defaults/install
-	$(INSTALL_DIR) $(1)/etc/freeswitch
+	$(INSTALL_DIR) $(1)/etc/$(PKG_NAME)
 endef
 
-define Package/freeswitch-example-config/install
+define Package/$(PKG_NAME)-example-config/install
-	$(INSTALL_DIR) $(1)/usr/share/freeswitch/examples/conf
+	$(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/examples/conf
-	$(CP) $(PKG_INSTALL_DIR)/etc/freeswitch/* $(1)/usr/share/freeswitch/examples/conf/
+	$(CP) $(PKG_INSTALL_DIR)/etc/$(PKG_NAME)/* $(1)/usr/share/$(PKG_NAME)/examples/conf/
 endef
 
-define Package/freeswitch-config-upstream-defaults/install
+define Package/$(PKG_NAME)-config-upstream-defaults/install
-	$(INSTALL_DIR) $(1)/etc/freeswitch
+	$(INSTALL_DIR) $(1)/etc/$(PKG_NAME)
-	$(CP) $(PKG_INSTALL_DIR)/etc/freeswitch/* $(1)/etc/freeswitch/
+	$(CP) $(PKG_INSTALL_DIR)/etc/$(PKG_NAME)/* $(1)/etc/$(PKG_NAME)/
 endef
 
-define Package/freeswitch-collection-minimal/install
+define Package/$(PKG_NAME)-collection-minimal/install
-	$(INSTALL_DIR) $(1)/etc/freeswitch
+	$(INSTALL_DIR) $(1)/etc/$(PKG_NAME)
 endef
 
-define Package/freeswitch-collection-uci-minimal/install
+define Package/$(PKG_NAME)-collection-uci-minimal/install
-	$(INSTALL_DIR) $(1)/etc/freeswitch
+	$(INSTALL_DIR) $(1)/etc/$(PKG_NAME)
 endef
 
-define Package/freeswitch-config-minimal/install
+define Package/$(PKG_NAME)-config-minimal/install
-	$(INSTALL_DIR) $(1)/etc/freeswitch
+	$(INSTALL_DIR) $(1)/etc/$(PKG_NAME)
-	$(CP) ./files/etc.minimal/* $(1)/etc/freeswitch/
+	$(CP) ./files/etc.minimal/* $(1)/etc/$(PKG_NAME)/
 endef
 
-define Package/freeswitch-sounds-en/install
+define Package/$(PKG_NAME)-sounds-en/install
-	$(INSTALL_DIR) $(1)/usr/share/freeswitch/sounds
+	$(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/freeswitch/sounds/en $(1)/usr/share/freeswitch/sounds/
+	$(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/en $(1)/usr/share/$(PKG_NAME)/sounds/
 endef
 
-define Package/freeswitch-sounds-moh/install
+define Package/$(PKG_NAME)-sounds-moh/install
-	$(INSTALL_DIR) $(1)/usr/share/freeswitch/sounds
+	$(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/freeswitch/sounds/music $(1)/usr/share/freeswitch/sounds/
+	$(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/music $(1)/usr/share/$(PKG_NAME)/sounds/
 endef
 
-define Package/freeswitch-tools/install
+define Package/$(PKG_NAME)-tools/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/fs_cli $(1)/usr/bin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/fs_encode $(1)/usr/bin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/fs_ivrd $(1)/usr/bin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/tone2wav $(1)/usr/bin/
 endef
 
 # 1. Name
@@ -453,49 +467,49 @@ endef
 # 4. Inter Depends
 # 5. Extra Depends
 define BuildPlugin
-  define Package/freeswitch-mod-$(1)
+  define Package/$(PKG_NAME)-mod-$(1)
-    $$(call Package/freeswitch/Default)
+    $$(call Package/$(PKG_NAME)/Default)
     TITLE:= FS $(2) module
-    DEPENDS:= freeswitch $$(foreach m,$(4),+freeswitch-mod-$$m) $(5)
+    DEPENDS:= $(PKG_NAME) $$(foreach m,$(4),+$(PKG_NAME)-mod-$$m) $(5)
   endef
 
-  define Package/freeswitch-mod-$(1)/install
+  define Package/$(PKG_NAME)-mod-$(1)/install
-	[ -z "$(3)" ] || $(INSTALL_DIR) $$(1)/usr/lib/freeswitch
+	[ -z "$(3)" ] || $(INSTALL_DIR) $$(1)/usr/lib/$(PKG_NAME)
 	for f in $(3); do \
 		$(CP) \
-			$(PKG_INSTALL_DIR)/usr/lib/freeswitch/$$$$$$$${f}.so \
+			$(PKG_INSTALL_DIR)/usr/lib/$(PKG_NAME)/$$$$$$$${f}.so \
-			$$(1)/usr/lib/freeswitch/ ; \
+			$$(1)/usr/lib/$(PKG_NAME)/ ; \
 	done
 	if [ -d "./files/etc.packages/$(1)" ]; then \
-		$(INSTALL_DIR) $$(1)/etc/freeswitch ; \
+		$(INSTALL_DIR) $$(1)/etc/$(PKG_NAME) ; \
 		$(CP) \
 			./files/etc.packages/$(1)/* \
-			$$(1)/etc/freeswitch/ ; \
+			$$(1)/etc/$(PKG_NAME)/ ; \
-        fi
+	fi
   endef
 
-  define Package/freeswitch-mod-$(1)/postinst
+  define Package/$(PKG_NAME)-mod-$(1)/postinst
 #!/bin/sh
-sed -i -e 's|^\([ \t]*\)<!-- *\(.*\)"mod_$(subst -,_,$(1))"\(.*\) *-->\(.*\)$$$$|\1\2"mod_$(subst -,_,$(1))"\3\4|' $$$${IPKG_INSTROOT}/etc/freeswitch/autoload_configs/modules.conf.xml
+sed -i -e 's|^\([ \t]*\)<!-- *\(.*\)"mod_$(subst -,_,$(1))"\(.*\) *-->\(.*\)$$$$|\1\2"mod_$(subst -,_,$(1))"\3\4|' $$$${IPKG_INSTROOT}/etc/$(PKG_NAME)/autoload_configs/modules.conf.xml
   endef
 
-  define Package/freeswitch-mod-$(1)/postrm
+  define Package/$(PKG_NAME)-mod-$(1)/postrm
 #!/bin/sh
-sed -i -e 's|^\([ \t]*\)\(.*\)"mod_$(subst -,_,$(1))"\(.*\)$$$$|\1<!-- \2"mod_$(subst -,_,$(1))"\3 -->|' $$$${IPKG_INSTROOT}/etc/freeswitch/autoload_configs/modules.conf.xml
+sed -i -e 's|^\([ \t]*\)\(.*\)"mod_$(subst -,_,$(1))"\(.*\)$$$$|\1<!-- \2"mod_$(subst -,_,$(1))"\3 -->|' $$$${IPKG_INSTROOT}/etc/$(PKG_NAME)/autoload_configs/modules.conf.xml
   endef
 
-  $$(eval $$(call BuildPackage,freeswitch-mod-$(1)))
+  $$(eval $$(call BuildPackage,$(PKG_NAME)-mod-$(1)))
 endef
 
-$(eval $(call BuildPackage,freeswitch))
+$(eval $(call BuildPackage,$(PKG_NAME)))
-$(eval $(call BuildPackage,freeswitch-collection-upstream-defaults))
+$(eval $(call BuildPackage,$(PKG_NAME)-collection-upstream-defaults))
-$(eval $(call BuildPackage,freeswitch-collection-minimal))
+$(eval $(call BuildPackage,$(PKG_NAME)-collection-minimal))
-$(eval $(call BuildPackage,freeswitch-sounds-en))
+$(eval $(call BuildPackage,$(PKG_NAME)-sounds-en))
-$(eval $(call BuildPackage,freeswitch-sounds-moh))
+$(eval $(call BuildPackage,$(PKG_NAME)-sounds-moh))
-$(eval $(call BuildPackage,freeswitch-tools))
+$(eval $(call BuildPackage,$(PKG_NAME)-tools))
-$(eval $(call BuildPackage,freeswitch-example-config))
+$(eval $(call BuildPackage,$(PKG_NAME)-example-config))
-$(eval $(call BuildPackage,freeswitch-config-upstream-defaults))
+$(eval $(call BuildPackage,$(PKG_NAME)-config-upstream-defaults))
-$(eval $(call BuildPackage,freeswitch-config-minimal))
+$(eval $(call BuildPackage,$(PKG_NAME)-config-minimal))
 
 #$(eval $(call BuildPlugin,Name,Title,Files,Depends))
 $(eval $(call BuildPlugin,alsa,Alsa endpoint,mod_alsa,,))
@@ -503,10 +517,12 @@ $(eval $(call BuildPlugin,amr,GSM-AMR codec,mod_amr,,))
 $(eval $(call BuildPlugin,amrwb,GSM-AMRWB,mod_amrwb,,))
 $(eval $(call BuildPlugin,bv,codec mod_bv,mod_bv,,))
 $(eval $(call BuildPlugin,cdr-csv,CSV-CDR handler,mod_cdr_csv,,))
+$(eval $(call BuildPlugin,cdr-pg-csv,Postgress CDR handler,mod_cdr_pg_csv,,+postgresql @BROKEN))
 $(eval $(call BuildPlugin,celt,CELT ultra-low delay codec,mod_celt,,+libogg))
 $(eval $(call BuildPlugin,cepstral,Cepstral interface,mod_cepstral,,@BROKEN)) # needs <swift.h>
 $(eval $(call BuildPlugin,cidlookup,applications mod_cidlookup,mod_cidlookup,,))
 $(eval $(call BuildPlugin,cluechoo,Framework Demo,mod_cluechoo,,))
+$(eval $(call BuildPlugin,codec2,CoDec 2,mod_codec2,,))
 $(eval $(call BuildPlugin,commands,API commands,mod_commands,,))
 $(eval $(call BuildPlugin,conference,Conference room,mod_conference,,))
 $(eval $(call BuildPlugin,console,Console logger,mod_console,,))
@@ -526,20 +542,19 @@ $(eval $(call BuildPlugin,esf,Extra SIP Functionality,mod_esf,,))
 $(eval $(call BuildPlugin,event-multicast,Multicast event handler,mod_event_multicast,,))
 $(eval $(call BuildPlugin,event-socket,Socket event handler,mod_event_socket,,))
 $(eval $(call BuildPlugin,expr,Expression evaluation,mod_expr,,))
-$(eval $(call BuildPlugin,fax,Fax,mod_fax,,+libjpeg @(!(powerpc)||BROKEN))) # fails in spandsp
 $(eval $(call BuildPlugin,fifo,FIFO,mod_fifo,,))
-$(eval $(call BuildPlugin,file-string,File streaming,mod_file_string,,))
+$(eval $(call BuildPlugin,file-string,File streaming,mod_file_string,,@OBSOLETE))
 $(eval $(call BuildPlugin,flite,Festival TTS,mod_flite,,@(!(armeb||avr32)||BROKEN)))
 $(eval $(call BuildPlugin,fsv,Video,mod_fsv,,))
 $(eval $(call BuildPlugin,g723-1,G.723.1 codec,mod_g723_1,,))
 $(eval $(call BuildPlugin,g729,G.729 codec,mod_g729,,))
 $(eval $(call BuildPlugin,h26x,H26X linear codec,mod_h26x,,))
 $(eval $(call BuildPlugin,h323,h323 endpoint,mod_h323,,@BROKEN)) # missing header files (other packages needed)
+$(eval $(call BuildPlugin,hash,API for manipulating a hash table,mod_hash,,))
 $(eval $(call BuildPlugin,java,Java language interface,mod_java,,@BROKEN)) # needs java
 $(eval $(call BuildPlugin,ilbc,ILBC codec,mod_ilbc,,))
 $(eval $(call BuildPlugin,lcr,Least Cost Routing,mod_lcr,,))
 $(eval $(call BuildPlugin,ldap,LDAP interface,mod_ldap,,@BROKEN)) # fails in openldap
-$(eval $(call BuildPlugin,limit,Resource limitation,mod_limit,,))
 $(eval $(call BuildPlugin,local-stream,Local streaming,mod_local_stream,,))
 $(eval $(call BuildPlugin,logfile,File logger,mod_logfile,,))
 $(eval $(call BuildPlugin,loopback,Loopback endpoint,mod_loopback,,))
@@ -554,7 +569,7 @@ $(eval $(call BuildPlugin,perl,Perl language interface,mod_perl,,+perl @BROKEN))
 $(eval $(call BuildPlugin,pocketsphinx,PocketSphinx SR,mod_pocketsphinx,,@BROKEN)) # fails in sphinxbase
 $(eval $(call BuildPlugin,portaudio,Local audio endpoint,mod_portaudio,,+alsa-lib))
 $(eval $(call BuildPlugin,portaudio-stream,format mod_portaudio_stream,mod_portaudio_stream,,))
-$(eval $(call BuildPlugin,python,Python language interface,mod_python,,+python @BROKEN)) # needs Python
+$(eval $(call BuildPlugin,python,Python language interface,mod_python,,@BROKEN)) # needs Python
 $(eval $(call BuildPlugin,radius-cdr,Radius-CDR interface,mod_radius_cdr,,@BROKEN)) # fails in freeradius-client
 $(eval $(call BuildPlugin,rss,RRS feeds via TTS,mod_rss,,))
 $(eval $(call BuildPlugin,say-de,German say,mod_say_de,,))
@@ -579,6 +594,7 @@ $(eval $(call BuildPlugin,sndfile,Multi-Format file transcoder,mod_sndfile,,))
 $(eval $(call BuildPlugin,snom,SNOM specific features,mod_snom,,))
 $(eval $(call BuildPlugin,sofia,SIP,mod_sofia,,))
 $(eval $(call BuildPlugin,soundtouch,Sound effects,mod_soundtouch,,@BROKEN)) # fails in soundtouch
+$(eval $(call BuildPlugin,spandsp,Span DSP,mod_spandsp,,@BROKEN))
 $(eval $(call BuildPlugin,speex,Speex codec,mod_speex,,))
 $(eval $(call BuildPlugin,spidermonkey,JavaScript,mod_spidermonkey,,@BROKEN)) # fails in js
 $(eval $(call BuildPlugin,spidermonkey-core_db,JavaScript DB,mod_spidermonkey_core_db,,@BROKEN))
@@ -594,7 +610,6 @@ $(eval $(call BuildPlugin,unimrcp,MRCP interface,mod_unimrcp,,))
 $(eval $(call BuildPlugin,valet-parking,application mod_valet_parking,mod_valet_parking,,))
 $(eval $(call BuildPlugin,vmd,VoiceMail beep detection,mod_vmd,,))
 $(eval $(call BuildPlugin,voicemail,VoiceMail,mod_voicemail,,))
-$(eval $(call BuildPlugin,voipcodecs,VoIP codecs,mod_voipcodecs,,@(!(powerpc)||BROKEN))) # fails in spandsp
 $(eval $(call BuildPlugin,xml-cdr,XML-CDR handler,mod_xml_cdr,,+libcurl))
 $(eval $(call BuildPlugin,xml-curl,XML-Curl gateway,mod_xml_curl,,+libcurl))
 $(eval $(call BuildPlugin,xml-ldap,LDAP-XML gateway,mod_xml_ldap,,@BROKEN)) # fails in openldap