remove stupid sleep, make the "sofia recover" only run if you've set freeswitch_cluster so it doesn't break the ability to start the daemon. Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: suffix)
Responsible Changed From-To: freebsd-ports-bugs->swills swills@ wants this submitter's PRs (via the GNATS Auto Assign Tool)
State Changed From-To: open->closed Committed, with minor changes. Thanks!
Author: swills Date: Mon Jan 21 00:33:44 2013 New Revision: 310727 URL: http://svnweb.freebsd.org/changeset/ports/310727 Log: - 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 <feld@feld.me> [1] Modified: head/net/freeswitch-core-devel/Makefile head/net/freeswitch-core-devel/files/freeswitch.in (contents, props changed) Modified: head/net/freeswitch-core-devel/Makefile ============================================================================== --- head/net/freeswitch-core-devel/Makefile Sun Jan 20 23:47:18 2013 (r310726) +++ head/net/freeswitch-core-devel/Makefile Mon Jan 21 00:33:44 2013 (r310727) @@ -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}" \ Modified: head/net/freeswitch-core-devel/files/freeswitch.in ============================================================================== --- head/net/freeswitch-core-devel/files/freeswitch.in Sun Jan 20 23:47:18 2013 (r310726) +++ head/net/freeswitch-core-devel/files/freeswitch.in Mon Jan 21 00:33:44 2013 (r310727) @@ -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" _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"