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 --- Makefile 11 Jan 2014 12:56:41 -0000 1.31 +++ Makefile 22 Sep 2014 08:07:40 -0000 @@ -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 --- distinfo 20 Sep 2013 10:09:08 -0000 1.13 +++ distinfo 22 Sep 2014 08:07:40 -0000 @@ -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 -0000 1.12 +++ patches/patch-unix_Makefile_in 22 Sep 2014 08:07:40 -0000 @@ -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 "$(SCRIPT_INSTALL_DIR)"/modules/8.5/http-2.7.13.tm; @echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/"; @for i in $(TOP_DIR)/library/opt/*.tcl ; \ do \ @@ -43,13 +52,13 @@ $OpenBSD: patch-unix_Makefile_in,v 1.12 @echo "Installing package msgcat 1.5.2 as a Tcl Module"; - @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.5.2.tm; + @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/modules/8.5/msgcat-1.5.2.tm; - @echo "Installing package tcltest 2.3.5 as a Tcl Module"; -- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.5.tm; -+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/modules/8.5/tcltest-2.3.5.tm; + @echo "Installing package tcltest 2.3.8 as a Tcl Module"; +- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.8.tm; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/modules/8.5/tcltest-2.3.8.tm; - @echo "Installing package platform 1.0.12 as a Tcl Module"; -- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.12.tm; -+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/modules/8.5/platform-1.0.12.tm; + @echo "Installing package platform 1.0.13 as a Tcl Module"; +- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.13.tm; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/modules/8.5/platform-1.0.13.tm; @echo "Installing package platform::shell 1.1.4 as a Tcl Module"; - @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform/shell-1.1.4.tm; + @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/modules/8.5/platform/shell-1.1.4.tm; Index: patches/patch-unix_installManPage =================================================================== RCS file: patches/patch-unix_installManPage diff -N patches/patch-unix_installManPage --- patches/patch-unix_installManPage 5 Nov 2013 04:45:18 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -$OpenBSD: patch-unix_installManPage,v 1.3 2013/11/05 04:45:18 stu Exp $ - -Put macros after .TH to prevent them from being redefined. Tcl bug 426679ef7d. - ---- unix/installManPage.orig Fri Sep 13 12:07:56 2013 -+++ unix/installManPage Mon Nov 4 11:06:19 2013 -@@ -103,7 +103,7 @@ for Target in $Names; do - rm -f $Dir/$Target $Dir/$Target.* - if test -z "$First" ; then - First=$Target -- sed -e "/man\.macros/r $SrcDir/man.macros" -e "/man\.macros/d" \ -+ sed -e "/man\.macros/d" -e "/\.TH/r $SrcDir/man.macros" \ - $ManPage > $Dir/$First - chmod 444 $Dir/$First - $Gzip $Dir/$First Index: pkg/DESCR =================================================================== RCS file: /cvs/ports/lang/tcl/8.5/pkg/DESCR,v retrieving revision 1.2 diff -u -p -r1.2 DESCR --- pkg/DESCR 1 Oct 2008 19:47:40 -0000 1.2 +++ pkg/DESCR 22 Sep 2014 08:07:40 -0000 @@ -4,5 +4,3 @@ web and desktop applications, networking many more. Open source and business-friendly, Tcl is a mature yet evolving language that is truly cross platform, easily deployed and highly extensible. - -Flavor: threaded - build with thread support Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/lang/tcl/8.5/pkg/PLIST,v retrieving revision 1.15 diff -u -p -r1.15 PLIST --- pkg/PLIST 21 Oct 2013 19:14:54 -0000 1.15 +++ pkg/PLIST 22 Sep 2014 08:07:41 -0000 @@ -17,6 +17,7 @@ include/tcl8.5/tclUnixPort.h lib/libtcl85.a @lib lib/libtcl85.so.${LIBtcl85_VERSION} lib/libtclstub85.a +lib/pkgconfig/tcl85.pc lib/tcl/ lib/tcl/modules/ lib/tcl/modules/8.5/ @@ -808,12 +809,12 @@ lib/tcl/tcl8.5/man/mann/ @man lib/tcl/tcl8.5/man/mann/while.n lib/tcl/tcl8.5/modules/ lib/tcl/tcl8.5/modules/8.5/ -lib/tcl/tcl8.5/modules/8.5/http-2.7.12.tm +lib/tcl/tcl8.5/modules/8.5/http-2.7.13.tm lib/tcl/tcl8.5/modules/8.5/msgcat-1.5.2.tm lib/tcl/tcl8.5/modules/8.5/platform/ -lib/tcl/tcl8.5/modules/8.5/platform-1.0.12.tm +lib/tcl/tcl8.5/modules/8.5/platform-1.0.13.tm lib/tcl/tcl8.5/modules/8.5/platform/shell-1.1.4.tm -lib/tcl/tcl8.5/modules/8.5/tcltest-2.3.5.tm +lib/tcl/tcl8.5/modules/8.5/tcltest-2.3.8.tm lib/tcl/tcl8.5/msgs/ lib/tcl/tcl8.5/msgs/af.msg lib/tcl/tcl8.5/msgs/af_za.msg Index: Makefile =================================================================== RCS file: /cvs/ports/x11/tk/8.5/Makefile,v retrieving revision 1.35 diff -u -p -r1.35 Makefile --- Makefile 5 Nov 2013 04:50:38 -0000 1.35 +++ Makefile 22 Sep 2014 08:07:24 -0000 @@ -2,10 +2,9 @@ COMMENT = graphical toolkit for Tcl -DISTNAME = tk8.5.15 -PKGNAME = tk-8.5.15 -REVISION = 1 -SHARED_LIBS = tk85 0.12 +DISTNAME = tk8.5.16 +PKGNAME = tk-8.5.16 +SHARED_LIBS = tk85 0.13 CATEGORIES = x11 x11/tk HOMEPAGE = http://www.tcl.tk/ MAINTAINER = Stuart Cassoff <s...@users.sourceforge.net> @@ -13,11 +12,13 @@ MAINTAINER = Stuart Cassoff <stwo@users # BSD PERMIT_PACKAGE_CDROM = Yes -WANTLIB = X11 Xext Xft Xss c m tcl85 +WANTLIB = X11 Xext Xft Xss c fontconfig m tcl85 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tcl/} DISTFILES = ${DISTNAME}-src.tar.gz +LIB_DEPENDS = tcl-8.5.16:lang/tcl/8.5 + MAKE_FLAGS += TK_LIBRARY='$$(prefix)/lib/tcl/tk$$(VERSION)' \ TCL_GENERIC_DIR='$$(GENERIC_DIR)' \ TCL_PLATFORM_DIR='$$(GENERIC_DIR)' @@ -45,17 +46,6 @@ CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ EXTRA_INSTALL="install-private-headers" \ EXTRA_CC_SWITCHES="-I${LOCALBASE}/include/tcl8.5" \ SHLIB_VERSION="${LIBtk85_VERSION}" - -FLAVORS = threaded -FLAVOR ?= - -.if ${FLAVOR:Mthreaded} -CONFIGURE_ARGS += --enable-threads -WANTLIB += pthread -LIB_DEPENDS += tcl->=8.5.15,<8.5.16-threaded:lang/tcl/8.5,threaded -.else -LIB_DEPENDS += tcl->=8.5.15,<8.5.16-!threaded:lang/tcl/8.5 -.endif .include <bsd.port.arch.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/x11/tk/8.5/distinfo,v retrieving revision 1.13 diff -u -p -r1.13 distinfo --- distinfo 20 Sep 2013 10:10:05 -0000 1.13 +++ distinfo 22 Sep 2014 08:07:24 -0000 @@ -1,2 +1,2 @@ -SHA256 (tk8.5.15-src.tar.gz) = gVxnBtC0/dQy/ha4Lnua36HwV8RO3RHSj3xLCsEEMj8= -SIZE (tk8.5.15-src.tar.gz) = 4086650 +SHA256 (tk8.5.16-src.tar.gz) = 5nogxR+HmOSiOjx8FZABLhcVnRSPBI1h8aoMacuOE0k= +SIZE (tk8.5.16-src.tar.gz) = 4095815 Index: patches/patch-unix_Makefile_in =================================================================== RCS file: /cvs/ports/x11/tk/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:10:05 -0000 1.12 +++ patches/patch-unix_Makefile_in 22 Sep 2014 08:07:24 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-unix_Makefile_in,v 1.12 2013/09/20 10:10:05 stu Exp $ ---- unix/Makefile.in.orig Fri Aug 30 12:28:24 2013 -+++ unix/Makefile.in Thu Sep 5 17:46:15 2013 +--- unix/Makefile.in.orig Wed Jul 23 09:13:57 2014 ++++ unix/Makefile.in Sun Aug 17 15:41:20 2014 @@ -541,6 +541,7 @@ PUBLIC_HDRS = $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDec # The private headers we want installed for install-private-headers PRIVATE_HDRS = $(GENERIC_DIR)/tkInt.h $(GENERIC_DIR)/tkIntDecls.h \ @@ -9,7 +9,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.12 $(TTK_HDRS) $(@TK_WINDOWINGSYSTEM@_PRIVATE_HDRS) DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget -@@ -572,6 +573,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} +@@ -576,6 +577,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} rm -f $@ @MAKE_STUB_LIB@ @@ -20,7 +20,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.12 # Make target which outputs the list of the .o contained in the Tk lib # usefull to build a single big shared library containing Tcl/Tk and other # extensions. used for the Tcl Plugin. -- dl -@@ -712,10 +717,10 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $ +@@ -712,10 +717,10 @@ install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) $ echo "}";\ fi \ ) > "$(PKG_INDEX)"; \ @@ -32,7 +32,16 @@ $OpenBSD: patch-unix_Makefile_in,v 1.12 @if test -f "tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \ $(INSTALL_LIBRARY) "tk${MAJOR_VERSION}${MINOR_VERSION}.dll" "$(DLL_INSTALL_DIR)";\ chmod 555 "$(DLL_INSTALL_DIR)/tk${MAJOR_VERSION}${MINOR_VERSION}.dll";\ -@@ -785,6 +790,7 @@ install-demos: +@@ -733,7 +738,7 @@ install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) $ + @EXTRA_INSTALL_BINARIES@ + @echo "Installing pkg-config file to $(LIB_INSTALL_DIR)/pkgconfig/" + @$(INSTALL_DATA_DIR) $(LIB_INSTALL_DIR)/pkgconfig +- @$(INSTALL_DATA) tk.pc $(LIB_INSTALL_DIR)/pkgconfig/tk.pc ++ @$(INSTALL_DATA) tk.pc $(LIB_INSTALL_DIR)/pkgconfig/tk85.pc + + install-libraries: libraries + @for i in "$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)/images" \ +@@ -788,6 +793,7 @@ install-demos: if [ -f $$i ] ; then \ sed -e '3 s|exec wish|exec wish$(VERSION)|' \ $$i > "$(DEMO_INSTALL_DIR)"/`basename $$i`; \ @@ -40,7 +49,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.12 fi; \ done; @for i in $(DEMOPROGS); \ -@@ -792,7 +798,7 @@ install-demos: +@@ -795,7 +801,7 @@ install-demos: if test $$i = "square"; then \ rm -f "$(DEMO_INSTALL_DIR)/$$i"; \ else \ Index: patches/patch-unix_installManPage =================================================================== RCS file: patches/patch-unix_installManPage diff -N patches/patch-unix_installManPage --- patches/patch-unix_installManPage 5 Nov 2013 04:50:38 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -$OpenBSD: patch-unix_installManPage,v 1.3 2013/11/05 04:50:38 stu Exp $ - -Put macros after .TH to prevent them from being redefined. Tcl bug 426679ef7d. - ---- unix/installManPage.orig Mon Sep 16 12:45:24 2013 -+++ unix/installManPage Mon Nov 4 10:16:42 2013 -@@ -103,7 +103,7 @@ for Target in $Names; do - rm -f $Dir/$Target $Dir/$Target.* - if test -z "$First" ; then - First=$Target -- sed -e "/man\.macros/r $SrcDir/man.macros" -e "/man\.macros/d" \ -+ sed -e "/man\.macros/d" -e "/\.TH/r $SrcDir/man.macros" \ - $ManPage > $Dir/$First - chmod 444 $Dir/$First - $Gzip $Dir/$First Index: pkg/DESCR =================================================================== RCS file: /cvs/ports/x11/tk/8.5/pkg/DESCR,v retrieving revision 1.2 diff -u -p -r1.2 DESCR --- pkg/DESCR 1 Oct 2008 19:48:46 -0000 1.2 +++ pkg/DESCR 22 Sep 2014 08:07:24 -0000 @@ -3,5 +3,3 @@ applications to a higher level than conv standard GUI not only for Tcl, but for many other dynamic languages, and can produce rich, native applications that run unchanged across most platforms. - -Flavor: threaded - build with threads support Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/x11/tk/8.5/pkg/PLIST,v retrieving revision 1.12 diff -u -p -r1.12 PLIST --- pkg/PLIST 21 Oct 2013 19:14:56 -0000 1.12 +++ pkg/PLIST 22 Sep 2014 08:07:24 -0000 @@ -21,6 +21,7 @@ include/tk8.5/ttkTheme.h lib/libtk85.a @lib lib/libtk85.so.${LIBtk85_VERSION} lib/libtkstub85.a +lib/pkgconfig/tk85.pc lib/tcl/ lib/tcl/tk8.5/ lib/tcl/tk8.5/bgerror.tcl
