From owner-svn-ports-head@FreeBSD.ORG Thu Nov 15 17:06:17 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C12095C2; Thu, 15 Nov 2012 17:06:17 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id A682F8FC14; Thu, 15 Nov 2012 17:06:17 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAFH6Hv8023043; Thu, 15 Nov 2012 17:06:17 GMT (envelope-from flo@svn.freebsd.org) Received: (from flo@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAFH6HET023041; Thu, 15 Nov 2012 17:06:17 GMT (envelope-from flo@svn.freebsd.org) Message-Id: <201211151706.qAFH6HET023041@svn.freebsd.org> From: Florian Smeets Date: Thu, 15 Nov 2012 17:06:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r307460 - head/net/asterisk10 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.14 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: Thu, 15 Nov 2012 17:06:17 -0000 Author: flo Date: Thu Nov 15 17:06:17 2012 New Revision: 307460 URL: http://svnweb.freebsd.org/changeset/ports/307460 Log: - Really enable chan_h323 if H323 is selected [1] - Bump PORTREVISION as H323 is on by default - fix a few portlint Tab/Whitespace warnings Submitted by: st41ker@st41ker.net [1] Feature safe: yes Modified: head/net/asterisk10/Makefile head/net/asterisk10/pkg-plist Modified: head/net/asterisk10/Makefile ============================================================================== --- head/net/asterisk10/Makefile Thu Nov 15 16:05:42 2012 (r307459) +++ head/net/asterisk10/Makefile Thu Nov 15 17:06:17 2012 (r307460) @@ -7,6 +7,7 @@ PORTNAME= asterisk PORTVERSION= 10.10.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ @@ -45,21 +46,21 @@ MAN8= asterisk.8 astgenkey.8 autosuppor CONFLICTS_BUILD= linuxthreads-* CONFLICTS_INSTALL= asterisk*-1.4* asterisk*-1.6* asterisk*-1.8* -OPTIONS_DEFINE= VORBIS PGSQL MYSQL RADIUS SNMP H323 FREETDS JABBER SQLITE GSM \ +OPTIONS_DEFINE= VORBIS PGSQL MYSQL RADIUS SNMP H323 FREETDS JABBER SQLITE GSM \ CURL SPANDSP EXCHANGE NEWG711 SRTP LUA LDAP ODBC OOH323 -OPTIONS_DEFAULT= VORBIS ODBC UNIXODBC PGSQL RADIUS SNMP H323 FREETDS JABBER GSM \ +OPTIONS_DEFAULT= VORBIS ODBC UNIXODBC PGSQL RADIUS SNMP H323 FREETDS JABBER GSM \ SQLITE CURL OPTIONS_SINGLE= ODBC OPTIONS_SINGLE_ODBC= IODBC UNIXODBC -OPTIONS_DEFINE_i386= DAHDI -OPTIONS_DEFINE_amd64= DAHDI -OPTIONS_DEFINE_sparc64= DAHDI - -OPTIONS_DEFAULT_i386= DAHDI -OPTIONS_DEFAULT_amd64= DAHDI -OPTIONS_DEFAULT_sparc64= DAHDI +OPTIONS_DEFINE_i386= DAHDI +OPTIONS_DEFINE_amd64= DAHDI +OPTIONS_DEFINE_sparc64= DAHDI + +OPTIONS_DEFAULT_i386= DAHDI +OPTIONS_DEFAULT_amd64= DAHDI +OPTIONS_DEFAULT_sparc64= DAHDI EXCHANGE_DESC?= Exchange calendar support NEWG711_DESC?= New G711 Codec @@ -281,13 +282,16 @@ post-patch: ${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample post-configure: -.if !empty(PORT_OPTIONS:MMYSQL) || !empty(PORT_OPTIONS:MNEWG711) || !empty(PORT_OPTIONS:MOOH323) +.if !empty(PORT_OPTIONS:MMYSQL) || !empty(PORT_OPTIONS:MNEWG711) || !empty(PORT_OPTIONS:MOOH323) || !empty(PORT_OPTIONS:MH323) @cd ${WRKSRC} && make menuselect.makeopts .if ${PORT_OPTIONS:MMYSQL} @cd ${WRKSRC} && ./menuselect/menuselect --enable res_config_mysql menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --enable app_mysql menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --enable cdr_mysql menuselect.makeopts .endif +.if ${PORT_OPTIONS:MH323} + @cd ${WRKSRC} && ./menuselect/menuselect --enable chan_h323 menuselect.makeopts +.endif .if ${PORT_OPTIONS:MOOH323} @cd ${WRKSRC} && ./menuselect/menuselect --enable chan_ooh323 menuselect.makeopts .endif Modified: head/net/asterisk10/pkg-plist ============================================================================== --- head/net/asterisk10/pkg-plist Thu Nov 15 16:05:42 2012 (r307459) +++ head/net/asterisk10/pkg-plist Thu Nov 15 17:06:17 2012 (r307460) @@ -550,6 +550,7 @@ lib/asterisk/modules/cel_sqlite3_custom. %%WITH_FREETDS%%lib/asterisk/modules/cel_tds.so lib/asterisk/modules/chan_agent.so %%WITH_JABBER%%lib/asterisk/modules/chan_gtalk.so +%%WITH_H323%%lib/asterisk/modules/chan_h323.so lib/asterisk/modules/chan_iax2.so lib/asterisk/modules/chan_local.so lib/asterisk/modules/chan_mgcp.so