From owner-cvs-ports@FreeBSD.ORG  Fri Aug  5 15:39:22 2011
Return-Path: <owner-cvs-ports@FreeBSD.ORG>
Delivered-To: cvs-ports@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F3E4B1065670;
	Fri,  5 Aug 2011 15:39:21 +0000 (UTC) (envelope-from kwm@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id CC5378FC16;
	Fri,  5 Aug 2011 15:39:21 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id p75FdLMV061039;
	Fri, 5 Aug 2011 15:39:21 GMT (envelope-from kwm@repoman.freebsd.org)
Received: (from kwm@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id p75FdLR9061038;
	Fri, 5 Aug 2011 15:39:21 GMT (envelope-from kwm)
Message-Id: <201108051539.p75FdLR9061038@repoman.freebsd.org>
From: Koop Mast <kwm@FreeBSD.org>
Date: Fri, 5 Aug 2011 15:39:21 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: ports/graphics/poppler-utils Makefile
 ports/graphics/xpdf Makefile
X-BeenThere: cvs-ports@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the ports tree <cvs-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-ports>
List-Post: <mailto:cvs-ports@freebsd.org>
List-Help: <mailto:cvs-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Aug 2011 15:39:22 -0000

kwm         2011-08-05 15:39:21 UTC

  FreeBSD ports repository

  Modified files:
    graphics/poppler-utils Makefile 
    graphics/xpdf        Makefile 
  Log:
  Register conflict between xpdf and poppler-utils.
  
  Revision  Changes    Path
  1.12      +2 -0      ports/graphics/poppler-utils/Makefile
  1.99      +2 -0      ports/graphics/xpdf/Makefile