From b8db12e6a453a4d07e8d74b224efebdb324ed096 Mon Sep 17 00:00:00 2001 From: Steve Wills Date: Mon, 21 Jan 2013 00:33:44 +0000 Subject: - Remove hard coded sleep [1] - Make the "sofia recover" only run if you've set freeswitch_cluster so it doesn't break the ability to start the daemon [1] - Bump PORTREVISION - Mark MAKE_JOBS_UNSAFE due to failures building it with FORCE_MAKE_JOBS PR: ports/175305 [1] Submitted by: Mark Felder [1] --- net/freeswitch-core-devel/Makefile | 2 ++ net/freeswitch-core-devel/files/freeswitch.in | 15 +++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) (limited to 'net/freeswitch-core-devel') diff --git a/net/freeswitch-core-devel/Makefile b/net/freeswitch-core-devel/Makefile index bf9f8ffa1e30..12a79aaf2c4d 100644 --- a/net/freeswitch-core-devel/Makefile +++ b/net/freeswitch-core-devel/Makefile @@ -2,6 +2,7 @@ # $FreeBSD$ PORTNAME= freeswitch +PORTREVISION= 1 DISTVERSION= 1.2.3 CATEGORIES= net MASTER_SITES= http://files.freeswitch.org/ \ @@ -70,6 +71,7 @@ CONFIGURE_ARGS+=--prefix=${PREFIX} \ --with-ogg=${LOCALBASE} \ --with-ogg-libraries=${LOCALBASE}/lib \ --with-ogg-includes=${LOCALBASE}/include +MAKE_JOBS_UNSAFE= yes CONFIGURE_ENV+= INCLUDES="${INCLUDES}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ diff --git a/net/freeswitch-core-devel/files/freeswitch.in b/net/freeswitch-core-devel/files/freeswitch.in index 666e6db9bfcf..cbf89cad0050 100644 --- a/net/freeswitch-core-devel/files/freeswitch.in +++ b/net/freeswitch-core-devel/files/freeswitch.in @@ -19,10 +19,11 @@ rcvar=`set_rcvar` load_rc_config $name -: ${freeswitch_enable="NO"} -: ${freeswitch_user="freeswitch"} -: ${freeswitch_group="freeswitch"} -: ${freeswitch_flags="-nc -waste"} +: ${freeswitch_enable=NO} +: ${freeswitch_cluster=NO} +: ${freeswitch_user=freeswitch} +: ${freeswitch_group=freeswitch} +: ${freeswitch_flags=-nc -waste} command=%%PREFIX%%/bin/freeswitch command_args="-u ${freeswitch_user} -g ${freeswitch_group}" @@ -42,8 +43,10 @@ freeswitch_stop () { freeswitch_prestart () { install -d -o ${freeswitch_user} -m755 /var/run/${name} - sleep 7.7 - %%PREFIX%%/bin/fs_cli -x "sofia recover" + + if checkyesno freeswitch_cluster; then + %%PREFIX%%/bin/fs_cli -x "sofia recover" + fi } run_rc_command "$1" -- cgit v1.2.3