cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 8.6.7.

Browse Source
This commit is contained in:
stu 2017-11-04 18:55:26 +00:00
parent d36bdc3591
commit 78c6d1ac0a
7 changed files with 68 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lang/tcl/8.6/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.18 2017/06/04 23:21:02 schwarze Exp $
# $OpenBSD: Makefile,v 1.19 2017/11/04 18:55:26 stu Exp $
COMMENT = Tool Command Language
P = 6
P = 7
DISTNAME = tcl8.6.${P}
PKGNAME = tcl-8.6.${P}
REVISION = 0
SHARED_LIBS = tcl86 1.${P}
CATEGORIES = lang lang/tcl
HOMEPAGE = http://www.tcl.tk/
@ -54,9 +53,9 @@ TESTFLAGS =
# These tests will always fail due to assumptions that don't hold on OpenBSD.
# Skip them until they're improved.
# fCmd-9.4.b expects to be able to overwrite a read-only directory.
# http-4.14 and many socket-14.* expect certain socket errors to occur
# Many socket-14.* expect certain socket errors to occur
# later rather than sooner. Bug 2911139.
TESTFLAGS += -skip 'fCmd-9.4.b http-4.14 socket-14.*'
TESTFLAGS += -skip 'fCmd-9.4.b socket-14.*'
pre-configure:
@${SUBST_CMD} ${WRKDIST}/library/init.tcl

4
lang/tcl/8.6/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (tcl-core8.6.6-src.tar.gz) = SvoALqwCFr/QVkMTXujCJ7rFM9r0zubDijfgU8S2RpY=
SIZE (tcl-core8.6.6-src.tar.gz) = 5868427
SHA256 (tcl-core8.6.7-src.tar.gz) = hEH7vOe3+UoPU+z75eC+WKqLu27v7/f0NnHU5tcCidE=
SIZE (tcl-core8.6.7-src.tar.gz) = 5875027

9
lang/tcl/8.6/patches/patch-tests_binary_test
View File

@ -1,7 +1,8 @@
$OpenBSD: patch-tests_binary_test,v 1.2 2013/09/22 10:33:13 stu Exp $
--- tests/binary.test.orig Tue Sep 17 08:14:17 2013
+++ tests/binary.test Tue Sep 17 20:54:45 2013
@@ -2822,7 +2822,7 @@ test binary-75.26 {binary decode uuencode} -body {
$OpenBSD: patch-tests_binary_test,v 1.3 2017/11/04 18:55:26 stu Exp $
Index: tests/binary.test
--- tests/binary.test.orig
+++ tests/binary.test
@@ -2834,7 +2834,7 @@ test binary-75.26 {binary decode uuencode} -body {
test binary-76.1 {binary string appending growth algorithm} unix {
# Create zero-length byte array first
set f [open /dev/null rb]

25
lang/tcl/8.6/patches/patch-unix_Makefile_in
View File

@ -1,6 +1,7 @@
$OpenBSD: patch-unix_Makefile_in,v 1.6 2017/05/10 01:20:34 stu Exp $
--- unix/Makefile.in.orig Tue Jul 26 10:07:18 2016
+++ unix/Makefile.in Mon Apr 10 02:13:20 2017
$OpenBSD: patch-unix_Makefile_in,v 1.7 2017/11/04 18:55:26 stu Exp $
Index: unix/Makefile.in
--- unix/Makefile.in.orig
+++ unix/Makefile.in
@@ -633,6 +633,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
rm -f $@
@MAKE_STUB_LIB@
@ -41,20 +42,20 @@ $OpenBSD: patch-unix_Makefile_in,v 1.6 2017/05/10 01:20:34 stu Exp $
@@ -841,21 +844,21 @@ install-libraries: libraries
$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \
done;
@echo "Installing package http 2.8.9 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.9.tm;
+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/modules/http-2.8.9.tm;
@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)"/modules/http-2.8.11.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.6.0 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.6.0.tm;
+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/modules/msgcat-1.6.0.tm;
@echo "Installing package tcltest 2.4.0 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.4.0.tm;
+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/modules/tcltest-2.4.0.tm;
@echo "Installing package msgcat 1.6.1 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.6.1.tm;
+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/modules/msgcat-1.6.1.tm;
@echo "Installing package tcltest 2.4.1 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.4.1.tm;
+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/modules/tcltest-2.4.1.tm;
@echo "Installing package platform 1.0.14 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.14.tm;

9
lang/tcl/8.6/patches/patch-unix_configure
View File

@ -1,10 +1,11 @@
$OpenBSD: patch-unix_configure,v 1.6 2017/05/10 01:20:34 stu Exp $
$OpenBSD: patch-unix_configure,v 1.7 2017/11/04 18:55:26 stu Exp $
Setting this here will allow it to propagate through everything.
--- unix/configure.orig Tue Jul 26 10:07:18 2016
+++ unix/configure Mon Apr 10 02:13:20 2017
@@ -19053,7 +19053,7 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
Index: unix/configure
--- unix/configure.orig
+++ unix/configure
@@ -19034,7 +19034,7 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
elif test "$prefix/lib" != "$libdir"; then
TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}"
else

35
lang/tcl/8.6/patches/patch-unix_tclUnixSock_c Normal file
View File

@ -0,0 +1,35 @@
$OpenBSD: patch-unix_tclUnixSock_c,v 1.1 2017/11/04 18:55:26 stu Exp $
gcc error: "#pragma GCC diagnostic not allowed inside functions"
Index: unix/tclUnixSock.c
--- unix/tclUnixSock.c.orig
+++ unix/tclUnixSock.c
@@ -700,6 +700,8 @@ TcpClose2Proc(
*/
#ifndef NEED_FAKE_RFC2553
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstrict-aliasing"
static inline int
IPv6AddressNeedsNumericRendering(
struct in6_addr addr)
@@ -713,16 +715,14 @@ IPv6AddressNeedsNumericRendering(
* at least some versions of OSX.
*/
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
if (!IN6_IS_ADDR_V4MAPPED(&addr)) {
-#pragma GCC diagnostic pop
return 0;
}
return (addr.s6_addr[12] == 0 && addr.s6_addr[13] == 0
&& addr.s6_addr[14] == 0 && addr.s6_addr[15] == 0);
}
+#pragma GCC diagnostic pop
#endif /* NEED_FAKE_RFC2553 */
static void

8
lang/tcl/8.6/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.10 2017/05/10 01:20:34 stu Exp $
@comment $OpenBSD: PLIST,v 1.11 2017/11/04 18:55:26 stu Exp $
@option no-default-conflict
@option is-branch
@conflict tcl->=8.6,<8.7
@ -924,12 +924,12 @@ lib/tcl/tcl8.6/man/mann/
@man lib/tcl/tcl8.6/man/mann/yieldto.n
@man lib/tcl/tcl8.6/man/mann/zlib.n
lib/tcl/tcl8.6/modules/
lib/tcl/tcl8.6/modules/http-2.8.9.tm
lib/tcl/tcl8.6/modules/msgcat-1.6.0.tm
lib/tcl/tcl8.6/modules/http-2.8.11.tm
lib/tcl/tcl8.6/modules/msgcat-1.6.1.tm
lib/tcl/tcl8.6/modules/platform/
lib/tcl/tcl8.6/modules/platform-1.0.14.tm
lib/tcl/tcl8.6/modules/platform/shell-1.1.4.tm
lib/tcl/tcl8.6/modules/tcltest-2.4.0.tm
lib/tcl/tcl8.6/modules/tcltest-2.4.1.tm
lib/tcl/tcl8.6/msgs/
lib/tcl/tcl8.6/msgs/af.msg
lib/tcl/tcl8.6/msgs/af_za.msg