From owner-svn-ports-head@freebsd.org  Thu Oct  5 01:52:48 2017
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 7F357E2789B;
 Thu,  5 Oct 2017 01:52:48 +0000 (UTC) (envelope-from cy@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 4F0377E54F;
 Thu,  5 Oct 2017 01:52:48 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v951qlLO072430;
 Thu, 5 Oct 2017 01:52:47 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v951qlvi072428;
 Thu, 5 Oct 2017 01:52:47 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201710050152.v951qlvi072428@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org
 using -f
From: Cy Schubert <cy@FreeBSD.org>
Date: Thu, 5 Oct 2017 01:52:47 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r451255 - in head/graphics: xpdf3 xpdf4
X-SVN-Group: ports-head
X-SVN-Commit-Author: cy
X-SVN-Commit-Paths: in head/graphics: xpdf3 xpdf4
X-SVN-Commit-Revision: 451255
X-SVN-Commit-Repository: ports
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: Thu, 05 Oct 2017 01:52:48 -0000

Author: cy
Date: Thu Oct  5 01:52:47 2017
New Revision: 451255
URL: https://svnweb.freebsd.org/changeset/ports/451255

Log:
  Register xpdf conflicts.
  
  Reported by:	rodrigo

Modified:
  head/graphics/xpdf3/Makefile   (contents, props changed)
  head/graphics/xpdf4/Makefile   (contents, props changed)

Modified: head/graphics/xpdf3/Makefile
==============================================================================
--- head/graphics/xpdf3/Makefile	Thu Oct  5 01:03:07 2017	(r451254)
+++ head/graphics/xpdf3/Makefile	Thu Oct  5 01:52:47 2017	(r451255)
@@ -10,6 +10,9 @@ MASTER_SITES=	http://mirrors.rit.edu/zi/ \
 		http://komquats.com/distfiles/
 .if !defined(MASTERDIR)
 PKGNAMESUFFIX=  3
+CONFLICTS_INSTALL=	xpdf4-* xpdf-*
+.else
+CONFLICTS_INSTALL=	xpdf4-*	xpdf3-*
 .endif
 
 MAINTAINER=	cy@FreeBSD.org

Modified: head/graphics/xpdf4/Makefile
==============================================================================
--- head/graphics/xpdf4/Makefile	Thu Oct  5 01:03:07 2017	(r451254)
+++ head/graphics/xpdf4/Makefile	Thu Oct  5 01:52:47 2017	(r451255)
@@ -7,6 +7,9 @@ CATEGORIES=	graphics print
 MASTER_SITES=	http://www.xpdfreader.com/dl/
 .if !defined(MASTERDIR)
 PKGNAMESUFFIX=	4
+CONFLICTS_INSTALL=	xpdf3-* xpdf-*
+.else
+CONFLICTS_INSTALL=	xpdf3-*	xpdf4-*
 .endif
 
 MAINTAINER=	cy@FreeBSD.org