net/freeswitch: Change -upstream-defaults and -minimal to use mod_syslog instead...

SVN-Revision: 21965

diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile
index e3da8a00f019e6a360854f6026783a52bdf478ea..a2123b59298fe1d41d04e0cc664c0118cdd8a00e 100644 (file)
--- a/net/freeswitch/Makefile
+++ b/net/freeswitch/Makefile
@@ -164,7 +164,7 @@ $(call Package/freeswitch/Default)
   DEPENDS:= freeswitch \
                +freeswitch-mod-commands \
                +freeswitch-mod-conference \
-               +freeswitch-mod-console \
+               +freeswitch-mod-syslog \
                +freeswitch-mod-curl \
                +freeswitch-mod-dialplan-xml \
                +freeswitch-mod-dptools \
@@ -193,7 +193,7 @@ $(call Package/freeswitch/Default)
   TITLE:=FreeSWITCH minimal config
   DEPENDS:= freeswitch \
                +freeswitch-mod-commands \
-               +freeswitch-mod-console \
+               +freeswitch-mod-syslog \
                +freeswitch-mod-dialplan-xml \
                +freeswitch-mod-dptools \
                +freeswitch-mod-event-socket \
@@ -349,6 +349,8 @@ define Build/Compile
                DESTDIR="$(PKG_INSTALL_DIR)" \
                LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \
                all $(MAKE_INSTALL_TARGETS)
+       $(SED) 's|^\([:blank:]*\)\(.*\)"mod_console"\(.*\)$$$$|\1<!-- \2"mod_console"\3 -->|' $(PKG_INSTALL_DIR)/etc/freeswitch/autoload_configs/modules.conf.xml
+       $(SED) 's|^\([:blank:]*\)<!-- \(.*\)"mod_syslog"\(.*\) -->\(.*\)$$$$|\1\2"mod_syslog"\3\4 -->|' $(PKG_INSTALL_DIR)/etc/freeswitch/autoload_configs/modules.conf.xml
 endef
 
 define Build/InstallDev

diff --git a/net/freeswitch/files/freeswitch.init b/net/freeswitch/files/freeswitch.init
index a155724dacf32d14087475cc0cfb0ac0a7920f83..8637556aa58cb5d12771786cc161126d9760d6d8 100644 (file)
--- a/net/freeswitch/files/freeswitch.init
+++ b/net/freeswitch/files/freeswitch.init
@@ -15,7 +15,7 @@ start() {
        mkdir -p $FS_DIR_DB
        mkdir -p $FS_DIR_LOG
        ulimit -s 240
-       $FS_DIR/usr/bin/freeswitch $OPTIONS -c &
+       $FS_DIR/usr/bin/freeswitch $OPTIONS -nc
 }
 
 stop() {
@@ -35,3 +35,4 @@ restart() {
        sleep 10
        start
 }
+