Date: Sat, 7 Oct 2017 14:10:19 +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: r451461 - head/net/pjsip Message-ID: <201710071410.v97EAJ2A008831@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Sat Oct 7 14:10:19 2017 New Revision: 451461 URL: https://svnweb.freebsd.org/changeset/ports/451461 Log: Correctly handle option caused conflict. PR: 222845 Submitted by: O. Hartmann <ohartmann@walstatt.org> Modified: head/net/pjsip/Makefile Modified: head/net/pjsip/Makefile ============================================================================== --- head/net/pjsip/Makefile Sat Oct 7 13:48:53 2017 (r451460) +++ head/net/pjsip/Makefile Sat Oct 7 14:10:19 2017 (r451461) @@ -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- 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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710071410.v97EAJ2A008831>