svn commit: r451278 - head/net/pjsip

[Guido Falsi]

Author: madpilot
Date: Thu Oct  5 08:49:17 2017
New Revision: 451278
URL: https://svnweb.freebsd.org/changeset/ports/451278

Log:
  Register conflict with libsrtp.
  
  Reported by:	rodrigo
  > PR:                       If and which Problem Report is related.
  > Submitted by:             If someone else sent in the change.
  > Reported by:              If someone else reported the issue.
  > Reviewed by:              If someone else reviewed your modification.
  > Approved by:              If you needed approval for this commit.
  > Obtained from:            If the change is from a third party.
  > MFC after:                N [day[s]|week[s]|month[s]].  Request a reminder email.
  > MFH:                      Ports tree branch name.  Request approval for merge.
  > Relnotes:                 Set to 'yes' for mention in release notes.
  > Security:                 Vulnerability reference (one per line) or description.
  > Sponsored by:             If the change was sponsored by an organization.
  > Differential Revision:    https://reviews.freebsd.org/D### (*full* phabric URL needed).
  > Empty fields above will be automatically removed.
  
  M    pjsip/Makefile

Modified:
  head/net/pjsip/Makefile

Modified: head/net/pjsip/Makefile
==============================================================================
--- head/net/pjsip/Makefile	Thu Oct  5 08:24:20 2017	(r451277)
+++ head/net/pjsip/Makefile	Thu Oct  5 08:49:17 2017	(r451278)
@@ -14,7 +14,8 @@ LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libportaudio.so:audio/portaudio
 
-CONFLICTS=	pjsip-extsrtp-[0-9]*
+CONFLICTS=	pjsip-extsrtp-[0-9]* \
+		libsrtp-[0-9]*
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-external-pa \