From owner-svn-ports-head@FreeBSD.ORG  Tue Feb 24 08:03:08 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E1705327;
 Tue, 24 Feb 2015 08:03:08 +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 CB774DC6;
 Tue, 24 Feb 2015 08:03:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1O838jC059973;
 Tue, 24 Feb 2015 08:03:08 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1O838TK059970;
 Tue, 24 Feb 2015 08:03:08 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201502240803.t1O838TK059970@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jbeich set sender to
 jbeich@FreeBSD.org using -f
From: Jan Beich <jbeich@FreeBSD.org>
Date: Tue, 24 Feb 2015 08:03:08 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r379764 - in head: devel/libosmo-sccp multimedia/libmtp
X-SVN-Group: ports-head
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.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Feb 2015 08:03:09 -0000

Author: jbeich
Date: Tue Feb 24 08:03:07 2015
New Revision: 379764
URL: https://svnweb.freebsd.org/changeset/ports/379764
QAT: https://qat.redports.org/buildarchive/r379764/

Log:
  Register CONFLICTS between libmtp and libosmo-sccp
  
  Differential Revision:	https://reviews.freebsd.org/D1947
  PR:		197948
  Reviewed by:	marino, pi
  Approved by:	Nikola Kolev <koue@chaosophia.net> (maintainer)

Modified:
  head/devel/libosmo-sccp/Makefile
  head/multimedia/libmtp/Makefile

Modified: head/devel/libosmo-sccp/Makefile
==============================================================================
--- head/devel/libosmo-sccp/Makefile	Tue Feb 24 08:00:58 2015	(r379763)
+++ head/devel/libosmo-sccp/Makefile	Tue Feb 24 08:03:07 2015	(r379764)
@@ -15,6 +15,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libosmocore.so:${PORTSDIR}/devel/libosmocore
 
+CONFLICTS_INSTALL=libmtp-[0-9]* # lib/libmtp.a
+
 USES=		autoreconf gmake pathfix pkgconfig
 PATHFIX_MAKEFILEIN=Makefile.am
 GNU_CONFIGURE=	yes

Modified: head/multimedia/libmtp/Makefile
==============================================================================
--- head/multimedia/libmtp/Makefile	Tue Feb 24 08:00:58 2015	(r379763)
+++ head/multimedia/libmtp/Makefile	Tue Feb 24 08:03:07 2015	(r379764)
@@ -12,6 +12,8 @@ COMMENT=	Media Transfer Protocol (MTP) l
 
 LICENSE=	LGPL21 # or any later version
 
+CONFLICTS_INSTALL=libosmo-sccp-[0-9]* # lib/libmtp.a
+
 OPTIONS_DEFINE=	MTPZ
 OPTIONS_DEFAULT=	MTPZ
 MTPZ_DESC=	Enable functionality to connect to MTPZ devices