Index: Makefile =================================================================== RCS file: /cvs/ports/lang/tcl/8.5/Makefile,v retrieving revision 1.21 diff -u -p -r1.21 Makefile --- Makefile 29 Mar 2012 13:38:40 -0000 1.21 +++ Makefile 8 Aug 2012 04:36:55 -0000 @@ -2,10 +2,9 @@
COMMENT = Tool Command Language -DISTNAME = tcl8.5.11 -PKGNAME = tcl-8.5.11 -REVISION = 0 -SHARED_LIBS = tcl85 1.1 +DISTNAME = tcl8.5.12 +PKGNAME = tcl-8.5.12 +SHARED_LIBS = tcl85 1.2 CATEGORIES = lang lang/tcl HOMEPAGE = http://www.tcl.tk/ MAINTAINER = Stuart Cassoff <s...@users.sourceforge.net> @@ -33,7 +32,7 @@ FAKE_FLAGS = INSTALL_DATA_DIR="${INSTAL MAN3_INSTALL_DIR='$$(MAN_INSTALL_DIR)/cat3' \ MANN_INSTALL_DIR='$$(MAN_INSTALL_DIR)/catn' -REGRESS_FLAGS = HOME=${TESTHOME} +REGRESS_FLAGS = HOME=${TESTHOME} TESTFLAGS="${TESTFLAGS}" SEPARATE_BUILD = Yes USE_GROFF = Yes CONFIGURE_STYLE = gnu old @@ -69,6 +68,9 @@ REGRESS_TARGET = test SUBST_VARS += _README_DIR TESTHOME = ${WRKDIR}/testhome + +# Use TESTFLAGS to control the Tcl tests +TESTFLAGS = pre-regress: mkdir -p ${TESTHOME} Index: distinfo =================================================================== RCS file: /cvs/ports/lang/tcl/8.5/distinfo,v retrieving revision 1.9 diff -u -p -r1.9 distinfo --- distinfo 21 Nov 2011 18:30:50 -0000 1.9 +++ distinfo 8 Aug 2012 04:36:55 -0000 @@ -1,5 +1,2 @@ -MD5 (tcl8.5.11-src.tar.gz) = sBqWkcg5kLPbDOYtEBLKZw== -RMD160 (tcl8.5.11-src.tar.gz) = NhQLXoNlwZAgITLdbw3+uDHqm8g= -SHA1 (tcl8.5.11-src.tar.gz) = y3Dc+3YlOJr9d04EOKet4+eqE8g= -SHA256 (tcl8.5.11-src.tar.gz) = it3DhfprW+RgXm1o+9xMDmdMWvHcHJXsVCA5DEsIBCo= -SIZE (tcl8.5.11-src.tar.gz) = 4484001 +SHA256 (tcl8.5.12-src.tar.gz) = ILp6EKMFcZg6/TWZ8ZtEGttSIrIfHSsn0Puj7Y1HB8I= +SIZE (tcl8.5.12-src.tar.gz) = 4501505 Index: patches/patch-unix_Makefile_in =================================================================== RCS file: /cvs/ports/lang/tcl/8.5/patches/patch-unix_Makefile_in,v retrieving revision 1.7 diff -u -p -r1.7 patch-unix_Makefile_in --- patches/patch-unix_Makefile_in 21 Nov 2011 18:30:50 -0000 1.7 +++ patches/patch-unix_Makefile_in 8 Aug 2012 04:36:55 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.7 2011/11/21 18:30:50 stu Exp $ ---- unix/Makefile.in.orig Thu Oct 20 12:06:53 2011 -+++ unix/Makefile.in Wed Oct 26 11:47:46 2011 -@@ -556,6 +556,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} +--- 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} rm -f $@ @MAKE_STUB_LIB@ @@ -12,7 +12,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.7 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 -@@ -711,17 +715,12 @@ install-binaries: binaries +@@ -712,17 +716,12 @@ install-binaries: binaries do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ @@ -25,13 +25,13 @@ $OpenBSD: patch-unix_Makefile_in,v 1.7 2 - @if test ! -x $(SRC_DIR)/../unix/install-sh; then \ - chmod +x $(SRC_DIR)/../unix/install-sh; \ - fi - @echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/" + @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" @@INSTALL_LIB@ -- @chmod 555 "$(LIB_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@ @echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/" -@@ -737,23 +736,18 @@ install-libraries: libraries $(INSTALL_TZDATA) install +@@ -738,23 +737,18 @@ install-libraries: libraries $(INSTALL_TZDATA) install do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ @@ -41,7 +41,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.7 2 else true; \ fi; \ done; -- @for i in opt0.4 http1.0 encoding ../tcl8 ../tcl8/8.3 ../tcl8/8.4 ../tcl8/8.4/platform ../tcl8/8.5; \ +- @for i in opt0.4 http1.0 encoding ../tcl8 ../tcl8/8.4 ../tcl8/8.4/platform ../tcl8/8.5; \ + @for i in opt0.4 http1.0 encoding modules modules/8.5 modules/8.5/platform ../modules/8.5; \ do \ if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \ @@ -58,23 +58,23 @@ $OpenBSD: patch-unix_Makefile_in,v 1.7 2 @echo "Installing header files"; @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \ $(GENERIC_DIR)/tclPlatDecls.h \ -@@ -774,21 +768,21 @@ install-libraries: libraries $(INSTALL_TZDATA) install +@@ -775,21 +769,21 @@ install-libraries: libraries $(INSTALL_TZDATA) install $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \ done; - @echo "Installing package http 2.7.7 as a Tcl Module"; -- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.7.tm; -+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/modules/8.5/http-2.7.7.tm; + @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"; @for i in $(TOP_DIR)/library/opt/*.tcl ; \ do \ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/opt0.4; \ done; - @echo "Installing package msgcat 1.4.4 as a Tcl Module"; -- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.4.4.tm; -+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/modules/8.5/msgcat-1.4.4.tm; - @echo "Installing package tcltest 2.3.3 as a Tcl Module"; -- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.3.tm; -+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/modules/8.5/tcltest-2.3.3.tm; + @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 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 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; @@ -85,7 +85,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.7 2 @echo "Installing library encoding directory"; @for i in $(TOP_DIR)/library/encoding/*.enc ; do \ -@@ -819,8 +813,7 @@ install-doc: doc +@@ -820,8 +814,7 @@ install-doc: doc do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ @@ -95,7 +95,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.7 2 else true; \ fi; \ done; -@@ -845,14 +838,10 @@ install-private-headers: libraries +@@ -846,14 +839,10 @@ install-private-headers: libraries do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/lang/tcl/8.5/pkg/PLIST,v retrieving revision 1.9 diff -u -p -r1.9 PLIST --- pkg/PLIST 21 Nov 2011 18:30:50 -0000 1.9 +++ pkg/PLIST 8 Aug 2012 04:36:55 -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.7.tm -lib/tcl/tcl8.5/modules/8.5/msgcat-1.4.4.tm +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/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 -lib/tcl/tcl8.5/modules/8.5/tcltest-2.3.3.tm +lib/tcl/tcl8.5/modules/8.5/tcltest-2.3.4.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.25 diff -u -p -r1.25 Makefile --- Makefile 29 Mar 2012 13:39:01 -0000 1.25 +++ Makefile 8 Aug 2012 04:41:12 -0000 @@ -2,9 +2,9 @@ COMMENT = graphical toolkit for Tcl -DISTNAME = tk8.5.11 -PKGNAME = tk-8.5.11 -SHARED_LIBS = tk85 0.8 +DISTNAME = tk8.5.12 +PKGNAME = tk-8.5.12 +SHARED_LIBS = tk85 0.9 CATEGORIES = x11 x11/tk HOMEPAGE = http://www.tcl.tk/ MAINTAINER = Stuart Cassoff <s...@users.sourceforge.net> @@ -35,7 +35,7 @@ FAKE_FLAGS = INSTALL_DATA_DIR="${INSTAL DEMO_INSTALL_DIR="${WRKINST}${TRUEPREFIX}/share/examples/tk8.5" \ TK_PKG_DIR='tcl/tk$$(VERSION)' -REGRESS_FLAGS = HOME=${TESTHOME} +REGRESS_FLAGS = HOME=${TESTHOME} TESTFLAGS="${TESTFLAGS}" SEPARATE_BUILD = Yes USE_GROFF = Yes CONFIGURE_STYLE = gnu old @@ -57,9 +57,9 @@ FLAVOR ?= .if ${FLAVOR:L:Mthreaded} CONFIGURE_ARGS += --enable-threads WANTLIB += pthread -LIB_DEPENDS += tcl->=8.5.11,<8.5.12-threaded:lang/tcl/8.5,threaded +LIB_DEPENDS += tcl->=8.5.12,<8.5.13-threaded:lang/tcl/8.5,threaded .else -LIB_DEPENDS += tcl->=8.5.11,<8.5.12-!threaded:lang/tcl/8.5 +LIB_DEPENDS += tcl->=8.5.12,<8.5.13-!threaded:lang/tcl/8.5 .endif .include <bsd.port.arch.mk> @@ -76,6 +76,9 @@ WRKSRC = ${WRKDIST}/unix REGRESS_TARGET = test TESTHOME = ${WRKDIR}/testhome + +# Use TESTFLAGS to control the Tk tests +TESTFLAGS = pre-regress: mkdir -p ${TESTHOME} Index: distinfo =================================================================== RCS file: /cvs/ports/x11/tk/8.5/distinfo,v retrieving revision 1.9 diff -u -p -r1.9 distinfo --- distinfo 21 Nov 2011 18:31:02 -0000 1.9 +++ distinfo 8 Aug 2012 04:41:12 -0000 @@ -1,5 +1,2 @@ -MD5 (tk8.5.11-src.tar.gz) = thty8KrSMAkbEAdG8Hi48Q== -RMD160 (tk8.5.11-src.tar.gz) = pH+iCe2GtCXpBHEckQ1AFXPdidI= -SHA1 (tk8.5.11-src.tar.gz) = PXyIy0zDKMkG4uTDYx/ZPtM+bLM= -SHA256 (tk8.5.11-src.tar.gz) = 01gQszoJMWVvHRKOfgd2zAxNi5xyrzIsq1p+4wSF63A= -SIZE (tk8.5.11-src.tar.gz) = 3809826 +SHA256 (tk8.5.12-src.tar.gz) = xFPYIJJb9Sa76KDRwXqzFosHb8uYRL6nl61147mtkpE= +SIZE (tk8.5.12-src.tar.gz) = 3826062 Index: patches/patch-unix_Makefile_in =================================================================== RCS file: /cvs/ports/x11/tk/8.5/patches/patch-unix_Makefile_in,v retrieving revision 1.8 diff -u -p -r1.8 patch-unix_Makefile_in --- patches/patch-unix_Makefile_in 17 Oct 2011 15:19:22 -0000 1.8 +++ patches/patch-unix_Makefile_in 8 Aug 2012 04:41:12 -0000 @@ -1,15 +1,15 @@ $OpenBSD: patch-unix_Makefile_in,v 1.8 2011/10/17 15:19:22 stu Exp $ ---- unix/Makefile.in.orig Thu Jun 23 14:37:39 2011 -+++ unix/Makefile.in Wed Oct 5 11:26:28 2011 -@@ -550,6 +550,7 @@ PUBLIC_HDRS = $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDec +--- 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 # 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 \ + $(GENERIC_DIR)/default.h $(UNIX_DIR)/tkUnixDefault.h \ $(TTK_HDRS) $(@TK_WINDOWINGSYSTEM@_PRIVATE_HDRS) - DEMOPROGS = browse hello ixset rmt rolodex tcolor timer widget -@@ -582,6 +583,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} + DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget +@@ -585,6 +586,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} rm -f $@ @MAKE_STUB_LIB@ @@ -20,7 +20,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.8 2 # Build Aqua resource files ${TK_RSRC_FILE}: $(AQUA_RESOURCES) rm -f $@ -@@ -702,14 +707,10 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) w +@@ -709,14 +714,10 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $ do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ @@ -36,19 +36,19 @@ $OpenBSD: patch-unix_Makefile_in,v 1.8 2 @if test "x$(TK_SHARED_BUILD)" = "x1"; then \ echo "Creating package index $(PKG_INDEX)"; \ rm -f "$(PKG_INDEX)"; \ -@@ -719,10 +720,10 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) w - echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL)\ - [list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\ +@@ -734,10 +735,10 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $ + echo "}";\ + fi \ ) > "$(PKG_INDEX)"; \ + chmod 444 "$(PKG_INDEX)"; \ fi - @echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/" + @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" @@INSTALL_LIB@ -- @chmod 555 "$(LIB_INSTALL_DIR)"/$(LIB_FILE) - @echo "Installing wish@EXEEXT@ as $(BIN_INSTALL_DIR)/wish$(VERSION)@EXEEXT@" - @$(INSTALL_PROGRAM) wish@EXEEXT@ "$(BIN_INSTALL_DIR)"/wish$(VERSION)@EXEEXT@ - @echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/" -@@ -742,14 +743,10 @@ install-libraries: libraries +- @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)";\ + 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"; \ @@ -64,7 +64,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.8 2 @echo "Installing header files"; @for i in $(PUBLIC_HDRS); \ do \ -@@ -792,8 +789,7 @@ install-demos: +@@ -811,8 +808,7 @@ install-demos: do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ @@ -74,7 +74,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.8 2 else true; \ fi; \ done; -@@ -803,11 +799,12 @@ install-demos: +@@ -822,6 +818,7 @@ install-demos: if [ -f $$i ] ; then \ sed -e '3 s|exec wish|exec wish$(VERSION)|' \ $$i > "$(DEMO_INSTALL_DIR)"/`basename $$i`; \ @@ -82,13 +82,16 @@ $OpenBSD: patch-unix_Makefile_in,v 1.8 2 fi; \ done; @for i in $(DEMOPROGS); \ - do \ -- chmod 755 "$(DEMO_INSTALL_DIR)"/$$i; \ -+ chmod 555 "$(DEMO_INSTALL_DIR)"/$$i; \ +@@ -829,7 +826,7 @@ install-demos: + if test $$i = "square"; then \ + rm -f "$(DEMO_INSTALL_DIR)/$$i"; \ + else \ +- chmod 755 "$(DEMO_INSTALL_DIR)/$$i"; \ ++ chmod 555 "$(DEMO_INSTALL_DIR)/$$i"; \ + fi; \ done; @echo "Installing demo images"; - @for i in $(TOP_DIR)/library/demos/images/*; \ -@@ -822,8 +819,7 @@ install-doc: +@@ -845,8 +842,7 @@ install-doc: do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ @@ -98,7 +101,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.8 2 else true; \ fi; \ done; -@@ -848,14 +844,10 @@ install-private-headers: libraries +@@ -871,14 +867,10 @@ install-private-headers: libraries do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/x11/tk/8.5/pkg/PLIST,v retrieving revision 1.7 diff -u -p -r1.7 PLIST --- pkg/PLIST 17 Oct 2011 15:19:22 -0000 1.7 +++ pkg/PLIST 8 Aug 2012 04:41:12 -0000 @@ -550,7 +550,6 @@ share/examples/tk8.5/ruler.tcl share/examples/tk8.5/sayings.tcl share/examples/tk8.5/search.tcl share/examples/tk8.5/spin.tcl -share/examples/tk8.5/square share/examples/tk8.5/states.tcl share/examples/tk8.5/style.tcl share/examples/tk8.5/tclIndex
