2 files changed, 24 insertions, 18 deletions

diff --git a/lang/tcl86/Makefile b/lang/tcl86/Makefile
index b20f698fad26..f43c378029fb 100644
--- a/lang/tcl86/Makefile
+++ b/lang/tcl86/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tcl
 PORTVERSION=	8.6.b.1
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tcl
@@ -31,7 +32,7 @@ PLIST_SUB=	TCL_VER=${TCL_VER} SHORT_TCL_VER=${SHORT_TCL_VER}
 EXTRACT_AFTER_ARGS=|${TAR} -xpf - --exclude compat/
 
 .if !defined(BUILDING_TCL_THREADS)
-OPTIONS=	TCL86_MAN "Install tcl 8.6 manpages" off \
+OPTIONS=	TCL86_MAN "Install tcl 8.6 function manpages" off \
 		TZDATA "Install tcl timezone data" off
 .else
 USE_TCL=	${SHORT_TCL_VER}
@@ -41,12 +42,18 @@ THREADS_SUFFIX=		-threads
 
 .include <bsd.port.pre.mk>
 
+DATADIR=	${PREFIX}/share/${PORTNAME}${TCL_VER}
+
 .if defined(WITH_TZDATA)
 PLIST_SUB+=		TZDATA=""
 .else
 PLIST_SUB+=		TZDATA="@comment "
 .endif
 
+.if !defined(NO_INSTALL_MANPAGES)
+MAN1=	tclsh${TCL_VER}${THREADS_SUFFIX}.1
+.endif
+
 .if defined(BUILDING_TCL_THREADS)
 . if (${ARCH} == "ia64")
 BROKEN=	does not compile on ia64
@@ -65,16 +72,7 @@ CONFIGURE_ENV+=		PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS
 
 CONFIGURE_ARGS+=	--disable-threads
 
-.if defined(NO_INSTALL_MANPAGES) || !defined(WITH_TCL86_MAN)
-
-PLIST_SUB+=	INSTMAN='@comment '
-
-.else
-
-DATADIR=	${PREFIX}/share/${PORTNAME}${TCL_VER}
-PLIST_SUB+=	INSTMAN=''
-
-MAN1=	tclsh.1
+.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TCL84_DOC)
 
 MAN3=	Access.3 AddErrInfo.3 Alloc.3 AllowExc.3 AppInit.3 AssocData.3 \
 	Async.3 BackgdErr.3 Backslash.3 BoolObj.3 ByteArrObj.3 CallDel.3 \
@@ -703,8 +701,12 @@ LATEST_LINK=	tcl86${THREADS_SUFFIX}
 
 TCLBASE?=	${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK}
 
-.if defined(BUILDING_TCL_THREADS)
 post-patch:
+	@${REINPLACE_CMD} -e 's|tclsh |tclsh${TCL_VER}${THREADS_SUFFIX} |g' -e 's|Tclsh |Tclsh${TCL_VER}${THREADS_SUFFIX} |g' \
+		-e 's|tclsh\\fR|tclsh${TCL_VER}${THREADS_SUFFIX}\\fR|g' -e 's|Tclsh\\fR|Tclsh${TCL_VER}${THREADS_SUFFIX}\\fR|g' \
+		-e 's|^.so man.macros|.so ${DATADIR}/man.macros|' \
+		${WRKSRC}/../doc/tclsh.1
+.if defined(BUILDING_TCL_THREADS)
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
 		-e 's|$${TCL_TRIM_DOTS}|$${TCL_TRIM_DOTS}${THREADS_SUFFIX}|g' \
 		-e 's|-ltcl$${TCL_VERSION}|-ltcl$${TCL_VERSION}${THREADS_SUFFIX}|g' \
@@ -742,22 +744,26 @@ do-install:
 	@cd ${WRKSRC} && ${MAKE_ENV} ${MAKE} -f Makefile install-binaries
 	@${MKDIR} ${PREFIX}/lib/tcl${TCL_VER}${THREADS_SUFFIX}
 	@${LN} -s ${PREFIX}/lib/tcl${TCL_VER}/tclConfig${THREADS_SUFFIX}.sh ${PREFIX}/lib/tcl${TCL_VER}${THREADS_SUFFIX}/tclConfig.sh
-.else
+.endif
+
 post-install:
 .if defined(WITH_TZDATA)
 	@cd ${WRKSRC} && ${MAKE} -f Makefile install-tzdata ${MAKE_ENV}
 .endif
-.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TCL86_MAN)
 	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/../doc/man.macros ${DATADIR}
+.if !defined(NO_INSTALL_MANPAGES)
+	${MKDIR} ${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/../doc/tclsh.1 ${MANPREFIX}/man/man1/tclsh${TCL_VER}${THREADS_SUFFIX}.1
+.if !defined(BUILDING_TCL_THREADS) && defined(WITH_TCL86_MAN)
 . for mp in ${MAN1} ${MAN3} ${MANN}
 	@${REINPLACE_CMD} -e 's|^.so man.macros|.so ${DATADIR}/man.macros|'	\
 		${WRKSRC}/../doc/${mp}
 . endfor
 	@cd ${WRKSRC} && ${MAKE} -f Makefile install-doc ${MAKE_ENV}
-.endif
+.endif # !defined(BUILDING_TCL_THREADS) && defined(WITH_TCL86_MAN)
 
-.endif # !defined(BUILDING_TCL_THREADS)
+.endif # !defined(NO_INSTALL_MANPAGES)
 
 regression-test:	build
 	cd ${WRKSRC} && LC_ALL=C ${MAKE} test
diff --git a/lang/tcl86/pkg-plist b/lang/tcl86/pkg-plist
index e679e0de86fe..db44c63bad5b 100644
--- a/lang/tcl86/pkg-plist
+++ b/lang/tcl86/pkg-plist
@@ -832,8 +832,8 @@ lib/tcl8/8.4/platform/shell-1.1.4.tm
 lib/tcl8/8.4/platform-1.0.3.tm
 lib/tcl8/8.5/msgcat-1.4.2.tm
 lib/tcl8/8.5/tcltest-2.3.0.tm
-%%INSTMAN%%%%DATADIR%%/man.macros
-%%INSTMAN%%@dirrm %%DATADIR%%
+%%DATADIR%%/man.macros
+@dirrm %%DATADIR%%
 %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata/US
 %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata/SystemV
 %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata/Pacific