From owner-svn-ports-head@FreeBSD.ORG Tue Nov 11 14:00:45 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DB7481C5; Tue, 11 Nov 2014 14:00:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C779BF4A; Tue, 11 Nov 2014 14:00:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sABE0jb8008470; Tue, 11 Nov 2014 14:00:45 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sABE0ijc008460; Tue, 11 Nov 2014 14:00:44 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201411111400.sABE0ijc008460@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Tue, 11 Nov 2014 14:00:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372448 - in head/net: asterisk asterisk/files asterisk11 asterisk11/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Nov 2014 14:00:46 -0000 Author: madpilot Date: Tue Nov 11 14:00:43 2014 New Revision: 372448 URL: https://svnweb.freebsd.org/changeset/ports/372448 QAT: https://qat.redports.org/buildarchive/r372448/ Log: - Update net/asterisk to 1.8.32.0 - Update net/asterisk11 to 11.14.0 - Allow customizing startup options used by rc script [1] - While here, fix some rclint warnings Reported/Requested by: Emmanuel Coulon [1] Modified: head/net/asterisk/Makefile head/net/asterisk/distinfo head/net/asterisk/files/asterisk.in head/net/asterisk11/Makefile head/net/asterisk11/distinfo head/net/asterisk11/files/asterisk.in Modified: head/net/asterisk/Makefile ============================================================================== --- head/net/asterisk/Makefile Tue Nov 11 13:41:37 2014 (r372447) +++ head/net/asterisk/Makefile Tue Nov 11 14:00:43 2014 (r372448) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 1.8.31.1 +PORTVERSION= 1.8.32.0 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ Modified: head/net/asterisk/distinfo ============================================================================== --- head/net/asterisk/distinfo Tue Nov 11 13:41:37 2014 (r372447) +++ head/net/asterisk/distinfo Tue Nov 11 14:00:43 2014 (r372448) @@ -1,2 +1,2 @@ -SHA256 (asterisk-1.8.31.1.tar.gz) = 430e095e937a29ec13e58c2cab6b8299caec5bbe7a6af0f396a9f29fbc926e7d -SIZE (asterisk-1.8.31.1.tar.gz) = 29630590 +SHA256 (asterisk-1.8.32.0.tar.gz) = 37dee258431baf3ef726fb89f5d590b3e5498654f5080afed649697a0a227a8f +SIZE (asterisk-1.8.32.0.tar.gz) = 29639709 Modified: head/net/asterisk/files/asterisk.in ============================================================================== --- head/net/asterisk/files/asterisk.in Tue Nov 11 13:41:37 2014 (r372447) +++ head/net/asterisk/files/asterisk.in Tue Nov 11 14:00:43 2014 (r372448) @@ -9,35 +9,48 @@ # # Add the following lines to /etc/rc.conf to enable asterisk: # -# asterisk_enable="YES" +# asterisk_enable (bool): Set it to "YES" to enable asterisk +# Default is "NO" +# asterisk_user (string): User asterisk runs as +# Default is %%ASTERISK_USER%% +# asterisk_args (string): Extra argumeents to pass to asterisk at startup +# Default is "-n" +# asterisk_pidfile (string): Location of the asterisk pid file +# Default is /var/run/asterisk/asterisk.pid # . /etc/rc.subr name=asterisk rcvar=asterisk_enable +desc="Asterisk PBX server" -extra_commands="reload" +load_rc_config $name + +: ${asterisk_enable:=NO} +: ${asterisk_user:=%%ASTERISK_USER%%} +: ${asterisk_args=-n} +: ${asterisk_pidfile:=/var/run/asterisk/asterisk.pid} + +extra_commands=reload -stop_cmd="asterisk_stop" -reload_cmd="asterisk_reload" +stop_cmd=asterisk_stop +reload_cmd=asterisk_reload command="%%PREFIX%%/sbin/asterisk" -command_args="-n -F -U %%ASTERISK_USER%%" -pidfile=${asterisk_pidfile:-"/var/run/asterisk/asterisk.pid"} +command_args="${asterisk_args} -F -U ${asterisk_user}" +pidfile=${asterisk_pidfile} -asterisk_stop() { - echo 'Stopping asterisk' - $command -nqrx 'core stop now' +asterisk_stop() +{ + echo 'Stopping asterisk' + $command -nqrx 'core stop now' } -asterisk_reload() { - echo 'Reloading asterisk' - $command -nqrx 'reload' +asterisk_reload() +{ + echo 'Reloading asterisk' + $command -nqrx 'reload' } -load_rc_config $name - -asterisk_enable=${asterisk_enable:-"NO"} - run_rc_command "$1" Modified: head/net/asterisk11/Makefile ============================================================================== --- head/net/asterisk11/Makefile Tue Nov 11 13:41:37 2014 (r372447) +++ head/net/asterisk11/Makefile Tue Nov 11 14:00:43 2014 (r372448) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 11.13.1 +PORTVERSION= 11.14.0 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ Modified: head/net/asterisk11/distinfo ============================================================================== --- head/net/asterisk11/distinfo Tue Nov 11 13:41:37 2014 (r372447) +++ head/net/asterisk11/distinfo Tue Nov 11 14:00:43 2014 (r372448) @@ -1,2 +1,2 @@ -SHA256 (asterisk-11.13.1.tar.gz) = 382e914f3025f746d3a36cd218bc35f6a0f335b58226f35eaf4cc664b228d351 -SIZE (asterisk-11.13.1.tar.gz) = 34959077 +SHA256 (asterisk-11.14.0.tar.gz) = ad4710aba7f21c75bf1d16159a349034a04d3d36895243c262059a89f892098a +SIZE (asterisk-11.14.0.tar.gz) = 34975152 Modified: head/net/asterisk11/files/asterisk.in ============================================================================== --- head/net/asterisk11/files/asterisk.in Tue Nov 11 13:41:37 2014 (r372447) +++ head/net/asterisk11/files/asterisk.in Tue Nov 11 14:00:43 2014 (r372448) @@ -9,35 +9,48 @@ # # Add the following lines to /etc/rc.conf to enable asterisk: # -# asterisk_enable="YES" +# asterisk_enable (bool): Set it to "YES" to enable asterisk +# Default is "NO" +# asterisk_user (string): User asterisk runs as +# Default is %%ASTERISK_USER%% +# asterisk_args (string): Extra argumeents to pass to asterisk at startup +# Default is "-n" +# asterisk_pidfile (string): Location of the asterisk pid file +# Default is /var/run/asterisk/asterisk.pid # . /etc/rc.subr name=asterisk rcvar=asterisk_enable +desc="Asterisk PBX server" -extra_commands="reload" +load_rc_config $name + +: ${asterisk_enable:=NO} +: ${asterisk_user:=%%ASTERISK_USER%%} +: ${asterisk_args=-n} +: ${asterisk_pidfile:=/var/run/asterisk/asterisk.pid} + +extra_commands=reload -stop_cmd="asterisk_stop" -reload_cmd="asterisk_reload" +stop_cmd=asterisk_stop +reload_cmd=asterisk_reload command="%%PREFIX%%/sbin/asterisk" -command_args="-n -F -U %%ASTERISK_USER%%" -pidfile=${asterisk_pidfile:-"/var/run/asterisk/asterisk.pid"} +command_args="${asterisk_args} -F -U ${asterisk_user}" +pidfile=${asterisk_pidfile} -asterisk_stop() { - echo 'Stopping asterisk' - $command -nqrx 'core stop now' +asterisk_stop() +{ + echo 'Stopping asterisk' + $command -nqrx 'core stop now' } -asterisk_reload() { - echo 'Reloading asterisk' - $command -nqrx 'reload' +asterisk_reload() +{ + echo 'Reloading asterisk' + $command -nqrx 'reload' } -load_rc_config $name - -asterisk_enable=${asterisk_enable:-"NO"} - run_rc_command "$1"