2 files changed, 11 insertions, 6 deletions

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"