From owner-svn-ports-head@freebsd.org  Sat Sep 24 22:35:00 2016
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 663F6BE8857;
 Sat, 24 Sep 2016 22:35:00 +0000 (UTC) (envelope-from rm@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 32FF7E4A;
 Sat, 24 Sep 2016 22:35:00 +0000 (UTC) (envelope-from rm@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8OMYxMh001155;
 Sat, 24 Sep 2016 22:34:59 GMT (envelope-from rm@FreeBSD.org)
Received: (from rm@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8OMYxoe001154;
 Sat, 24 Sep 2016 22:34:59 GMT (envelope-from rm@FreeBSD.org)
Message-Id: <201609242234.u8OMYxoe001154@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rm set sender to rm@FreeBSD.org
 using -f
From: Ruslan Makhmatkhanov <rm@FreeBSD.org>
Date: Sat, 24 Sep 2016 22:34:59 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r422738 - head/archivers/freeze
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.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, 24 Sep 2016 22:35:00 -0000

Author: rm
Date: Sat Sep 24 22:34:59 2016
New Revision: 422738
URL: https://svnweb.freebsd.org/changeset/ports/422738

Log:
  archivers/freeze: register conflict with multimedia/mlt
  
  Both ports installing bin/melt binary, but freeze lacks
  corresponding CONFLICTS entry.
  
  PR:		171313
  Reported by:	bartsch@dssgmbh.de
  Approved by:	maintainer timeout

Modified:
  head/archivers/freeze/Makefile

Modified: head/archivers/freeze/Makefile
==============================================================================
--- head/archivers/freeze/Makefile	Sat Sep 24 20:23:53 2016	(r422737)
+++ head/archivers/freeze/Makefile	Sat Sep 24 22:34:59 2016	(r422738)
@@ -12,6 +12,7 @@ MASTER_SITES=	ftp://ftp.warwick.ac.uk/pu
 MAINTAINER=	gabor@FreeBSD.org
 COMMENT=	Compression program - often used in QNX
 
+CONFLICTS_INSTALL=	mlt-[0-9]*
 GNU_CONFIGURE=	yes
 ALL_TARGET=	prog