aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lang/tcl85/Makefile4
-rw-r--r--lang/tcl85/distinfo4
-rw-r--r--lang/tcl85/files/patch-unix-Makefile.in32
-rw-r--r--lang/tcl85/files/patch-unix-configure14
-rw-r--r--lang/tcl85/pkg-plist27
-rw-r--r--lang/tcl85/pkg-plist.tm8
-rw-r--r--x11-toolkits/tk85/Makefile6
-rw-r--r--x11-toolkits/tk85/distinfo4
-rw-r--r--x11-toolkits/tk85/files/patch-unix::configure12
-rw-r--r--x11-toolkits/tk85/pkg-plist1
10 files changed, 58 insertions, 54 deletions
diff --git a/lang/tcl85/Makefile b/lang/tcl85/Makefile
index 17a07b56dc2e..8ec5ff8bccad 100644
--- a/lang/tcl85/Makefile
+++ b/lang/tcl85/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME?= tcl
-PORTVERSION= 8.5.9
+PORTVERSION= 8.5.10
CATEGORIES= lang
MASTER_SITES= SF/tcl/Tcl/${PORTVERSION}
PKGNAMESUFFIX?= ${THREADS_SUFFIX}${PKGNAMESUFFIX2}
@@ -54,7 +54,7 @@ PLIST= ${PKGDIR}/pkg-plist.tm
.if !defined(BUILDING_TCL_TM)
.if !defined(WITHOUT_TCL_MODULES)
-RUN_DEPENDS+= ${LOCALBASE}/lib/tcl8/8.5/tcltest-2.3.2.tm:${PORTSDIR}/lang/tcl-modules
+RUN_DEPENDS+= ${LOCALBASE}/lib/tcl8/8.5/tcltest-2.3.3.tm:${PORTSDIR}/lang/tcl-modules
.endif
DATADIR= ${PREFIX}/share/${PORTNAME}${TCL_VER}
diff --git a/lang/tcl85/distinfo b/lang/tcl85/distinfo
index 4e2c89448bb9..ddc91b890e3b 100644
--- a/lang/tcl85/distinfo
+++ b/lang/tcl85/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tcl8.5.9-src.tar.gz) = 3ab671b417e3eeb41b9cef626d742d8f7f57425101e83e5fcad1d552cd99237d
-SIZE (tcl8.5.9-src.tar.gz) = 4469603
+SHA256 (tcl8.5.10-src.tar.gz) = f582063edd5419a39ee8f7b5c8f95d557b5daad13efb0ed2f0967ca185613bb7
+SIZE (tcl8.5.10-src.tar.gz) = 4498413
diff --git a/lang/tcl85/files/patch-unix-Makefile.in b/lang/tcl85/files/patch-unix-Makefile.in
index 2fae3b37f4eb..924e0b68575a 100644
--- a/lang/tcl85/files/patch-unix-Makefile.in
+++ b/lang/tcl85/files/patch-unix-Makefile.in
@@ -119,20 +119,20 @@
do \
$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \
done;
-- @echo "Installing package http 2.7.5 as a Tcl Module";
-- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.5.tm;
+- @echo "Installing package http 2.7.6 as a Tcl Module";
+- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.6.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.3 as a Tcl Module";
-- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.4.3.tm;
-- @echo "Installing package tcltest 2.3.2 as a Tcl Module";
-- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.2.tm;
+- @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;
+- @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;
-
-- @echo "Installing package platform 1.0.9 as a Tcl Module";
-- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.9.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;
- @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;
@@ -152,15 +152,15 @@
+ else true; \
+ fi; \
+ done;
-+ @echo "Installing package http 2.7.5 as a Tcl Module";
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/http-2.7.5.tm;
-+ @echo "Installing package msgcat 1.4.3 as a Tcl Module";
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.5/msgcat-1.4.3.tm;
-+ @echo "Installing package tcltest 2.3.2 as a Tcl Module";
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.5/tcltest-2.3.2.tm;
++ @echo "Installing package http 2.7.6 as a Tcl Module";
++ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/http-2.7.6.tm;
++ @echo "Installing package msgcat 1.4.4 as a Tcl Module";
++ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(LIB_INSTALL_DIR)"/tcl8/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 "$(LIB_INSTALL_DIR)"/tcl8/8.5/tcltest-2.3.3.tm;
+
-+ @echo "Installing package platform 1.0.9 as a Tcl Module";
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/platform-1.0.9.tm;
++ @echo "Installing package platform 1.0.10 as a Tcl Module";
++ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/platform-1.0.10.tm;
+ @echo "Installing package platform::shell 1.1.4 as a Tcl Module";
+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/platform/shell-1.1.4.tm;
+
diff --git a/lang/tcl85/files/patch-unix-configure b/lang/tcl85/files/patch-unix-configure
index 30448eb4d197..1fced9ec8b33 100644
--- a/lang/tcl85/files/patch-unix-configure
+++ b/lang/tcl85/files/patch-unix-configure
@@ -1,6 +1,6 @@
---- configure.orig 2010-09-08 19:40:48.000000000 +0200
-+++ configure 2010-12-09 09:21:58.223421249 +0100
-@@ -6636,7 +6636,7 @@
+--- configure.orig 2011-06-23 15:18:36.000000000 +0200
++++ configure 2011-06-25 21:30:44.310215849 +0200
+@@ -6638,7 +6638,7 @@
# is disabled by the user. [Bug 1016796]
LDFLAGS_ARCH=""
UNSHARED_LIB_SUFFIX=""
@@ -9,7 +9,7 @@
ECHO_VERSION='`echo ${VERSION}`'
TCL_LIB_VERSIONS_OK=ok
CFLAGS_DEBUG=-g
-@@ -7609,7 +7609,7 @@
+@@ -7648,7 +7648,7 @@
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
@@ -18,7 +18,7 @@
if test $doRpath = yes; then
CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-@@ -7620,16 +7620,16 @@
+@@ -7659,16 +7659,16 @@
# The -pthread needs to go in the CFLAGS, not LIBS
LIBS=`echo $LIBS | sed s/-pthread//`
@@ -39,12 +39,12 @@
TCL_LIB_VERSIONS_OK=nodots
;;
esac
-@@ -7638,7 +7638,7 @@
+@@ -7677,7 +7677,7 @@
# This configuration from FreeBSD Ports.
SHLIB_CFLAGS="-fPIC"
SHLIB_LD="${CC} -shared"
- TCL_SHLIB_LD_EXTRAS="-soname \$@"
+ TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\$@"
- SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
+ DL_LIBS=""
diff --git a/lang/tcl85/pkg-plist b/lang/tcl85/pkg-plist
index 209ec35b3656..7e3f92cde7dd 100644
--- a/lang/tcl85/pkg-plist
+++ b/lang/tcl85/pkg-plist
@@ -413,6 +413,14 @@ lib/tcl%%TCL_VER%%/tclIndex
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Guayaquil
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Halifax
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Havana
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Indiana/Indianapolis
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Indiana/Knox
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Indiana/Marengo
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Indiana/Petersburg
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Indiana/Tell_City
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Indiana/Vevay
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Indiana/Vincennes
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Indiana/Winamac
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Lima
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Hermosillo
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Indianapolis
@@ -421,6 +429,8 @@ lib/tcl%%TCL_VER%%/tclIndex
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Jamaica
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Jujuy
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Juneau
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Kentucky/Louisville
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Kentucky/Monticello
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Knox_IN
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/La_Paz
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Los_Angeles
@@ -435,6 +445,7 @@ lib/tcl%%TCL_VER%%/tclIndex
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Mendoza
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Menominee
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Merida
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Metlakatla
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Mexico_City
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Miquelon
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Moncton
@@ -447,6 +458,9 @@ lib/tcl%%TCL_VER%%/tclIndex
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Nipigon
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Nome
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Noronha
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/North_Dakota/Beulah
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/North_Dakota/Center
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/North_Dakota/New_Salem
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Ojinaga
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Panama
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Pangnirtung
@@ -471,6 +485,7 @@ lib/tcl%%TCL_VER%%/tclIndex
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Sao_Paulo
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Scoresbysund
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Shiprock
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Sitka
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/St_Barthelemy
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/St_Johns
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/St_Kitts
@@ -490,18 +505,6 @@ lib/tcl%%TCL_VER%%/tclIndex
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Winnipeg
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Yakutat
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Yellowknife
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Indiana/Indianapolis
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Indiana/Knox
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Indiana/Marengo
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Indiana/Petersburg
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Indiana/Tell_City
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Indiana/Vevay
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Indiana/Vincennes
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Indiana/Winamac
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Kentucky/Louisville
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Kentucky/Monticello
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/North_Dakota/New_Salem
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/North_Dakota/Center
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Antarctica/Casey
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Antarctica/Davis
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Antarctica/Mawson
diff --git a/lang/tcl85/pkg-plist.tm b/lang/tcl85/pkg-plist.tm
index 3097dc00f69e..10978e3e4e76 100644
--- a/lang/tcl85/pkg-plist.tm
+++ b/lang/tcl85/pkg-plist.tm
@@ -1,8 +1,8 @@
-lib/tcl8/8.4/http-2.7.5.tm
+lib/tcl8/8.4/http-2.7.6.tm
lib/tcl8/8.4/platform/shell-1.1.4.tm
-lib/tcl8/8.4/platform-1.0.9.tm
-lib/tcl8/8.5/msgcat-1.4.3.tm
-lib/tcl8/8.5/tcltest-2.3.2.tm
+lib/tcl8/8.4/platform-1.0.10.tm
+lib/tcl8/8.5/msgcat-1.4.4.tm
+lib/tcl8/8.5/tcltest-2.3.3.tm
@dirrmtry lib/tcl8/8.3
@dirrmtry lib/tcl8/8.4/platform
@dirrmtry lib/tcl8/8.4
diff --git a/x11-toolkits/tk85/Makefile b/x11-toolkits/tk85/Makefile
index 33c0596c9fec..2fb99b806dbc 100644
--- a/x11-toolkits/tk85/Makefile
+++ b/x11-toolkits/tk85/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= tk
-PORTVERSION= 8.5.9
+PORTVERSION= 8.5.10
CATEGORIES= x11-toolkits
MASTER_SITES= SF/tcl/Tcl/${PORTVERSION}
PKGNAMESUFFIX?= ${THREADS_SUFFIX}
@@ -117,8 +117,8 @@ MANN= bell.n bind.n bindtags.n bitmap.n button.n canvas.n checkbutton.n \
ttk_button.n ttk_checkbutton.n ttk_combobox.n ttk_entry.n ttk_frame.n \
ttk_image.n ttk_intro.n ttk_label.n ttk_labelframe.n ttk_menubutton.n \
ttk_notebook.n ttk_panedwindow.n ttk_progressbar.n ttk_radiobutton.n \
- ttk_scale.n ttk_scrollbar.n ttk_separator.n ttk_sizegrip.n ttk_style.n \
- ttk_treeview.n ttk_vsapi.n ttk_widget.n
+ ttk_scale.n ttk_scrollbar.n ttk_separator.n ttk_sizegrip.n \
+ ttk_spinbox.n ttk_style.n ttk_treeview.n ttk_vsapi.n ttk_widget.n
# MLINKS generated via awk '/ln/ {print "\t" $2,$3,"\\"}' unix/mkLinks
MLINKS= 3DBorder.3 Tk_Alloc3DBorderFromObj.3 \
diff --git a/x11-toolkits/tk85/distinfo b/x11-toolkits/tk85/distinfo
index 4e016bf75ce5..7d2ac8915596 100644
--- a/x11-toolkits/tk85/distinfo
+++ b/x11-toolkits/tk85/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tk8.5.9-src.tar.gz) = f46b33d41e71ef533140f1814961f0dc22d62aac316df4a4fd3357e1fd788b83
-SIZE (tk8.5.9-src.tar.gz) = 3825659
+SHA256 (tk8.5.10-src.tar.gz) = f6ac59a3414a0989c9ca30237b3c14ceee95733eb486739ffc271c8055e37c9f
+SIZE (tk8.5.10-src.tar.gz) = 3807862
diff --git a/x11-toolkits/tk85/files/patch-unix::configure b/x11-toolkits/tk85/files/patch-unix::configure
index 4da022e29b0c..d2e2d8c0f98e 100644
--- a/x11-toolkits/tk85/files/patch-unix::configure
+++ b/x11-toolkits/tk85/files/patch-unix::configure
@@ -1,5 +1,5 @@
---- configure.orig 2010-09-02 20:12:14.000000000 +0200
-+++ configure 2010-12-09 09:26:30.809229814 +0100
+--- configure.orig 2011-06-23 20:37:39.000000000 +0200
++++ configure 2011-06-26 10:43:11.471967707 +0200
@@ -3538,6 +3538,7 @@
# Threads support - this auto-enables if Tcl was compiled threaded
#------------------------------------------------------------------------
@@ -8,7 +8,7 @@
# Check whether --enable-threads or --disable-threads was given.
if test "${enable_threads+set}" = set; then
-@@ -5815,7 +5816,7 @@
+@@ -5854,7 +5855,7 @@
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
@@ -17,7 +17,7 @@
if test $doRpath = yes; then
CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-@@ -5826,16 +5827,16 @@
+@@ -5865,16 +5866,16 @@
# The -pthread needs to go in the CFLAGS, not LIBS
LIBS=`echo $LIBS | sed s/-pthread//`
@@ -38,12 +38,12 @@
TCL_LIB_VERSIONS_OK=nodots
;;
esac
-@@ -5844,7 +5845,7 @@
+@@ -5883,7 +5884,7 @@
# This configuration from FreeBSD Ports.
SHLIB_CFLAGS="-fPIC"
SHLIB_LD="${CC} -shared"
- TCL_SHLIB_LD_EXTRAS="-soname \$@"
+ TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\$@"
- SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
+ DL_LIBS=""
diff --git a/x11-toolkits/tk85/pkg-plist b/x11-toolkits/tk85/pkg-plist
index a2ff0ec9c159..bebbcfece209 100644
--- a/x11-toolkits/tk85/pkg-plist
+++ b/x11-toolkits/tk85/pkg-plist
@@ -119,6 +119,7 @@ lib/tk%%TK_VER%%/console.tcl
%%DEMOS%%lib/tk%%TK_VER%%/demos/ttknote.tcl
%%DEMOS%%lib/tk%%TK_VER%%/demos/ttkpane.tcl
%%DEMOS%%lib/tk%%TK_VER%%/demos/ttkprogress.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/ttkscale.tcl
%%DEMOS%%lib/tk%%TK_VER%%/demos/twind.tcl
%%DEMOS%%lib/tk%%TK_VER%%/demos/unicodeout.tcl
%%DEMOS%%lib/tk%%TK_VER%%/demos/vscale.tcl