From owner-freebsd-gnome@FreeBSD.ORG  Fri May 25 03:40:40 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 A018D106566B
	for <gnome@freebsd.org>; Fri, 25 May 2012 03:40:40 +0000 (UTC)
	(envelope-from Cy.Schubert@komquats.com)
Received: from idcmail-mo2no.shaw.ca (idcmail-mo2no.shaw.ca [64.59.134.9])
	by mx1.freebsd.org (Postfix) with ESMTP id 677568FC0A
	for <gnome@freebsd.org>; Fri, 25 May 2012 03:40:40 +0000 (UTC)
Received: from lb7f8hsrpno-svcs.dcs.int.inet (HELO pd5ml2no-ssvc.prod.shaw.ca)
	([10.0.144.222])
	by pd6mo1no-svcs.prod.shaw.ca with ESMTP; 24 May 2012 21:40:39 -0600
X-Cloudmark-SP-Filtered: true
X-Cloudmark-SP-Result: v=1.1 cv=m05oFQ/DU99dGqsFIml08suKTIzCBvSA/J37eL+THWw=
	c=1 sm=1
	a=QrugwKR0C_UA:10 a=wAGQQ9Az6v0A:10 a=BLceEmwcHowA:10 a=ICAaq7hcmGcA:10
	a=kj9zAlcOel0A:10 a=IbtKDeXwb2+SRU442/pi3A==:17 a=BWvPGDcYAAAA:8
	a=6I5d2MoRAAAA:8 a=yfeq05Ao35h4pu3zMfYA:9 a=CjuIK1q_8ugA:10
	a=V7tsTZBp22UA:10 a=SV7veod9ZcQA:10 a=HpAAvcLHHh0Zw7uRqdWCyQ==:117
Received: from unknown (HELO spqr.komquats.com) ([96.50.7.119])
	by pd5ml2no-dmz.prod.shaw.ca with ESMTP; 24 May 2012 21:40:39 -0600
Received: from slippy.cwsent.com (slippy2 [10.1.3.91])
	by spqr.komquats.com (Postfix) with ESMTP id 3198C80;
	Thu, 24 May 2012 20:40:39 -0700 (PDT)
Received: from slippy (localhost [127.0.0.1])
	by slippy.cwsent.com (8.14.5/8.14.5) with ESMTP id q4P3ecOe010528;
	Thu, 24 May 2012 20:40:38 -0700 (PDT)
	(envelope-from Cy.Schubert@komquats.com)
Message-Id: <201205250340.q4P3ecOe010528@slippy.cwsent.com>
X-Mailer: exmh version 2.7.2 01/07/2005 with nmh-1.3
From: Cy Schubert <Cy.Schubert@komquats.com>
X-os: FreeBSD
X-Sender: cy@cwsent.com
X-URL: http://www.komquats.com/
To: gnome@freebsd.org
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Date: Thu, 24 May 2012 20:40:38 -0700
Cc: Marcelo Araujo <araujobsdport@gmail.com>
Subject: graphics/poppler
X-BeenThere: freebsd-gnome@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Cy Schubert <Cy.Schubert@komquats.com>
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, 25 May 2012 03:40:40 -0000

Hi gnome@,

Do you mind if I commit this? graphics/xpdf/Makefile r1.102/r1.103 
addresses the conflict.

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/graphics/poppler/Makefile,v
retrieving revision 1.67
diff -u -r1.67 Makefile
--- Makefile	14 Mar 2012 15:27:44 -0000	1.67
+++ Makefile	25 May 2012 03:38:41 -0000
@@ -72,7 +72,6 @@
 .if ${SLAVEPORT}=="utils"
 LIB_DEPENDS+=	poppler-glib.8:${PORTSDIR}/graphics/poppler-glib
 CONFIGURE_ARGS+=--enable-utils
-CONFLICTS=	xpdf-[0-9]*
 BUILD_WRKSRC=	${WRKSRC}/utils
 INSTALL_WRKSRC=	${WRKSRC}/utils
 MAN1=		pdffonts.1 pdfimages.1 pdfinfo.1 pdfseparate.1 pdftocairo.1 \


-- 
Cheers,
Cy Schubert <Cy.Schubert@komquats.com>
FreeBSD UNIX:  <cy@FreeBSD.org>   Web:  http://www.FreeBSD.org