From owner-svn-ports-head@freebsd.org Sun Jan 31 17:11:49 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 633FAA7433A; Sun, 31 Jan 2016 17:11:49 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 2231E1B68; Sun, 31 Jan 2016 17:11:49 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0VHBmaH028085; Sun, 31 Jan 2016 17:11:48 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0VHBlvK028079; Sun, 31 Jan 2016 17:11:47 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201601311711.u0VHBlvK028079@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Sun, 31 Jan 2016 17:11:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r407652 - in head/net: asterisk asterisk/files asterisk11 asterisk11/files asterisk13 asterisk13/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.20 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: Sun, 31 Jan 2016 17:11:49 -0000 Author: madpilot Date: Sun Jan 31 17:11:47 2016 New Revision: 407652 URL: https://svnweb.freebsd.org/changeset/ports/407652 Log: - Enable SPANDSP option by default - Make startup script create pidfile directory if it does not exist While here, reflow OPTIONS_DEFAULT lists. Subitted/Requested by: lidl@ Modified: head/net/asterisk/Makefile head/net/asterisk/files/asterisk.in head/net/asterisk11/Makefile head/net/asterisk11/files/asterisk.in head/net/asterisk13/Makefile head/net/asterisk13/files/asterisk.in Modified: head/net/asterisk/Makefile ============================================================================== --- head/net/asterisk/Makefile Sun Jan 31 15:55:52 2016 (r407651) +++ head/net/asterisk/Makefile Sun Jan 31 17:11:47 2016 (r407652) @@ -3,7 +3,7 @@ PORTNAME= asterisk PORTVERSION= 1.8.32.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:main,g729 MASTER_SITE_SUBDIR= asterisk/:main \ @@ -54,8 +54,8 @@ CONFLICTS_INSTALL= asterisk*-11* asteris OPTIONS_DEFINE= BACKTRACE CURL EXCHANGE FREETDS H323 JABBER LUA LDAP \ MP3PLAYER OOH323 RADIUS SNMP SPANDSP SRTP SYSINFO -OPTIONS_DEFAULT= BACKTRACE CURL FREETDS GSM H323 JABBER LUA NEWT ODBC PGSQL RADIUS SNMP SPEEX \ - SQLITE VORBIS +OPTIONS_DEFAULT= BACKTRACE CURL FREETDS GSM H323 JABBER LUA NEWT ODBC \ + PGSQL RADIUS SNMP SPANDSP SPEEX SQLITE VORBIS OPTIONS_DEFINE_i386= DAHDI OPTIONS_DEFINE_amd64= DAHDI Modified: head/net/asterisk/files/asterisk.in ============================================================================== --- head/net/asterisk/files/asterisk.in Sun Jan 31 15:55:52 2016 (r407651) +++ head/net/asterisk/files/asterisk.in Sun Jan 31 17:11:47 2016 (r407652) @@ -34,6 +34,7 @@ load_rc_config $name extra_commands=reload +start_precmd=asterisk_precmd stop_cmd=asterisk_stop reload_cmd=asterisk_reload @@ -41,6 +42,14 @@ command="%%PREFIX%%/sbin/asterisk" command_args="${asterisk_args} -F -U ${asterisk_user}" pidfile=${asterisk_pidfile} +asterisk_precmd() +{ + local rundir=${asterisk_pidfile%/*} + if [ ! -d $rundir ] ; then + install -d -m 0755 -o asterisk -g asterisk $rundir + fi +} + asterisk_stop() { echo 'Stopping asterisk' Modified: head/net/asterisk11/Makefile ============================================================================== --- head/net/asterisk11/Makefile Sun Jan 31 15:55:52 2016 (r407651) +++ head/net/asterisk11/Makefile Sun Jan 31 17:11:47 2016 (r407652) @@ -2,6 +2,7 @@ PORTNAME= asterisk PORTVERSION= 11.21.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:main,g729 MASTER_SITE_SUBDIR= asterisk/:main \ @@ -52,8 +53,9 @@ CONFLICTS_INSTALL= asterisk*-1.8* asteri OPTIONS_DEFINE= BACKTRACE CURL EXCHANGE FREETDS LDAP LUA \ MP3PLAYER OOH323 RADIUS SNMP SPANDSP SRTP \ SYSINFO UUID XMPP -OPTIONS_DEFAULT= BACKTRACE CURL FREETDS GCC GSM LUA MP3PLAYER NEWT ODBC PGSQL \ - RADIUS SNMP SPEEX SQLITE2 UUID VORBIS XMPP +OPTIONS_DEFAULT= BACKTRACE CURL FREETDS GCC GSM LUA MP3PLAYER \ + NEWT ODBC PGSQL RADIUS SNMP SPANDSP SPEEX \ + SQLITE2 UUID VORBIS XMPP OPTIONS_DEFINE_i386= DAHDI OPTIONS_DEFINE_amd64= DAHDI Modified: head/net/asterisk11/files/asterisk.in ============================================================================== --- head/net/asterisk11/files/asterisk.in Sun Jan 31 15:55:52 2016 (r407651) +++ head/net/asterisk11/files/asterisk.in Sun Jan 31 17:11:47 2016 (r407652) @@ -34,6 +34,7 @@ load_rc_config $name extra_commands=reload +start_precmd=asterisk_precmd stop_cmd=asterisk_stop reload_cmd=asterisk_reload @@ -41,6 +42,14 @@ command="%%PREFIX%%/sbin/asterisk" command_args="${asterisk_args} -F -U ${asterisk_user}" pidfile=${asterisk_pidfile} +asterisk_precmd() +{ + local rundir=${asterisk_pidfile%/*} + if [ ! -d $rundir ] ; then + install -d -m 0755 -o asterisk -g asterisk $rundir + fi +} + asterisk_stop() { echo 'Stopping asterisk' Modified: head/net/asterisk13/Makefile ============================================================================== --- head/net/asterisk13/Makefile Sun Jan 31 15:55:52 2016 (r407651) +++ head/net/asterisk13/Makefile Sun Jan 31 17:11:47 2016 (r407652) @@ -2,6 +2,7 @@ PORTNAME= asterisk PORTVERSION= 13.7.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:main,g729 MASTER_SITE_SUBDIR= asterisk/:main \ @@ -59,7 +60,7 @@ OPTIONS_DEFINE= ASTVERSION BACKTRACE C MP3PLAYER OOH323 PJSIP PORTAUDIO RADIUS SNMP \ SPANDSP SRTP SYSINFO XMPP OPTIONS_DEFAULT= CURL FREETDS GCC GSM LUA MP3PLAYER NEWT ODBC PGSQL PJSIP \ - PORTAUDIO RADIUS SNMP SPEEX SQLITE2 VORBIS \ + PORTAUDIO RADIUS SNMP SPANDSP SPEEX SQLITE2 VORBIS \ XMPP OPTIONS_DEFINE_i386= DAHDI Modified: head/net/asterisk13/files/asterisk.in ============================================================================== --- head/net/asterisk13/files/asterisk.in Sun Jan 31 15:55:52 2016 (r407651) +++ head/net/asterisk13/files/asterisk.in Sun Jan 31 17:11:47 2016 (r407652) @@ -34,6 +34,7 @@ load_rc_config $name extra_commands=reload +start_precmd=asterisk_precmd stop_cmd=asterisk_stop reload_cmd=asterisk_reload @@ -41,6 +42,14 @@ command="%%PREFIX%%/sbin/asterisk" command_args="${asterisk_args} -F -U ${asterisk_user}" pidfile=${asterisk_pidfile} +asterisk_precmd() +{ + local rundir=${asterisk_pidfile%/*} + if [ ! -d $rundir ] ; then + install -d -m 0755 -o asterisk -g asterisk $rundir + fi +} + asterisk_stop() { echo 'Stopping asterisk'