- Separate common tcl85 and tcl86 modules to a new port lang/tcl-modules

- Make tcl-modules a slave port of tcl85
- Fix incompatible pkg-lists of tcl85 and tcl86
- Add modules to OPTIONS
- Bump PORTREVISION

3 files changed, 70 insertions, 15 deletions

diff --git a/lang/tcl86/Makefile b/lang/tcl86/Makefile
index cbcfb319db48..783d062fa60d 100644
--- a/lang/tcl86/Makefile
+++ b/lang/tcl86/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tcl
 PORTVERSION=	8.6.b.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tcl
@@ -34,7 +34,8 @@ EXTRACT_AFTER_ARGS=|${TAR} -xpf - --exclude compat/
 
 .if !defined(BUILDING_TCL_THREADS)
 OPTIONS=	TCL86_MAN "Install tcl 8.6 function manpages" off \
-		TZDATA "Install tcl timezone data" off
+		TZDATA "Install tcl timezone data" off \
+		TCL_MODULES "Install tcl common modules" on
 .else
 USE_TCL=	${SHORT_TCL_VER}
 PLIST=		${PKGDIR}/pkg-plist.threads
@@ -44,6 +45,10 @@ LATEST_LINK=	tcl86${THREADS_SUFFIX}
 
 .include <bsd.port.pre.mk>
 
+.if !defined(WITHOUT_TCL_MODULES)
+RUN_DEPENDS+=	${LOCALBASE}/lib/tcl8/8.5/tcltest-2.3.0.tm:${PORTSDIR}/lang/tcl-modules
+.endif
+
 DATADIR=	${PREFIX}/share/${PORTNAME}${TCL_VER}
 
 .if defined(WITH_TZDATA)
diff --git a/lang/tcl86/files/patch-unix-Makefile.in b/lang/tcl86/files/patch-unix-Makefile.in
index cd967be5b7d0..a9f558996a57 100644
--- a/lang/tcl86/files/patch-unix-Makefile.in
+++ b/lang/tcl86/files/patch-unix-Makefile.in
@@ -1,5 +1,5 @@
 --- Makefile.in.orig	2008-12-22 18:45:06.000000000 +0100
-+++ Makefile.in	2009-01-22 11:33:50.707552793 +0100
++++ Makefile.in	2009-03-03 00:22:47.953160997 +0100
 @@ -55,6 +55,8 @@
  
  # Directory in which to install the include file tcl.h:
@@ -92,6 +92,15 @@
  	    do \
  	    if [ ! -d "$$i" ] ; then \
  		echo "Making directory $$i"; \
+@@ -780,7 +801,7 @@
+ 		else true; \
+ 		fi; \
+ 	    done;
+-	@for i in opt0.4 http1.0 encoding ../tcl8 ../tcl8/8.3 ../tcl8/8.4  ../tcl8/8.4/platform ../tcl8/8.5 ../tcl8/8.6; \
++	@for i in opt0.4 http1.0 encoding; \
+ 	    do \
+ 	    if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
+ 		echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
 @@ -793,14 +814,21 @@
  	    chmod +x $(UNIX_DIR)/install-sh; \
  	    fi
@@ -120,7 +129,59 @@
  	@echo "Installing library files to $(SCRIPT_INSTALL_DIR)";
  	@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex \
  		$(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix @DTRACE_SRC@; \
-@@ -868,18 +896,27 @@
+@@ -812,22 +840,11 @@
+ 	    do \
+ 	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \
+ 	    done;
+-	@echo "Installing package http 2.7.2 as a Tcl Module";
+-	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.2.tm;
+ 	@echo "Installing library opt0.4 directory";
+ 	@for i in $(TOP_DIR)/library/opt/*.tcl ; \
+ 	    do \
+ 	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/opt0.4; \
+ 	    done;
+-	@echo "Installing package msgcat 1.4.2 as a Tcl Module";
+-	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.4.2.tm;
+-	@echo "Installing package tcltest 2.3.0 as a Tcl Module";
+-	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.0.tm;
+-
+-	@echo "Installing package platform 1.0.3 as a Tcl Module";
+-	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.3.tm;
+-	@echo "Installing package platform::shell 1.1.4 as a Tcl Module";
+-	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform/shell-1.1.4.tm;
+ 
+ 	@echo "Installing library encoding directory";
+ 	@for i in $(TOP_DIR)/library/encoding/*.enc ; do \
+@@ -839,6 +856,28 @@
+ 	        "$(SCRIPT_INSTALL_DIR)"/tm.tcl; \
+ 	fi
+ 
++install-tm:
++	@for i in ../tcl8 ../tcl8/8.3 ../tcl8/8.4  ../tcl8/8.4/platform ../tcl8/8.5 ../tcl8/8.6; \; \
++	    do \
++	    if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
++		echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
++		mkdir -p "$(SCRIPT_INSTALL_DIR)"/$$i; \
++		chmod 755 "$(SCRIPT_INSTALL_DIR)"/$$i; \
++		else true; \
++		fi; \
++	    done;
++	@echo "Installing package http 2.7.2 as a Tcl Module";
++	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.2.tm;
++	@echo "Installing package msgcat 1.4.2 as a Tcl Module";
++	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.4.2.tm;
++	@echo "Installing package tcltest 2.3.0 as a Tcl Module";
++	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.0.tm;
++
++	@echo "Installing package platform 1.0.3 as a Tcl Module";
++	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.3.tm;
++	@echo "Installing package platform::shell 1.1.4 as a Tcl Module";
++	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform/shell-1.1.4.tm;
++
+ install-tzdata: tclsh
+ 	@echo "Installing time zone data"
+ 	@@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \
+@@ -868,18 +907,27 @@
  	    done;
  	@echo "Installing and cross-linking top-level (.1) docs";
  	@for i in $(TOP_DIR)/doc/*.1; do \
diff --git a/lang/tcl86/pkg-plist b/lang/tcl86/pkg-plist
index db44c63bad5b..d377087398bf 100644
--- a/lang/tcl86/pkg-plist
+++ b/lang/tcl86/pkg-plist
@@ -827,11 +827,6 @@ lib/tcl%%TCL_VER%%/tclIndex
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/US/Pacific-New
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/US/Samoa
 lib/tcl%%TCL_VER%%/word.tcl
-lib/tcl8/8.4/http-2.7.2.tm
-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
 %%DATADIR%%/man.macros
 @dirrm %%DATADIR%%
 %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata/US
@@ -861,12 +856,6 @@ lib/tcl8/8.5/tcltest-2.3.0.tm
 @dirrm lib/tcl%%TCL_VER%%/http1.0
 @dirrm lib/tcl%%TCL_VER%%/encoding
 @dirrmtry lib/tcl%%TCL_VER%%
-@dirrmtry lib/tcl8/8.3
-@dirrmtry lib/tcl8/8.4/platform
-@dirrmtry lib/tcl8/8.4
-@dirrmtry lib/tcl8/8.5
-@dirrmtry lib/tcl8/8.6
-@dirrmtry lib/tcl8
 @dirrm include/tcl%%TCL_VER%%/unix
 @dirrm include/tcl%%TCL_VER%%/generic
 @dirrm include/tcl%%TCL_VER%%