From owner-svn-ports-head@FreeBSD.ORG  Thu Sep  4 09:19:25 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id ACD42190;
 Thu,  4 Sep 2014 09:19:25 +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 96BB41A70;
 Thu,  4 Sep 2014 09:19:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s849JPOA006156;
 Thu, 4 Sep 2014 09:19:25 GMT (envelope-from madpilot@FreeBSD.org)
Received: (from madpilot@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s849JP8b006155;
 Thu, 4 Sep 2014 09:19:25 GMT (envelope-from madpilot@FreeBSD.org)
Message-Id: <201409040919.s849JP8b006155@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: madpilot set sender to
 madpilot@FreeBSD.org using -f
From: Guido Falsi <madpilot@FreeBSD.org>
Date: Thu, 4 Sep 2014 09:19:25 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r367253 - head/graphics/zathura-pdf-poppler
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: Thu, 04 Sep 2014 09:19:25 -0000

Author: madpilot
Date: Thu Sep  4 09:19:25 2014
New Revision: 367253
URL: http://svnweb.freebsd.org/changeset/ports/367253
QAT: https://qat.redports.org/buildarchive/r367253/

Log:
  Register conflict with new zathura-pdf-mupdf port.

Modified:
  head/graphics/zathura-pdf-poppler/Makefile

Modified: head/graphics/zathura-pdf-poppler/Makefile
==============================================================================
--- head/graphics/zathura-pdf-poppler/Makefile	Thu Sep  4 09:15:03 2014	(r367252)
+++ head/graphics/zathura-pdf-poppler/Makefile	Thu Sep  4 09:19:25 2014	(r367253)
@@ -3,6 +3,7 @@
 
 PORTNAME=	zathura-pdf-poppler
 PORTVERSION=	0.2.5
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://pwmt.org/projects/zathura/plugins/download/
 
@@ -16,6 +17,8 @@ RUN_DEPENDS=	zathura:${PORTSDIR}/graphic
 USE_GNOME=	glib20 gtk30
 USES=		desktop-file-utils gmake pkgconfig
 
+CONFLICTS=	zathura-pdf-mupdf-[0-9]*
+
 PLIST_FILES=	lib/zathura/pdf.so \
 		share/applications/zathura-pdf-poppler.desktop
 PLIST_DIRSTRY=	lib/zathura