From owner-freebsd-gnome@FreeBSD.ORG Sat May 26 14:43:50 2012 Return-Path: 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 75FE8106566C for ; Sat, 26 May 2012 14:43:50 +0000 (UTC) (envelope-from mezz.freebsd@gmail.com) Received: from mail-yx0-f182.google.com (mail-yx0-f182.google.com [209.85.213.182]) by mx1.freebsd.org (Postfix) with ESMTP id 301398FC0C for ; Sat, 26 May 2012 14:43:50 +0000 (UTC) Received: by yenl8 with SMTP id l8so1082337yen.13 for ; Sat, 26 May 2012 07:43:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; bh=jOKUDLYiCtRHxQbZGoZu9aNylHj4bTI3zt1bQ5Ajjpg=; b=jslpYeaeJNFecQEBOzwO/qd+NxqIbrFYCSIQa7VKTlZoF+WijqpfR6HwXD+2uz6yJo EIw3T669VmU9DGZLQiuyndiMG7+a8hi6A7eiMV5F+aGYTLXi51A1OtrOS3mhmInrYLpC qITWu1aoRWjvpdDbE4YB9lyj8vagMmxcEG9yJr1D2KhV+r9wONTKMosggCvGxvUjVWKy Se0IQT6sZNiT9ag9bmWRaQRFUJvpj/4MKgWUBfysEXJOKQ/QYA2JW9oflnA54cOtW8lU soVxijGlYdBbsJfxFb2N+zbA+2m9P5rNcvnd/2zskXkKcMZrt3NloXqGMuxV74T6MX0E arWQ== MIME-Version: 1.0 Received: by 10.50.140.99 with SMTP id rf3mr1092567igb.25.1338043429205; Sat, 26 May 2012 07:43:49 -0700 (PDT) Received: by 10.42.73.194 with HTTP; Sat, 26 May 2012 07:43:49 -0700 (PDT) In-Reply-To: <201205250340.q4P3ecOe010528@slippy.cwsent.com> References: <201205250340.q4P3ecOe010528@slippy.cwsent.com> Date: Sat, 26 May 2012 09:43:49 -0500 Message-ID: From: Jeremy Messenger To: Cy Schubert Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: gnome@freebsd.org, Marcelo Araujo Subject: Re: graphics/poppler X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 May 2012 14:43:50 -0000 On Thu, May 24, 2012 at 10:40 PM, Cy Schubert wr= ote: > Hi gnome@, > > Do you mind if I commit this? graphics/xpdf/Makefile r1.102/r1.103 > addresses the conflict. I don't mind. Cheers, Mezz > Index: Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > RCS file: /home/pcvs/ports/graphics/poppler/Makefile,v > retrieving revision 1.67 > diff -u -r1.67 Makefile > --- Makefile =A0 =A014 Mar 2012 15:27:44 -0000 =A0 =A0 =A01.67 > +++ Makefile =A0 =A025 May 2012 03:38:41 -0000 > @@ -72,7 +72,6 @@ > =A0.if ${SLAVEPORT}=3D=3D"utils" > =A0LIB_DEPENDS+=3D =A0poppler-glib.8:${PORTSDIR}/graphics/poppler-glib > =A0CONFIGURE_ARGS+=3D--enable-utils > -CONFLICTS=3D =A0 =A0 xpdf-[0-9]* > =A0BUILD_WRKSRC=3D =A0${WRKSRC}/utils > =A0INSTALL_WRKSRC=3D =A0 =A0 =A0 =A0${WRKSRC}/utils > =A0MAN1=3D =A0 =A0 =A0 =A0 =A0pdffonts.1 pdfimages.1 pdfinfo.1 pdfseparat= e.1 pdftocairo.1 \ > > > -- > Cheers, > Cy Schubert > FreeBSD UNIX: =A0 =A0 Web: =A0http://www.FreeBSD.org > > > _______________________________________________ > freebsd-gnome@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-gnome > To unsubscribe, send any mail to "freebsd-gnome-unsubscribe@freebsd.org" --=20 mezz.freebsd@gmail.com - mezz@FreeBSD.org FreeBSD GNOME Team http://www.FreeBSD.org/gnome/ - gnome@FreeBSD.org