diff --git a/lang/tclX/Makefile b/lang/tclX/Makefile
index c32c2b0581f2..634ea40236bb 100644
--- a/lang/tclX/Makefile
+++ b/lang/tclX/Makefile
@@ -1,68 +1,70 @@
 PORTNAME=	tclX
 PORTVERSION=	8.4.1
+PORTREVISION=	1
 CATEGORIES=	lang tcl devel
 MASTER_SITES=	SF/${PORTNAME:tl}/TclX/${PORTVERSION}:tclx \
     		http://core.tcl.tk/tclconfig/raw/:tclm4
 DISTFILES=	tclx${PORTVERSION}${EXTRACT_SUFX}:tclx \
     		${TCLM4}:tclm4
 EXTRACT_ONLY=	tclx${PORTVERSION}${EXTRACT_SUFX}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Extended TCL
 WWW=		https://tclx.sourceforge.net/
 
 LICENSE=	TclTk
 LICENSE_NAME=	Tcl/Tk License
 LICENSE_FILE=	${WRKSRC}/license.terms
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 WRKSRC=		${WRKDIR}/${PORTNAME:tl}${PORTVERSION:R}
 
 USES=		autoreconf alias tcl:tea tar:bzip2
 USE_LDCONFIG=	${PREFIX}/lib/tclx${PORTVERSION:R}
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--enable-shared \
 		--with-help=Help
 PLIST_SUB=	TCLX_VER=${PORTVERSION:R}
 ALL_TARGET=	binaries libraries
 INSTALL_TARGET=	install-binaries install-libraries
 LLD_UNSAFE=	yes
 TCLM4=		tcl.m4?name=2e84c8
 
 .include <bsd.port.pre.mk>
 
 .if ${TCL_VER} > 8.4
 EXTRA_PATCHES+=	${FILESDIR}/tcl85-test-patch
 .endif
 .if ${TCL_VER} > 8.5
 EXTRA_PATCHES+=	${FILESDIR}/tcl86-test-patch
 .endif
 
 post-extract:
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/${TCLM4} ${WRKSRC}/tclconfig/tcl.m4
 
 post-configure:
 	# Disabling the failing help.test
 	${MV} ${WRKSRC}/tests/help.test ${WRKSRC}/tests/help.test.dis
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/doc/TclX.n ${STAGEDIR}${PREFIX}/man/mann
+	${INSTALL_DATA} ${WRKSRC}/doc/TclX.n ${STAGEDIR}${PREFIX}/share/man/mann
 .for l in CmdWrite Handles Keylist ObjCmdWrite TclXInit
-	${INSTALL_DATA} ${WRKSRC}/doc/${l}.3 ${STAGEDIR}${PREFIX}/man/man3
+	${INSTALL_DATA} ${WRKSRC}/doc/${l}.3 ${STAGEDIR}${PREFIX}/share/man/man3
 .endfor
-	${LN} -s CmdWrite.3.gz ${STAGEDIR}${PREFIX}/man/man3/TclCommandWriting.3.gz
-	${LN} -s KeyList.3.gz ${STAGEDIR}${PREFIX}/man/man3/TclX_NewKeyedListObj.3.gz
+	${LN} -s CmdWrite.3.gz ${STAGEDIR}${PREFIX}/share/man/man3/TclCommandWriting.3.gz
+	${LN} -s KeyList.3.gz ${STAGEDIR}${PREFIX}/share/man/man3/TclX_NewKeyedListObj.3.gz
 .for l in Delete Get GetKeys Set TclX_Main TclX_NewKeyedListObj
-	${LN} -s KeyList.3.gz ${STAGEDIR}${PREFIX}/man/man3/TclX_KeyedList${l}.3.gz
+	${LN} -s KeyList.3.gz ${STAGEDIR}${PREFIX}/share/man/man3/TclX_KeyedList${l}.3.gz
 .endfor
 .for l in Alloc Free TblInit TblRelease TblUseCount Walk Xlate
-	${LN} -s Handles.3.gz ${STAGEDIR}${PREFIX}/man/man3/TclX_Handle${l}.3.gz
+	${LN} -s Handles.3.gz ${STAGEDIR}${PREFIX}/share/man/man3/TclX_Handle${l}.3.gz
 .endfor
 .for l in Tclxcmd_Init TclX_Main Tkx_Init TkX_Main
-	${LN} -s TclXInit.3.gz ${STAGEDIR}${PREFIX}/man/man3/${l}.3.gz
+	${LN} -s TclXInit.3.gz ${STAGEDIR}${PREFIX}/share/man/man3/${l}.3.gz
 .endfor
 
 regression-test test: build
 	${SETENV} ${MAKE_ENV} ${MAKE} -C ${WRKSRC} test
 
 .include <bsd.port.post.mk>
diff --git a/lang/tclX/pkg-plist b/lang/tclX/pkg-plist
index 62acb853b8cc..5f178c2d555b 100644
--- a/lang/tclX/pkg-plist
+++ b/lang/tclX/pkg-plist
@@ -1,46 +1,46 @@
 include/tclExtend.h
 lib/tclx%%TCLX_VER%%/arrayprocs.tcl
 lib/tclx%%TCLX_VER%%/autoload.tcl
 lib/tclx%%TCLX_VER%%/buildhelp.tcl
 lib/tclx%%TCLX_VER%%/compat.tcl
 lib/tclx%%TCLX_VER%%/convlib.tcl
 lib/tclx%%TCLX_VER%%/edprocs.tcl
 lib/tclx%%TCLX_VER%%/events.tcl
 lib/tclx%%TCLX_VER%%/fmath.tcl
 lib/tclx%%TCLX_VER%%/forfile.tcl
 lib/tclx%%TCLX_VER%%/globrecur.tcl
 lib/tclx%%TCLX_VER%%/help.tcl
 lib/tclx%%TCLX_VER%%/libtclx%%TCLX_VER%%.so
 lib/tclx%%TCLX_VER%%/pkgIndex.tcl
 lib/tclx%%TCLX_VER%%/profrep.tcl
 lib/tclx%%TCLX_VER%%/pushd.tcl
 lib/tclx%%TCLX_VER%%/setfuncs.tcl
 lib/tclx%%TCLX_VER%%/showproc.tcl
 lib/tclx%%TCLX_VER%%/stringfile.tcl
 lib/tclx%%TCLX_VER%%/tcllib.tcl
 lib/tclx%%TCLX_VER%%/tclx.tcl
-man/man3/CmdWrite.3.gz
-man/man3/Handles.3.gz
-man/man3/Keylist.3.gz
-man/man3/ObjCmdWrite.3.gz
-man/man3/TclCommandWriting.3.gz
-man/man3/TclXInit.3.gz
-man/man3/TclX_HandleAlloc.3.gz
-man/man3/TclX_HandleFree.3.gz
-man/man3/TclX_HandleTblInit.3.gz
-man/man3/TclX_HandleTblRelease.3.gz
-man/man3/TclX_HandleTblUseCount.3.gz
-man/man3/TclX_HandleWalk.3.gz
-man/man3/TclX_HandleXlate.3.gz
-man/man3/TclX_KeyedListDelete.3.gz
-man/man3/TclX_KeyedListGet.3.gz
-man/man3/TclX_KeyedListGetKeys.3.gz
-man/man3/TclX_KeyedListSet.3.gz
-man/man3/TclX_KeyedListTclX_Main.3.gz
-man/man3/TclX_KeyedListTclX_NewKeyedListObj.3.gz
-man/man3/TclX_Main.3.gz
-man/man3/TclX_NewKeyedListObj.3.gz
-man/man3/Tclxcmd_Init.3.gz
-man/man3/TkX_Main.3.gz
-man/man3/Tkx_Init.3.gz
-man/mann/TclX.n.gz
+share/man/man3/CmdWrite.3.gz
+share/man/man3/Handles.3.gz
+share/man/man3/Keylist.3.gz
+share/man/man3/ObjCmdWrite.3.gz
+share/man/man3/TclCommandWriting.3.gz
+share/man/man3/TclXInit.3.gz
+share/man/man3/TclX_HandleAlloc.3.gz
+share/man/man3/TclX_HandleFree.3.gz
+share/man/man3/TclX_HandleTblInit.3.gz
+share/man/man3/TclX_HandleTblRelease.3.gz
+share/man/man3/TclX_HandleTblUseCount.3.gz
+share/man/man3/TclX_HandleWalk.3.gz
+share/man/man3/TclX_HandleXlate.3.gz
+share/man/man3/TclX_KeyedListDelete.3.gz
+share/man/man3/TclX_KeyedListGet.3.gz
+share/man/man3/TclX_KeyedListGetKeys.3.gz
+share/man/man3/TclX_KeyedListSet.3.gz
+share/man/man3/TclX_KeyedListTclX_Main.3.gz
+share/man/man3/TclX_KeyedListTclX_NewKeyedListObj.3.gz
+share/man/man3/TclX_Main.3.gz
+share/man/man3/TclX_NewKeyedListObj.3.gz
+share/man/man3/Tclxcmd_Init.3.gz
+share/man/man3/TkX_Main.3.gz
+share/man/man3/Tkx_Init.3.gz
+share/man/mann/TclX.n.gz