Re: UPDATE: Tcl/Tk 8.5.15 - 8.5.16
Also remove the threaded FLAVOR; I don't see anything using it.
If threaded Tcl is wanted then 8.6 should be used.
Index: Makefile
===
RCS file: /cvs/ports/lang/tcl/8.5/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile11 Jan 2014 12:56:41 - 1.31
+++ Makefile22 Sep 2014 08:07:40 -
@@ -2,10 +2,9 @@
COMMENT = Tool Command Language
-DISTNAME = tcl8.5.15
-PKGNAME = tcl-8.5.15
-REVISION = 2
-SHARED_LIBS = tcl85 1.5
+DISTNAME = tcl8.5.16
+PKGNAME = tcl-8.5.16
+SHARED_LIBS = tcl85 1.6
CATEGORIES = lang lang/tcl
HOMEPAGE = http://www.tcl.tk/
MAINTAINER = Stuart Cassoff s...@users.sourceforge.net
@@ -41,14 +40,6 @@ CONFIGURE_ARGS +=${CONFIGURE_SHARED} \
EXTRA_INSTALL=install-private-headers \
SHLIB_VERSION=${LIBtcl85_VERSION}
-FLAVORS = threaded
-FLAVOR ?=
-
-.if ${FLAVOR:Mthreaded}
-CONFIGURE_ARGS += --enable-threads
-WANTLIB += pthread
-.endif
-
.include bsd.port.arch.mk
.if ${NO_SHARED_LIBS:L} == no
@@ -66,8 +57,8 @@ TESTHOME =${WRKDIR}/testhome
# Use TESTFLAGS to control the Tcl tests
TESTFLAGS =
-# XXX Until Tcl bug 2911139 is fixed; bug is in test, not in Tcl.
-TESTFLAGS += -skip http-4.14
+# XXX Until Tcl bug 2911139 is fixed; bug is in tests, not in Tcl.
+TESTFLAGS += -skip 'http-4.14 socket-14.14'
pre-test:
mkdir -p ${TESTHOME}
Index: distinfo
===
RCS file: /cvs/ports/lang/tcl/8.5/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo20 Sep 2013 10:09:08 - 1.13
+++ distinfo22 Sep 2014 08:07:40 -
@@ -1,2 +1,2 @@
-SHA256 (tcl8.5.15-src.tar.gz) = 8k6q5GF5XmsJv1TH6fON7wJYktpV8mAIwWQTz92iiE4=
-SIZE (tcl8.5.15-src.tar.gz) = 4536117
+SHA256 (tcl8.5.16-src.tar.gz) = omy9sEN9BeWgDJk1cHN+cfpsyQhOGRdNcUCXtcuqwbE=
+SIZE (tcl8.5.16-src.tar.gz) = 4545982
Index: patches/patch-unix_Makefile_in
===
RCS file: /cvs/ports/lang/tcl/8.5/patches/patch-unix_Makefile_in,v
retrieving revision 1.12
diff -u -p -r1.12 patch-unix_Makefile_in
--- patches/patch-unix_Makefile_in 20 Sep 2013 10:09:08 - 1.12
+++ patches/patch-unix_Makefile_in 22 Sep 2014 08:07:40 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-unix_Makefile_in,v 1.12 2013/09/20 10:09:08 stu Exp $
unix/Makefile.in.orig Fri Nov 9 10:14:39 2012
-+++ unix/Makefile.in Wed Nov 14 07:50:42 2012
-@@ -558,6 +558,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
+--- unix/Makefile.in.orig Wed Jul 23 09:03:24 2014
unix/Makefile.in Sun Aug 17 15:22:06 2014
+@@ -565,6 +565,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
rm -f $@
@MAKE_STUB_LIB@
@@ -12,15 +12,24 @@ $OpenBSD: patch-unix_Makefile_in,v 1.12
# Make target which outputs the list of the .o contained in the Tcl lib useful
# to build a single big shared library containing Tcl and other extensions.
# Used for the Tcl Plugin. -- dl
-@@ -719,7 +723,6 @@ install-binaries: binaries
+@@ -726,7 +730,6 @@ install-binaries: binaries
done;
@echo Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/
@@INSTALL_LIB@
-- @chmod 555 $(DLL_INSTALL_DIR)/$(LIB_FILE)
+- @chmod 555 $(DLL_INSTALL_DIR)/$(LIB_FILE)
@echo Installing ${TCL_EXE} as
$(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@
- @$(INSTALL_PROGRAM) ${TCL_EXE}
$(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@
+ @$(INSTALL_PROGRAM) ${TCL_EXE}
$(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@
@echo Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/
-@@ -739,7 +742,7 @@ install-libraries: libraries $(INSTALL_TZDATA) install
+@@ -738,7 +741,7 @@ install-binaries: binaries
+ @EXTRA_INSTALL_BINARIES@
+ @echo Installing pkg-config file to $(LIB_INSTALL_DIR)/pkgconfig/
+ @mkdir -p $(LIB_INSTALL_DIR)/pkgconfig
+- @$(INSTALL_DATA) tcl.pc $(LIB_INSTALL_DIR)/pkgconfig/tcl.pc
++ @$(INSTALL_DATA) tcl.pc $(LIB_INSTALL_DIR)/pkgconfig/tcl85.pc
+
+ install-libraries: libraries $(INSTALL_TZDATA) install-msgs
+ @for i in $(INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \
+@@ -749,7 +752,7 @@ install-libraries: libraries $(INSTALL_TZDATA) install
else true; \
fi; \
done;
@@ -29,12 +38,12 @@ $OpenBSD: patch-unix_Makefile_in,v 1.12
do \
if [ ! -d $(SCRIPT_INSTALL_DIR)/$$i ] ; then \
echo Making directory $(SCRIPT_INSTALL_DIR)/$$i; \
-@@ -767,21 +770,21 @@ install-libraries: libraries $(INSTALL_TZDATA) install
+@@ -777,21 +780,21 @@ install-libraries: libraries $(INSTALL_TZDATA) install
$(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR)/http1.0; \
done;
- @echo
Re: UPDATE: Tcl/Tk 8.5.15 - 8.5.16
I don't think this will be problematic; Tcl is very stable and smooth in the upgrade. k?
Re: UPDATE: Tcl/Tk 8.5.15 - 8.5.16
These were mangled as well.
Index: Makefile
===
RCS file: /cvs/ports/lang/tcl/8.5/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile11 Jan 2014 12:56:41 - 1.31
+++ Makefile16 Sep 2014 14:49:45 -
@@ -2,10 +2,9 @@
COMMENT = Tool Command Language
-DISTNAME = tcl8.5.15
-PKGNAME = tcl-8.5.15
-REVISION = 2
-SHARED_LIBS = tcl85 1.5
+DISTNAME = tcl8.5.16
+PKGNAME = tcl-8.5.16
+SHARED_LIBS = tcl85 1.6
CATEGORIES = lang lang/tcl
HOMEPAGE = http://www.tcl.tk/
MAINTAINER = Stuart Cassoff s...@users.sourceforge.net
@@ -66,8 +65,8 @@ TESTHOME =${WRKDIR}/testhome
# Use TESTFLAGS to control the Tcl tests
TESTFLAGS =
-# XXX Until Tcl bug 2911139 is fixed; bug is in test, not in Tcl.
-TESTFLAGS += -skip http-4.14
+# XXX Until Tcl bug 2911139 is fixed; bug is in tests, not in Tcl.
+TESTFLAGS += -skip 'http-4.14 socket-14.14'
pre-test:
mkdir -p ${TESTHOME}
Index: distinfo
===
RCS file: /cvs/ports/lang/tcl/8.5/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo20 Sep 2013 10:09:08 - 1.13
+++ distinfo16 Sep 2014 14:49:45 -
@@ -1,2 +1,2 @@
-SHA256 (tcl8.5.15-src.tar.gz) = 8k6q5GF5XmsJv1TH6fON7wJYktpV8mAIwWQTz92iiE4=
-SIZE (tcl8.5.15-src.tar.gz) = 4536117
+SHA256 (tcl8.5.16-src.tar.gz) = omy9sEN9BeWgDJk1cHN+cfpsyQhOGRdNcUCXtcuqwbE=
+SIZE (tcl8.5.16-src.tar.gz) = 4545982
Index: patches/patch-unix_Makefile_in
===
RCS file: /cvs/ports/lang/tcl/8.5/patches/patch-unix_Makefile_in,v
retrieving revision 1.12
diff -u -p -r1.12 patch-unix_Makefile_in
--- patches/patch-unix_Makefile_in 20 Sep 2013 10:09:08 - 1.12
+++ patches/patch-unix_Makefile_in 16 Sep 2014 14:49:45 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-unix_Makefile_in,v 1.12 2013/09/20 10:09:08 stu Exp $
unix/Makefile.in.orig Fri Nov 9 10:14:39 2012
-+++ unix/Makefile.in Wed Nov 14 07:50:42 2012
-@@ -558,6 +558,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
+--- unix/Makefile.in.orig Wed Jul 23 09:03:24 2014
unix/Makefile.in Sun Aug 17 15:22:06 2014
+@@ -565,6 +565,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
rm -f $@
@MAKE_STUB_LIB@
@@ -12,15 +12,24 @@ $OpenBSD: patch-unix_Makefile_in,v 1.12
# Make target which outputs the list of the .o contained in the Tcl lib useful
# to build a single big shared library containing Tcl and other extensions.
# Used for the Tcl Plugin. -- dl
-@@ -719,7 +723,6 @@ install-binaries: binaries
+@@ -726,7 +730,6 @@ install-binaries: binaries
done;
@echo Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/
@@INSTALL_LIB@
-- @chmod 555 $(DLL_INSTALL_DIR)/$(LIB_FILE)
+- @chmod 555 $(DLL_INSTALL_DIR)/$(LIB_FILE)
@echo Installing ${TCL_EXE} as
$(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@
- @$(INSTALL_PROGRAM) ${TCL_EXE}
$(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@
+ @$(INSTALL_PROGRAM) ${TCL_EXE}
$(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@
@echo Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/
-@@ -739,7 +742,7 @@ install-libraries: libraries $(INSTALL_TZDATA) install
+@@ -738,7 +741,7 @@ install-binaries: binaries
+ @EXTRA_INSTALL_BINARIES@
+ @echo Installing pkg-config file to $(LIB_INSTALL_DIR)/pkgconfig/
+ @mkdir -p $(LIB_INSTALL_DIR)/pkgconfig
+- @$(INSTALL_DATA) tcl.pc $(LIB_INSTALL_DIR)/pkgconfig/tcl.pc
++ @$(INSTALL_DATA) tcl.pc $(LIB_INSTALL_DIR)/pkgconfig/tcl85.pc
+
+ install-libraries: libraries $(INSTALL_TZDATA) install-msgs
+ @for i in $(INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \
+@@ -749,7 +752,7 @@ install-libraries: libraries $(INSTALL_TZDATA) install
else true; \
fi; \
done;
@@ -29,12 +38,12 @@ $OpenBSD: patch-unix_Makefile_in,v 1.12
do \
if [ ! -d $(SCRIPT_INSTALL_DIR)/$$i ] ; then \
echo Making directory $(SCRIPT_INSTALL_DIR)/$$i; \
-@@ -767,21 +770,21 @@ install-libraries: libraries $(INSTALL_TZDATA) install
+@@ -777,21 +780,21 @@ install-libraries: libraries $(INSTALL_TZDATA) install
$(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR)/http1.0; \
done;
- @echo Installing package http 2.7.12 as a Tcl Module;
-- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl
$(SCRIPT_INSTALL_DIR)/../tcl8/8.4/http-2.7.12.tm;
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl
$(SCRIPT_INSTALL_DIR)/modules/8.5/http-2.7.12.tm;
+ @echo Installing package http 2.7.13 as a Tcl Module;
+- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl
$(SCRIPT_INSTALL_DIR)/../tcl8/8.4/http-2.7.13.tm;
++ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl
