Merge 8.7

9 files changed, 29 insertions, 7 deletions

diff --git a/library/http/cookiejar.tcl b/library/cookiejar/cookiejar.tcl
index 2eae877..2eae877 100644
--- a/library/http/cookiejar.tcl
+++ b/library/cookiejar/cookiejar.tcl
diff --git a/library/http/effective_tld_names.txt.gz b/library/cookiejar/effective_tld_names.txt.gz
index 13e08bb..13e08bb 100644
--- a/library/http/effective_tld_names.txt.gz
+++ b/library/cookiejar/effective_tld_names.txt.gz
diff --git a/library/http/idna.tcl b/library/cookiejar/idna.tcl
index 2a7d289..2a7d289 100644
--- a/library/http/idna.tcl
+++ b/library/cookiejar/idna.tcl
diff --git a/library/cookiejar/pkgIndex.tcl b/library/cookiejar/pkgIndex.tcl
new file mode 100644
index 0000000..a8d8742
--- /dev/null
+++ b/library/cookiejar/pkgIndex.tcl
@@ -0,0 +1,3 @@
+if {![package vsatisfies [package provide Tcl] 8.6-]} {return}
+package ifneeded cookiejar 0.1 [list source [file join $dir cookiejar.tcl]]
+package ifneeded tcl::idna 1.0 [list source [file join $dir idna.tcl]]
diff --git a/library/http/pkgIndex.tcl b/library/http/pkgIndex.tcl
index e126083..f9f1176 100644
--- a/library/http/pkgIndex.tcl
+++ b/library/http/pkgIndex.tcl
@@ -1,4 +1,2 @@
 if {![package vsatisfies [package provide Tcl] 8.6-]} {return}
 package ifneeded http 2.9.1 [list tclPkgSetup $dir http 2.9.1 {{http.tcl source {::http::config ::http::formatQuery ::http::geturl ::http::reset ::http::wait ::http::register ::http::unregister ::http::mapReply}}}]
-package ifneeded cookiejar 0.1 [list source [file join $dir cookiejar.tcl]]
-package ifneeded tcl::idna 1.0 [list source [file join $dir idna.tcl]]
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 77c57cd..6132f3e 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -1016,7 +1016,7 @@ install-libraries: libraries
 		$(INSTALL_DATA_DIR) "$$i"; \
 	    fi; \
 	done
-	@for i in opt0.4 encoding ../tcl8 ../tcl8/8.4  ../tcl8/8.4/platform ../tcl8/8.5 ../tcl8/8.6 ../tcl8/8.7; do \
+	@for i in opt0.4 cookiejar0.1 encoding ../tcl8 ../tcl8/8.4  ../tcl8/8.4/platform ../tcl8/8.5 ../tcl8/8.6 ../tcl8/8.7; do \
 	    if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
 		echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
 		$(INSTALL_DATA_DIR) "$(SCRIPT_INSTALL_DIR)"/$$i; \
@@ -1027,6 +1027,10 @@ install-libraries: libraries
 		$(UNIX_DIR)/tclAppInit.c @LDAIX_SRC@ @DTRACE_SRC@ ; do \
 	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"; \
 	done
+	@echo "Installing package cookiejar 0.1 files to $(SCRIPT_INSTALL_DIR)/cookiejar0.1/"
+	@for i in $(TOP_DIR)/library/cookiejar/*.{tcl,txt.gz}; do \
+	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/cookiejar0.1; \
+	done
 	@echo "Installing package http 2.9.1 as a Tcl Module"
 	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl \
 		"$(MODULE_INSTALL_DIR)"/tcl8/8.6/http-2.9.1.tm
@@ -2205,7 +2209,7 @@ DISTROOT = /tmp/dist
 DISTNAME = tcl${VERSION}${PATCH_LEVEL}
 ZIPNAME	 = tcl${MAJOR_VERSION}${MINOR_VERSION}${PATCH_LEVEL}-src.zip
 DISTDIR	 = $(DISTROOT)/$(DISTNAME)
-BUILTIN_PACKAGE_LIST = http opt msgcat reg dde tcltest platform
+BUILTIN_PACKAGE_LIST = cookiejar http opt msgcat reg dde tcltest platform
 
 $(UNIX_DIR)/configure: $(UNIX_DIR)/configure.ac $(UNIX_DIR)/tcl.m4 \
 		$(UNIX_DIR)/aclocal.m4
@@ -2247,6 +2251,7 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/tcl.pc.in \
 	    mkdir $(DISTDIR)/library/$$i;\
 	    cp -p $(TOP_DIR)/library/$$i/*.tcl $(DISTDIR)/library/$$i; \
 	done
+	cp -p $(TOP_DIR)/library/cookiejar/*.txt.gz $(DISTDIR)/library/cookiejar
 	@mkdir $(DISTDIR)/library/encoding
 	cp -p $(TOP_DIR)/library/encoding/*.enc $(DISTDIR)/library/encoding
 	@mkdir $(DISTDIR)/library/msgs
diff --git a/win/Makefile.in b/win/Makefile.in
index 311374c..9febe60 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -846,7 +846,7 @@ install-libraries: libraries install-tzdata install-msgs
 		else true; \
 		fi; \
 	    done;
-	@for i in opt0.4 encoding ../tcl8 ../tcl8/8.4  ../tcl8/8.4/platform ../tcl8/8.5 ../tcl8/8.6 ../tcl8/8.7; \
+	@for i in opt0.4 cookiejar0.1 encoding ../tcl8 ../tcl8/8.4  ../tcl8/8.4/platform ../tcl8/8.5 ../tcl8/8.6 ../tcl8/8.7; \
 	    do \
 	    if [ ! -d $(SCRIPT_INSTALL_DIR)/$$i ] ; then \
 		echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
@@ -859,6 +859,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)/../tcl8/8.6/http-2.9.1.tm;
 	@echo "Installing library opt0.4 directory";
diff --git a/win/makefile.vc b/win/makefile.vc
index e22f5f9..e5629ff 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -895,6 +895,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" \

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

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

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

 	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8" \

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

 	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4" \

@@ -935,8 +939,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" \