From owner-freebsd-gnome@FreeBSD.ORG  Fri May 11 09:00:28 2012
Return-Path: <owner-freebsd-gnome@FreeBSD.ORG>
Delivered-To: gnome@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4D37C106564A;
	Fri, 11 May 2012 09:00:28 +0000 (UTC)
	(envelope-from kwm@rainbow-runner.nl)
Received: from fep11.mx.upcmail.net (fep11.mx.upcmail.net [62.179.121.31])
	by mx1.freebsd.org (Postfix) with ESMTP id 5D4978FC15;
	Fri, 11 May 2012 09:00:27 +0000 (UTC)
Received: from edge03.upcmail.net ([192.168.13.238]) by viefep11-int.chello.at
	(InterMail vM.8.01.05.04 201-2260-151-105-20111014) with ESMTP
	id <20120511090026.QMNP993.viefep11-int.chello.at@edge03.upcmail.net>; 
	Fri, 11 May 2012 11:00:26 +0200
Received: from [127.0.0.1] ([178.84.137.57]) by edge03.upcmail.net with edge
	id 8Z0Q1j0291EUzH603Z0RCl; Fri, 11 May 2012 11:00:26 +0200
X-SourceIP: 178.84.137.57
Message-ID: <4FACD526.8040500@rainbow-runner.nl>
Date: Fri, 11 May 2012 11:00:22 +0200
From: Koop Mast <kwm@rainbow-runner.nl>
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64;
	rv:12.0) Gecko/20120428 Thunderbird/12.0.1
MIME-Version: 1.0
To: Cy Schubert <Cy.Schubert@komquats.com>
References: <201205110633.q4B6X3LA018482@slippy.cwsent.com>
In-Reply-To: <201205110633.q4B6X3LA018482@slippy.cwsent.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
X-Antivirus: avast! (VPS 120510-1, 10-05-2012), Outbound message
X-Antivirus-Status: Clean
Cc: gnome@FreeBSD.org, araujo@FreeBSD.org
Subject: Re: Poppler-utils
X-BeenThere: freebsd-gnome@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: GNOME for FreeBSD -- porting and maintaining
	<freebsd-gnome.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gnome>,
	<mailto:freebsd-gnome-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-gnome>
List-Post: <mailto:freebsd-gnome@freebsd.org>
List-Help: <mailto:freebsd-gnome-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gnome>,
	<mailto:freebsd-gnome-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 11 May 2012 09:00:28 -0000

On 11-5-2012 8:33, Cy Schubert wrote:
> Hi gnome@,
>
> Would you please approve the following patch to poppler-utils. A
> corresponding patch to xpdf will allow both ports to co-exist.

Approved.

-Koop

> cvs diff: Diffing .
> Index: Makefile
> ===================================================================
> RCS file: /home/pcvs/ports/graphics/poppler-utils/Makefile,v
> retrieving revision 1.12
> diff -u -r1.12 Makefile
> --- Makefile	5 Aug 2011 15:39:21 -0000	1.12
> +++ Makefile	11 May 2012 06:31:04 -0000
> @@ -16,6 +16,4 @@
>   SLAVEPORT=	utils
>   PLIST=		${.CURDIR}/pkg-plist
>
> -CONFLICTS=	xpdf-3.*
> -
>   .include "${MASTERDIR}/Makefile"
>
>
>