From owner-svn-ports-head@freebsd.org  Sat Oct  7 14:10:20 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CDF08E38E62;
 Sat,  7 Oct 2017 14:10:20 +0000 (UTC)
 (envelope-from madpilot@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7E9681254;
 Sat,  7 Oct 2017 14:10:20 +0000 (UTC)
 (envelope-from madpilot@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v97EAJgo008832;
 Sat, 7 Oct 2017 14:10:19 GMT (envelope-from madpilot@FreeBSD.org)
Received: (from madpilot@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v97EAJ2A008831;
 Sat, 7 Oct 2017 14:10:19 GMT (envelope-from madpilot@FreeBSD.org)
Message-Id: <201710071410.v97EAJ2A008831@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: madpilot set sender to
 madpilot@FreeBSD.org using -f
From: Guido Falsi <madpilot@FreeBSD.org>
Date: Sat, 7 Oct 2017 14:10:19 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r451461 - head/net/pjsip
X-SVN-Group: ports-head
X-SVN-Commit-Author: madpilot
X-SVN-Commit-Paths: head/net/pjsip
X-SVN-Commit-Revision: 451461
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Oct 2017 14:10:21 -0000

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: