Update to 8.5.8, some patch bits went upstream. Some Makefile adjustments. Release announcement: http://www.tcl.tk/software/tcltk/8.5.html
Index: lang/tcl/8.5/Makefile =================================================================== RCS file: /cvs/ports//lang/tcl/8.5/Makefile,v retrieving revision 1.7 diff -N -u -p lang/tcl/8.5/Makefile --- lang/tcl/8.5/Makefile 24 Apr 2009 21:13:13 -0000 1.7 +++ lang/tcl/8.5/Makefile 20 Nov 2009 02:03:41 -0000 @@ -2,10 +2,9 @@ COMMENT = Tool Command Language -V = 8.5.7 -DISTNAME = tcl${V} -PKGNAME = tcl-${V} -SHARED_LIBS = tcl85 0.4 +DISTNAME = tcl8.5.8 +PKGNAME = tcl-8.5.8 +SHARED_LIBS = tcl85 0.5 CATEGORIES = lang lang/tcl HOMEPAGE = http://www.tcl.tk/ MAINTAINER = Stuart Cassoff <s...@users.sourceforge.net> @@ -43,9 +42,6 @@ CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ --disable-rpath CONFIGURE_ENV += SHLIB_VERSION="${LIBtcl85_VERSION}" - -# Needs a full network connection to run? -#REGRESS_IS_INTERACTIVE=Yes FLAVORS = threaded FLAVOR ?= Index: lang/tcl/8.5/distinfo =================================================================== RCS file: /cvs/ports//lang/tcl/8.5/distinfo,v retrieving revision 1.5 diff -N -u -p lang/tcl/8.5/distinfo --- lang/tcl/8.5/distinfo 24 Apr 2009 21:13:13 -0000 1.5 +++ lang/tcl/8.5/distinfo 20 Nov 2009 02:03:41 -0000 @@ -1,5 +1,5 @@ -MD5 (tcl8.5.7-src.tar.gz) = 9wrY94teSp95L+EB8isSXw== -RMD160 (tcl8.5.7-src.tar.gz) = G7hDVIwFMy6zQEuZtIAGE/Janb8= -SHA1 (tcl8.5.7-src.tar.gz) = pgPSe/C4VHOcmfDWWL/D8cSF9Xg= -SHA256 (tcl8.5.7-src.tar.gz) = Z9KNUajQTDcRQDAnZQO8iFmkspG8MxM1VqstETA+ZvI= -SIZE (tcl8.5.7-src.tar.gz) = 4421720 +MD5 (tcl8.5.8-src.tar.gz) = fxI+U7PaqrokeNOvWgdS4w== +RMD160 (tcl8.5.8-src.tar.gz) = 37pj6aOJY1C4j1kjAfvmZppgtcE= +SHA1 (tcl8.5.8-src.tar.gz) = Id4nokYzx1UDg7x8NXNums1cs6g= +SHA256 (tcl8.5.8-src.tar.gz) = awkMECQDjQOB4cz71tXA8ObvIFJpzrnSi9e9esW79Kc= +SIZE (tcl8.5.8-src.tar.gz) = 4452127 Index: lang/tcl/8.5/patches/patch-unix_Makefile_in =================================================================== RCS file: /cvs/ports//lang/tcl/8.5/patches/patch-unix_Makefile_in,v retrieving revision 1.3 diff -N -u -p lang/tcl/8.5/patches/patch-unix_Makefile_in --- lang/tcl/8.5/patches/patch-unix_Makefile_in 24 Apr 2009 21:13:13 -0000 1.3 +++ lang/tcl/8.5/patches/patch-unix_Makefile_in 20 Nov 2009 02:03:41 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-unix_Makefile_in,v 1.3 2009/04/24 21:13:13 sthen Exp $ ---- unix/Makefile.in.orig Wed Apr 15 15:30:05 2009 -+++ unix/Makefile.in Fri Apr 17 11:09:50 2009 +--- unix/Makefile.in.orig Fri Nov 13 13:38:45 2009 ++++ unix/Makefile.in Thu Nov 19 20:29:58 2009 @@ -557,6 +557,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} rm -f $@ @MAKE_STUB_LIB@ @@ -87,14 +87,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.3 2009/04/24 21:1 @echo "Installing library files to $(SCRIPT_INSTALL_DIR)"; @for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex \ $(UNIX_DIR)/tclAppInit.c @LDAIX_SRC@ @DTRACE_SRC@; \ -@@ -828,31 +835,27 @@ install-msgs: tclsh - $(TOP_DIR)/library/msgs "$(SCRIPT_INSTALL_DIR)"/msgs - - install-doc: doc -- @if test ! -x $(UNIX_DIR)/installManPage; then \ -- chmod +x $(UNIX_DIR)/installManPage; \ -- fi - @for i in "$(MAN_INSTALL_DIR)" "$(MAN1_INSTALL_DIR)" "$(MAN3_INSTALL_DIR)" "$(MANN_INSTALL_DIR)" ; \ +@@ -832,8 +839,7 @@ install-doc: doc do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ @@ -104,22 +97,3 @@ $OpenBSD: patch-unix_Makefile_in,v 1.3 2009/04/24 21:1 else true; \ fi; \ done; - @echo "Installing and cross-linking top-level (.1) docs"; - @for i in $(TOP_DIR)/doc/*.1; do \ -- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \ -+ $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \ - done - - @echo "Installing and cross-linking C API (.3) docs"; - @for i in $(TOP_DIR)/doc/*.3; do \ -- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \ -+ $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \ - done - - @echo "Installing and cross-linking command (.n) docs"; - @for i in $(TOP_DIR)/doc/*.n; do \ -- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \ -+ $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \ - done - - # Optional target to install private headers Index: lang/tcl/8.5/pkg/PLIST =================================================================== RCS file: /cvs/ports//lang/tcl/8.5/pkg/PLIST,v retrieving revision 1.4 diff -N -u -p lang/tcl/8.5/pkg/PLIST --- lang/tcl/8.5/pkg/PLIST 24 Apr 2009 21:13:13 -0000 1.4 +++ lang/tcl/8.5/pkg/PLIST 20 Nov 2009 02:03:41 -0000 @@ -952,12 +952,12 @@ lib/tcl8.5/tm.tcl lib/tcl8.5/word.tcl lib/tcl8/8.3/ lib/tcl8/8.4/ -lib/tcl8/8.4/http-2.7.3.tm +lib/tcl8/8.4/http-2.7.5.tm lib/tcl8/8.4/platform/ -lib/tcl8/8.4/platform-1.0.4.tm +lib/tcl8/8.4/platform-1.0.5.tm lib/tcl8/8.4/platform/shell-1.1.4.tm lib/tcl8/8.5/ lib/tcl8/8.5/msgcat-1.4.2.tm -lib/tcl8/8.5/tcltest-2.3.1.tm +lib/tcl8/8.5/tcltest-2.3.2.tm share/doc/tcltk8.5/ share/doc/tcltk8.5/README.OpenBSD Index: x11/tk/8.5/Makefile =================================================================== RCS file: /cvs/ports//x11/tk/8.5/Makefile,v retrieving revision 1.11 diff -N -u -p x11/tk/8.5/Makefile --- x11/tk/8.5/Makefile 6 Sep 2009 10:46:26 -0000 1.11 +++ x11/tk/8.5/Makefile 20 Nov 2009 02:16:28 -0000 @@ -2,10 +2,9 @@ COMMENT = graphical toolkit for Tcl -V = 8.5.7 -DISTNAME = tk${V} -PKGNAME = tk-${V}p0 -SHARED_LIBS = tk85 0.4 +DISTNAME = tk8.5.8 +PKGNAME = tk-8.5.8 +SHARED_LIBS = tk85 0.5 CATEGORIES = x11 x11/tk HOMEPAGE = http://www.tcl.tk/ MAINTAINER = Stuart Cassoff <s...@users.sourceforge.net> @@ -57,9 +56,9 @@ FLAVOR ?= .if ${FLAVOR:L:Mthreaded} CONFIGURE_ARGS += --enable-threads WANTLIB += pthread -LIB_DEPENDS = tcl85:tcl->=$V,<8.5.8-${FLAVOR}:lang/tcl/8.5 +LIB_DEPENDS = tcl85:tcl->=8.5.8,<8.5.9-${FLAVOR}:lang/tcl/8.5 .else -LIB_DEPENDS = tcl85:tcl->=$V,<8.5.8:lang/tcl/8.5 +LIB_DEPENDS = tcl85:tcl->=8.5.8,<8.5.9:lang/tcl/8.5 .endif WRKSRC = ${WRKDIST}/unix Index: x11/tk/8.5/distinfo =================================================================== RCS file: /cvs/ports//x11/tk/8.5/distinfo,v retrieving revision 1.5 diff -N -u -p x11/tk/8.5/distinfo --- x11/tk/8.5/distinfo 24 Apr 2009 21:13:13 -0000 1.5 +++ x11/tk/8.5/distinfo 20 Nov 2009 02:16:28 -0000 @@ -1,5 +1,5 @@ -MD5 (tk8.5.7-src.tar.gz) = B2T2OuIQa0d0xOyw7zkWEA== -RMD160 (tk8.5.7-src.tar.gz) = j/QS+E/7drmw2loy90BMN6UzcAM= -SHA1 (tk8.5.7-src.tar.gz) = td72hx5Tx4NUrAGyer1SO7QpUVg= -SHA256 (tk8.5.7-src.tar.gz) = 2TZu05fEvellUOydMKj89nh4zyaTfK6T5YByaofXrzA= -SIZE (tk8.5.7-src.tar.gz) = 3779867 +MD5 (tk8.5.8-src.tar.gz) = E7+QYC4W/FMOBRlkMQIdxg== +RMD160 (tk8.5.8-src.tar.gz) = SUoNIXzmqBwQr7kbNExhEN0JhrA= +SHA1 (tk8.5.8-src.tar.gz) = 6hO50L9hHHZxxIi8C18/c5rX45k= +SHA256 (tk8.5.8-src.tar.gz) = lzfaXDDmMSgQYrasu0dThA+elWV8eON2V9nFIFiastQ= +SIZE (tk8.5.8-src.tar.gz) = 3789533 Index: x11/tk/8.5/patches/patch-unix_Makefile_in =================================================================== RCS file: /cvs/ports//x11/tk/8.5/patches/patch-unix_Makefile_in,v retrieving revision 1.5 diff -N -u -p x11/tk/8.5/patches/patch-unix_Makefile_in --- x11/tk/8.5/patches/patch-unix_Makefile_in 24 Apr 2009 21:13:13 -0000 1.5 +++ x11/tk/8.5/patches/patch-unix_Makefile_in 20 Nov 2009 02:16:28 -0000 @@ -1,27 +1,8 @@ $OpenBSD: patch-unix_Makefile_in,v 1.5 2009/04/24 21:13:13 sthen Exp $ ---- unix/Makefile.in.orig Wed Apr 15 10:11:42 2009 -+++ unix/Makefile.in Wed Apr 15 23:16:23 2009 -@@ -95,6 +95,9 @@ HTML_INSTALL_DIR = $(INSTALL_ROOT)$(HTML_DIR) - # Directory in which to install the configuration file tkConfig.sh: - CONFIG_INSTALL_DIR = $(INSTALL_ROOT)$(libdir) +--- unix/Makefile.in.orig Wed Nov 4 14:40:26 2009 ++++ unix/Makefile.in Wed Nov 4 15:02:26 2009 +@@ -543,7 +543,8 @@ AQUA_XLIB_HDRS = $(XLIB_DIR)/X11/*.h $(XLIB_DIR)/xbyte -+# Directory in which to install the demo files: -+DEMO_INSTALL_DIR = $(INSTALL_ROOT)$(TK_LIBRARY)/demos -+ - # The directory containing the Tcl sources and headers appropriate - # for this version of Tk ("srcdir" will be replaced or has already - # been replaced by the configure script): -@@ -190,7 +193,7 @@ NO_DEPRECATED_FLAGS = -DTCL_NO_DEPRECATED - - # Some versions of make, like SGI's, use the following variable to - # determine which shell to use for executing commands: --SHELL = /bin/sh -+SHELL = @SHELL@ - - # BUILD_TCLSH is the fully qualified path name of the tclsh shell - # in the Tcl build directory. Test that need to be run in the -@@ -540,7 +543,8 @@ AQUA_XLIB_HDRS = $(XLIB_DIR)/X11/*.h $(XLIB_DIR)/xbyte - AQUA_PRIVATE_HDRS = $(MAC_OSX_DIR)/tkMacOSXPort.h $(MAC_OSX_DIR)/tkMacOSXInt.h -X11_PRIVATE_HDRS = $(UNIX_DIR)/tkUnixPort.h $(UNIX_DIR)/tkUnixInt.h @@ -30,19 +11,16 @@ $OpenBSD: patch-unix_Makefile_in,v 1.5 2009/04/24 21:1 # Currently private, eventually public TTK_HDRS = $(TTK_DIR)/ttkTheme.h $(TTK_DIR)/ttkDecls.h -@@ -551,9 +555,9 @@ PUBLIC_HDRS = $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDec +@@ -554,7 +555,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 \ - $(TTK_HDRS) $(@tk_windowingsys...@_private_hdrs) + $(GENERIC_DIR)/default.h --DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget -+DEMOPROGS = browse hello ixset rmt rolodex tcolor timer widget + DEMOPROGS = browse hello ixset rmt rolodex tcolor timer widget - SHELL_ENV = \ - @ld_library_path_...@="`pwd`:${TCL_BIN_DIR}:$...@ld_library_path_var@}"; \ -@@ -583,6 +587,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} +@@ -586,6 +587,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} rm -f $@ @MAKE_STUB_LIB@ @@ -53,15 +31,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.5 2009/04/24 21:1 # Build Aqua resource files ${TK_RSRC_FILE}: $(AQUA_RESOURCES) rm -f $@ -@@ -638,7 +646,6 @@ xttest: test.o tkTest.o tkSquare.o $(TK_LIB_FILE) - # % make test TESTFLAGS="-verbose bps -file fileName.test" - - test: test-classic test-ttk -- @ - - test-classic: tktest - $(SHELL_ENV) ./tktest $(TEST_DIR)/all.tcl -geometry +0+0 $(TESTFLAGS) -@@ -696,14 +703,10 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $ +@@ -698,14 +703,10 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $ do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ @@ -77,7 +47,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.5 2009/04/24 21:1 @if test "x$(TK_SHARED_BUILD)" = "x1"; then \ echo "Creating package index $(PKG_INDEX)"; \ rm -f "$(PKG_INDEX)"; \ -@@ -713,14 +716,15 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $ +@@ -715,14 +716,15 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $ echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL)\ [list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\ ) > "$(PKG_INDEX)"; \ @@ -94,7 +64,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.5 2009/04/24 21:1 fi @echo "Installing wish as $(BIN_INSTALL_DIR)/wish$(VERSION)" @$(INSTALL_PROGRAM) wish "$(BIN_INSTALL_DIR)"/wish$(VERSION) -@@ -736,24 +740,35 @@ install-libraries: libraries +@@ -738,24 +740,35 @@ install-libraries: libraries @if test "$(@tk_windowingsys...@_xlib_hdrs)" != ""; then \ XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \ for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}" \ @@ -135,14 +105,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.5 2009/04/24 21:1 @list='$(@tk_windowingsys...@_xlib_hdrs)'; for i in $$list ; \ do \ $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"/X11; \ -@@ -787,63 +802,57 @@ install-libraries: libraries - done; - - install-demos: -- @for i in "$(SCRIPT_INSTALL_DIR)" \ -- "$(SCRIPT_INSTALL_DIR)"/demos \ -- "$(SCRIPT_INSTALL_DIR)"/demos/images ; \ -+ @for i in "$(DEMO_INSTALL_DIR)" "$(DEMO_INSTALL_DIR)"/images ; \ +@@ -793,8 +806,7 @@ install-demos: do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ @@ -152,37 +115,22 @@ $OpenBSD: patch-unix_Makefile_in,v 1.5 2009/04/24 21:1 else true; \ fi; \ done; -- @echo "Installing demos to $(SCRIPT_INSTALL_DIR)/demos/"; -+ @echo "Installing demos to $(DEMO_INSTALL_DIR)/"; - @for i in $(TOP_DIR)/library/demos/*; \ - do \ +@@ -804,11 +816,12 @@ install-demos: if [ -f $$i ] ; then \ sed -e '3 s|exec wish|exec wish$(VERSION)|' \ -- $$i > "$(SCRIPT_INSTALL_DIR)"/demos/`basename $$i`; \ -+ $$i > "$(DEMO_INSTALL_DIR)"/`basename $$i`; \ + $$i > "$(DEMO_INSTALL_DIR)"/`basename $$i`; \ + chmod 444 "$(DEMO_INSTALL_DIR)"/`basename $$i`; \ fi; \ done; @for i in $(DEMOPROGS); \ do \ -- chmod 755 "$(SCRIPT_INSTALL_DIR)"/demos/$$i; \ +- chmod 755 "$(DEMO_INSTALL_DIR)"/$$i; \ + chmod 555 "$(DEMO_INSTALL_DIR)"/$$i; \ done; @echo "Installing demo images"; @for i in $(TOP_DIR)/library/demos/images/*; \ +@@ -823,8 +836,7 @@ install-doc: do \ - if [ -f $$i ] ; then \ -- $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/demos/images; \ -+ $(INSTALL_DATA) $$i "$(DEMO_INSTALL_DIR)"/images; \ - fi; \ - done; - - install-doc: -- @if test ! -x $(UNIX_DIR)/installManPage; then \ -- chmod +x $(UNIX_DIR)/installManPage; \ -- fi - @for i in "$(MAN_INSTALL_DIR)" "$(MAN1_INSTALL_DIR)" "$(MAN3_INSTALL_DIR)" "$(MANN_INSTALL_DIR)" ; \ - do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ - mkdir -p "$$i"; \ @@ -191,22 +139,3 @@ $OpenBSD: patch-unix_Makefile_in,v 1.5 2009/04/24 21:1 else true; \ fi; \ done; - @echo "Installing and cross-linking top-level (.1) docs"; - @for i in $(TOP_DIR)/doc/*.1; do \ -- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \ -+ $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \ - done - - @echo "Installing and cross-linking C API (.3) docs"; - @for i in $(TOP_DIR)/doc/*.3; do \ -- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \ -+ $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \ - done - - @echo "Installing and cross-linking command (.n) docs"; - @for i in $(TOP_DIR)/doc/*.n; do \ -- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \ -+ $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \ - done - - # Optional target to install private headers Index: x11/tk/8.5/pkg/PLIST =================================================================== RCS file: /cvs/ports//x11/tk/8.5/pkg/PLIST,v retrieving revision 1.4 diff -N -u -p x11/tk/8.5/pkg/PLIST --- x11/tk/8.5/pkg/PLIST 24 Apr 2009 21:13:13 -0000 1.4 +++ x11/tk/8.5/pkg/PLIST 20 Nov 2009 02:16:29 -0000 @@ -421,6 +421,7 @@ lib/tk8.5/man/mann/ @man lib/tk8.5/man/mann/ttk_sizegrip.n @man lib/tk8.5/man/mann/ttk_style.n @man lib/tk8.5/man/mann/ttk_treeview.n +...@man lib/tk8.5/man/mann/ttk_vsapi.n @man lib/tk8.5/man/mann/ttk_widget.n @man lib/tk8.5/man/mann/winfo.n @man lib/tk8.5/man/mann/wm.n @@ -481,6 +482,7 @@ lib/tk8.5/ttk/sizegrip.tcl lib/tk8.5/ttk/treeview.tcl lib/tk8.5/ttk/ttk.tcl lib/tk8.5/ttk/utils.tcl +lib/tk8.5/ttk/vistaTheme.tcl lib/tk8.5/ttk/winTheme.tcl lib/tk8.5/ttk/xpTheme.tcl lib/tk8.5/unsupported.tcl