Allow graphics/xpdf and graphics/poppler-utils to co-exist.

Approved by:	araujo (xpdf) and kwm (poppler-utils)

graphics/poppler-utils/Makefile

@@ -16,6 +16,4 @@ MASTERDIR=	${.CURDIR}/../../graphics/poppler
 SLAVEPORT=	utils
 PLIST=		${.CURDIR}/pkg-plist
 
-CONFLICTS=	xpdf-3.*
-
 .include "${MASTERDIR}/Makefile"

graphics/xpdf/Makefile

@@ -18,15 +18,14 @@ COMMENT=	Display PDF files, and convert them to other formats
 BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 
-CONFLICTS=	poppler-utils-[0-9]*
-
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-opi \
 		--with-freetype2-library="${LOCALBASE}/lib" \
-		--with-freetype2-includes="${LOCALBASE}/include/freetype2/"
+		--with-freetype2-includes="${LOCALBASE}/include/freetype2/" \
+		--bindir="${LOCALBASE}/lib/xpdf"
 
 OPTIONS=	LIBPAPER "Enable libpaper"      off     \
 		TYPE1	"Ghostscript type1 fonts" on \
@@ -81,5 +80,8 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
+.if !defined(WITHOUT_X11)
+	${LN} -sf ${LOCALBASE}/lib/xpdf/xpdf ${LOCALBASE}/bin/xpdf 
+.endif
 
 .include <bsd.port.mk>

graphics/xpdf/pkg-plist

@@ -1,10 +1,11 @@
-bin/pdffonts
-bin/pdfimages
-bin/pdfinfo
-bin/pdfdetach
-bin/pdftoppm
-bin/pdftops
-bin/pdftotext
+lib/xpdf/pdffonts
+lib/xpdf/pdfimages
+lib/xpdf/pdfinfo
+lib/xpdf/pdfdetach
+lib/xpdf/pdftoppm
+lib/xpdf/pdftops
+lib/xpdf/pdftotext
+%%X11%%lib/xpdf/xpdf
 %%X11%%bin/xpdf
 etc/xpdfrc
 %%PORTDOCS%%%%DOCSDIR%%/ANNOUNCE
@@ -12,3 +13,4 @@ etc/xpdfrc
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/hello.pdf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm lib/xpdf