Date: Sat, 26 May 2012 09:43:49 -0500 From: Jeremy Messenger <mezz.freebsd@gmail.com> To: Cy Schubert <Cy.Schubert@komquats.com> Cc: gnome@freebsd.org, Marcelo Araujo <araujobsdport@gmail.com> Subject: Re: graphics/poppler Message-ID: <CADLFtte1bpLiKbhkDg%2BOop=knvWgvgwKp3jzVNXYVpK7X_caug@mail.gmail.com> In-Reply-To: <201205250340.q4P3ecOe010528@slippy.cwsent.com> References: <201205250340.q4P3ecOe010528@slippy.cwsent.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, May 24, 2012 at 10:40 PM, Cy Schubert <Cy.Schubert@komquats.com> 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 <Cy.Schubert@komquats.com>
> FreeBSD UNIX: =A0<cy@FreeBSD.org> =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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CADLFtte1bpLiKbhkDg%2BOop=knvWgvgwKp3jzVNXYVpK7X_caug>