diff options
| author | madpilot <madpilot@FreeBSD.org> | 2017-10-07 22:10:19 +0800 |
|---|---|---|
| committer | Koop Mast <kwm@rainbow-runner.nl> | 2018-02-04 05:41:13 +0800 |
| commit | b8c61f24f4c8c4f30329766bf4ae4f33e29aea73 (patch) | |
| tree | d962e41b9cc1f78f1eafa6102575cfbb689d98e0 | |
| parent | 0c29ce799f650b92c1846c59b43721f5f5086460 (diff) | |
| download | freebsd-ports-gnome-b8c61f24f4c8c4f30329766bf4ae4f33e29aea73.tar.gz freebsd-ports-gnome-b8c61f24f4c8c4f30329766bf4ae4f33e29aea73.tar.zst freebsd-ports-gnome-b8c61f24f4c8c4f30329766bf4ae4f33e29aea73.zip | |
Correctly handle option caused conflict.
PR: 222845
Submitted by: O. Hartmann <ohartmann@walstatt.org>
| -rw-r--r-- | net/pjsip/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
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: |