Index: head/graphics/xpdf4/Makefile
===================================================================
--- head/graphics/xpdf4/Makefile	(revision 513806)
+++ head/graphics/xpdf4/Makefile	(revision 513807)
@@ -1,74 +1,73 @@
 # $FreeBSD$
 
 PORTNAME=	xpdf
-PORTVERSION=	4.01
-PORTREVISION=	2
+PORTVERSION=	4.02
 PORTEPOCH=	1
 CATEGORIES=	graphics print
 MASTER_SITES=	https://xpdfreader-dl.s3.amazonaws.com/
 .if !defined(MASTERDIR)
 PKGNAMESUFFIX=	4
 .endif
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Display PDF files and convert them to other formats
 
 LICENSE=	GPLv2
 
 CONFLICTS_INSTALL=	xpdf
 .if !defined(MASTERDIR)
 CONFLICTS_INSTALL+=	xpdf3-* xpdf-*
 .else
 CONFLICTS_INSTALL+=	xpdf3-*	xpdf4-*
 .endif
 
 USES=		compiler:c++11-lang cmake localbase:ldflags \
 		desktop-file-utils
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libpng.so:graphics/png
 BUILD_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/d050000l.pfb:print/gsfonts
 RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/d050000l.pfb:print/gsfonts
 MANPREFIX=	${PREFIX}/share/xpdf
 SUB_FILES=	xpdf-man.conf
 CMAKE_ARGS+=	-DOPI_SUPPORT:BOOL=ON -DCMAKE_DISABLE_FIND_PACKAGE_Qt4:BOOL=ON \
 		-DUSE_LCMS:BOOL=OFF -DSYSTEM_XPDFRC=${PREFIX}/etc/xpdfrc \
 		-DCMAKE_INSTALL_PREFIX=${PREFIX} \
 		-DCMAKE_INSTALL_BINDIR=${PREFIX}/libexec/xpdf \
 		-DCMAKE_INSTALL_MANDIR=${PREFIX}/share/xpdf/man \
 		-DNO_TEXT_SELECT:BOOL=OFF \
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets:BOOL=FALSE
 
 PLIST_SUB=		DESKTOPDIR="${DESKTOPDIR}"
 
 OPTIONS_DEFINE=		TYPE1 LIBPAPER PRINT GUI
 OPTIONS_DEFAULT=	TYPE1 PRINT GUI
 OPTIONS_SUB=		yes
 
 TYPE1_CMAKE_BOOL=	TYPE1
 TYPE1_DESC=		Ghostscript type1 fonts
 TYPE1_RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/d050000l.pfb:print/gsfonts
 
 LIBPAPER_CMAKE_BOOL=	USE_LIBPAPER
 LIBPAPER_LIB_DEPENDS=	libpaper.so:print/libpaper
 
 GUI_CMAKE_OFF=		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets=1
 GUI_DESC=		QT5 interface
 GUI_CMAKE_ARGS+=	-DNO_TEXT_SELECT:BOOL=OFF
 GUI_USES=		qt:5
 GUI_USE=		QT=buildtools_build,qmake_build,concurrent,core,gui,widgets,printsupport,svg,network,printsupport
 
 PRINT_CMAKE_ON=		-DXPDFWIDGET_PRINTING:BOOL=ON -DCUPS:BOOL=ON
 PRINT_CMAKE_OFF=	-DXPDFWIDGET_PRINTING:BOOL=OFF -DCUPS:BOOL=OFF
 PRINT_DESC=		Print support (CUPS dependency)
 PRINT_LDFLAGS=		-L${LOCALBASE}/lib
 PRINT_LIB_DEPENDS=	libcups.so:print/cups
 
 post-install:
 		@cd ${STAGEDIR}${PREFIX}; \
 		${LN} -sf ../libexec/xpdf/xpdf bin/xpdf
 		${INSTALL_DATA} ${WRKSRC}/doc/sample-xpdfrc ${STAGEDIR}${PREFIX}/etc/xpdfrc.sample
 		${INSTALL_DATA} ${WRKDIR}/xpdf-man.conf \
 			${STAGEDIR}${PREFIX}/etc/man.d/xpdf.conf
 		${INSTALL_DATA} ${FILESDIR}/xpdf.desktop ${STAGEDIR}${DESKTOPDIR}
 
 .include <bsd.port.mk>
Index: head/graphics/xpdf4/distinfo
===================================================================
--- head/graphics/xpdf4/distinfo	(revision 513806)
+++ head/graphics/xpdf4/distinfo	(revision 513807)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1550580216
-SHA256 (xpdf-4.01.tar.gz) = a4de7369029ce6d920af39fe02b777d86721464c70a2a678087fe265e5557563
-SIZE (xpdf-4.01.tar.gz) = 891150
+TIMESTAMP = 1570240487
+SHA256 (xpdf-4.02.tar.gz) = 52d51dc943b9614b8da66e8662b3031a3c82dc25bfc792eac6b438aa36d549a4
+SIZE (xpdf-4.02.tar.gz) = 912885
Index: head/graphics/xpdf4/files/patch-aconf.h.in
===================================================================
--- head/graphics/xpdf4/files/patch-aconf.h.in	(revision 513806)
+++ head/graphics/xpdf4/files/patch-aconf.h.in	(nonexistent)
@@ -1,12 +0,0 @@
---- aconf.h.in.orig	2017-08-08 16:22:50.000000000 -0700
-+++ aconf.h.in	2017-09-17 20:40:48.183421000 -0700
-@@ -110,4 +110,9 @@
-  */
- #cmakedefine01 BUILDING_XPDFREADER
- 
-+/*
-+ * Defined when print option selected
-+ */
-+#cmakedefine01 XPDFWIDGET_PRINTING
-+
- #endif

Property changes on: head/graphics/xpdf4/files/patch-aconf.h.in
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/graphics/xpdf4/files/patch-cmake-config.txt
===================================================================
--- head/graphics/xpdf4/files/patch-cmake-config.txt	(revision 513806)
+++ head/graphics/xpdf4/files/patch-cmake-config.txt	(revision 513807)
@@ -1,73 +1,58 @@
---- cmake-config.txt.orig	2019-02-18 10:24:19.000000000 -0800
-+++ cmake-config.txt	2019-02-19 18:15:45.359569000 -0800
+--- cmake-config.txt.orig	2019-09-25 12:54:33.000000000 -0700
++++ cmake-config.txt	2019-10-04 19:03:10.517020000 -0700
 @@ -81,6 +81,7 @@
  option(USE_EXCEPTIONS "use C++ exceptions" ON)
  option(USE_FIXEDPOINT "use fixed point (instead of floating point) arithmetic" OFF)
  option(SPLASH_CMYK "include support for CMYK rasterization" OFF)
 +option(USE_LIBPAPER "use libpaper" OFF)
+ option(NO_FONTCONFIG "disable support for libfontconfig" OFF)
  option(SYSTEM_XPDFRC "full path for system-wide xpdfrc file" "")
  if (SYSTEM_XPDFRC)
-   set(SYSTEM_XPDFRC_DEFINE "#define SYSTEM_XPDFRC \"${SYSTEM_XPDFRC}\"")
-@@ -200,9 +201,7 @@
-   if (XPDFWIDGET_PRINTING)
-     set(QT_INCLUDES "${Qt5Widgets_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS} ${Qt5PrintSupport_INCLUDE_DIRS}")
-     set(QT_DEFINITIONS "${Qt5Widgets_DEFINITIONS} ${Qt5Network_DEFINITIONS} ${Qt5PrintSupport_DEFINITIONS}")
--    if (APPLE)
--      set(QT_LIBRARIES Qt5::Widgets Qt5::Network Qt5::PrintSupport "-framework ApplicationServices")
--    elseif (UNIX)
-+    if (CUPS)
-       set(QT_LIBRARIES Qt5::Widgets Qt5::Network Qt5::PrintSupport cups)
-     else ()
-       set(QT_LIBRARIES Qt5::Widgets Qt5::Network Qt5::PrintSupport)
-@@ -213,9 +212,7 @@
-     set(QT_LIBRARIES Qt5::Widgets Qt5::Network)
-   endif ()
-   if (XPDFWIDGET_PRINTING)
--    if (APPLE)
--      set(EXTRA_QT_LIBRARIES "-framework ApplicationServices")
--    elseif (UNIX)
-+    if (CUPS)
-       set(EXTRA_QT_LIBRARIES cups)
-     else ()
-       set(EXTRA_QT_LIBRARIES "")
-@@ -226,9 +223,7 @@
- elseif(QT4_FOUND)
-   message(STATUS "Qt4 found")
-   if (XPDFWIDGET_PRINTING)
--    if (APPLE)
--      set(EXTRA_QT_LIBRARIES "-framework ApplicationServices")
--    elseif (UNIX)
-+    if (CUPS)
-       set(EXTRA_QT_LIBRARIES cups)
-     else ()
-       set(EXTRA_QT_LIBRARIES "")
-@@ -243,6 +238,29 @@
+@@ -212,7 +213,7 @@
+       set(EXTRA_QT_LIBRARIES "-framework ApplicationServices")
+     elseif (UNIX)
+       find_package(Cups)
+-      if (CUPS_FOUND)
++      if (CUPS)
+         set(EXTRA_QT_LIBRARIES ${CUPS_LIBRARIES})
+       else ()
+         set (XPDFWIDGET_PRINTING OFF)
+@@ -230,7 +231,7 @@
+       set(EXTRA_QT_LIBRARIES "-framework ApplicationServices")
+     elseif (UNIX)
+       find_package(Cups)
+-      if (CUPS_FOUND)
++      if (CUPS)
+         set(EXTRA_QT_LIBRARIES ${CUPS_LIBRARIES})
+       else ()
+         set (XPDFWIDGET_PRINTING OFF)
+@@ -248,6 +249,29 @@
               NAMES paper libpaper
               PATH_SUFFIXES lib64 lib
  )
 +if(USE_LIBPAPER)
 +  find_library(PAPER_LIBRARY
 +    NAMES paper libpaper
 +    HINTS
 +    ${PAPER_DIR}
 +    PATHS
 +    /usr/local
 +  )
 +  find_path(PAPER_INCLUDE_DIR .h
 +    HINTS
 +    ${PAPER_DIR}
 +    PATHS
 +    /usr/local/include
 +    PATH_SUFFIXES include
 +  )
 + if (PAPER_INCLUDE_DIR AND PAPER_LIBRARY)
 +   set(HAVE_PAPER_H TRUE)
 +   message(STATUS "Found libpaper: ${PAPER_LIBRARY}")
 + else ()
 +  set(HAVE_PAPER_H FALSE)
 +  message(STATUS "libpaper not found")
 + endif ()
 +endif ()
  if (PAPER_LIBRARY)
    set(HAVE_PAPER_H TRUE)
  else ()