Index: head/graphics/xpdf4/Makefile
===================================================================
--- head/graphics/xpdf4/Makefile	(revision 513861)
+++ head/graphics/xpdf4/Makefile	(revision 513862)
@@ -1,73 +1,72 @@
 # $FreeBSD$
 
 PORTNAME=	xpdf
 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
+USES=		compiler:c++11-lang cmake localbase:ldflags
 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_USES=		qt:5 desktop-file-utils
 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/files/patch-cmake-config.txt
===================================================================
--- head/graphics/xpdf4/files/patch-cmake-config.txt	(revision 513861)
+++ head/graphics/xpdf4/files/patch-cmake-config.txt	(revision 513862)
@@ -1,58 +1,67 @@
 --- 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)
+@@ -194,7 +195,7 @@
+   find_package(Qt5Network)
+   find_package(Qt5PrintSupport)
+ else ()
+-  find_package(Qt4 COMPONENTS QtCore QtGui QtNetwork REQUIRED)
++  find_package(Qt4 COMPONENTS QtCore QtGui QtNetwork)
+ endif ()
+ if(Qt5Widgets_FOUND)
+   message(STATUS "Qt5 found")
 @@ -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 ()
Index: head/graphics/xpdf4/pkg-plist
===================================================================
--- head/graphics/xpdf4/pkg-plist	(revision 513861)
+++ head/graphics/xpdf4/pkg-plist	(revision 513862)
@@ -1,25 +1,25 @@
 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
 %%GUI%%libexec/xpdf/xpdf
 %%GUI%%bin/xpdf
-%%DESKTOPDIR%%/xpdf.desktop
+%%GUI%%%%DESKTOPDIR%%/xpdf.desktop
 etc/man.d/xpdf.conf
 %%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
 %%GUI%%%%DATADIR%%/man/man1/xpdf.1.gz
 %%DATADIR%%/man/man5/xpdfrc.5.gz
 @sample etc/xpdfrc.sample