Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 15 Nov 2012 17:06:17 +0000 (UTC)
From:      Florian Smeets <flo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r307460 - head/net/asterisk10
Message-ID:  <201211151706.qAFH6HET023041@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211151706.qAFH6HET023041>