Date: Mon, 11 Jun 2018 17:19:29 +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: r472194 - in head/net: asterisk13 asterisk15 pjsip pjsip-extsrtp Message-ID: <201806111719.w5BHJTYI075082@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Mon Jun 11 17:19:29 2018 New Revision: 472194 URL: https://svnweb.freebsd.org/changeset/ports/472194 Log: Make asterisk and pjsip ports use the new net/libsrtp2 port as a dependency. Reported by: tijl (thanks!) Modified: head/net/asterisk13/Makefile head/net/asterisk15/Makefile head/net/pjsip-extsrtp/Makefile head/net/pjsip/Makefile Modified: head/net/asterisk13/Makefile ============================================================================== --- head/net/asterisk13/Makefile Mon Jun 11 17:01:15 2018 (r472193) +++ head/net/asterisk13/Makefile Mon Jun 11 17:19:29 2018 (r472194) @@ -2,6 +2,7 @@ PORTNAME= asterisk PORTVERSION= 13.21.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 MASTER_SITE_SUBDIR= asterisk/ \ @@ -193,7 +194,7 @@ SQLITE2_CONFIGURE_WITH= sqlite SQLITE2_LIB_DEPENDS= libsqlite.so:databases/sqlite2 SRTP_CONFIGURE_WITH= srtp -SRTP_LIB_DEPENDS= libsrtp.so:net/libsrtp +SRTP_LIB_DEPENDS= libsrtp2.so:net/libsrtp2 SYSINFO_LIB_DEPENDS= libsysinfo.so:devel/libsysinfo @@ -216,8 +217,6 @@ GROUPS= ${ASTERISK_GROUP} dahdi LIB_DEPENDS+= libpj.so:net/pjsip-extsrtp .elif ${PORT_OPTIONS:MPJSIP} && ! ${PORT_OPTIONS:MSRTP} LIB_DEPENDS+= libpj.so:net/pjsip -.elif ! ${PORT_OPTIONS:MPJSIP} && ${PORT_OPTIONS:MSRTP} -LIB_DEPENDS+= libsrtp.so:net/libsrtp .endif .include <bsd.port.pre.mk> Modified: head/net/asterisk15/Makefile ============================================================================== --- head/net/asterisk15/Makefile Mon Jun 11 17:01:15 2018 (r472193) +++ head/net/asterisk15/Makefile Mon Jun 11 17:19:29 2018 (r472194) @@ -2,6 +2,7 @@ PORTNAME= asterisk PORTVERSION= 15.4.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 MASTER_SITE_SUBDIR= asterisk/ \ @@ -194,7 +195,7 @@ SQLITE2_CONFIGURE_WITH= sqlite SQLITE2_LIB_DEPENDS= libsqlite.so:databases/sqlite2 SRTP_CONFIGURE_WITH= srtp -SRTP_LIB_DEPENDS= libsrtp.so:net/libsrtp +SRTP_LIB_DEPENDS= libsrtp2.so:net/libsrtp2 SYSINFO_LIB_DEPENDS= libsysinfo.so:devel/libsysinfo @@ -217,8 +218,6 @@ GROUPS= ${ASTERISK_GROUP} dahdi LIB_DEPENDS+= libpj.so:net/pjsip-extsrtp .elif ${PORT_OPTIONS:MPJSIP} && ! ${PORT_OPTIONS:MSRTP} LIB_DEPENDS+= libpj.so:net/pjsip -.elif ! ${PORT_OPTIONS:MPJSIP} && ${PORT_OPTIONS:MSRTP} -LIB_DEPENDS+= libsrtp.so:net/libsrtp .endif .include <bsd.port.pre.mk> Modified: head/net/pjsip-extsrtp/Makefile ============================================================================== --- head/net/pjsip-extsrtp/Makefile Mon Jun 11 17:01:15 2018 (r472193) +++ head/net/pjsip-extsrtp/Makefile Mon Jun 11 17:19:29 2018 (r472194) @@ -2,7 +2,7 @@ PKGNAMESUFFIX= -extsrtp -CONFLICTS= pjsip-[0-9]* +CONFLICTS= pjsip OPTIONS_SLAVE= EXTSRTP MASTERDIR= ${.CURDIR}/../pjsip Modified: head/net/pjsip/Makefile ============================================================================== --- head/net/pjsip/Makefile Mon Jun 11 17:01:15 2018 (r472193) +++ head/net/pjsip/Makefile Mon Jun 11 17:19:29 2018 (r472194) @@ -2,7 +2,7 @@ PORTNAME= pjsip PORTVERSION= 2.7.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://www.pjsip.org/release/${PORTVERSION}/ DISTNAME= pjproject-${DISTVERSION} @@ -14,7 +14,7 @@ LICENSE= GPLv2+ LIB_DEPENDS= libportaudio.so:audio/portaudio -CONFLICTS?= pjsip-extsrtp-[0-9]* +CONFLICTS?= pjsip-extsrtp GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-external-pa \ @@ -53,8 +53,8 @@ AMR_LIB_DEPENDS= libopencore-amrwb.so:audio/opencore- DEBUG_CFLAGS= -DNDEBUG=0 DEBUG_CFLAGS_OFF= -DNDEBUG=1 EXTSRTP_CONFIGURE_WITH= external-srtp -EXTSRTP_CONFLICTS_OFF= libsrtp-[0-9]* -EXTSRTP_LIB_DEPENDS= libsrtp.so:net/libsrtp +EXTSRTP_CONFLICTS_OFF= libsrtp libsrtp2 +EXTSRTP_LIB_DEPENDS= libsrtp2.so:net/libsrtp2 FFMPEG_CONFIGURE_ENABLE= ffmpeg FFMPEG_LIB_DEPENDS= libswresample.so:multimedia/ffmpeg G711_CONFIGURE_ENABLE= g711-codec
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806111719.w5BHJTYI075082>