lang/tcl85, lang/tcl86: remove MODULES option

MODULES conflict with WITHOUT_MODULES from make.conf (see bug 226557).
Moreover, they don't require any additional dependencies and their cost in
terms of size is small wrt the total size of these ports.

PR:		226557

4 files changed, 24 insertions, 28 deletions

diff --git a/lang/tcl85/Makefile b/lang/tcl85/Makefile
index aa97685ae9f6..8b6d6cc25568 100644
--- a/lang/tcl85/Makefile
+++ b/lang/tcl85/Makefile
@@ -18,16 +18,15 @@ LICENSE_NAME=	Tcl/Tk License
 LICENSE_FILE=	${WRKSRC}/../license.terms
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-OPTIONS_DEFINE=	TCLMAN TZDATA MODULES THREADS
-OPTIONS_DEFAULT=MODULES THREADS
+OPTIONS_DEFINE=	TCLMAN TZDATA THREADS
+OPTIONS_DEFAULT=THREADS
 TCLMAN_DESC=	Install Tcl function manpages
 TZDATA_DESC=	Install Tcl timezone data
-MODULES_DESC=	Install Tcl common modules
 OPTIONS_SUB=	yes
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//:S/rc1//}/unix
 ALL_TARGET=	all
-INSTALL_TARGET=	install install-libraries
+INSTALL_TARGET=	install install-libraries install-tm
 TEST_TARGET=	do-test
 
 USE_LDCONFIG=	yes
@@ -48,7 +47,6 @@ PLIST_SUB=	TCL_VER=${TCL_VER} \
 		SHORT_TCL_VER=${SHORT_TCL_VER}
 
 TCLMAN_VARS=	INSTALL_TARGET+=install-doc
-MODULES_VARS=	INSTALL_TARGET+=install-tm
 THREADS_CONFIGURE_ENABLE=	threads
 TZDATA_CONFIGURE_WITH=		tzdata
 
diff --git a/lang/tcl85/pkg-plist b/lang/tcl85/pkg-plist
index 06c596ff839d..40a928c0d219 100644
--- a/lang/tcl85/pkg-plist
+++ b/lang/tcl85/pkg-plist
@@ -1539,12 +1539,12 @@ libdata/pkgconfig/tcl85.pc
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/W-SU
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/WET
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Zulu
-%%MODULES%%lib/tcl%%TCL_VER%%/http-2.7.13.tm
-%%MODULES%%lib/tcl%%TCL_VER%%/http1.0/http.tcl
-%%MODULES%%lib/tcl%%TCL_VER%%/http1.0/pkgIndex.tcl
-%%MODULES%%lib/tcl%%TCL_VER%%/msgcat-1.5.2.tm
-%%MODULES%%lib/tcl%%TCL_VER%%/opt0.4/optparse.tcl
-%%MODULES%%lib/tcl%%TCL_VER%%/opt0.4/pkgIndex.tcl
-%%MODULES%%lib/tcl%%TCL_VER%%/platform-1.0.14.tm
-%%MODULES%%lib/tcl%%TCL_VER%%/platform/shell-1.1.4.tm
-%%MODULES%%lib/tcl%%TCL_VER%%/tcltest-2.3.8.tm
+lib/tcl%%TCL_VER%%/http-2.7.13.tm
+lib/tcl%%TCL_VER%%/http1.0/http.tcl
+lib/tcl%%TCL_VER%%/http1.0/pkgIndex.tcl
+lib/tcl%%TCL_VER%%/msgcat-1.5.2.tm
+lib/tcl%%TCL_VER%%/opt0.4/optparse.tcl
+lib/tcl%%TCL_VER%%/opt0.4/pkgIndex.tcl
+lib/tcl%%TCL_VER%%/platform-1.0.14.tm
+lib/tcl%%TCL_VER%%/platform/shell-1.1.4.tm
+lib/tcl%%TCL_VER%%/tcltest-2.3.8.tm
diff --git a/lang/tcl86/Makefile b/lang/tcl86/Makefile
index 13d7700d3aad..a450be96de30 100644
--- a/lang/tcl86/Makefile
+++ b/lang/tcl86/Makefile
@@ -18,13 +18,12 @@ LICENSE_NAME=	Tcl/Tk License
 LICENSE_FILE=	${WRKSRC}/../license.terms
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-OPTIONS_DEFINE=	TCLMAN TZDATA MODULES THREADS DEBUG
+OPTIONS_DEFINE=	TCLMAN TZDATA THREADS DEBUG
 OPTIONS_DEFINE_amd64=	DTRACE
-OPTIONS_DEFAULT=MODULES THREADS
+OPTIONS_DEFAULT=THREADS
 OPTIONS_DEFAULT_amd64=	DTRACE
 TCLMAN_DESC=	Install Tcl function manpages
 TZDATA_DESC=	Install Tcl timezone data
-MODULES_DESC=	Install Tcl common modules
 OPTIONS_SUB=	yes
 
 .if !exists(/usr/sbin/dtrace)
@@ -37,7 +36,7 @@ PATCH_WRKSRC=	${WRKDIR}/${PORTNAME}${PORTVERSION}
 WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION}/unix
 
 ALL_TARGET=	all
-INSTALL_TARGET=	install-strip install-libraries
+INSTALL_TARGET=	install-strip install-libraries install-modules
 TEST_TARGET=	test-tcl
 
 USE_LDCONFIG=	yes
@@ -59,7 +58,6 @@ PLIST_SUB=	TCL_VER=${TCL_VER} \
 
 TCLMAN_INSTALL_TARGET=	install-doc
 TZDATA_INSTALL_TARGET=	install-tzdata
-MODULES_INSTALL_TARGET=	install-modules
 THREADS_CONFIGURE_ENABLE=	threads
 DEBUG_CONFIGURE_ENABLE=	symbols
 DTRACE_CONFIGURE_ENABLE=	dtrace
diff --git a/lang/tcl86/pkg-plist b/lang/tcl86/pkg-plist
index 2a04cbb1da57..66b7789b2f1c 100644
--- a/lang/tcl86/pkg-plist
+++ b/lang/tcl86/pkg-plist
@@ -39,15 +39,15 @@ include/tcl%%TCL_VER%%/tclOO.h
 include/tcl%%TCL_VER%%/tclOODecls.h
 include/tcl%%TCL_VER%%/tclTomMath.h
 include/tcl%%TCL_VER%%/tclTomMathDecls.h
-%%MODULES%%lib/tcl%%TCL_VER%%/http-2.8.12.tm
-%%MODULES%%lib/tcl%%TCL_VER%%/http1.0/http.tcl
-%%MODULES%%lib/tcl%%TCL_VER%%/http1.0/pkgIndex.tcl
-%%MODULES%%lib/tcl%%TCL_VER%%/msgcat-1.6.1.tm
-%%MODULES%%lib/tcl%%TCL_VER%%/opt0.4/optparse.tcl
-%%MODULES%%lib/tcl%%TCL_VER%%/opt0.4/pkgIndex.tcl
-%%MODULES%%lib/tcl%%TCL_VER%%/platform-1.0.14.tm
-%%MODULES%%lib/tcl%%TCL_VER%%/platform/shell-1.1.4.tm
-%%MODULES%%lib/tcl%%TCL_VER%%/tcltest-2.4.1.tm
+lib/tcl%%TCL_VER%%/http-2.8.12.tm
+lib/tcl%%TCL_VER%%/http1.0/http.tcl
+lib/tcl%%TCL_VER%%/http1.0/pkgIndex.tcl
+lib/tcl%%TCL_VER%%/msgcat-1.6.1.tm
+lib/tcl%%TCL_VER%%/opt0.4/optparse.tcl
+lib/tcl%%TCL_VER%%/opt0.4/pkgIndex.tcl
+lib/tcl%%TCL_VER%%/platform-1.0.14.tm
+lib/tcl%%TCL_VER%%/platform/shell-1.1.4.tm
+lib/tcl%%TCL_VER%%/tcltest-2.4.1.tm
 lib/tcl%%TCL_VER%%/auto.tcl
 lib/tcl%%TCL_VER%%/clock.tcl
 lib/tcl%%TCL_VER%%/encoding/ascii.enc