Index: head/graphics/xpdf3/Makefile
===================================================================
--- head/graphics/xpdf3/Makefile	(revision 467808)
+++ head/graphics/xpdf3/Makefile	(revision 467809)
@@ -1,73 +1,77 @@
 # $FreeBSD$
 
 PORTNAME=	xpdf
 PORTVERSION=	3.04
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	graphics print
 MASTER_SITES=	http://mirrors.rit.edu/zi/ \
 		ftp://ftp.foolabs.com/pub/xpdf/ \
 		TEX_CTAN/support/xpdf \
 		http://komquats.com/distfiles/
 .if !defined(MASTERDIR)
 PKGNAMESUFFIX=	3
 CONFLICTS_INSTALL=	xpdf4-* xpdf-*
 .else
 CONFLICTS_INSTALL=	xpdf4-*	xpdf3-*
 .endif
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Display PDF files and convert them to other formats
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libpng.so:graphics/png
 
 GNU_CONFIGURE=	yes
 USES=		gmake cpe localbase
 CPE_VENDOR=	foolabs
 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:print/gsfonts
 
 LIBPAPER_LIB_DEPENDS=	libpaper.so: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
+X11_USES=		desktop-file-utils motif
+X11_PLIST_SUB=		DESKTOPDIR=${DESKTOPDIR}
 
 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
 	@cd ${STAGEDIR}${PREFIX}; \
 	${LN} -sf ../libexec/xpdf/xpdf bin/xpdf
 	${INSTALL_DATA} ${WRKDIR}/xpdf-man.conf \
 		${STAGEDIR}${PREFIX}/etc/man.d/xpdf.conf
+
+post-install-X11-on:
+	${INSTALL_DATA} ${FILESDIR}/xpdf.desktop ${STAGEDIR}${DESKTOPDIR}
 
 .include <bsd.port.mk>
Index: head/graphics/xpdf3/files/xpdf.desktop
===================================================================
--- head/graphics/xpdf3/files/xpdf.desktop	(nonexistent)
+++ head/graphics/xpdf3/files/xpdf.desktop	(revision 467809)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=xpdf
+GenericName=PDF viewer
+Comment=Display PDF files
+Exec=xpdf %f
+Icon=xpdf
+Terminal=false
+Type=Application
+MimeType=application/pdf;
+Categories=Viewer;Graphics;
+Keywords=Viewer;Graphics;

Property changes on: head/graphics/xpdf3/files/xpdf.desktop
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/xpdf3/pkg-plist
===================================================================
--- head/graphics/xpdf3/pkg-plist	(revision 467808)
+++ head/graphics/xpdf3/pkg-plist	(revision 467809)
@@ -1,28 +1,29 @@
 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
+%%X11%%%%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
 %%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
 @sample etc/xpdfrc.sample
Index: head/graphics/xpdf4/Makefile
===================================================================
--- head/graphics/xpdf4/Makefile	(revision 467808)
+++ head/graphics/xpdf4/Makefile	(revision 467809)
@@ -1,63 +1,69 @@
 # $FreeBSD$
 
 PORTNAME=	xpdf
 PORTVERSION=	4.00
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics print
 MASTER_SITES=	https://xpdfreader-dl.s3.amazonaws.com/
 .if !defined(MASTERDIR)
 PKGNAMESUFFIX=	4
 CONFLICTS_INSTALL=	xpdf3-* xpdf-*
 .else
 CONFLICTS_INSTALL=	xpdf3-*	xpdf4-*
 .endif
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Display PDF files and convert them to other formats
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libpng.so:graphics/png
 
 CONFLICTS_INSTALL=	xpdf
 
 MANPREFIX=	${PREFIX}/share/xpdf
 SUB_FILES=	xpdf-man.conf
 
 USES=		cmake:outsource localbase
 CMAKE_ARGS+=	-DOPI_SUPPORT:BOOL=ON -DCMAKE_DISABLE_FIND_PACKAGE_Qt4:BOOL=ON \
 		-DUSE_LCMS:BOOL=OFF -DSYSTEM_XPDFRC=${PREFIX}/etc/xpdfrc
 
 OPTIONS_DEFINE=		TYPE1 LIBPAPER GUI PRINT
 OPTIONS_DEFAULT=	TYPE1 GUI PRINT
 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_ON=		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets:BOOL=FALSE
 GUI_CMAKE_OFF=		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets:BOOL=TRUE
 GUI_DESC=		QT5 interface
 GUI_CMAKE_ARGS+=	-DNO_TEXT_SELECT:BOOL=OFF
 GUI_USE=		QT5=buildtools_build,qmake_build,concurrent,core,gui,widgets,printsupport,svg
+GUI_PLIST_SUB=		DESKTOPDIR="${DESKTOPDIR}"
+GUI_USES=		desktop-file-utils
 
 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_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
+
+post-install-GUI-on:
+		${INSTALL_DATA} ${FILESDIR}/xpdf.desktop ${STAGEDIR}${DESKTOPDIR}
 
 .include <bsd.port.mk>
Index: head/graphics/xpdf4/files/xpdf.desktop
===================================================================
--- head/graphics/xpdf4/files/xpdf.desktop	(nonexistent)
+++ head/graphics/xpdf4/files/xpdf.desktop	(revision 467809)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=xpdf
+GenericName=PDF viewer
+Comment=Display PDF files
+Exec=xpdf %f
+Icon=xpdf
+Terminal=false
+Type=Application
+MimeType=application/pdf;
+Categories=Viewer;Graphics;
+Keywords=Viewer;Graphics;

Property changes on: head/graphics/xpdf4/files/xpdf.desktop
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/xpdf4/pkg-plist
===================================================================
--- head/graphics/xpdf4/pkg-plist	(revision 467808)
+++ head/graphics/xpdf4/pkg-plist	(revision 467809)
@@ -1,24 +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
+%%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