From owner-svn-ports-all@FreeBSD.ORG Tue Jan 13 11:54:04 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8AD68DF; Tue, 13 Jan 2015 11:54:04 +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 7665E1DB; Tue, 13 Jan 2015 11:54:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0DBs40l056924; Tue, 13 Jan 2015 11:54:04 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0DBs32V056917; Tue, 13 Jan 2015 11:54:03 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201501131154.t0DBs32V056917@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Tue, 13 Jan 2015 11:54:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r376918 - in head/net: asterisk13 pjsip X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Jan 2015 11:54:04 -0000 Author: madpilot Date: Tue Jan 13 11:54:03 2015 New Revision: 376918 URL: https://svnweb.freebsd.org/changeset/ports/376918 QAT: https://qat.redports.org/buildarchive/r376918/ Log: - Make pjsip use ports provided libsrtp instead of boudled one - Fix asterisk13 SRTP support - Fix asterisk13 SPEEX_LIB_DEPENDS - While here make SRTP option default for asterisk13 since it does not add dependencies Modified: head/net/asterisk13/Makefile head/net/pjsip/Makefile head/net/pjsip/pkg-plist (contents, props changed) Modified: head/net/asterisk13/Makefile ============================================================================== --- head/net/asterisk13/Makefile Tue Jan 13 11:53:31 2015 (r376917) +++ head/net/asterisk13/Makefile Tue Jan 13 11:54:03 2015 (r376918) @@ -2,7 +2,7 @@ PORTNAME= asterisk PORTVERSION= 13.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ @@ -47,7 +47,7 @@ CONFLICTS_INSTALL= asterisk*-1.8* asteri OPTIONS_DEFINE= VORBIS PGSQL MYSQL ODBC RADIUS SNMP FREETDS XMPP SQLITE GSM \ CURL SPANDSP EXCHANGE NEWG711 SRTP LUA LDAP OOH323 PJSIP SPEEX OPTIONS_DEFAULT= VORBIS ODBC PGSQL RADIUS SNMP FREETDS \ - XMPP GSM SQLITE3 CURL LUA PJSIP SPEEX + XMPP GSM SQLITE3 CURL SRTP LUA PJSIP SPEEX OPTIONS_DEFINE_i386= DAHDI OPTIONS_DEFINE_amd64= DAHDI @@ -105,7 +105,6 @@ SPANDSP_LIB_DEPENDS= libspandsp.so:${POR EXCHANGE_CONFIGURE_OFF= --without-neon --without-neon29 EXCHANGE_LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon SRTP_CONFIGURE_WITH= srtp -SRTP_BUILD_DEPENDS= libsrtp>=1.4.4:${PORTSDIR}/net/libsrtp LUA_CONFIGURE_WITH= lua LUA_USES= lua:51 LUA_CFLAGS= -I${LUA_INCDIR} @@ -115,7 +114,7 @@ LDAP_USE= OPENLDAP=yes PJSIP_LIB_DEPENDS= libpj.so:${PORTSDIR}/net/pjsip PJSIP_CONFIGURE_WITH= pjproject PJSIP_USES= pkgconfig -SPEEX_LIB_DEPENDS= libspeexdsp.so:${PORTSDIR}/audio/speex +SPEEX_LIB_DEPENDS= libspeex.so:${PORTSDIR}/audio/speex SPEEX_CONFIGURE_WITH= speex ASTERISK_USER?= asterisk @@ -124,6 +123,12 @@ ASTERISK_GROUP?= asterisk USERS= ${ASTERISK_USER} GROUPS= ${ASTERISK_GROUP} dahdi +.include + +.if ! ${PORT_OPTIONS:MPJSIP} && ${PORT_OPTIONS:MSRTP} +LIB_DEPENDS+= libsrtp.so:${PORTSDIR}/net/libsrtp +.endif + .include .if ${PREFIX} == ${LOCALBASE} Modified: head/net/pjsip/Makefile ============================================================================== --- head/net/pjsip/Makefile Tue Jan 13 11:53:31 2015 (r376917) +++ head/net/pjsip/Makefile Tue Jan 13 11:54:03 2015 (r376918) @@ -2,6 +2,7 @@ PORTNAME= pjsip PORTVERSION= 2.3 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.pjsip.org/release/${PORTVERSION}/ DISTNAME= pjproject-${DISTVERSION} @@ -11,10 +12,12 @@ COMMENT= Multimedia communication librar LICENSE= GPLv2 -LIB_DEPENDS= libportaudio.so.2:${PORTSDIR}/audio/portaudio2 +LIB_DEPENDS= libportaudio.so.2:${PORTSDIR}/audio/portaudio2 \ + libsrtp.so:${PORTSDIR}/net/libsrtp GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-external-pa \ + --with-external-srtp \ --disable-silk USES= gmake tar:bz2 USE_LDCONFIG= yes Modified: head/net/pjsip/pkg-plist ============================================================================== --- head/net/pjsip/pkg-plist Tue Jan 13 11:53:31 2015 (r376917) +++ head/net/pjsip/pkg-plist Tue Jan 13 11:54:03 2015 (r376918) @@ -342,7 +342,4 @@ lib/libpjsua2-%%CONFIGURE_TARGET%%.a %%NO_SAMPLERATE%%%%RESAMPLE%%lib/libresample-%%CONFIGURE_TARGET%%.a %%NO_SAMPLERATE%%%%RESAMPLE%%%%RESAMPLEDLL%%lib/libresample.so %%NO_SAMPLERATE%%%%RESAMPLE%%%%RESAMPLEDLL%%lib/libresample.so.2 -lib/libsrtp-%%CONFIGURE_TARGET%%.a -%%SHARED%%lib/libsrtp.so -%%SHARED%%lib/libsrtp.so.2 libdata/pkgconfig/libpjproject.pc