Attachment #129702 for bug #173753

View | Details | Raw Unified | Return to bug 173753
Collapse All | Expand All

Lines 1-11 Link Here

(-)tcl85/Makefile (-2 / +1 lines)
1	# Created by: Martin Matuska <mm@FreeBSD.org>	1	# Created by: Martin Matuska <mm@FreeBSD.org>
2	# $FreeBSD: head/lang/tcl85/Makefile 305074 2012-09-30 06:25:19Z rm $	2	# $FreeBSD: head/lang/tcl85/Makefile 305074 2012-09-30 06:25:19Z rm $
3		3
4	PORTNAME?= tcl	4	PORTNAME?= tcl
5	PORTVERSION= 8.5.12	5	PORTVERSION= 8.5.13
6	PORTREVISION= 2
7	CATEGORIES= lang	6	CATEGORIES= lang
8	MASTER_SITES= SF/tcl/Tcl/${PORTVERSION}	7	MASTER_SITES= SF/tcl/Tcl/${PORTVERSION}
9	PKGNAMESUFFIX?= ${THREADS_SUFFIX}${PKGNAMESUFFIX2}	8	PKGNAMESUFFIX?= ${THREADS_SUFFIX}${PKGNAMESUFFIX2}
10	DISTNAME= tcl${PORTVERSION}-src	9	DISTNAME= tcl${PORTVERSION}-src
11		10

Lines 1-2 Link Here

(-)tcl85/distinfo (-2 / +2 lines)
1	SHA256 (tcl8.5.12-src.tar.gz) = 20ba7a10a30571983afd3599f19b441adb5222b21f1d2b27d0fba3ed8d4707c2	1	SHA256 (tcl8.5.13-src.tar.gz) = 9b868dd563e65671a26fcf518b6b86c1bb1b6756f48fdc90f04301d4f3a6596a
2	SIZE (tcl8.5.12-src.tar.gz) = 4501505	2	SIZE (tcl8.5.13-src.tar.gz) = 4513204




Fix the misspelled name of "March" in Ukrainian.

Submitted upstream as:

https://sourceforge.net/tracker/?func=detail&aid=3561330&group_id=10894&atid=310894

--- ../library/msgs/uk.msg	2011-04-26 11:14:03.000000000 -0400
+++ ../library/msgs/uk.msg	2012-08-24 12:52:15.000000000 -0400
@@ -34,5 +34,5 @@
         "\u0441\u0456\u0447\u043d\u044f"\
         "\u043b\u044e\u0442\u043e\u0433\u043e"\
-        "\u0431\u0435\u0440\u0435\u0436\u043d\u044f"\
+        "\u0431\u0435\u0440\u0435\u0437\u043d\u044f"\
         "\u043a\u0432\u0456\u0442\u043d\u044f"\
         "\u0442\u0440\u0430\u0432\u043d\u044f"\




--- Makefile.in.bak	2012-11-20 23:39:58.000000000 -0600
+++ Makefile.in	2012-11-20 23:47:34.000000000 -0600
@@ -54,6 +54,8 @@
 
 # Directory in which to install the include file tcl.h:
 INCLUDE_INSTALL_DIR	= $(INSTALL_ROOT)$(includedir)
+GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic

-CFLAGS			= @CFLAGS_DEFAULT@ @CFLAGS@
+CFLAGS			+= @CFLAGS_DEFAULT@ @CFLAGS@
 
 # Flags to pass to the linker
 LDFLAGS_DEBUG		= @LDFLAGS_DEBUG@
@@ -542,7 +544,7 @@
 
 all: binaries libraries doc
 
-binaries: ${LIB_FILE} $(STUB_LIB_FILE) ${TCL_EXE}
+binaries: ${LIB_FILE} $(STUB_LIB_FILE) ${TCL_EXE} libtcl${SHORT_TCL_VER}.a
 
 libraries:
 
@@ -553,6 +555,14 @@
 ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
 	rm -f $@
 	@MAKE_LIB@
+	@ln -sf $(LIB_FILE) ./libtcl${SHORT_TCL_VER}.so
+	if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \
+		$(RANLIB) ${LIB_FILE}; \
+	fi;
+
+libtcl${SHORT_TCL_VER}.a: ${OBJS}
+	rm -f libtcl${SHORT_TCL_VER}.a
+	ar cr libtcl${SHORT_TCL_VER}.a ${OBJS}
+	$(RANLIB) libtcl${SHORT_TCL_VER}.a
 
 ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
 	rm -f $@
@@ -694,7 +704,7 @@
 dltest.marker: ${STUB_LIB_FILE}
 	cd dltest ; $(MAKE)
 
-INSTALL_TARGETS = install-binaries install-libraries install-doc @EXTRA_INSTALL@
+INSTALL_TARGETS = install-binaries install-libraries @EXTRA_INSTALL@
 
 install: $(INSTALL_TARGETS)
 
@@ -720,10 +730,17 @@
 	@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
 	@@INSTALL_LIB@
 	@chmod 555 "$(DLL_INSTALL_DIR)"/$(LIB_FILE)
+	@ln -sf $(LIB_FILE) "$(DLL_INSTALL_DIR)"/libtcl${SHORT_TCL_VER}.so
+	@echo "Installing libtcl${SHORT_TCL_VER}.a"
+	@$(INSTALL_DATA) libtcl${SHORT_TCL_VER}.a \
+		"$(DLL_INSTALL_DIR)"/libtcl${SHORT_TCL_VER}.a
+	@(cd "$(DLL_INSTALL_DIR)"; $(RANLIB) libtcl${SHORT_TCL_VER}.a)
+	@chmod 555 "$(DLL_INSTALL_DIR)"/libtcl${SHORT_TCL_VER}.a
+
 	@echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@"
+	@echo "Installing tclConfig.sh to $(SCRIPT_INSTALL_DIR)/"
+	@mkdir -p "$(SCRIPT_INSTALL_DIR)"
+	@$(INSTALL_DATA) tclConfig.sh "$(SCRIPT_INSTALL_DIR)"/tclConfig.sh
 	@$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)"/tclsh$(VERSION)@EXEEXT@
-	@echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/"
-	@$(INSTALL_DATA) tclConfig.sh "$(CONFIG_INSTALL_DIR)"/tclConfig.sh
+	@echo "Installing tclConfig.sh to $(SCRIPT_INSTALL_DIR)/"
+	@mkdir -p "$(SCRIPT_INSTALL_DIR)"
+	@$(INSTALL_DATA) tclConfig.sh "$(SCRIPT_INSTALL_DIR)"/tclConfig.sh
 	@if test "$(STUB_LIB_FILE)" != "" ; then \
 	    echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
 	    @INSTALL_STUB_LIB@ ; \
@@ -731,7 +748,8 @@
 	@EXTRA_INSTALL_BINARIES@
 
 install-libraries: libraries $(INSTALL_TZDATA) install-msgs
-	@for i in "$(INCLUDE_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)"; \
+	@for i in "$(GENERIC_INCLUDE_INSTALL_DIR)" \
+		"$(UNIX_INCLUDE_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)"; \
 	    do \
 	    if [ ! -d "$$i" ] ; then \
 		echo "Making directory $$i"; \
@@ -739,7 +757,7 @@
 		else true; \
 		fi; \
 	    done;
-	@for i in opt0.4 http1.0 encoding ../tcl8 ../tcl8/8.4  ../tcl8/8.4/platform ../tcl8/8.5; \
+	@for i in opt0.4 http1.0 encoding; \
 	    do \
 	    if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
 		echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
@@ -748,13 +766,17 @@
 		fi; \
 	    done;
 	@echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
-	@for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \
-		$(GENERIC_DIR)/tclPlatDecls.h \
-		$(GENERIC_DIR)/tclTomMath.h \
-		$(GENERIC_DIR)/tclTomMathDecls.h ; \
+	@for i in $(GENERIC_DIR)/*.h ; \

+	    $(INSTALL_DATA) $$i "$(UNIX_INCLUDE_INSTALL_DIR)"; \
 	    done;
+	@ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tcl.h "$(INCLUDE_INSTALL_DIR)"/tcl.h
+	@ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tclDecls.h "$(INCLUDE_INSTALL_DIR)"/tclDecls.h
+	@ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tclPlatDecls.h "$(INCLUDE_INSTALL_DIR)"/tclPlatDecls.h
 	@echo "Installing library files to $(SCRIPT_INSTALL_DIR)/";
 	@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex \
 		$(UNIX_DIR)/tclAppInit.c @LDAIX_SRC@ @DTRACE_SRC@; \
@@ -766,23 +788,11 @@
 	    do \
 	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \
 	    done;
-	@echo "Installing package http 2.7.10 as a Tcl Module";
-	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.10.tm;
 	@echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/";
 	@for i in $(TOP_DIR)/library/opt/*.tcl ; \
 	    do \
 	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/opt0.4; \
 	    done;
-	@echo "Installing package msgcat 1.5.0 as a Tcl Module";
-	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.5.0.tm;
-	@echo "Installing package tcltest 2.3.4 as a Tcl Module";
-	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.4.tm;
-
-	@echo "Installing package platform 1.0.10 as a Tcl Module";
-	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.10.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 encoding files to $(SCRIPT_INSTALL_DIR)/encoding/";
 	@for i in $(TOP_DIR)/library/encoding/*.enc ; do \
 		$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/encoding; \
@@ -792,6 +802,27 @@
 	    echo "if {![interp issafe]} { ::tcl::tm::roots {$(TCL_MODULE_PATH)} }" >> \
 	        "$(SCRIPT_INSTALL_DIR)"/tm.tcl; \
 	fi
 
+install-tm:
+	@for i in tcl8 tcl8/8.4 tcl8/8.4/platform tcl8/8.5; \
+	    do \
+	if [ ! -d "$(LIB_INSTALL_DIR)"/$$i ] ; then \
+		echo "Making directory $(LIB_INSTALL_DIR)/$$i"; \
+		mkdir -p "$(LIB_INSTALL_DIR)"/$$i; \
+		chmod 755 "$(LIB_INSTALL_DIR)"/$$i; \
+		else true; \
+		fi; \
+	done;
+	@echo "Installing package http 2.7.9 as a Tcl Module";
+	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/http-2.7.9.tm;
+	@echo "Installing package msgcat 1.4.5 as a Tcl Module";
+	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.5/msgcat-1.4.5.tm;
+	@echo "Installing package tcltest 2.3.4 as a Tcl Module";

+
+	@echo "Installing package platform 1.0.10 as a Tcl Module";
+	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/platform-1.0.10.tm;
+	@echo "Installing package platform::shell 1.1.4 as a Tcl Module";
+	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/platform/shell-1.1.4.tm;
 
 install-tzdata: ${TCL_EXE}
 	@echo "Installing time zone files to $(SCRIPT_INSTALL_DIR)/tzdata/"
@@ -823,18 +854,23 @@
@@ -825,21 +860,26 @@
 		else true; \
 		fi; \
 	    done;
-	@echo "Installing and cross-linking top-level (.1) docs to $(MAN1_INSTALL_DIR)/";
-	@for i in $(TOP_DIR)/doc/*.1; do \
-	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \
-	done
 	@echo "Installing and cross-linking C API (.3) docs to $(MAN3_INSTALL_DIR)/";
 	@echo "Installing and cross-linking C API (.3) docs";
 	@for i in $(TOP_DIR)/doc/*.3; do \
-	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \
-	done
+	$(BSD_INSTALL_MAN) $$i "$(MAN3_INSTALL_DIR)"; \
+	done;
 	@echo "Installing and cross-linking command (.n) docs to $(MANN_INSTALL_DIR)/";
 	@for i in $(TOP_DIR)/doc/*.n; do \
-	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \
-	done
+	$(BSD_INSTALL_MAN) $$i "$(MANN_INSTALL_DIR)"; \
+	done;
+	@echo "**********"
+	@echo "IMPORTANT:"
+	@echo "**********"
+	@echo "tclConfig.sh in $(SCRIPT_INSTALL_DIR)/tclConfig.sh"
+	@echo "tcl.h        in $(INCLUDE_INSTALL_DIR)/tcl.h"
+	@echo "tclDecls.h   in $(INCLUDE_INSTALL_DIR)/tclDecls.h"
+	@echo "There are NOT default place, but good place to avoid"
+	@echo "conflicting with another version of Tcl/Tks."
+
 
 # Optional target to install private headers
 install-private-headers: libraries
@@ -1537,7 +1573,7 @@
 			match=1; \
 		    fi; \
 		done; \
-		if [ $$match -eq 0 ]; then echo $$i; fi \
+		if [ $$match -eq 0 ]; then echo $$i; fi; \
 	done
 
 #
@@ -1554,7 +1590,7 @@
 			match=1; \
 		    fi; \
 		done; \
-		if [ $$match -eq 0 ]; then echo $$i; fi \
+		if [ $$match -eq 0 ]; then echo $$i; fi; \
 	done
 
 #

Return to bug 173753

Lines 1-15 Link Here

(-)tcl85/files/patch-uk-locale (-15 lines)
1	Fix the misspelled name of "March" in Ukrainian.
2
3	Submitted upstream as:
4
5	https://sourceforge.net/tracker/?func=detail&aid=3561330&group_id=10894&atid=310894
6
7	--- ../library/msgs/uk.msg 2011-04-26 11:14:03.000000000 -0400
8	+++ ../library/msgs/uk.msg 2012-08-24 12:52:15.000000000 -0400
9	@@ -34,5 +34,5 @@
10	"\u0441\u0456\u0447\u043d\u044f"\
11	"\u043b\u044e\u0442\u043e\u0433\u043e"\
12	- "\u0431\u0435\u0440\u0435\u0436\u043d\u044f"\
13	+ "\u0431\u0435\u0440\u0435\u0437\u043d\u044f"\
14	"\u043a\u0432\u0456\u0442\u043d\u044f"\
15	"\u0442\u0440\u0430\u0432\u043d\u044f"\

Lines 1-7 Link Here

(-)tcl85/files/patch-unix-Makefile.in (-46 / +61 lines)
1	--- Makefile.in.orig 2012-07-25 18:45:05.000000000 +0200	1	--- Makefile.in.bak 2012-11-20 23:39:58.000000000 -0600
2	+++ Makefile.in 2012-08-02 15:10:04.590514599 +0200	2	+++ Makefile.in 2012-11-20 23:47:34.000000000 -0600
3	@@ -54,6 +54,8 @@	3	@@ -54,6 +54,8 @@
4		4
5	# Directory in which to install the include file tcl.h:	5	# Directory in which to install the include file tcl.h:
6	INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)	6	INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)
7	+GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic	7	+GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic
Lines 16-103 Link Here
16	-CFLAGS = @CFLAGS_DEFAULT@ @CFLAGS@	16	-CFLAGS = @CFLAGS_DEFAULT@ @CFLAGS@
17	+CFLAGS += @CFLAGS_DEFAULT@ @CFLAGS@	17	+CFLAGS += @CFLAGS_DEFAULT@ @CFLAGS@
18		18
19	# Flags to pass to the linker	19	# Flags to pass to the linker
20	LDFLAGS_DEBUG = @LDFLAGS_DEBUG@	20	LDFLAGS_DEBUG = @LDFLAGS_DEBUG@
21	@@ -541,7 +543,7 @@	21	@@ -542,7 +544,7 @@
22		22
23	all: binaries libraries doc	23	all: binaries libraries doc
24		24
25	-binaries: ${LIB_FILE} $(STUB_LIB_FILE) ${TCL_EXE}	25	-binaries: ${LIB_FILE} $(STUB_LIB_FILE) ${TCL_EXE}
26	+binaries: ${LIB_FILE} $(STUB_LIB_FILE) ${TCL_EXE} libtcl${SHORT_TCL_VER}.a	26	+binaries: ${LIB_FILE} $(STUB_LIB_FILE) ${TCL_EXE} libtcl${SHORT_TCL_VER}.a
27		27
28	libraries:	28	libraries:
29		29
30	@@ -552,6 +554,15 @@	30	@@ -553,6 +555,14 @@
31	${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}	31	${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
32	rm -f $@	32	rm -f $@
33	@MAKE_LIB@	33	@MAKE_LIB@
34	+ @ln -sf $(LIB_FILE) ./libtcl${SHORT_TCL_VER}.so	34	+ @ln -sf $(LIB_FILE) ./libtcl${SHORT_TCL_VER}.so
35	+ if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \	35	+ if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \
36	+ $(RANLIB) ${LIB_FILE}; \	36	+ $(RANLIB) ${LIB_FILE}; \
37	+ fi	37	+ fi;
38	+
39	+libtcl${SHORT_TCL_VER}.a: ${OBJS}	38	+libtcl${SHORT_TCL_VER}.a: ${OBJS}
40	+ rm -f libtcl${SHORT_TCL_VER}.a	39	+ rm -f libtcl${SHORT_TCL_VER}.a
41	+ ar cr libtcl${SHORT_TCL_VER}.a ${OBJS}	40	+ ar cr libtcl${SHORT_TCL_VER}.a ${OBJS}
42	+ $(RANLIB) libtcl${SHORT_TCL_VER}.a	41	+ $(RANLIB) libtcl${SHORT_TCL_VER}.a
43		42
44	${STUB_LIB_FILE}: ${STUB_LIB_OBJS}	43	${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
45	rm -f $@	44	rm -f $@
46	@@ -693,7 +704,7 @@	45	@@ -694,7 +704,7 @@
47	dltest.marker: ${STUB_LIB_FILE}	46	dltest.marker: ${STUB_LIB_FILE}
48	cd dltest ; $(MAKE)	47	cd dltest ; $(MAKE)
49		48
50	-INSTALL_TARGETS = install-binaries install-libraries install-doc @EXTRA_INSTALL@	49	-INSTALL_TARGETS = install-binaries install-libraries install-doc @EXTRA_INSTALL@
51	+INSTALL_TARGETS = install-binaries install-libraries @EXTRA_INSTALL@	50	+INSTALL_TARGETS = install-binaries install-libraries @EXTRA_INSTALL@
52		51
53	install: $(INSTALL_TARGETS)	52	install: $(INSTALL_TARGETS)
54		53
55	@@ -723,10 +734,18 @@	54	@@ -720,10 +730,17 @@
56	@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"	55	@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
57	@@INSTALL_LIB@	56	@@INSTALL_LIB@
58	@chmod 555 "$(DLL_INSTALL_DIR)"/$(LIB_FILE)	57	@chmod 555 "$(DLL_INSTALL_DIR)"/$(LIB_FILE)
59	+ @ln -sf $(LIB_FILE) "$(DLL_INSTALL_DIR)"/libtcl${SHORT_TCL_VER}.so	58	+ @ln -sf $(LIB_FILE) "$(DLL_INSTALL_DIR)"/libtcl${SHORT_TCL_VER}.so
60	+ @echo "Installing libtcl${SHORT_TCL_VER}.a"	59	+ @echo "Installing libtcl${SHORT_TCL_VER}.a"
61	+ @$(INSTALL_DATA) libtcl${SHORT_TCL_VER}.a \	60	+ @$(INSTALL_DATA) libtcl${SHORT_TCL_VER}.a \
62	+ "$(DLL_INSTALL_DIR)"/libtcl${SHORT_TCL_VER}.a	61	+ "$(DLL_INSTALL_DIR)"/libtcl${SHORT_TCL_VER}.a
63	+ @(cd "$(DLL_INSTALL_DIR)"; $(RANLIB) libtcl${SHORT_TCL_VER}.a)	62	+ @(cd "$(DLL_INSTALL_DIR)"; $(RANLIB) libtcl${SHORT_TCL_VER}.a)
64	+ @chmod 555 "$(DLL_INSTALL_DIR)"/libtcl${SHORT_TCL_VER}.a	63	+ @chmod 555 "$(DLL_INSTALL_DIR)"/libtcl${SHORT_TCL_VER}.a
65	+
66	@echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@"	64	@echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@"
		65	+ @echo "Installing tclConfig.sh to $(SCRIPT_INSTALL_DIR)/"
		66	+ @mkdir -p "$(SCRIPT_INSTALL_DIR)"
		67	+ @$(INSTALL_DATA) tclConfig.sh "$(SCRIPT_INSTALL_DIR)"/tclConfig.sh
67	@$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)"/tclsh$(VERSION)@EXEEXT@	68	@$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)"/tclsh$(VERSION)@EXEEXT@
68	- @echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/"	69	- @echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/"
69	- @$(INSTALL_DATA) tclConfig.sh "$(CONFIG_INSTALL_DIR)"/tclConfig.sh	70	- @$(INSTALL_DATA) tclConfig.sh "$(CONFIG_INSTALL_DIR)"/tclConfig.sh
70	+ @echo "Installing tclConfig.sh to $(SCRIPT_INSTALL_DIR)/"
71	+ @mkdir -p "$(SCRIPT_INSTALL_DIR)"
72	+ @$(INSTALL_DATA) tclConfig.sh "$(SCRIPT_INSTALL_DIR)"/tclConfig.sh
73	@if test "$(STUB_LIB_FILE)" != "" ; then \	71	@if test "$(STUB_LIB_FILE)" != "" ; then \
74	echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \	72	echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
75	@INSTALL_STUB_LIB@ ; \	73	@INSTALL_STUB_LIB@ ; \
76	@@ -734,7 +753,8 @@	74	@@ -731,7 +748,8 @@
77	@EXTRA_INSTALL_BINARIES@	75	@EXTRA_INSTALL_BINARIES@
78		76
79	install-libraries: libraries $(INSTALL_TZDATA) install-msgs	77	install-libraries: libraries $(INSTALL_TZDATA) install-msgs
80	- @for i in "$(INCLUDE_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)"; \	78	- @for i in "$(INCLUDE_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)"; \
81	+ @for i in "$(GENERIC_INCLUDE_INSTALL_DIR)" \	79	+ @for i in "$(GENERIC_INCLUDE_INSTALL_DIR)" \
82	+ "$(UNIX_INCLUDE_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)"; \	80	+ "$(UNIX_INCLUDE_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)"; \
83	do \	81	do \
84	if [ ! -d "$$i" ] ; then \	82	if [ ! -d "$$i" ] ; then \
85	echo "Making directory $$i"; \	83	echo "Making directory $$i"; \
86	@@ -743,7 +763,7 @@	84	@@ -739,7 +757,7 @@
87	else true; \	85	else true; \
88	fi; \	86	fi; \
89	done;	87	done;
90	- @for i in opt0.4 http1.0 encoding ../tcl8 ../tcl8/8.4 ../tcl8/8.4/platform ../tcl8/8.5; \	88	- @for i in opt0.4 http1.0 encoding ../tcl8 ../tcl8/8.4 ../tcl8/8.4/platform ../tcl8/8.5; \
91	+ @for i in opt0.4 http1.0 encoding; \	89	+ @for i in opt0.4 http1.0 encoding; \
92	do \	90	do \
93	if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \	91	if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
94	echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \	92	echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
95	@@ -756,13 +776,17 @@	93	@@ -748,13 +766,17 @@
96	chmod +x $(SRC_DIR)/../unix/install-sh; \	94	fi; \
97	fi	95	done;
98	@echo "Installing header files";	96	@echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
99	- @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \	97	- @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \
100	- $(GENERIC_DIR)/tclPlatDecls.h \	98	- $(GENERIC_DIR)/tclPlatDecls.h \
101	- $(GENERIC_DIR)/tclTomMath.h \	99	- $(GENERIC_DIR)/tclTomMath.h \
102	- $(GENERIC_DIR)/tclTomMathDecls.h ; \	100	- $(GENERIC_DIR)/tclTomMathDecls.h ; \
103	+ @for i in $(GENERIC_DIR)/*.h ; \	101	+ @for i in $(GENERIC_DIR)/*.h ; \
Lines 110-159 Link Here
110	+ $(INSTALL_DATA) $$i "$(UNIX_INCLUDE_INSTALL_DIR)"; \	108	+ $(INSTALL_DATA) $$i "$(UNIX_INCLUDE_INSTALL_DIR)"; \
111	done;	109	done;
112	+ @ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tcl.h "$(INCLUDE_INSTALL_DIR)"/tcl.h	110	+ @ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tcl.h "$(INCLUDE_INSTALL_DIR)"/tcl.h
113	+ @ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tclDecls.h "$(INCLUDE_INSTALL_DIR)"/tclDecls.h	111	+ @ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tclDecls.h "$(INCLUDE_INSTALL_DIR)"/tclDecls.h
114	+ @ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tclPlatDecls.h "$(INCLUDE_INSTALL_DIR)"/tclPlatDecls.h	112	+ @ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tclPlatDecls.h "$(INCLUDE_INSTALL_DIR)"/tclPlatDecls.h
115	@echo "Installing library files to $(SCRIPT_INSTALL_DIR)";	113	@echo "Installing library files to $(SCRIPT_INSTALL_DIR)/";
116	@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex \	114	@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex \
117	$(UNIX_DIR)/tclAppInit.c @LDAIX_SRC@ @DTRACE_SRC@; \	115	$(UNIX_DIR)/tclAppInit.c @LDAIX_SRC@ @DTRACE_SRC@; \
118	@@ -774,22 +798,11 @@	116	@@ -766,23 +788,11 @@
119	do \	117	do \
120	$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \	118	$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \
121	done;	119	done;
122	- @echo "Installing package http 2.7.9 as a Tcl Module";	120	- @echo "Installing package http 2.7.10 as a Tcl Module";
123	- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.9.tm;	121	- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.10.tm;
124	@echo "Installing library opt0.4 directory";	122	@echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/";
125	@for i in $(TOP_DIR)/library/opt/*.tcl ; \	123	@for i in $(TOP_DIR)/library/opt/*.tcl ; \
126	do \	124	do \
127	$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/opt0.4; \	125	$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/opt0.4; \
128	done;	126	done;
129	- @echo "Installing package msgcat 1.4.5 as a Tcl Module";	127	- @echo "Installing package msgcat 1.5.0 as a Tcl Module";
130	- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.4.5.tm;	128	- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.5.0.tm;
131	- @echo "Installing package tcltest 2.3.4 as a Tcl Module";	129	- @echo "Installing package tcltest 2.3.4 as a Tcl Module";
132	- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.4.tm;	130	- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.4.tm;
133	-	131	-
134	- @echo "Installing package platform 1.0.10 as a Tcl Module";	132	- @echo "Installing package platform 1.0.10 as a Tcl Module";
135	- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.10.tm;	133	- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.10.tm;
136	- @echo "Installing package platform::shell 1.1.4 as a Tcl Module";	134	- @echo "Installing package platform::shell 1.1.4 as a Tcl Module";
137	- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform/shell-1.1.4.tm;	135	- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform/shell-1.1.4.tm;
138		136	-
139	@echo "Installing library encoding directory";	137	@echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/";
140	@for i in $(TOP_DIR)/library/encoding/*.enc ; do \	138	@for i in $(TOP_DIR)/library/encoding/*.enc ; do \
141	@@ -801,6 +814,28 @@	139	$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/encoding; \
		140	@@ -792,6 +802,27 @@
		141	echo "if {![interp issafe]} { ::tcl::tm::roots {$(TCL_MODULE_PATH)} }" >> \
142	"$(SCRIPT_INSTALL_DIR)"/tm.tcl; \	142	"$(SCRIPT_INSTALL_DIR)"/tm.tcl; \
143	fi	143	fi
144
145	+install-tm:	144	+install-tm:
146	+ @for i in tcl8 tcl8/8.4 tcl8/8.4/platform tcl8/8.5; \	145	+ @for i in tcl8 tcl8/8.4 tcl8/8.4/platform tcl8/8.5; \
147	+ do \	146	+ do \
148	+ if [ ! -d "$(LIB_INSTALL_DIR)"/$$i ] ; then \	147	+ if [ ! -d "$(LIB_INSTALL_DIR)"/$$i ] ; then \
149	+ echo "Making directory $(LIB_INSTALL_DIR)/$$i"; \	148	+ echo "Making directory $(LIB_INSTALL_DIR)/$$i"; \
150	+ mkdir -p "$(LIB_INSTALL_DIR)"/$$i; \	149	+ mkdir -p "$(LIB_INSTALL_DIR)"/$$i; \
151	+ chmod 755 "$(LIB_INSTALL_DIR)"/$$i; \	150	+ chmod 755 "$(LIB_INSTALL_DIR)"/$$i; \
152	+ else true; \	151	+ else true; \
153	+ fi; \	152	+ fi; \
154	+ done;	153	+ done;
155	+ @echo "Installing package http 2.7.9 as a Tcl Module";	154	+ @echo "Installing package http 2.7.9 as a Tcl Module";
156	+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/http-2.7.9.tm;	155	+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/http-2.7.9.tm;
157	+ @echo "Installing package msgcat 1.4.5 as a Tcl Module";	156	+ @echo "Installing package msgcat 1.4.5 as a Tcl Module";
158	+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.5/msgcat-1.4.5.tm;	157	+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.5/msgcat-1.4.5.tm;
159	+ @echo "Installing package tcltest 2.3.4 as a Tcl Module";	158	+ @echo "Installing package tcltest 2.3.4 as a Tcl Module";
Lines 161-202 Link Here
161	+	160	+
162	+ @echo "Installing package platform 1.0.10 as a Tcl Module";	161	+ @echo "Installing package platform 1.0.10 as a Tcl Module";
163	+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/platform-1.0.10.tm;	162	+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/platform-1.0.10.tm;
164	+ @echo "Installing package platform::shell 1.1.4 as a Tcl Module";	163	+ @echo "Installing package platform::shell 1.1.4 as a Tcl Module";
165	+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/platform/shell-1.1.4.tm;	164	+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/platform/shell-1.1.4.tm;
166	+	165
167	install-tzdata: ${TCL_EXE}	166	install-tzdata: ${TCL_EXE}
168	@echo "Installing time zone data"	167	@echo "Installing time zone files to $(SCRIPT_INSTALL_DIR)/tzdata/"
169	@@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \	168	@@ -823,18 +854,23 @@
170	@@ -825,21 +860,26 @@
171	else true; \	169	else true; \
172	fi; \	170	fi; \
173	done;	171	done;
174	- @echo "Installing and cross-linking top-level (.1) docs";	172	- @echo "Installing and cross-linking top-level (.1) docs to $(MAN1_INSTALL_DIR)/";
175	- @for i in $(TOP_DIR)/doc/*.1; do \	173	- @for i in $(TOP_DIR)/doc/*.1; do \
176	- $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \	174	- $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \
177	- done	175	- done
178		176	@echo "Installing and cross-linking C API (.3) docs to $(MAN3_INSTALL_DIR)/";
179	@echo "Installing and cross-linking C API (.3) docs";
180	@for i in $(TOP_DIR)/doc/*.3; do \	177	@for i in $(TOP_DIR)/doc/*.3; do \
181	- $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \	178	- $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \
182	+ $(BSD_INSTALL_MAN) $$i "$(MAN3_INSTALL_DIR)"; \	179	- done
183	done	180	+ $(BSD_INSTALL_MAN) $$i "$(MAN3_INSTALL_DIR)"; \
184		181	+ done;
185	@echo "Installing and cross-linking command (.n) docs";	182	@echo "Installing and cross-linking command (.n) docs to $(MANN_INSTALL_DIR)/";
186	@for i in $(TOP_DIR)/doc/*.n; do \	183	@for i in $(TOP_DIR)/doc/*.n; do \
187	- $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \	184	- $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \
188	+ $(BSD_INSTALL_MAN) $$i "$(MANN_INSTALL_DIR)"; \	185	- done
189	done	186	+ $(BSD_INSTALL_MAN) $$i "$(MANN_INSTALL_DIR)"; \
190		187	+ done;
191	+ @echo "**********"	188	+ @echo "**********"
192	+ @echo "IMPORTANT:"	189	+ @echo "IMPORTANT:"
193	+ @echo "**********"	190	+ @echo "**********"
194	+ @echo "tclConfig.sh in $(SCRIPT_INSTALL_DIR)/tclConfig.sh"	191	+ @echo "tclConfig.sh in $(SCRIPT_INSTALL_DIR)/tclConfig.sh"
195	+ @echo "tcl.h in $(INCLUDE_INSTALL_DIR)/tcl.h"	192	+ @echo "tcl.h in $(INCLUDE_INSTALL_DIR)/tcl.h"
196	+ @echo "tclDecls.h in $(INCLUDE_INSTALL_DIR)/tclDecls.h"	193	+ @echo "tclDecls.h in $(INCLUDE_INSTALL_DIR)/tclDecls.h"
197	+ @echo "There are NOT default place, but good place to avoid"	194	+ @echo "There are NOT default place, but good place to avoid"
198	+ @echo "conflicting with another version of Tcl/Tks."	195	+ @echo "conflicting with another version of Tcl/Tks."
199	+	196	+
		197
200	# Optional target to install private headers	198	# Optional target to install private headers
201	install-private-headers: libraries	199	install-private-headers: libraries
202	@for i in "$(PRIVATE_INCLUDE_INSTALL_DIR)"; \	200	@@ -1537,7 +1573,7 @@
		201	match=1; \
		202	fi; \
		203	done; \
		204	- if [ $$match -eq 0 ]; then echo $$i; fi \
		205	+ if [ $$match -eq 0 ]; then echo $$i; fi; \
		206	done
		207
		208	#
		209	@@ -1554,7 +1590,7 @@
		210	match=1; \
		211	fi; \
		212	done; \
		213	- if [ $$match -eq 0 ]; then echo $$i; fi \
		214	+ if [ $$match -eq 0 ]; then echo $$i; fi; \
		215	done
		216
		217	#