Index: head/graphics/xpdf/Makefile
===================================================================
--- head/graphics/xpdf/Makefile	(revision 449702)
+++ head/graphics/xpdf/Makefile	(revision 449703)
@@ -1,66 +1,67 @@
 # $FreeBSD$
 
 PORTNAME=	xpdf
 PORTVERSION=	3.04
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics print
 MASTER_SITES=	http://mirrors.rit.edu/zi/ \
 		ftp://ftp.foolabs.com/pub/xpdf/ \
 		TEX_CTAN/support/xpdf \
 		http://komquats.com/distfiles/
 
 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
 
 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
+	@cd ${STAGEDIR}${PREFIX}; \
+	${LN} -sf libexec/xpdf/xpdf bin/xpdf
 	${INSTALL_DATA} ${WRKDIR}/xpdf-man.conf \
 		${STAGEDIR}${PREFIX}/etc/man.d/xpdf.conf
 
 .include <bsd.port.mk>
Index: head/graphics/xpdf4/Makefile
===================================================================
--- head/graphics/xpdf4/Makefile	(revision 449702)
+++ head/graphics/xpdf4/Makefile	(revision 449703)
@@ -1,49 +1,52 @@
 # $FreeBSD$
 
 PORTNAME=	xpdf
 PORTVERSION=	4.00
+PORTREVISION=	1
 CATEGORIES=	graphics print
 MASTER_SITES=	http://www.xpdfreader.com/dl/
 PKGNAMESUFFIX=	4
 
 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
 OPTIONS_DEFAULT=	TYPE1 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_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
 
 post-install:
-		${LN} -sf ${PREFIX}/libexec/xpdf/xpdf ${STAGEDIR}${PREFIX}/bin/xpdf
+		@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
 
 .include <bsd.port.mk>