diff --git a/x11-fonts/libXft/Makefile b/x11-fonts/libXft/Makefile
index f85380dc87ab..563d46aafbc9 100644
--- a/x11-fonts/libXft/Makefile
+++ b/x11-fonts/libXft/Makefile
@@ -1,33 +1,37 @@
 PORTNAME=	libXft
 DISTVERSION=	2.3.7
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	desktop@FreeBSD.org
 COMMENT=	Client-sided font API for X applications
 WWW=		https://www.freedesktop.org/wiki/Software/Xft/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig
 
 USES=		tar:xz xorg xorg-cat:lib
 USE_XORG=	x11 xorgproto xrender
+
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
+
 INSTALL_TARGET=	install-strip
 
 PLIST_SUB=	SHLIB_VER=${DISTVERSION}
 
 post-extract:
 	@${CP} ${FILESDIR}/xft-config.in \
 		${WRKSRC}/xft-config.in
 
 post-patch:
 	@${REINPLACE_CMD} -e '/ac_config_files/s|xft\.pc|xft\.pc xft-config|' \
 		${WRKSRC}/configure
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/xft-config \
 		${STAGEDIR}${PREFIX}/bin/
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/libXft/pkg-plist b/x11-fonts/libXft/pkg-plist
index 974092b390c2..d7f02f6d0353 100644
--- a/x11-fonts/libXft/pkg-plist
+++ b/x11-fonts/libXft/pkg-plist
@@ -1,86 +1,86 @@
 bin/xft-config
 include/X11/Xft/Xft.h
 include/X11/Xft/XftCompat.h
 lib/libXft.a
 lib/libXft.so
 lib/libXft.so.2
 lib/libXft.so.%%SHLIB_VER%%
 libdata/pkgconfig/xft.pc
-man/man3/Xft.3.gz
-man/man3/XftCharExists.3.gz
-man/man3/XftCharFontSpecRender.3.gz
-man/man3/XftCharIndex.3.gz
-man/man3/XftCharSpecRender.3.gz
-man/man3/XftColorAllocName.3.gz
-man/man3/XftColorAllocValue.3.gz
-man/man3/XftColorFree.3.gz
-man/man3/XftDefaultHasRender.3.gz
-man/man3/XftDefaultSet.3.gz
-man/man3/XftDefaultSubstitute.3.gz
-man/man3/XftDrawChange.3.gz
-man/man3/XftDrawCharFontSpec.3.gz
-man/man3/XftDrawCharSpec.3.gz
-man/man3/XftDrawColormap.3.gz
-man/man3/XftDrawCreate.3.gz
-man/man3/XftDrawCreateAlpha.3.gz
-man/man3/XftDrawCreateBitmap.3.gz
-man/man3/XftDrawDestroy.3.gz
-man/man3/XftDrawDisplay.3.gz
-man/man3/XftDrawDrawable.3.gz
-man/man3/XftDrawGlyphFontSpec.3.gz
-man/man3/XftDrawGlyphSpec.3.gz
-man/man3/XftDrawGlyphs.3.gz
-man/man3/XftDrawPicture.3.gz
-man/man3/XftDrawRect.3.gz
-man/man3/XftDrawSetClip.3.gz
-man/man3/XftDrawSetClipRectangles.3.gz
-man/man3/XftDrawSetSubwindowMode.3.gz
-man/man3/XftDrawSrcPicture.3.gz
-man/man3/XftDrawString16.3.gz
-man/man3/XftDrawString32.3.gz
-man/man3/XftDrawString8.3.gz
-man/man3/XftDrawStringUtf16.3.gz
-man/man3/XftDrawStringUtf8.3.gz
-man/man3/XftDrawVisual.3.gz
-man/man3/XftFontCheckGlyph.3.gz
-man/man3/XftFontClose.3.gz
-man/man3/XftFontCopy.3.gz
-man/man3/XftFontInfoCreate.3.gz
-man/man3/XftFontInfoDestroy.3.gz
-man/man3/XftFontInfoEqual.3.gz
-man/man3/XftFontInfoHash.3.gz
-man/man3/XftFontLoadGlyphs.3.gz
-man/man3/XftFontMatch.3.gz
-man/man3/XftFontOpen.3.gz
-man/man3/XftFontOpenInfo.3.gz
-man/man3/XftFontOpenName.3.gz
-man/man3/XftFontOpenPattern.3.gz
-man/man3/XftFontOpenXlfd.3.gz
-man/man3/XftFontUnloadGlyphs.3.gz
-man/man3/XftGetVersion.3.gz
-man/man3/XftGlyphExtents.3.gz
-man/man3/XftGlyphFontSpecRender.3.gz
-man/man3/XftGlyphRender.3.gz
-man/man3/XftGlyphSpecRender.3.gz
-man/man3/XftInit.3.gz
-man/man3/XftInitFtLibrary.3.gz
-man/man3/XftListFonts.3.gz
-man/man3/XftLockFace.3.gz
-man/man3/XftNameParse.3.gz
-man/man3/XftNameUnparse.3.gz
-man/man3/XftTextExtents16.3.gz
-man/man3/XftTextExtents32.3.gz
-man/man3/XftTextExtents8.3.gz
-man/man3/XftTextExtentsUtf16.3.gz
-man/man3/XftTextExtentsUtf8.3.gz
-man/man3/XftTextRender16.3.gz
-man/man3/XftTextRender16BE.3.gz
-man/man3/XftTextRender16LE.3.gz
-man/man3/XftTextRender32.3.gz
-man/man3/XftTextRender32BE.3.gz
-man/man3/XftTextRender32LE.3.gz
-man/man3/XftTextRender8.3.gz
-man/man3/XftTextRenderUtf16.3.gz
-man/man3/XftTextRenderUtf8.3.gz
-man/man3/XftUnlockFace.3.gz
-man/man3/XftXlfdParse.3.gz
+share/man/man3/Xft.3.gz
+share/man/man3/XftCharExists.3.gz
+share/man/man3/XftCharFontSpecRender.3.gz
+share/man/man3/XftCharIndex.3.gz
+share/man/man3/XftCharSpecRender.3.gz
+share/man/man3/XftColorAllocName.3.gz
+share/man/man3/XftColorAllocValue.3.gz
+share/man/man3/XftColorFree.3.gz
+share/man/man3/XftDefaultHasRender.3.gz
+share/man/man3/XftDefaultSet.3.gz
+share/man/man3/XftDefaultSubstitute.3.gz
+share/man/man3/XftDrawChange.3.gz
+share/man/man3/XftDrawCharFontSpec.3.gz
+share/man/man3/XftDrawCharSpec.3.gz
+share/man/man3/XftDrawColormap.3.gz
+share/man/man3/XftDrawCreate.3.gz
+share/man/man3/XftDrawCreateAlpha.3.gz
+share/man/man3/XftDrawCreateBitmap.3.gz
+share/man/man3/XftDrawDestroy.3.gz
+share/man/man3/XftDrawDisplay.3.gz
+share/man/man3/XftDrawDrawable.3.gz
+share/man/man3/XftDrawGlyphFontSpec.3.gz
+share/man/man3/XftDrawGlyphSpec.3.gz
+share/man/man3/XftDrawGlyphs.3.gz
+share/man/man3/XftDrawPicture.3.gz
+share/man/man3/XftDrawRect.3.gz
+share/man/man3/XftDrawSetClip.3.gz
+share/man/man3/XftDrawSetClipRectangles.3.gz
+share/man/man3/XftDrawSetSubwindowMode.3.gz
+share/man/man3/XftDrawSrcPicture.3.gz
+share/man/man3/XftDrawString16.3.gz
+share/man/man3/XftDrawString32.3.gz
+share/man/man3/XftDrawString8.3.gz
+share/man/man3/XftDrawStringUtf16.3.gz
+share/man/man3/XftDrawStringUtf8.3.gz
+share/man/man3/XftDrawVisual.3.gz
+share/man/man3/XftFontCheckGlyph.3.gz
+share/man/man3/XftFontClose.3.gz
+share/man/man3/XftFontCopy.3.gz
+share/man/man3/XftFontInfoCreate.3.gz
+share/man/man3/XftFontInfoDestroy.3.gz
+share/man/man3/XftFontInfoEqual.3.gz
+share/man/man3/XftFontInfoHash.3.gz
+share/man/man3/XftFontLoadGlyphs.3.gz
+share/man/man3/XftFontMatch.3.gz
+share/man/man3/XftFontOpen.3.gz
+share/man/man3/XftFontOpenInfo.3.gz
+share/man/man3/XftFontOpenName.3.gz
+share/man/man3/XftFontOpenPattern.3.gz
+share/man/man3/XftFontOpenXlfd.3.gz
+share/man/man3/XftFontUnloadGlyphs.3.gz
+share/man/man3/XftGetVersion.3.gz
+share/man/man3/XftGlyphExtents.3.gz
+share/man/man3/XftGlyphFontSpecRender.3.gz
+share/man/man3/XftGlyphRender.3.gz
+share/man/man3/XftGlyphSpecRender.3.gz
+share/man/man3/XftInit.3.gz
+share/man/man3/XftInitFtLibrary.3.gz
+share/man/man3/XftListFonts.3.gz
+share/man/man3/XftLockFace.3.gz
+share/man/man3/XftNameParse.3.gz
+share/man/man3/XftNameUnparse.3.gz
+share/man/man3/XftTextExtents16.3.gz
+share/man/man3/XftTextExtents32.3.gz
+share/man/man3/XftTextExtents8.3.gz
+share/man/man3/XftTextExtentsUtf16.3.gz
+share/man/man3/XftTextExtentsUtf8.3.gz
+share/man/man3/XftTextRender16.3.gz
+share/man/man3/XftTextRender16BE.3.gz
+share/man/man3/XftTextRender16LE.3.gz
+share/man/man3/XftTextRender32.3.gz
+share/man/man3/XftTextRender32BE.3.gz
+share/man/man3/XftTextRender32LE.3.gz
+share/man/man3/XftTextRender8.3.gz
+share/man/man3/XftTextRenderUtf16.3.gz
+share/man/man3/XftTextRenderUtf8.3.gz
+share/man/man3/XftUnlockFace.3.gz
+share/man/man3/XftXlfdParse.3.gz