Tested on i386/amd64.
Index: Makefile =================================================================== RCS file: /cvs/ports/lang/tcl/8.5/Makefile,v retrieving revision 1.22 diff -u -p -r1.22 Makefile --- Makefile 26 Aug 2012 15:47:00 -0000 1.22 +++ Makefile 17 Nov 2012 16:05:12 -0000 @@ -2,9 +2,9 @@ COMMENT = Tool Command Language -DISTNAME = tcl8.5.12 -PKGNAME = tcl-8.5.12 -SHARED_LIBS = tcl85 1.2 +DISTNAME = tcl8.5.13 +PKGNAME = tcl-8.5.13 +SHARED_LIBS = tcl85 1.3 CATEGORIES = lang lang/tcl HOMEPAGE = http://www.tcl.tk/ MAINTAINER = Stuart Cassoff <[email protected]> Index: distinfo =================================================================== RCS file: /cvs/ports/lang/tcl/8.5/distinfo,v retrieving revision 1.10 diff -u -p -r1.10 distinfo --- distinfo 26 Aug 2012 15:47:00 -0000 1.10 +++ distinfo 17 Nov 2012 16:05:12 -0000 @@ -1,2 +1,2 @@ -SHA256 (tcl8.5.12-src.tar.gz) = ILp6EKMFcZg6/TWZ8ZtEGttSIrIfHSsn0Puj7Y1HB8I= -SIZE (tcl8.5.12-src.tar.gz) = 4501505 +SHA256 (tcl8.5.13-src.tar.gz) = m4aN1WPmVnGib89Ri2uGwbsbZ1b0j9yQ8EMB1POmWWo= +SIZE (tcl8.5.13-src.tar.gz) = 4513204 Index: patches/patch-unix_Makefile_in =================================================================== RCS file: /cvs/ports/lang/tcl/8.5/patches/patch-unix_Makefile_in,v retrieving revision 1.9 diff -u -p -r1.9 patch-unix_Makefile_in --- patches/patch-unix_Makefile_in 26 Aug 2012 16:51:13 -0000 1.9 +++ patches/patch-unix_Makefile_in 17 Nov 2012 16:05:12 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.9 2012/08/26 16:51:13 stu Exp $ ---- unix/Makefile.in.orig Tue Jul 10 09:58:51 2012 -+++ unix/Makefile.in Tue Jul 10 12:11:54 2012 -@@ -557,6 +557,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} +--- 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} rm -f $@ @MAKE_STUB_LIB@ @@ -12,32 +12,15 @@ $OpenBSD: patch-unix_Makefile_in,v 1.9 2 # 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 -@@ -712,17 +716,12 @@ install-binaries: binaries - do \ - if [ ! -d "$$i" ] ; then \ - echo "Making directory $$i"; \ -- mkdir -p "$$i"; \ -- chmod 755 "$$i"; \ -+ $(INSTALL_DATA_DIR) "$$i"; \ - else true; \ - fi; \ +@@ -719,7 +723,6 @@ install-binaries: binaries done; -- @if test ! -x $(SRC_DIR)/../unix/install-sh; then \ -- chmod +x $(SRC_DIR)/../unix/install-sh; \ -- fi @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" @@INSTALL_LIB@ - @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@ @echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/" -@@ -738,23 +737,18 @@ install-libraries: libraries $(INSTALL_TZDATA) install - do \ - if [ ! -d "$$i" ] ; then \ - echo "Making directory $$i"; \ -- mkdir -p "$$i"; \ -- chmod 755 "$$i"; \ -+ $(INSTALL_DATA_DIR) "$$i"; \ +@@ -739,7 +742,7 @@ install-libraries: libraries $(INSTALL_TZDATA) install else true; \ fi; \ done; @@ -46,32 +29,20 @@ $OpenBSD: patch-unix_Makefile_in,v 1.9 2 do \ if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \ echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \ -- mkdir -p "$(SCRIPT_INSTALL_DIR)"/$$i; \ -- chmod 755 "$(SCRIPT_INSTALL_DIR)"/$$i; \ -+ $(INSTALL_DATA_DIR) "$(SCRIPT_INSTALL_DIR)"/$$i; \ - else true; \ - fi; \ - done; -- @if test ! -x $(SRC_DIR)/../unix/install-sh; then \ -- chmod +x $(SRC_DIR)/../unix/install-sh; \ -- fi - @echo "Installing header files"; - @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \ - $(GENERIC_DIR)/tclPlatDecls.h \ -@@ -775,21 +769,21 @@ install-libraries: libraries $(INSTALL_TZDATA) install +@@ -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.9 as a Tcl Module"; -- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.9.tm; -+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/modules/8.5/http-2.7.9.tm; - @echo "Installing library opt0.4 directory"; + @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 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.4.5 as a Tcl Module"; -- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.4.5.tm; -+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/modules/8.5/msgcat-1.4.5.tm; + @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; @@ -83,31 +54,5 @@ $OpenBSD: patch-unix_Makefile_in,v 1.9 2 - @$(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; - @echo "Installing library encoding directory"; + @echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/"; @for i in $(TOP_DIR)/library/encoding/*.enc ; do \ -@@ -820,8 +814,7 @@ install-doc: doc - do \ - if [ ! -d "$$i" ] ; then \ - echo "Making directory $$i"; \ -- mkdir -p "$$i"; \ -- chmod 755 "$$i"; \ -+ $(INSTALL_DATA_DIR) "$$i"; \ - else true; \ - fi; \ - done; -@@ -846,14 +839,10 @@ install-private-headers: libraries - do \ - if [ ! -d "$$i" ] ; then \ - echo "Making directory $$i"; \ -- mkdir -p "$$i"; \ -- chmod 755 "$$i"; \ -+ $(INSTALL_DATA_DIR) "$$i"; \ - else true; \ - fi; \ - done; -- @if test ! -x $(SRC_DIR)/../unix/install-sh; then \ -- chmod +x $(SRC_DIR)/../unix/install-sh; \ -- fi - @echo "Installing private header files"; - @for i in $(GENERIC_DIR)/tclInt.h $(GENERIC_DIR)/tclIntDecls.h \ - $(GENERIC_DIR)/tclIntPlatDecls.h $(GENERIC_DIR)/tclPort.h \ Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/lang/tcl/8.5/pkg/PLIST,v retrieving revision 1.10 diff -u -p -r1.10 PLIST --- pkg/PLIST 26 Aug 2012 15:47:00 -0000 1.10 +++ pkg/PLIST 17 Nov 2012 16:05:12 -0000 @@ -807,8 +807,8 @@ 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.9.tm -lib/tcl/tcl8.5/modules/8.5/msgcat-1.4.5.tm +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/platform/ lib/tcl/tcl8.5/modules/8.5/platform-1.0.10.tm lib/tcl/tcl8.5/modules/8.5/platform/shell-1.1.4.tm Index: Makefile =================================================================== RCS file: /cvs/ports/x11/tk/8.5/Makefile,v retrieving revision 1.26 diff -u -p -r1.26 Makefile --- Makefile 26 Aug 2012 16:57:58 -0000 1.26 +++ Makefile 17 Nov 2012 16:06:01 -0000 @@ -2,9 +2,9 @@ COMMENT = graphical toolkit for Tcl -DISTNAME = tk8.5.12 -PKGNAME = tk-8.5.12 -SHARED_LIBS = tk85 0.9 +DISTNAME = tk8.5.13 +PKGNAME = tk-8.5.13 +SHARED_LIBS = tk85 0.10 CATEGORIES = x11 x11/tk HOMEPAGE = http://www.tcl.tk/ MAINTAINER = Stuart Cassoff <[email protected]> @@ -57,9 +57,9 @@ FLAVOR ?= .if ${FLAVOR:L:Mthreaded} CONFIGURE_ARGS += --enable-threads WANTLIB += pthread -LIB_DEPENDS += tcl->=8.5.12,<8.5.13-threaded:lang/tcl/8.5,threaded +LIB_DEPENDS += tcl->=8.5.13,<8.5.14-threaded:lang/tcl/8.5,threaded .else -LIB_DEPENDS += tcl->=8.5.12,<8.5.13-!threaded:lang/tcl/8.5 +LIB_DEPENDS += tcl->=8.5.13,<8.5.14-!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.10 diff -u -p -r1.10 distinfo --- distinfo 26 Aug 2012 16:57:58 -0000 1.10 +++ distinfo 17 Nov 2012 16:06:01 -0000 @@ -1,2 +1,2 @@ -SHA256 (tk8.5.12-src.tar.gz) = xFPYIJJb9Sa76KDRwXqzFosHb8uYRL6nl61147mtkpE= -SIZE (tk8.5.12-src.tar.gz) = 3826062 +SHA256 (tk8.5.13-src.tar.gz) = noO6JwStc6ZZhut83FHkMqXbbsqNhpHjPKzu9A7QxWM= +SIZE (tk8.5.13-src.tar.gz) = 4086092 Index: patches/patch-unix_Makefile_in =================================================================== RCS file: /cvs/ports/x11/tk/8.5/patches/patch-unix_Makefile_in,v retrieving revision 1.9 diff -u -p -r1.9 patch-unix_Makefile_in --- patches/patch-unix_Makefile_in 26 Aug 2012 16:57:58 -0000 1.9 +++ patches/patch-unix_Makefile_in 17 Nov 2012 16:06:01 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.9 2012/08/26 16:57:58 stu Exp $ ---- unix/Makefile.in.orig Sun Jul 22 01:01:39 2012 -+++ unix/Makefile.in Sun Jul 22 01:25:28 2012 -@@ -553,6 +553,7 @@ PUBLIC_HDRS = $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDec +--- 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 # 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.9 2 $(TTK_HDRS) $(@TK_WINDOWINGSYSTEM@_PRIVATE_HDRS) DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget -@@ -585,6 +586,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} +@@ -573,6 +574,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} rm -f $@ @MAKE_STUB_LIB@ @@ -17,26 +17,10 @@ $OpenBSD: patch-unix_Makefile_in,v 1.9 2 + rm -f $@ + ${STLIB_LD} $@ ${OBJS} ; ${RANLIB} $@ + - # Build Aqua resource files - ${TK_RSRC_FILE}: $(AQUA_RESOURCES) - rm -f $@ -@@ -709,14 +714,10 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $ - do \ - if [ ! -d "$$i" ] ; then \ - echo "Making directory $$i"; \ -- mkdir -p "$$i"; \ -- chmod 755 "$$i"; \ -+ $(INSTALL_DATA_DIR) "$$i"; \ - else true; \ - fi; \ - done; -- @if test ! -x $(SRC_DIR)/install-sh; then \ -- chmod +x $(SRC_DIR)/install-sh; \ -- fi - @if test "x$(TK_SHARED_BUILD)" = "x1"; then \ - echo "Creating package index $(PKG_INDEX)"; \ - rm -f "$(PKG_INDEX)"; \ -@@ -734,10 +735,10 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $ + # 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) $ echo "}";\ fi \ ) > "$(PKG_INDEX)"; \ @@ -46,35 +30,9 @@ $OpenBSD: patch-unix_Makefile_in,v 1.9 2 @@INSTALL_LIB@ - @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)" @if test -f "tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \ - $(INSTALL_LIBRARY) "${TOP_DIR}/win/tk${MAJOR_VERSION}${MINOR_VERSION}.dll" "$(DLL_INSTALL_DIR)";\ + $(INSTALL_LIBRARY) "tk${MAJOR_VERSION}${MINOR_VERSION}.dll" "$(DLL_INSTALL_DIR)";\ chmod 555 "$(DLL_INSTALL_DIR)/tk${MAJOR_VERSION}${MINOR_VERSION}.dll";\ -@@ -761,14 +762,10 @@ install-libraries: libraries - do \ - if [ -n "$$i" -a ! -d "$$i" ] ; then \ - echo "Making directory $$i"; \ -- mkdir -p "$$i"; \ -- chmod 755 "$$i"; \ -+ $(INSTALL_DATA_DIR) "$$i"; \ - else true; \ - fi; \ - done; -- @if test ! -x $(SRC_DIR)/install-sh; then \ -- chmod +x $(SRC_DIR)/install-sh; \ -- fi - @echo "Installing header files"; - @for i in $(PUBLIC_HDRS); \ - do \ -@@ -811,8 +808,7 @@ install-demos: - do \ - if [ ! -d "$$i" ] ; then \ - echo "Making directory $$i"; \ -- mkdir -p "$$i"; \ -- chmod 755 "$$i"; \ -+ $(INSTALL_DATA_DIR) "$$i"; \ - else true; \ - fi; \ - done; -@@ -822,6 +818,7 @@ install-demos: +@@ -784,6 +789,7 @@ install-demos: if [ -f $$i ] ; then \ sed -e '3 s|exec wish|exec wish$(VERSION)|' \ $$i > "$(DEMO_INSTALL_DIR)"/`basename $$i`; \ @@ -82,7 +40,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.9 2 fi; \ done; @for i in $(DEMOPROGS); \ -@@ -829,7 +826,7 @@ install-demos: +@@ -791,7 +797,7 @@ install-demos: if test $$i = "square"; then \ rm -f "$(DEMO_INSTALL_DIR)/$$i"; \ else \ @@ -90,30 +48,4 @@ $OpenBSD: patch-unix_Makefile_in,v 1.9 2 + chmod 555 "$(DEMO_INSTALL_DIR)/$$i"; \ fi; \ done; - @echo "Installing demo images"; -@@ -845,8 +842,7 @@ install-doc: - do \ - if [ ! -d "$$i" ] ; then \ - echo "Making directory $$i"; \ -- mkdir -p "$$i"; \ -- chmod 755 "$$i"; \ -+ $(INSTALL_DATA_DIR) "$$i"; \ - else true; \ - fi; \ - done; -@@ -871,14 +867,10 @@ install-private-headers: libraries - do \ - if [ ! -d "$$i" ] ; then \ - echo "Making directory $$i"; \ -- mkdir -p "$$i"; \ -- chmod 755 "$$i"; \ -+ $(INSTALL_DATA_DIR) "$$i"; \ - else true; \ - fi; \ - done; -- @if test ! -x $(SRC_DIR)/install-sh; then \ -- chmod +x $(SRC_DIR)/install-sh; \ -- fi - @echo "Installing private header files"; - @for i in $(PRIVATE_HDRS); \ - do \ + @echo "Installing demo image files to $(DEMO_INSTALL_DIR)/images/";
