diff --git a/x11-toolkits/tkshape/Makefile b/x11-toolkits/tkshape/Makefile
index 9a6aafae42d0..b6818f87b28b 100644
--- a/x11-toolkits/tkshape/Makefile
+++ b/x11-toolkits/tkshape/Makefile
@@ -1,91 +1,91 @@
 PORTNAME=		tkshape
 PORTVERSION=		0.4
-PORTREVISION=		2
+PORTREVISION=		3
 CATEGORIES=		x11-toolkits
 MASTER_SITES=		http://www.cs.man.ac.uk/~fellowsd/tcl/ \
 			http://nivi.interfree.it/distfiles/${PORTNAME}/${PORTVERSION}/
 DISTNAME=		shape${PORTVERSION:S/.//g}
 
 MAINTAINER=		nivit@FreeBSD.org
 COMMENT=		Tk library to access to X Shaped Window Extension
 WWW=		https://www.cs.man.ac.uk/~fellowsd/tcl/shapeidx.html
 
 USES=			gmake tk xorg
 
 USE_XORG=		x11 xext
 
 PLIST_SUB=		PORTNAME="${PORTNAME}"
 
 USE_LDCONFIG=		yes
 
 OPTIONS_DEFINE=		MANPAGES
 OPTIONS_DEFAULT=	MANPAGES
 MANPAGES_DESC=	Install manual pages
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMANPAGES}
 PLIST_SUB+=		MAN=""
 .else
 PLIST_SUB+=		MAN="@comment "
 .endif
 
 WRKSRC=			${WRKDIR}/${PORTNAME:C/^tk//1}${PORTVERSION}
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--with-tclconf=${TCL_LIBDIR} \
 			--with-tkconf=${TK_LIBDIR}
 CONFIGURE_WRKSRC=	${WRKSRC}/unix
 BUILD_WRKSRC=		${CONFIGURE_WRKSRC}
 
 WHERE_REPLACE=		${WRKSRC}/demos
 REPLACE_FILES=		${WHERE_REPLACE}/dragger.tcl \
 			${WHERE_REPLACE}/fancytext.tcl \
 			${WHERE_REPLACE}/fingerprint.tcl
 
 post-patch: .SILENT
 	for FILE in ${REPLACE_FILES}; do \
 		${REINPLACE_CMD} -e "/%%WISH%%/s//${WISH:S/\//\\\//g}/g" \
 		$${FILE}; \
 	done;
 	${REINPLACE_CMD} -E 's,(^CFLAGS = )-g,\1${CFLAGS},' \
 		${BUILD_WRKSRC}/Makefile.in
 
 FIND_DIRS=		-type d \! -empty
 FIND_DEMOS=		demos -type f -and -name "*.tcl" -maxdepth 1
 FIND_IMAGES=		demos/images -type f \
 			-and \( -name "*.gif" -or -name "*.xbm" \
 			-or -name "*.cur" \)
 
 TARGET_DIR=		${STAGEDIR}${PREFIX}/lib/${PORTNAME}
 MANPAGES=		CombShape.3 QuryShape.3 shape.n
 
 do-install:
 # script, library
 	cd ${WRKSRC}; \
 	${MKDIR} ${TARGET_DIR}/demos; \
 	FILES=$$(${FIND} ${FIND_DEMOS}); \
 	for FILE in $${FILES}; do \
 		${INSTALL_SCRIPT} $${FILE} ${TARGET_DIR}/$${FILE}; \
 	done; \
 	${INSTALL_SCRIPT} unix/libshape04.so.1.0 ${TARGET_DIR}/libshape04.so.1;
 
 # images, pkgIndex.tcl
 	cd ${WRKSRC}; \
 	${MKDIR} ${TARGET_DIR}/demos/images; \
 	FILES=$$(${FIND} ${FIND_IMAGES}); \
 	for FILE in $${FILES}; do \
 		${INSTALL_DATA} $${FILE} ${TARGET_DIR}/$${FILE}; \
 	done; \
 	${INSTALL_DATA} unix/pkgIndex.tcl ${TARGET_DIR}/pkgIndex.tcl;
 
 # manpages
 .if ${PORT_OPTIONS:MMANPAGES}
 	cd ${WRKSRC}; \
 	for m in ${MANPAGES} ; do \
 	    s=$${m##*.}; \
-	    ${INSTALL_MAN} doc/$${m} ${STAGEDIR}${PREFIX}/man/man$${s}/$${m}; \
+	    ${INSTALL_MAN} doc/$${m} ${STAGEDIR}${PREFIX}/share/man/man$${s}/$${m}; \
 	done;
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/tkshape/pkg-plist b/x11-toolkits/tkshape/pkg-plist
index 9ad52a172ce5..f30a09251c97 100644
--- a/x11-toolkits/tkshape/pkg-plist
+++ b/x11-toolkits/tkshape/pkg-plist
@@ -1,15 +1,15 @@
 lib/%%PORTNAME%%/libshape04.so.1
 lib/%%PORTNAME%%/pkgIndex.tcl
 lib/%%PORTNAME%%/demos/dragger.tcl
 lib/%%PORTNAME%%/demos/fancytext.tcl
 lib/%%PORTNAME%%/demos/fingerprint.tcl
 lib/%%PORTNAME%%/demos/images/doc-img.gif
 lib/%%PORTNAME%%/demos/images/doc-mask.xbm
 lib/%%PORTNAME%%/demos/images/fingerprint.xbm
 lib/%%PORTNAME%%/demos/images/none.cur
 lib/%%PORTNAME%%/demos/images/ptr-green.gif
 lib/%%PORTNAME%%/demos/images/ptr-mask.xbm
 lib/%%PORTNAME%%/demos/images/ptr-red.gif
-%%MAN%%man/man3/CombShape.3.gz
-%%MAN%%man/man3/QuryShape.3.gz
-%%MAN%%man/mann/shape.n.gz
+%%MAN%%share/man/man3/CombShape.3.gz
+%%MAN%%share/man/man3/QuryShape.3.gz
+%%MAN%%share/man/mann/shape.n.gz