Merge 8.7

4 files changed, 20 insertions, 4 deletions

diff --git a/library/manifest.txt b/library/manifest.txt
index 16092b8..6bbbb51 100644
--- a/library/manifest.txt
+++ b/library/manifest.txt
@@ -8,6 +8,8 @@ apply {{dir} {
     0 http            2.9.1 {http http.tcl}
     1 msgcat          1.7.0  {msgcat msgcat.tcl}
     1 opt             0.4.7  {opt optparse.tcl}
+    0 cookiejar       0.1    {cookiejar cookiejar.tcl}
+    0 tcl::idna       1.0    {cookiejar idna.tcl}
     0 platform        1.0.14 {platform platform.tcl}
     0 platform::shell 1.1.4  {platform shell.tcl}
     1 tcltest         2.5.1  {tcltest tcltest.tcl}
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 5e66a5c..69b80a7 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -1014,7 +1014,7 @@ install-libraries: libraries
 		$(INSTALL_DATA_DIR) "$$i"; \
 	    fi; \
 	done
-	@for i in opt0.4 encoding ../tcl9 ../tcl9/9.0  ../tcl9/9.0/platform; do \
+	@for i in opt0.4 cookiejar0.1 encoding ../tcl9 ../tcl9/9.0  ../tcl9/9.0/platform; do \
 	    if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
 		echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
 		$(INSTALL_DATA_DIR) "$(SCRIPT_INSTALL_DIR)"/$$i; \
diff --git a/win/Makefile.in b/win/Makefile.in
index dae34af..14accef 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -850,7 +850,7 @@ install-libraries: libraries install-tzdata install-msgs
 		else true; \
 		fi; \
 	    done;
-	@for i in opt0.4 encoding ../tcl9 ../tcl9/9.0 ../tcl9/9.0/platform; \
+	@for i in opt0.4 cookiejar0.1 encoding ../tcl9 ../tcl9/9.0 ../tcl9/9.0/platform; \
 	    do \
 	    if [ ! -d $(SCRIPT_INSTALL_DIR)/$$i ] ; then \
 		echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
@@ -863,6 +863,11 @@ install-libraries: libraries install-tzdata install-msgs
 	    do \
 	    $(COPY) "$$i" "$(SCRIPT_INSTALL_DIR)"; \
 	    done;
+	@echo "Installing package cookiejar 0.1 files to $(SCRIPT_INSTALL_DIR)/cookiejar0.1/"
+	@for j in $(ROOT_DIR)/library/cookiejar/*.{tcl,txt.gz}; do \
+	    do \
+	    $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/cookiejar0.1"; \
+	    done;
 	@echo "Installing package http 2.9.1 as a Tcl Module";
 	@$(COPY) $(ROOT_DIR)/library/http/http.tcl $(SCRIPT_INSTALL_DIR)/../tcl9/9.0/http-2.9.1.tm;
 	@echo "Installing library opt0.4 directory";
diff --git a/win/makefile.vc b/win/makefile.vc
index 396a7df..6987818 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -879,6 +879,10 @@ install-binaries:
 install-libraries: tclConfig tcl-nmake install-msgs install-tzdata

 	@if not exist "$(SCRIPT_INSTALL_DIR)" \

 		$(MKDIR) "$(SCRIPT_INSTALL_DIR)"

+	@if not exist "$(SCRIPT_INSTALL_DIR)\opt0.4$(NULL)" \

+		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\opt0.4"

+	@if not exist "$(SCRIPT_INSTALL_DIR)\cookiejar0.1$(NULL)" \

+		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\cookiejar0.1"

 	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl9$(NULL)" \

 		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl9"

 	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl9\9.0$(NULL)" \

@@ -910,8 +914,13 @@ install-libraries: tclConfig tcl-nmake install-msgs install-tzdata
 	@$(CPY) "$(WIN_DIR)\targets.vc"              "$(LIB_INSTALL_DIR)\nmake\"

 	@$(CPY) "$(WIN_DIR)\nmakehlp.c"            "$(LIB_INSTALL_DIR)\nmake\"

 	@$(CPY) "$(OUT_DIR)\tcl.nmake"            "$(LIB_INSTALL_DIR)\nmake\"

-	@echo Installing library opt0.4 directory

-	@$(CPY) "$(ROOT)\library\opt\*.tcl" \

+	@echo Installing package cookiejar 0.1 files to $(SCRIPT_INSTALL_DIR)/cookiejar0.1/

+	@$(CPY) "$(ROOT)\library\cookiejar\*.tcl" \

+	    "$(SCRIPT_INSTALL_DIR)\cookiejar0.1\"

+	@$(CPY) "$(ROOT)\library\cookiejar\*.gz" \

+	    "$(SCRIPT_INSTALL_DIR)\cookiejar0.1\"

+	@echo Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/

+	@$(CPY) "$(ROOT)\library\opt0.4\*.tcl" \

 	    "$(SCRIPT_INSTALL_DIR)\opt0.4\"

 	@echo Installing package http $(PKG_HTTP_VER) as a Tcl Module

 	@$(COPY) "$(ROOT)\library\http\http.tcl" \