lang/tcl86, x11-toolkits/tk86: update to 8.6.8

Announcement: https://sourceforge.net/p/tcl/mailman/message/36166576/

While at it, rename pkg-config files to avoid conflict with Tcl/Tk 8.7 [1].

PR:		224819 [1]
Reported by:	Ting-Wei Lan <lantw44@gmail.com>

5 files changed, 10 insertions, 27 deletions

diff --git a/lang/tcl86/Makefile b/lang/tcl86/Makefile
index 37b8aa894557..13d7700d3aad 100644
--- a/lang/tcl86/Makefile
+++ b/lang/tcl86/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tcl
-PORTVERSION=	8.6.7
+PORTVERSION=	8.6.8
 PORTREVISION=	0
 CATEGORIES=	lang
 MASTER_SITES=	SF/tcl/Tcl/${PORTVERSION} \
diff --git a/lang/tcl86/distinfo b/lang/tcl86/distinfo
index 0596f091bbc6..e7e8b225c15b 100644
--- a/lang/tcl86/distinfo
+++ b/lang/tcl86/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503160359
-SHA256 (tcl8.6.7-src.tar.gz) = 7c6b8f84e37332423cfe5bae503440d88450da8cc1243496249faa5268026ba5
-SIZE (tcl8.6.7-src.tar.gz) = 9687799
+TIMESTAMP = 1514887912
+SHA256 (tcl8.6.8-src.tar.gz) = c43cb0c1518ce42b00e7c8f6eaddd5195c53a98f94adc717234a65cbcfd3f96a
+SIZE (tcl8.6.8-src.tar.gz) = 9793786
diff --git a/lang/tcl86/files/patch-unix-Makefile.in b/lang/tcl86/files/patch-unix-Makefile.in
index fcf9e13f2609..eca4b86ea67e 100644
--- a/lang/tcl86/files/patch-unix-Makefile.in
+++ b/lang/tcl86/files/patch-unix-Makefile.in
@@ -85,7 +85,7 @@
 -	@$(INSTALL_DATA) tcl.pc $(LIB_INSTALL_DIR)/pkgconfig/tcl.pc
 +	@echo "Installing pkg-config file to $(prefix)/libdata/pkgconfig"
 +	@$(INSTALL_DATA_DIR) $(INSTALL_ROOT)$(prefix)/libdata/pkgconfig
-+	@$(INSTALL_DATA) tcl.pc $(INSTALL_ROOT)$(prefix)/libdata/pkgconfig/tcl.pc
++	@$(INSTALL_DATA) tcl.pc $(INSTALL_ROOT)$(prefix)/libdata/pkgconfig/tcl86.pc
 +	@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex \
 +		$(UNIX_DIR)/tclAppInit.c @LDAIX_SRC@ @DTRACE_SRC@; \
 +	    do \
@@ -116,9 +116,9 @@
 @@ -841,31 +865,31 @@ install-libraries: libraries
  	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \
  	    done;
- 	@echo "Installing package http 2.8.11 as a Tcl Module";
--	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.11.tm;
-+	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/http-2.8.11.tm;
+ 	@echo "Installing package http 2.8.12 as a Tcl Module";
+-	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.12.tm;
++	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/http-2.8.12.tm;
  	@echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/";
  	@for i in $(TOP_DIR)/library/opt/*.tcl ; \
  	    do \
diff --git a/lang/tcl86/files/patch-unix-tclUnixSock.c b/lang/tcl86/files/patch-unix-tclUnixSock.c
deleted file mode 100644
index f6ff7fdf0dd2..000000000000
--- a/lang/tcl86/files/patch-unix-tclUnixSock.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- unix/tclUnixSock.c.orig	2017-09-04 07:52:03 UTC
-+++ unix/tclUnixSock.c
-@@ -713,10 +713,14 @@ IPv6AddressNeedsNumericRendering(
-      * at least some versions of OSX.
-      */
- 
-+#if defined (__clang__) || ((__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5))))
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-+#endif
-     if (!IN6_IS_ADDR_V4MAPPED(&addr)) {
-+#if defined (__clang__) || ((__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5))))
- #pragma GCC diagnostic pop
-+#endif
-         return 0;
-     }
- 
diff --git a/lang/tcl86/pkg-plist b/lang/tcl86/pkg-plist
index 791940208550..2a04cbb1da57 100644
--- a/lang/tcl86/pkg-plist
+++ b/lang/tcl86/pkg-plist
@@ -39,7 +39,7 @@ 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.11.tm
+%%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
@@ -1683,4 +1683,4 @@ lib/tcl%%TCL_VER%%/word.tcl
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/W-SU
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/WET
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Zulu
-libdata/pkgconfig/tcl.pc
+libdata/pkgconfig/tcl86.pc