From owner-svn-ports-head@FreeBSD.ORG Wed Nov 26 10:40:06 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A8978D3B; Wed, 26 Nov 2014 10:40:06 +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 89B3B255; Wed, 26 Nov 2014 10:40:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQAe6DH066805; Wed, 26 Nov 2014 10:40:06 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQAe6LQ066804; Wed, 26 Nov 2014 10:40:06 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201411261040.sAQAe6LQ066804@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Wed, 26 Nov 2014 10:40:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r373444 - head/net/asterisk11 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: Wed, 26 Nov 2014 10:40:06 -0000 Author: madpilot Date: Wed Nov 26 10:40:05 2014 New Revision: 373444 URL: https://svnweb.freebsd.org/changeset/ports/373444 QAT: https://qat.redports.org/buildarchive/r373444/ Log: - Make UUID support an option (enabled by default, no functional change in default port) - Mark conflict on UUID option with ossp-uuid port, since asterisk requires misc/e2fsprogs-libuuid for this functionality and will not build if the former is installed. Please note that when compiling without UUID support the res_rtp module in asterisk will have reduced functionality, so it is suggested to keep the option turned on. PR: 195249 Submitted by: blacktux82 at gmail.com Modified: head/net/asterisk11/Makefile Modified: head/net/asterisk11/Makefile ============================================================================== --- head/net/asterisk11/Makefile Wed Nov 26 10:25:45 2014 (r373443) +++ head/net/asterisk11/Makefile Wed Nov 26 10:40:05 2014 (r373444) @@ -2,6 +2,7 @@ PORTNAME= asterisk PORTVERSION= 11.14.1 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ @@ -13,14 +14,12 @@ COMMENT= Open Source PBX and telephony t LIB_DEPENDS= libspeex.so:${PORTSDIR}/audio/speex \ libnewt.so:${PORTSDIR}/devel/newt \ libexecinfo.so:${PORTSDIR}/devel/libexecinfo \ - libsqlite3.so:${PORTSDIR}/databases/sqlite3 \ - libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid + libsqlite3.so:${PORTSDIR}/databases/sqlite3 RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 ONLY_FOR_ARCHS= i386 amd64 powerpc sparc64 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-uuid=${LOCALBASE} LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323 CFLAGS+= -I${LOCALBASE}/include @@ -43,9 +42,9 @@ CONFLICTS_BUILD= linuxthreads-* CONFLICTS_INSTALL= asterisk*-1.4* asterisk*-1.6* asterisk*-1.8* OPTIONS_DEFINE= VORBIS PGSQL MYSQL ODBC RADIUS SNMP FREETDS XMPP SQLITE GSM \ - CURL SPANDSP EXCHANGE NEWG711 SRTP LUA LDAP OOH323 + CURL SPANDSP EXCHANGE NEWG711 SRTP LUA LDAP OOH323 UUID OPTIONS_DEFAULT= VORBIS ODBC PGSQL RADIUS SNMP FREETDS \ - XMPP GSM SQLITE CURL LUA + XMPP GSM SQLITE CURL LUA UUID OPTIONS_DEFINE_i386= DAHDI OPTIONS_DEFINE_amd64= DAHDI @@ -61,6 +60,7 @@ SRTP_DESC?= SecureRTP support OOH323_DESC?= ooh323 support DAHDI_DESC?= DAHDI support XMPP_DESC?= XMPP/GTALK support +UUID_DESC?= libuuid support(required for ICE and TURN in RTP) OPTIONS_SUB= yes OOH323_LIB_DEPENDS= libpt_r.so:${PORTSDIR}/devel/pwlib \ @@ -109,6 +109,10 @@ LUA_CFLAGS= -I${LUA_INCDIR} LUA_LDFLAGS= -L${LUA_LIBDIR} LDAP_CONFIGURE_WITH= ldap LDAP_USE= OPENLDAP=yes +UUID_LIB_DEPENDS= libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid +UUID_CONFIGURE_ON= --with-uuid=${LOCALBASE} +UUID_CONFIGURE_OFF= --disable-uuid +UUID_CONFLICTS= ossp-uuid-[0-9]* ASTERISK_USER?= asterisk ASTERISK_GROUP?= asterisk