Um ... comes with a free frogurt?
On 05/25/13 05:27, Stuart Cassoff wrote: > Index: Makefile > =================================================================== > RCS file: /cvs/ports/lang/tcl/8.5/Makefile,v > retrieving revision 1.24 > diff -u -p -u -p -r1.24 Makefile > --- Makefile 11 Mar 2013 11:20:28 -0000 1.24 > +++ Makefile 25 May 2013 09:04:44 -0000 > @@ -2,9 +2,9 @@ > > COMMENT = Tool Command Language > > -DISTNAME = tcl8.5.13 > -PKGNAME = tcl-8.5.13 > -SHARED_LIBS = tcl85 1.3 > +DISTNAME = tcl8.5.14 > +PKGNAME = tcl-8.5.14 > +SHARED_LIBS = tcl85 1.4 > CATEGORIES = lang lang/tcl > HOMEPAGE = http://www.tcl.tk/ > MAINTAINER = Stuart Cassoff <s...@users.sourceforge.net> > @@ -67,6 +67,9 @@ SUBST_VARS += _README_DIR > 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 > > pre-test: > mkdir -p ${TESTHOME} > Index: distinfo > =================================================================== > RCS file: /cvs/ports/lang/tcl/8.5/distinfo,v > retrieving revision 1.11 > diff -u -p -u -p -r1.11 distinfo > --- distinfo 19 Nov 2012 15:09:52 -0000 1.11 > +++ distinfo 25 May 2013 09:04:44 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (tcl8.5.13-src.tar.gz) = m4aN1WPmVnGib89Ri2uGwbsbZ1b0j9yQ8EMB1POmWWo= > -SIZE (tcl8.5.13-src.tar.gz) = 4513204 > +SHA256 (tcl8.5.14-src.tar.gz) = dJTpTx4ZWlBcVCo8UOAVidL4v9GVlzgoJ6iV+hxHHy0= > +SIZE (tcl8.5.14-src.tar.gz) = 4528533 > Index: patches/patch-library_init_tcl > =================================================================== > RCS file: /cvs/ports/lang/tcl/8.5/patches/patch-library_init_tcl,v > retrieving revision 1.2 > diff -u -p -u -p -r1.2 patch-library_init_tcl > --- patches/patch-library_init_tcl 17 Oct 2011 15:18:39 -0000 1.2 > +++ patches/patch-library_init_tcl 25 May 2013 09:04:45 -0000 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-library_init_tcl,v 1.2 2011/10/17 15:18:39 stu Exp $ > ---- library/init.tcl.orig Tue May 31 11:03:46 2011 > -+++ library/init.tcl Wed Oct 5 01:55:14 2011 > -@@ -51,11 +51,14 @@ namespace eval tcl { > +--- library/init.tcl.orig Fri Mar 22 07:39:05 2013 > ++++ library/init.tcl Tue Apr 9 21:51:00 2013 > +@@ -52,11 +52,14 @@ namespace eval tcl { > lappend ::auto_path $Dir > } > } > Index: patches/patch-library_tm_tcl > =================================================================== > RCS file: /cvs/ports/lang/tcl/8.5/patches/patch-library_tm_tcl,v > retrieving revision 1.1 > diff -u -p -u -p -r1.1 patch-library_tm_tcl > --- patches/patch-library_tm_tcl 5 Jan 2011 16:13:53 -0000 1.1 > +++ patches/patch-library_tm_tcl 25 May 2013 09:04:45 -0000 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-library_tm_tcl,v 1.1 2011/01/05 16:13:53 stu Exp $ > ---- library/tm.tcl.orig Mon Nov 10 12:57:10 2008 > -+++ library/tm.tcl Fri Oct 1 03:31:35 2010 > -@@ -321,10 +321,10 @@ proc ::tcl::tm::Defaults {} { > +--- library/tm.tcl.orig Thu Mar 21 08:59:20 2013 > ++++ library/tm.tcl Tue Apr 9 21:51:00 2013 > +@@ -319,10 +319,10 @@ proc ::tcl::tm::Defaults {} { > > # Note that we're using [::list], not [list] because [list] means > # something other than [::list] in this namespace. > Index: patches/patch-tools_installData_tcl > =================================================================== > RCS file: patches/patch-tools_installData_tcl > diff -N patches/patch-tools_installData_tcl > --- patches/patch-tools_installData_tcl 17 Oct 2011 15:18:39 -0000 > 1.3 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,12 +0,0 @@ > -$OpenBSD: patch-tools_installData_tcl,v 1.3 2011/10/17 15:18:39 stu Exp $ > ---- tools/installData.tcl.orig Tue May 31 11:03:47 2011 > -+++ tools/installData.tcl Wed Oct 5 01:55:14 2011 > -@@ -32,7 +32,7 @@ proc copyDir {d1 d2} { > - } elseif {[file isfile $f]} { > - file copy -force $f [file join $d2 $ftail] > - if {$::tcl_platform(platform) eq {unix}} { > -- file attributes [file join $d2 $ftail] -permissions 0644 > -+ file attributes [file join $d2 $ftail] -permissions 0444 > - } else { > - file attributes [file join $d2 $ftail] -readonly 1 > - } > Index: patches/patch-unix_Makefile_in > =================================================================== > RCS file: /cvs/ports/lang/tcl/8.5/patches/patch-unix_Makefile_in,v > retrieving revision 1.10 > diff -u -p -u -p -r1.10 patch-unix_Makefile_in > --- patches/patch-unix_Makefile_in 19 Nov 2012 15:09:52 -0000 1.10 > +++ patches/patch-unix_Makefile_in 25 May 2013 09:04:45 -0000 > @@ -32,24 +32,24 @@ $OpenBSD: patch-unix_Makefile_in,v 1.10 > @@ -767,21 +770,21 @@ install-libraries: libraries $(INSTALL_TZDATA) install > $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \ > done; > - @echo "Installing package http 2.7.10 as a Tcl Module"; > -- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl > "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.10.tm; > -+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl > "$(SCRIPT_INSTALL_DIR)"/modules/8.5/http-2.7.10.tm; > + @echo "Installing package http 2.7.11 as a Tcl Module"; > +- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl > "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.11.tm; > ++ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl > "$(SCRIPT_INSTALL_DIR)"/modules/8.5/http-2.7.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.5.0 as a Tcl Module"; > -- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl > "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.5.0.tm; > -+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl > "$(SCRIPT_INSTALL_DIR)"/modules/8.5/msgcat-1.5.0.tm; > - @echo "Installing package tcltest 2.3.4 as a Tcl Module"; > -- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl > "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.4.tm; > -+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl > "$(SCRIPT_INSTALL_DIR)"/modules/8.5/tcltest-2.3.4.tm; > + @echo "Installing package msgcat 1.5.1 as a Tcl Module"; > +- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl > "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.5.1.tm; > ++ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl > "$(SCRIPT_INSTALL_DIR)"/modules/8.5/msgcat-1.5.1.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 platform 1.0.10 as a Tcl Module"; > -- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl > "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.10.tm; > -+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl > "$(SCRIPT_INSTALL_DIR)"/modules/8.5/platform-1.0.10.tm; > + @echo "Installing package platform 1.0.11 as a Tcl Module"; > +- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl > "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.11.tm; > ++ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl > "$(SCRIPT_INSTALL_DIR)"/modules/8.5/platform-1.0.11.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: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/lang/tcl/8.5/pkg/PLIST,v > retrieving revision 1.11 > diff -u -p -u -p -r1.11 PLIST > --- pkg/PLIST 19 Nov 2012 15:09:52 -0000 1.11 > +++ pkg/PLIST 25 May 2013 09:04:46 -0000 > @@ -807,12 +807,12 @@ lib/tcl/tcl8.5/man/catn/ > lib/tcl/tcl8.5/man/license.terms > lib/tcl/tcl8.5/modules/ > lib/tcl/tcl8.5/modules/8.5/ > -lib/tcl/tcl8.5/modules/8.5/http-2.7.10.tm > -lib/tcl/tcl8.5/modules/8.5/msgcat-1.5.0.tm > +lib/tcl/tcl8.5/modules/8.5/http-2.7.11.tm > +lib/tcl/tcl8.5/modules/8.5/msgcat-1.5.1.tm > lib/tcl/tcl8.5/modules/8.5/platform/ > -lib/tcl/tcl8.5/modules/8.5/platform-1.0.10.tm > +lib/tcl/tcl8.5/modules/8.5/platform-1.0.11.tm > lib/tcl/tcl8.5/modules/8.5/platform/shell-1.1.4.tm > -lib/tcl/tcl8.5/modules/8.5/tcltest-2.3.4.tm > +lib/tcl/tcl8.5/modules/8.5/tcltest-2.3.5.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.30 > diff -u -p -u -p -r1.30 Makefile > --- Makefile 28 Apr 2013 13:01:34 -0000 1.30 > +++ Makefile 25 May 2013 09:22:50 -0000 > @@ -2,10 +2,9 @@ > > COMMENT = graphical toolkit for Tcl > > -DISTNAME = tk8.5.13 > -PKGNAME = tk-8.5.13 > -REVISION = 0 > -SHARED_LIBS = tk85 0.10 > +DISTNAME = tk8.5.14 > +PKGNAME = tk-8.5.14 > +SHARED_LIBS = tk85 0.11 > CATEGORIES = x11 x11/tk > HOMEPAGE = http://www.tcl.tk/ > MAINTAINER = Stuart Cassoff <s...@users.sourceforge.net> > @@ -55,9 +54,9 @@ FLAVOR ?= > .if ${FLAVOR:Mthreaded} > CONFIGURE_ARGS += --enable-threads > WANTLIB += pthread > -LIB_DEPENDS += > tcl->=8.5.13,<8.5.14-threaded:lang/tcl/8.5,threaded > +LIB_DEPENDS += > tcl->=8.5.14,<8.5.15-threaded:lang/tcl/8.5,threaded > .else > -LIB_DEPENDS += tcl->=8.5.13,<8.5.14-!threaded:lang/tcl/8.5 > +LIB_DEPENDS += tcl->=8.5.14,<8.5.15-!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.11 > diff -u -p -u -p -r1.11 distinfo > --- distinfo 19 Nov 2012 15:10:48 -0000 1.11 > +++ distinfo 25 May 2013 09:22:50 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (tk8.5.13-src.tar.gz) = noO6JwStc6ZZhut83FHkMqXbbsqNhpHjPKzu9A7QxWM= > -SIZE (tk8.5.13-src.tar.gz) = 4086092 > +SHA256 (tk8.5.14-src.tar.gz) = mnuoznP4oym96JSVTnD5NFy7B6rB1+Z0aDxHJwsy4aE= > +SIZE (tk8.5.14-src.tar.gz) = 4093990 > Index: patches/patch-unix_Makefile_in > =================================================================== > RCS file: /cvs/ports/x11/tk/8.5/patches/patch-unix_Makefile_in,v > retrieving revision 1.10 > diff -u -p -u -p -r1.10 patch-unix_Makefile_in > --- patches/patch-unix_Makefile_in 19 Nov 2012 15:10:48 -0000 1.10 > +++ patches/patch-unix_Makefile_in 25 May 2013 09:22:51 -0000 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-unix_Makefile_in,v 1.10 2012/11/19 15:10:48 stu Exp $ > ---- unix/Makefile.in.orig Fri Nov 9 10:15:03 2012 > -+++ unix/Makefile.in Thu Nov 15 00:03:40 2012 > -@@ -542,6 +542,7 @@ PUBLIC_HDRS = $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDec > +--- unix/Makefile.in.orig Mon Apr 1 14:36:49 2013 > ++++ unix/Makefile.in Tue Apr 9 22:16:04 2013 > +@@ -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 \ > $(GENERIC_DIR)/tkIntPlatDecls.h $(GENERIC_DIR)/tkPort.h \ > @@ -9,7 +9,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.10 > $(TTK_HDRS) $(@TK_WINDOWINGSYSTEM@_PRIVATE_HDRS) > > DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget > -@@ -573,6 +574,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} > +@@ -572,6 +573,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} > rm -f $@ > @MAKE_STUB_LIB@ > > @@ -20,7 +20,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.10 > # 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 > -@@ -713,10 +718,10 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $ > +@@ -712,10 +717,10 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $ > echo "}";\ > fi \ > ) > "$(PKG_INDEX)"; \ > @@ -32,7 +32,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.10 > @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";\ > -@@ -784,6 +789,7 @@ install-demos: > +@@ -783,6 +788,7 @@ install-demos: > if [ -f $$i ] ; then \ > sed -e '3 s|exec wish|exec wish$(VERSION)|' \ > $$i > "$(DEMO_INSTALL_DIR)"/`basename $$i`; \ > @@ -40,7 +40,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.10 > fi; \ > done; > @for i in $(DEMOPROGS); \ > -@@ -791,7 +797,7 @@ install-demos: > +@@ -790,7 +796,7 @@ install-demos: > if test $$i = "square"; then \ > rm -f "$(DEMO_INSTALL_DIR)/$$i"; \ > else \ > > > >