From owner-svn-ports-all@FreeBSD.ORG  Tue Aug 26 13:47:22 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 919CF46B;
 Tue, 26 Aug 2014 13:47:22 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 7D5973871;
 Tue, 26 Aug 2014 13:47:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7QDlMgB097652;
 Tue, 26 Aug 2014 13:47:22 GMT (envelope-from wg@FreeBSD.org)
Received: (from wg@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7QDlMba097651;
 Tue, 26 Aug 2014 13:47:22 GMT (envelope-from wg@FreeBSD.org)
Message-Id: <201408261347.s7QDlMba097651@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: wg set sender to wg@FreeBSD.org
 using -f
From: William Grzybowski <wg@FreeBSD.org>
Date: Tue, 26 Aug 2014 13:47:22 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r366214 - head/net/openh323
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Aug 2014 13:47:22 -0000

Author: wg
Date: Tue Aug 26 13:47:21 2014
New Revision: 366214
URL: http://svnweb.freebsd.org/changeset/ports/366214
QAT: https://qat.redports.org/buildarchive/r366214/

Log:
  net/openh323: conflicts with h323plus
  
  PR:		192985
  Submitted by:	Nikola Kolev

Modified:
  head/net/openh323/Makefile

Modified: head/net/openh323/Makefile
==============================================================================
--- head/net/openh323/Makefile	Tue Aug 26 13:37:43 2014	(r366213)
+++ head/net/openh323/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
@@ -15,6 +15,8 @@ COMMENT=	H323 Video Conferencing library
 
 LIB_DEPENDS=	libpt_r.so:${PORTSDIR}/devel/pwlib
 
+CONFLICTS=	h323plus-1.*
+
 WRKSRC=		${WRKDIR}/${PORTNAME}_v${PORTVERSION:S/./_/g}
 
 USES=		bison gmake