Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 26 Nov 2014 10:40:06 +0000 (UTC)
From:      Guido Falsi <madpilot@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r373444 - head/net/asterisk11
Message-ID:  <201411261040.sAQAe6LQ066804@svn.freebsd.org>

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



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