Index: head/graphics/xpdf/Makefile
===================================================================
--- head/graphics/xpdf/Makefile	(revision 402083)
+++ head/graphics/xpdf/Makefile	(revision 402084)
@@ -1,69 +1,69 @@
 # $FreeBSD$
 
 PORTNAME=	xpdf
 PORTVERSION=	3.04
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics print
 MASTER_SITES=	http://mirrors.rit.edu/zi/ \
 		ftp://ftp.foolabs.com/pub/xpdf/ \
 		TEX_CTAN/support/xpdf \
 		http://komquats.com/distfiles/
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Display PDF files and convert them to other formats
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libpng.so:${PORTSDIR}/graphics/png
 
 GNU_CONFIGURE=	yes
 USES=		gmake cpe
 CPE_VENDOR=	foolabs
 CFLAGS+=	-I${LOCALBASE}/include -O0
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-opi \
 		--with-freetype2-library="${LOCALBASE}/lib" \
 		--with-freetype2-includes="${LOCALBASE}/include/freetype2" \
 		--bindir="${PREFIX}/libexec/xpdf" \
 		--mandir="${PREFIX}/share/xpdf/man"
 
 MANPREFIX=	${PREFIX}/share/xpdf
 
 OPTIONS_DEFINE=	LIBPAPER TYPE1 X11 DOCS
 LIBPAPER_DESC=	Enable libpaper
 TYPE1_DESC=	Ghostscript type1 fonts
 OPTIONS_DEFAULT=	TYPE1 X11
 OPTIONS_SUB=		yes
 
 SUB_FILES=	xpdf-man.conf
 
 TYPE1_RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/n021003l.pfb:${PORTSDIR}/print/gsfonts
 
 LIBPAPER_LIB_DEPENDS=	libpaper.so:${PORTSDIR}/print/libpaper
 LIBPAPER_CONFIGURE_ON=--with-libpaper-library="${LOCALBASE}/lib" \
 		--with-libpaper-includes="${LOCALBASE}/include"
 LIBPAPER_CONFIGURE_OFF=--without-libpaper-library
 
 .if defined(A4)
 CONFIGURE_ARGS+=	--enable-a4-paper
 .endif
 
 X11_CONFIGURE_WITH=	x
 X11_USES=		motif
 
 post-patch:
 	${REINPLACE_CMD} -e 's|undef USE_COMBO_BOX|define USE_COMBO_BOX 1|' \
 		${WRKSRC}/xpdf/XPDFViewer.h
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in ANNOUNCE CHANGES README misc/hello.pdf
 	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
 	${LN} -sf ${PREFIX}/libexec/xpdf/xpdf ${STAGEDIR}${PREFIX}/bin/xpdf
 	${INSTALL_DATA} ${WRKDIR}/xpdf-man.conf \
 		${STAGEDIR}${PREFIX}/etc/man.d/xpdf.conf
 
 .include <bsd.port.mk>
Index: head/graphics/xpdf/pkg-message
===================================================================
--- head/graphics/xpdf/pkg-message	(nonexistent)
+++ head/graphics/xpdf/pkg-message	(revision 402084)
@@ -0,0 +1,8 @@
+Please note: The binaries in this package -- pdffonts, pdfimages, pdfinfo,
+pdfdetach, pdftohtml, pdftopng, pdftoppm, pdftops, pdftotext -- are
+installed in ${LOCALBASE}/libexec/xpdf. The reason for this is to not
+conflict with the poppler-utils package, which is a prerequisite of many
+other packages. If you need to use any of these utilites,
+
+a) create symlinks in ${LOCALBASE}/bin or some other directory in $PATH, or
+b) install graphics/poppler-utils.

Property changes on: head/graphics/xpdf/pkg-message
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property