Date: Fri, 20 Sep 2013 07:32:38 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327664 - in head: lang/tcl86 lang/tcl86/files x11-toolkits/tk86 Message-ID: <201309200732.r8K7WceX065268@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Fri Sep 20 07:32:38 2013 New Revision: 327664 URL: http://svnweb.freebsd.org/changeset/ports/327664 Log: - Update Tcl/Tk 8.6 to 8.6.1 Release notes: http://code.activestate.com/lists/tcl-core/13590/ Deleted: head/lang/tcl86/files/patch-generic-regc_nfa.c head/lang/tcl86/files/patch-unix-configure Modified: head/lang/tcl86/Makefile head/lang/tcl86/Makefile.man head/lang/tcl86/distinfo head/lang/tcl86/files/patch-generic-tclPort.h head/lang/tcl86/files/patch-unix-Makefile.in head/lang/tcl86/pkg-plist head/x11-toolkits/tk86/Makefile head/x11-toolkits/tk86/distinfo Modified: head/lang/tcl86/Makefile ============================================================================== --- head/lang/tcl86/Makefile Fri Sep 20 07:26:51 2013 (r327663) +++ head/lang/tcl86/Makefile Fri Sep 20 07:32:38 2013 (r327664) @@ -2,12 +2,12 @@ # $FreeBSD$ PORTNAME= tcl -PORTVERSION= 8.6.0 -PORTREVISION= 2 +PORTVERSION= 8.6.1 CATEGORIES= lang MASTER_SITES= SF/tcl/Tcl/${PORTVERSION} \ ${MASTER_SITE_TCLTK} MASTER_SITE_SUBDIR=tcl8_6 +PKGNAMESUFFIX= ${PORTVERSION:R:S/.//} DISTNAME= ${PORTNAME}${PORTVERSION}-src MAINTAINER= tcltk@FreeBSD.org Modified: head/lang/tcl86/Makefile.man ============================================================================== --- head/lang/tcl86/Makefile.man Fri Sep 20 07:26:51 2013 (r327663) +++ head/lang/tcl86/Makefile.man Fri Sep 20 07:32:38 2013 (r327664) @@ -408,6 +408,7 @@ MAN3= TCL_MEM_DEBUG.${MAN_SUFFIX}.3 \ Tcl_NRCreateCommand.${MAN_SUFFIX}.3 \ Tcl_NREvalObj.${MAN_SUFFIX}.3 \ Tcl_NREvalObjv.${MAN_SUFFIX}.3 \ + Tcl_NRExprObj.${MAN_SUFFIX}.3 \ Tcl_NewBignumObj.${MAN_SUFFIX}.3 \ Tcl_NewBooleanObj.${MAN_SUFFIX}.3 \ Tcl_NewByteArrayObj.${MAN_SUFFIX}.3 \ Modified: head/lang/tcl86/distinfo ============================================================================== --- head/lang/tcl86/distinfo Fri Sep 20 07:26:51 2013 (r327663) +++ head/lang/tcl86/distinfo Fri Sep 20 07:32:38 2013 (r327664) @@ -1,2 +1,2 @@ -SHA256 (tcl8.6.0-src.tar.gz) = 354422b9c4791685499123b2dfe01faa98b555c08906c010cb4449ddc75dcade -SIZE (tcl8.6.0-src.tar.gz) = 8636908 +SHA256 (tcl8.6.1-src.tar.gz) = 16ee769248e64ba1cae6b4834fcc4e4edd7470d881410e8d58f7dd1434343514 +SIZE (tcl8.6.1-src.tar.gz) = 8755700 Modified: head/lang/tcl86/files/patch-generic-tclPort.h ============================================================================== --- head/lang/tcl86/files/patch-generic-tclPort.h Fri Sep 20 07:26:51 2013 (r327663) +++ head/lang/tcl86/files/patch-generic-tclPort.h Fri Sep 20 07:32:38 2013 (r327664) @@ -1,11 +1,11 @@ ---- ../generic/tclPort.h.orig 2012-06-26 15:59:02.000000000 +0200 -+++ ../generic/tclPort.h 2012-09-17 16:29:41.000000000 +0200 -@@ -22,7 +22,7 @@ - #endif - #include "tcl.h" - #if !defined(_WIN32) +--- ../generic/tclPort.h.orig 2013-09-03 14:47:31.000000000 +0200 ++++ ../generic/tclPort.h 2013-09-04 10:23:22.000000000 +0200 +@@ -20,7 +20,7 @@ + #if defined(_WIN32) + # include "tclWinPort.h" + #else -# include "tclUnixPort.h" +# include "../unix/tclUnixPort.h" #endif + #include "tcl.h" - #if !defined(LLONG_MIN) Modified: head/lang/tcl86/files/patch-unix-Makefile.in ============================================================================== --- head/lang/tcl86/files/patch-unix-Makefile.in Fri Sep 20 07:26:51 2013 (r327663) +++ head/lang/tcl86/files/patch-unix-Makefile.in Fri Sep 20 07:32:38 2013 (r327664) @@ -1,5 +1,5 @@ ---- Makefile.in.orig 2012-12-20 16:02:15.000000000 +0100 -+++ Makefile.in 2013-01-09 16:51:17.000000000 +0100 +--- Makefile.in.orig 2013-09-19 22:17:13.000000000 +0200 ++++ Makefile.in 2013-09-20 09:14:56.000000000 +0200 @@ -54,6 +54,8 @@ # Directory in which to install the include file tcl.h: @@ -22,7 +22,7 @@ # Package search path. TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@ -@@ -601,9 +603,9 @@ +@@ -611,9 +613,9 @@ # Start of rules #-------------------------------------------------------------------------- @@ -34,14 +34,11 @@ libraries: -@@ -614,10 +616,15 @@ +@@ -624,7 +626,12 @@ ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} rm -f $@ @MAKE_LIB@ + @ln -sf ${LIB_FILE} ./libtcl${SHORT_TCL_VER}.so - @if test "x$(DLL_INSTALL_DIR)" = "x$(BIN_INSTALL_DIR)"; then\ - cp ${ZLIB_DIR}/win32/zlib1.dll .;\ - fi +libtcl${SHORT_TCL_VER}.a: ${OBJS} + rm -f libtcl${SHORT_TCL_VER}.a @@ -50,7 +47,7 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} rm -f $@ -@@ -758,13 +765,13 @@ +@@ -765,13 +772,13 @@ # Installation rules #-------------------------------------------------------------------------- @@ -67,7 +64,7 @@ install: $(INSTALL_TARGETS) -@@ -795,6 +802,11 @@ +@@ -797,6 +804,11 @@ @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" @@INSTALL_LIB@ @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)" @@ -79,7 +76,7 @@ @echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}" @$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}" @echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/" -@@ -807,12 +819,12 @@ +@@ -809,12 +821,12 @@ @INSTALL_STUB_LIB@ ; \ fi @EXTRA_INSTALL_BINARIES@ @@ -96,17 +93,11 @@ do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ -@@ -820,7 +832,19 @@ +@@ -822,7 +834,13 @@ else true; \ fi; \ done; - @for i in opt0.4 http1.0 encoding ../tcl8 ../tcl8/8.4 ../tcl8/8.4/platform ../tcl8/8.5 ../tcl8/8.6; \ -+ @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@; \ -+ do \ -+ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"; \ -+ done; + @echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/"; + @for i in $(TOP_DIR)/library/encoding/*.enc ; do \ + $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/encoding; \ @@ -117,65 +108,47 @@ do \ if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \ echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \ -@@ -828,47 +852,33 @@ - else true; \ - fi; \ - done; -- @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@; \ -- do \ -- $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"; \ -- done; - @echo "Installing package http1.0 files to $(SCRIPT_INSTALL_DIR)/http1.0/"; - @for i in $(TOP_DIR)/library/http1.0/*.tcl ; \ - do \ +@@ -842,31 +860,29 @@ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \ done; - @echo "Installing package http 2.8.5 as a Tcl Module"; -- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.5.tm; -+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/http-2.8.5.tm; + @echo "Installing package http 2.8.7 as a Tcl Module"; +- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.7.tm; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/http-2.8.7.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)"/msgcat-1.5.0.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)"/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)"/platform-1.0.10.tm; + @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)"/msgcat-1.5.2.tm; + @echo "Installing package tcltest 2.3.6 as a Tcl Module"; +- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.6.tm; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest-2.3.6.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)"/platform-1.0.12.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)"/platform/shell-1.1.4.tm; -+ @echo "Customizing tcl module path"; \ -+ echo "::tcl::tm::path add {$(SCRIPT_INSTALL_DIR)}" >> \ -+ "$(SCRIPT_INSTALL_DIR)"/tm.tcl; \ -- @echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/"; -- @for i in $(TOP_DIR)/library/encoding/*.enc ; do \ -- $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/encoding; \ -- done; + @echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/"; + @for i in $(TOP_DIR)/library/encoding/*.enc ; do \ + $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/encoding; \ + done; - @if [ -n "$(TCL_MODULE_PATH)" -a -f $(TOP_DIR)/library/tm.tcl ]; then \ - echo "Customizing tcl module path"; \ - echo "if {![interp issafe]} { ::tcl::tm::roots {$(TCL_MODULE_PATH)} }" >> \ - "$(SCRIPT_INSTALL_DIR)"/tm.tcl; \ - fi -- --install-tzdata: ${NATIVE_TCLSH} -+install-tzdata: - @echo "Installing time zone files to $(SCRIPT_INSTALL_DIR)/tzdata/" -- @${NATIVE_TCLSH} $(TOOL_DIR)/installData.tcl \ -+ ./tclsh $(TOOL_DIR)/installData.tcl \ - $(TOP_DIR)/library/tzdata "$(SCRIPT_INSTALL_DIR)"/tzdata ++ @echo "Customizing tcl module path"; \ ++ echo "::tcl::tm::path add {$(SCRIPT_INSTALL_DIR)}" >> \ ++ "$(SCRIPT_INSTALL_DIR)"/tm.tcl; \ - install-msgs: -@@ -910,7 +920,7 @@ + install-tzdata: + @for i in tzdata; \ +@@ -941,7 +957,7 @@ done install-headers: @@ -184,7 +157,7 @@ do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ -@@ -919,14 +929,21 @@ +@@ -950,14 +966,21 @@ fi; \ done; @echo "Installing header files to $(INCLUDE_INSTALL_DIR)/"; Modified: head/lang/tcl86/pkg-plist ============================================================================== --- head/lang/tcl86/pkg-plist Fri Sep 20 07:26:51 2013 (r327663) +++ head/lang/tcl86/pkg-plist Fri Sep 20 07:32:38 2013 (r327664) @@ -36,15 +36,15 @@ include/tcl%%TCL_VER%%/tclOO.h include/tcl%%TCL_VER%%/tclOODecls.h include/tcl%%TCL_VER%%/tclTomMath.h include/tcl%%TCL_VER%%/tclTomMathDecls.h -%%MODULES%%lib/tcl%%TCL_VER%%/http-2.8.5.tm +%%MODULES%%lib/tcl%%TCL_VER%%/http-2.8.7.tm %%MODULES%%lib/tcl%%TCL_VER%%/http1.0/http.tcl %%MODULES%%lib/tcl%%TCL_VER%%/http1.0/pkgIndex.tcl -%%MODULES%%lib/tcl%%TCL_VER%%/msgcat-1.5.0.tm +%%MODULES%%lib/tcl%%TCL_VER%%/msgcat-1.5.2.tm %%MODULES%%lib/tcl%%TCL_VER%%/opt0.4/optparse.tcl %%MODULES%%lib/tcl%%TCL_VER%%/opt0.4/pkgIndex.tcl -%%MODULES%%lib/tcl%%TCL_VER%%/platform-1.0.10.tm +%%MODULES%%lib/tcl%%TCL_VER%%/platform-1.0.12.tm %%MODULES%%lib/tcl%%TCL_VER%%/platform/shell-1.1.4.tm -%%MODULES%%lib/tcl%%TCL_VER%%/tcltest-2.3.5.tm +%%MODULES%%lib/tcl%%TCL_VER%%/tcltest-2.3.6.tm lib/tcl%%TCL_VER%%/auto.tcl lib/tcl%%TCL_VER%%/clock.tcl lib/tcl%%TCL_VER%%/encoding/ascii.enc @@ -580,6 +580,7 @@ lib/tcl%%TCL_VER%%/word.tcl %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Kashgar %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Kathmandu %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Katmandu +%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Khandyga %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Kolkata %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Krasnoyarsk %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Kuala_Lumpur @@ -621,6 +622,7 @@ lib/tcl%%TCL_VER%%/word.tcl %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Ulaanbaatar %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Ulan_Bator %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Urumqi +%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Ust-Nera %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Vientiane %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Vladivostok %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Yakutsk @@ -721,6 +723,7 @@ lib/tcl%%TCL_VER%%/word.tcl %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Europe/Brussels %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Europe/Bucharest %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Europe/Budapest +%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Europe/Busingen %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Europe/Chisinau %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Europe/Copenhagen %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Europe/Dublin Modified: head/x11-toolkits/tk86/Makefile ============================================================================== --- head/x11-toolkits/tk86/Makefile Fri Sep 20 07:26:51 2013 (r327663) +++ head/x11-toolkits/tk86/Makefile Fri Sep 20 07:32:38 2013 (r327664) @@ -2,12 +2,12 @@ # $FreeBSD$ PORTNAME= tk -PORTVERSION= 8.6.0 -PORTREVISION= 2 +PORTVERSION= 8.6.1 CATEGORIES= x11-toolkits MASTER_SITES= SF/tcl/Tcl/${PORTVERSION} \ ${MASTER_SITE_TCLTK} MASTER_SITE_SUBDIR=tcl8_6 +PKGNAMESUFFIX= ${PORTVERSION:R:S/.//} DISTNAME= ${PORTNAME}${PORTVERSION}-src MAINTAINER= tcltk@FreeBSD.org @@ -16,10 +16,11 @@ COMMENT= Graphical toolkit for Tcl LICENSE= BSD LICENSE_FILE= ${WRKSRC}/../license.terms -OPTIONS_DEFINE= TKMAN DEMOS XFT THREADS -OPTIONS_DEFAULT=XFT THREADS +OPTIONS_DEFINE= TKMAN DEMOS THREADS +OPTIONS_DEFAULT=THREADS TKMAN_DESC= Install Tk function manpages DEMOS_DESC= Install demos +XSS_DESC= XScrnSaver support WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION}/unix @@ -27,10 +28,12 @@ ALL_TARGET= all INSTALL_TARGET= install USE_LDCONFIG= yes -USE_TCL= ${SHORT_TK_VER} -USE_XORG= x11 xt +USES+= tcl:${SHORT_TK_VER} +USE_XORG= x11 xft xscrnsaver GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared \ + --enable-xss \ + --enable-xft \ --enable-man-suffix=.${MAN_SUFFIX} \ --with-tcl=${TCL_LIBDIR} \ --includedir=${PREFIX}/include/tk${TK_VER} @@ -52,13 +55,6 @@ PLIST_SUB= TK_VER=${TK_VER} \ .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MXFT} -CONFIGURE_ARGS+=--enable-xft -LIB_DEPENDS+= Xft:${PORTSDIR}/x11-fonts/libXft -.else -CONFIGURE_ARGS+=--disable-xft -.endif - .if ${PORT_OPTIONS:MDEMOS} INSTALL_TARGET+= install install-demos PLIST_SUB+= DEMOS="" Modified: head/x11-toolkits/tk86/distinfo ============================================================================== --- head/x11-toolkits/tk86/distinfo Fri Sep 20 07:26:51 2013 (r327663) +++ head/x11-toolkits/tk86/distinfo Fri Sep 20 07:32:38 2013 (r327664) @@ -1,2 +1,2 @@ -SHA256 (tk8.6.0-src.tar.gz) = 5c708b2b6f658916df59190b27750fa1ea2bc10992108e10f961c0700f058de6 -SIZE (tk8.6.0-src.tar.gz) = 4239836 +SHA256 (tk8.6.1-src.tar.gz) = b691a2e84907392918665fe03a0deb913663a026bed2162185b4a9a14898162c +SIZE (tk8.6.1-src.tar.gz) = 4244010
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309200732.r8K7WceX065268>