6 files changed, 58 insertions, 10 deletions

diff --git a/lang/tcl82/Makefile b/lang/tcl82/Makefile
index bef81da7d69c..aa8e30d336dd 100644
--- a/lang/tcl82/Makefile
+++ b/lang/tcl82/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tcl
 PORTVERSION=	8.2.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	lang tcl82
 MASTER_SITES=	${MASTER_SITE_TCLTK}
 MASTER_SITE_SUBDIR=	tcl8_2
@@ -29,6 +29,10 @@ NOPRECIOUSMAKEVARS=	yes # Otherwise 'make readmes' is broken
 USE_REINPLACE=	YES
 PLIST_SUB=	TCL_VER=8.2 SHORT_TCL_VER=82
 
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_TCL82_MAN)
+
 MAN1=	tclsh.1
 
 MAN3=	Access.3 AddErrInfo.3 Alloc.3 AllowExc.3 AppInit.3 AssocData.3 \
@@ -369,7 +373,7 @@ MLINKS=	Access.3 Tcl_Access.3 \
 	pkgMkIndex.n pkg_mkIndex.n \
 	safe.n Safe\Base.n
 
-.include <bsd.port.pre.mk>
+.endif
 
 post-extract:
 	${MV} ${WRKDIR}/${DISTNAME}/doc/InitStubs.3 \
@@ -378,6 +382,10 @@ post-extract:
 post-configure:
 	${REINPLACE_CMD} -e 's=${WRKDIRPREFIX}${PORTSDIR}=$${WRKDIRPREFIX}${PORTSDIR}=' \
 		${WRKSRC}/tclConfig.sh
+.if !defined(WITH_TCL82_MAN)
+	${REINPLACE_CMD} -e 's|^MAN_INSTALL_DIR.*$$|MAN_INSTALL_DIR = ${WRKDIR}|' \
+		${WRKSRC}/Makefile
+.endif
 
 post-install:
 .if exists(${PKGINSTALL})
diff --git a/lang/tcl83/Makefile b/lang/tcl83/Makefile
index 0bd62be7c3f3..b9eb7a979850 100644
--- a/lang/tcl83/Makefile
+++ b/lang/tcl83/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tcl
 PORTVERSION=	8.3.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang tcl83
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tcl
@@ -31,6 +31,10 @@ NOPRECIOUSMAKEVARS=	yes # Otherwise 'make readmes' is broken
 USE_REINPLACE=	YES
 PLIST_SUB=	TCL_VER=${TCL_VER} SHORT_TCL_VER=83
 
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_TCL83_MAN)
+
 MAN1=	tclsh.1
 
 MAN3=	Access.3 AddErrInfo.3 Alloc.3 AllowExc.3 AppInit.3 AssocData.3 \
@@ -421,11 +425,15 @@ MLINKS=	Access.3 Tcl_Access.3 \
 	safe.n Safe\Base.n \
 	tcltest.n Tcltest.n
 
-.include <bsd.port.pre.mk>
+.endif
 
 post-configure:
 	${REINPLACE_CMD} -e 's=${WRKDIRPREFIX}${PORTSDIR}=$${WRKDIRPREFIX}${PORTSDIR}=' \
 		${WRKSRC}/tclConfig.sh
+.if !defined(WITH_TCL83_MAN)
+	${REINPLACE_CMD} -e 's|^MAN_INSTALL_DIR.*$$|MAN_INSTALL_DIR = ${WRKDIR}|' \
+		${WRKSRC}/Makefile
+.endif
 
 post-install:
 .if exists(${PKGINSTALL})
diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile
index 99fc517199fd..e619fbf485ad 100644
--- a/lang/tcl84/Makefile
+++ b/lang/tcl84/Makefile
@@ -38,6 +38,10 @@ THREADS_SUFFIX=		-threads
 CONFIGURE_ARGS+=	--enable-threads
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_TCL84_MAN)
+
 MAN1=	tclsh.1
 
 MAN3=	Access.3 AddErrInfo.3 Alloc.3 AllowExc.3 AppInit.3 AssocData.3 \
@@ -589,7 +593,7 @@ MLINKS=	Access.3 Tcl_Access.3 \
 	pkgMkIndex.n pkg_mkIndex.n \
 	safe.n SafeBase.n
 
-.include <bsd.port.pre.mk>
+.endif
 
 .if defined(TCL_WITH_THREADS) || defined(WITH_THREADS)
 post-patch:
@@ -601,6 +605,10 @@ post-patch:
 post-configure:
 	${REINPLACE_CMD} -e 's=${WRKDIRPREFIX}${PORTSDIR}=$${WRKDIRPREFIX}${PORTSDIR}=' \
 		${WRKSRC}/tclConfig.sh
+.if defined(WITHOUT_TCL84_MAN)
+	${REINPLACE_CMD} -e 's|^MAN_INSTALL_DIR.*$$|MAN_INSTALL_DIR = ${WRKDIR}|' \
+		${WRKSRC}/Makefile
+.endif
 
 post-install:
 .if exists(${PKGINSTALL})
diff --git a/x11-toolkits/tk82/Makefile b/x11-toolkits/tk82/Makefile
index 6987c624cc1c..80ac932b1537 100644
--- a/x11-toolkits/tk82/Makefile
+++ b/x11-toolkits/tk82/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tk
 PORTVERSION=	8.2.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits tk82
 MASTER_SITES=	${MASTER_SITE_TCLTK}
 MASTER_SITE_SUBDIR=	tcl8_2
@@ -35,6 +35,10 @@ TCL82_PORT?=	lang/tcl82
 USE_REINPLACE=	YES
 MANCOMPRESSED=	no
 
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_TK82_MAN)
+
 MAN1=	wish.1
 MAN3=	3DBorder.3 BindTable.3 CanvPsY.3 CanvTkwin.3 CanvTxtInfo.3 \
 	Clipboard.3 ClrSelect.3 ConfigWidg.3 ConfigWind.3 CoordToWin.3 \
@@ -301,11 +305,15 @@ MLINKS=	3DBorder.3 Tk_Alloc3DBorderFromObj.3 \
 	palette.n tk_bisque.n \
 	popup.n tk_popup.n
 
-.include <bsd.port.pre.mk>
+.endif
 
 post-configure:
 	${REINPLACE_CMD} -e 's=${WRKDIRPREFIX}${PORTSDIR}=$${WRKDIRPREFIX}${PORTSDIR}=' \
 		${WRKSRC}/tkConfig.sh
+.if !defined(WITH_TK82_MAN)
+	${REINPLACE_CMD} -e 's|^MAN_INSTALL_DIR.*$$|MAN_INSTALL_DIR = ${WRKDIR}|' \
+		${WRKSRC}/Makefile
+.endif
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/pkgIndex.tcl ${PREFIX}/lib/tk${TK_VER}/
diff --git a/x11-toolkits/tk83/Makefile b/x11-toolkits/tk83/Makefile
index 0684bd208030..dfd0dae9e299 100644
--- a/x11-toolkits/tk83/Makefile
+++ b/x11-toolkits/tk83/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tk
 PORTVERSION=	8.3.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits tk83
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tcl
@@ -37,6 +37,10 @@ TCL83_PORT?=	lang/tcl83
 USE_REINPLACE=	YES
 MANCOMPRESSED=	no
 
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_TK83_MAN)
+
 MAN1=	wish.1
 MAN3=	3DBorder.3 AddOption.3 BindTable.3 CanvPsY.3 CanvTkwin.3 \
 	CanvTxtInfo.3 Clipboard.3 ClrSelect.3 ConfigWidg.3 ConfigWind.3 \
@@ -319,11 +323,15 @@ MLINKS=	3DBorder.3 Tk_Alloc3DBorderFromObj.3 \
 	palette.n tk_bisque.n \
 	popup.n tk_popup.n
 
-.include <bsd.port.pre.mk>
+.endif
 
 post-configure:
 	${REINPLACE_CMD} -e 's=${WRKDIRPREFIX}${PORTSDIR}=$${WRKDIRPREFIX}${PORTSDIR}=' \
 		${WRKSRC}/tkConfig.sh
+.if !defined(WITH_TK83_MAN)
+	${REINPLACE_CMD} -e 's|^MAN_INSTALL_DIR.*$$|MAN_INSTALL_DIR = ${WRKDIR}|' \
+		${WRKSRC}/Makefile
+.endif
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/pkgIndex.tcl ${PREFIX}/lib/tk${TK_VER}/
diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile
index 9aaa7c39e6f5..82767bacfedd 100644
--- a/x11-toolkits/tk84/Makefile
+++ b/x11-toolkits/tk84/Makefile
@@ -43,6 +43,10 @@ CONFIGURE_ARGS+=	--enable-threads
 PKGNAMESUFFIX?=		-threads
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_TK84_MAN)
+
 MAN1=	wish.1
 MAN3=	3DBorder.3 AddOption.3 BindTable.3 CanvPsY.3 CanvTkwin.3 \
 	CanvTxtInfo.3 Clipboard.3 ClrSelect.3 ConfigWidg.3 ConfigWind.3 \
@@ -344,7 +348,7 @@ MLINKS=	3DBorder.3 Tk_Alloc3DBorderFromObj.3 \
 	text.n tk_textCut.n \
 	text.n tk_textPaste.n
 
-.include <bsd.port.pre.mk>
+.endif
 
 pre-everything::
 	@if ${TEST} -e "${NONEXISTENT}"; then ${ECHO_MSG} "=== Aborted, please remove ${NONEXISTENT}"; exit 1; fi
@@ -356,6 +360,10 @@ post-patch:
 post-configure:
 	${REINPLACE_CMD} -e 's=${WRKDIRPREFIX}${PORTSDIR}=$${WRKDIRPREFIX}${PORTSDIR}=' \
 		${WRKSRC}/tkConfig.sh
+.if defined(WITHOUT_TK84_MAN)
+	${REINPLACE_CMD} -e 's|^MAN_INSTALL_DIR.*$$|MAN_INSTALL_DIR = ${WRKDIR}|' \
+		${WRKSRC}/Makefile
+.endif
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/pkgIndex.tcl ${PREFIX}/lib/tk${TK_VER}/