Index: head/graphics/xpdf/Makefile
===================================================================
--- head/graphics/xpdf/Makefile	(revision 377534)
+++ head/graphics/xpdf/Makefile	(revision 377535)
@@ -1,62 +1,62 @@
 # $FreeBSD$
 
 PORTNAME=	xpdf
 PORTVERSION=	3.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics print
 MASTER_SITES=	http://mirrors.rit.edu/zi/ \
 		ftp://ftp.foolabs.com/pub/xpdf/ \
 		${MASTER_SITE_TEX_CTAN} \
 		http://komquats.com/distfiles/
 MASTER_SITE_SUBDIR=	support/xpdf
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Display PDF files and convert them to other formats
 
 LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
 
 GNU_CONFIGURE=	yes
 USES=		gmake
 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
 
 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
 
 .include <bsd.port.mk>
Index: head/graphics/xpdf/files/patch-Makefile.in
===================================================================
--- head/graphics/xpdf/files/patch-Makefile.in	(revision 377534)
+++ head/graphics/xpdf/files/patch-Makefile.in	(revision 377535)
@@ -1,19 +1,24 @@
-Index: Makefile.in
-@@ -89,7 +89,7 @@
+--- Makefile.in.orig	2014-05-28 11:50:50.000000000 -0700
++++ Makefile.in	2015-01-20 11:21:34.614223754 -0800
+@@ -89,7 +89,9 @@
  	$(INSTALL_PROGRAM) xpdf/pdfinfo$(EXE) $(DESTDIR)@bindir@/pdfinfo$(EXE)
  	$(INSTALL_PROGRAM) xpdf/pdffonts$(EXE) $(DESTDIR)@bindir@/pdffonts$(EXE)
  	$(INSTALL_PROGRAM) xpdf/pdfdetach$(EXE) $(DESTDIR)@bindir@/pdfdetach$(EXE)
 -@X@	$(INSTALL_PROGRAM) xpdf/pdftoppm$(EXE) $(DESTDIR)@bindir@/pdftoppm$(EXE)
++	$(INSTALL_PROGRAM) xpdf/pdftohtml$(EXE) $(DESTDIR)@bindir@/pdftohtml$(EXE)
++	$(INSTALL_PROGRAM) xpdf/pdftopng$(EXE) $(DESTDIR)@bindir@/pdftopng$(EXE)
 +	$(INSTALL_PROGRAM) xpdf/pdftoppm$(EXE) $(DESTDIR)@bindir@/pdftoppm$(EXE)
  	$(INSTALL_PROGRAM) xpdf/pdfimages$(EXE) $(DESTDIR)@bindir@/pdfimages$(EXE)
  	-mkdir -p $(DESTDIR)@mandir@/man1
  @X@	$(INSTALL_DATA) $(srcdir)/doc/xpdf.1 $(DESTDIR)@mandir@/man1/xpdf.1
-@@ -98,7 +98,7 @@
+@@ -98,7 +100,9 @@
  	$(INSTALL_DATA) $(srcdir)/doc/pdfinfo.1 $(DESTDIR)@mandir@/man1/pdfinfo.1
  	$(INSTALL_DATA) $(srcdir)/doc/pdffonts.1 $(DESTDIR)@mandir@/man1/pdffonts.1
  	$(INSTALL_DATA) $(srcdir)/doc/pdfdetach.1 $(DESTDIR)@mandir@/man1/pdfdetach.1
 -@X@	$(INSTALL_DATA) $(srcdir)/doc/pdftoppm.1 $(DESTDIR)@mandir@/man1/pdftoppm.1
++	$(INSTALL_DATA) $(srcdir)/doc/pdftohtml.1 $(DESTDIR)@mandir@/man1/pdftohtml.1
++	$(INSTALL_DATA) $(srcdir)/doc/pdftopng.1 $(DESTDIR)@mandir@/man1/pdftopng.1
 +	$(INSTALL_DATA) $(srcdir)/doc/pdftoppm.1 $(DESTDIR)@mandir@/man1/pdftoppm.1
  	$(INSTALL_DATA) $(srcdir)/doc/pdfimages.1 $(DESTDIR)@mandir@/man1/pdfimages.1
  	-mkdir -p $(DESTDIR)@mandir@/man5
  	$(INSTALL_DATA) $(srcdir)/doc/xpdfrc.5 $(DESTDIR)@mandir@/man5/xpdfrc.5
Index: head/graphics/xpdf/files/patch-xpdf__Makefile.in
===================================================================
--- head/graphics/xpdf/files/patch-xpdf__Makefile.in	(revision 377534)
+++ head/graphics/xpdf/files/patch-xpdf__Makefile.in	(revision 377535)
@@ -1,11 +1,12 @@
 --- xpdf/Makefile.in.orig	2014-05-28 11:50:50.000000000 -0700
-+++ xpdf/Makefile.in	2015-01-20 08:19:38.054680354 -0800
-@@ -122,7 +122,7 @@
++++ xpdf/Makefile.in	2015-01-20 11:19:11.373669249 -0800
+@@ -122,7 +122,8 @@
  	pdftopng$(EXE) pdfimages$(EXE)
  
  all-no-x: pdftops$(EXE) pdftotext$(EXE) pdftohtml$(EXE) pdfinfo$(EXE) \
 -	pdffonts$(EXE) pdfdetach$(EXE) pdfimages$(EXE)
-+	pdffonts$(EXE) pdfdetach$(EXE) pdftoppm$(EXE) pdfimages$(EXE)
++	pdffonts$(EXE) pdfdetach$(EXE) pdftoppm$(EXE) pdftopng$(EXE) \
++	pdfimages$(EXE)
  
  #------------------------------------------------------------------------
  
Index: head/graphics/xpdf/pkg-plist
===================================================================
--- head/graphics/xpdf/pkg-plist	(revision 377534)
+++ head/graphics/xpdf/pkg-plist	(revision 377535)
@@ -1,23 +1,27 @@
 libexec/xpdf/pdffonts
 libexec/xpdf/pdfimages
 libexec/xpdf/pdfinfo
 libexec/xpdf/pdfdetach
+libexec/xpdf/pdftohtml
+libexec/xpdf/pdftopng
 libexec/xpdf/pdftoppm
 libexec/xpdf/pdftops
 libexec/xpdf/pdftotext
 %%X11%%libexec/xpdf/xpdf
 %%X11%%bin/xpdf
 etc/xpdfrc
 %%DATADIR%%/man/man1/pdfdetach.1.gz
 %%DATADIR%%/man/man1/pdffonts.1.gz
 %%DATADIR%%/man/man1/pdfimages.1.gz
 %%DATADIR%%/man/man1/pdfinfo.1.gz
+%%DATADIR%%/man/man1/pdftohtml.1.gz
+%%DATADIR%%/man/man1/pdftopng.1.gz
 %%DATADIR%%/man/man1/pdftoppm.1.gz
 %%DATADIR%%/man/man1/pdftops.1.gz
 %%DATADIR%%/man/man1/pdftotext.1.gz
 %%X11%%%%DATADIR%%/man/man1/xpdf.1.gz
 %%DATADIR%%/man/man5/xpdfrc.5.gz
 %%PORTDOCS%%%%DOCSDIR%%/ANNOUNCE
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/hello.pdf