mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-18 19:49:40 +00:00
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>
This commit is contained in:
parent
2838ce1052
commit
3310c2fb17
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=457841
@ -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} \
|
||||
|
@ -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
|
||||
|
@ -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 \
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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
|
||||
|
@ -2,7 +2,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= tk
|
||||
PORTVERSION= 8.6.7
|
||||
PORTVERSION= 8.6.8
|
||||
CATEGORIES= x11-toolkits
|
||||
MASTER_SITES= SF/tcl/Tcl/${PORTVERSION} TCLTK/tcl8_6
|
||||
PKGNAMESUFFIX= ${PORTVERSION:R:S/.//}
|
||||
|
@ -1,3 +1,3 @@
|
||||
TIMESTAMP = 1503162035
|
||||
SHA256 (tk8.6.7-src.tar.gz) = 061de2a354f9b7c7d04de3984c90c9bc6dd3a1b8377bb45509f1ad8a8d6337aa
|
||||
SIZE (tk8.6.7-src.tar.gz) = 4282972
|
||||
TIMESTAMP = 1514889188
|
||||
SHA256 (tk8.6.8-src.tar.gz) = 49e7bca08dde95195a27f594f7c850b088be357a7c7096e44e1158c7a5fd7b33
|
||||
SIZE (tk8.6.8-src.tar.gz) = 4319854
|
||||
|
@ -79,7 +79,7 @@
|
||||
- @$(INSTALL_DATA) tk.pc $(LIB_INSTALL_DIR)/pkgconfig/tk.pc
|
||||
+ @echo "Installing pkg-config file to $(INSTALL_ROOT)$(prefix)/libdata/pkgconfig/"
|
||||
+ @$(INSTALL_DATA_DIR) $(INSTALL_ROOT)$(prefix)/libdata/pkgconfig
|
||||
+ @$(INSTALL_DATA) tk.pc $(INSTALL_ROOT)$(prefix)/libdata/pkgconfig/tk.pc
|
||||
+ @$(INSTALL_DATA) tk.pc $(INSTALL_ROOT)$(prefix)/libdata/pkgconfig/tk86.pc
|
||||
|
||||
install-libraries: libraries
|
||||
@for i in "$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)/images" \
|
||||
|
@ -586,4 +586,4 @@ lib/tk%%TK_VER%%/xmfbox.tcl
|
||||
%%TKMAN%%man/mann/ttk_widget.tk86.n.gz
|
||||
%%TKMAN%%man/mann/winfo.tk86.n.gz
|
||||
%%TKMAN%%man/mann/wm.tk86.n.gz
|
||||
libdata/pkgconfig/tk.pc
|
||||
libdata/pkgconfig/tk86.pc
|
||||
|
Loading…
Reference in New Issue
Block a user