svn commit: r379764 - in head: devel/libosmo-sccp multimedia/libmtp

[Jan Beich]

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 at 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