From 0832f6effb6dfdfe3e0239898487dfeaa767183b Mon Sep 17 00:00:00 2001 From: madpilot Date: Sat, 7 Oct 2017 14:10:19 +0000 Subject: Correctly handle option caused conflict. PR: 222845 Submitted by: O. Hartmann --- net/pjsip/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'net') diff --git a/net/pjsip/Makefile b/net/pjsip/Makefile index 96557503b53c..839028ca525a 100644 --- a/net/pjsip/Makefile +++ b/net/pjsip/Makefile @@ -13,8 +13,7 @@ LICENSE= GPLv2+ LIB_DEPENDS= libportaudio.so:audio/portaudio -CONFLICTS?= pjsip-extsrtp-[0-9]* \ - libsrtp-[0-9]* +CONFLICTS?= pjsip-extsrtp-[0-9]* GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-external-pa \ @@ -87,6 +86,7 @@ AMR_LIB_DEPENDS= libopencore-amrwb.so:audio/opencore-amr \ libvo-amrwbenc.so:audio/vo-amrwbenc EXTSRTP_CONFIGURE_WITH= external-srtp EXTSRTP_LIB_DEPENDS= libsrtp.so:net/libsrtp +EXTSRTP_CONFLICTS_OFF= libsrtp-[0-9]* WEBRTC_CONFIGURE_OFF= --disable-libwebrtc post-patch: -- cgit