svn commit: r451358 - head/net/pjsip

[Guido Falsi]

Author: madpilot
Date: Fri Oct  6 08:14:40 2017
New Revision: 451358
URL: https://svnweb.freebsd.org/changeset/ports/451358

Log:
  Fix CONFLICTS to not overwrite slave port setting.
  
  PR:		222804
  Submitted by:	vvd at unislabs.com

Modified:
  head/net/pjsip/Makefile

Modified: head/net/pjsip/Makefile
==============================================================================
--- head/net/pjsip/Makefile	Fri Oct  6 08:08:36 2017	(r451357)
+++ head/net/pjsip/Makefile	Fri Oct  6 08:14:40 2017	(r451358)
@@ -13,7 +13,7 @@ LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libportaudio.so:audio/portaudio
 
-CONFLICTS=	pjsip-extsrtp-[0-9]* \
+CONFLICTS?=	pjsip-extsrtp-[0-9]* \
 		libsrtp-[0-9]*
 
 GNU_CONFIGURE=	yes