Date: Thu, 24 May 2012 20:40:38 -0700 From: Cy Schubert <Cy.Schubert@komquats.com> To: gnome@freebsd.org Cc: Marcelo Araujo <araujobsdport@gmail.com> Subject: graphics/poppler Message-ID: <201205250340.q4P3ecOe010528@slippy.cwsent.com>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201205250340.q4P3ecOe010528>