aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormm <mm@FreeBSD.org>2010-09-17 23:04:14 +0800
committermm <mm@FreeBSD.org>2010-09-17 23:04:14 +0800
commita61518f9f9c254964111ba22d90634323f2d5a0c (patch)
treec9a6bdcde60bedf6cfb1cc6062699f9c42334650
parent3430f0a38a69921278958dd284b238842bd9272a (diff)
downloadfreebsd-ports-gnome-a61518f9f9c254964111ba22d90634323f2d5a0c.tar.gz
freebsd-ports-gnome-a61518f9f9c254964111ba22d90634323f2d5a0c.tar.zst
freebsd-ports-gnome-a61518f9f9c254964111ba22d90634323f2d5a0c.zip
- Update to 8.5.9
-rw-r--r--lang/tcl85/Makefile2
-rw-r--r--lang/tcl85/distinfo6
-rw-r--r--lang/tcl85/files/patch-generic-tclPort.h12
-rw-r--r--lang/tcl85/files/patch-unix-Makefile.in56
-rw-r--r--lang/tcl85/pkg-plist.tm4
-rw-r--r--x11-toolkits/tk85/Makefile3
-rw-r--r--x11-toolkits/tk85/distinfo6
-rw-r--r--x11-toolkits/tk85/files/patch-unix::Makefile.in41
-rw-r--r--x11-toolkits/tk85/pkg-plist1
9 files changed, 62 insertions, 69 deletions
diff --git a/lang/tcl85/Makefile b/lang/tcl85/Makefile
index cfbcbcb50bcb..e6eb0657c0c4 100644
--- a/lang/tcl85/Makefile
+++ b/lang/tcl85/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME?= tcl
-PORTVERSION= 8.5.8
+PORTVERSION= 8.5.9
CATEGORIES= lang
MASTER_SITES= SF/tcl/Tcl/${PORTVERSION}
PKGNAMESUFFIX?= ${THREADS_SUFFIX}${PKGNAMESUFFIX2}
diff --git a/lang/tcl85/distinfo b/lang/tcl85/distinfo
index 63bec0d5444a..585bc1a807e9 100644
--- a/lang/tcl85/distinfo
+++ b/lang/tcl85/distinfo
@@ -1,3 +1,3 @@
-MD5 (tcl8.5.8-src.tar.gz) = 7f123e53b3daaaba2478d3af5a0752e3
-SHA256 (tcl8.5.8-src.tar.gz) = 6b090c1024038d0381e1ccfbd6d5c0f0e6ef205269ceb9d28bd7bd7ac5bbf4a7
-SIZE (tcl8.5.8-src.tar.gz) = 4452127
+MD5 (tcl8.5.9-src.tar.gz) = 8512d8db3233041dd68a81476906012a
+SHA256 (tcl8.5.9-src.tar.gz) = 3ab671b417e3eeb41b9cef626d742d8f7f57425101e83e5fcad1d552cd99237d
+SIZE (tcl8.5.9-src.tar.gz) = 4469603
diff --git a/lang/tcl85/files/patch-generic-tclPort.h b/lang/tcl85/files/patch-generic-tclPort.h
index 5b8d1d292e5e..edcef0bd2918 100644
--- a/lang/tcl85/files/patch-generic-tclPort.h
+++ b/lang/tcl85/files/patch-generic-tclPort.h
@@ -1,11 +1,11 @@
---- ../generic/tclPort.h.orig Tue Jan 30 11:39:50 2007
-+++ ../generic/tclPort.h Tue Jan 30 11:41:05 2007
+--- ../generic/tclPort.h.orig 2010-02-01 00:51:36.000000000 +0100
++++ ../generic/tclPort.h 2010-09-17 16:28:05.133598753 +0200
@@ -24,7 +24,7 @@
- #if defined(__WIN32__)
- # include "../win/tclWinPort.h"
- #else
+ #endif
+ #include "tcl.h"
+ #if !defined(_WIN32)
-# include "tclUnixPort.h"
+# include "../unix/tclUnixPort.h"
#endif
- #if !defined(LLONG_MIN)
+ #if defined(__CYGWIN__)
diff --git a/lang/tcl85/files/patch-unix-Makefile.in b/lang/tcl85/files/patch-unix-Makefile.in
index e675d436296d..2fae3b37f4eb 100644
--- a/lang/tcl85/files/patch-unix-Makefile.in
+++ b/lang/tcl85/files/patch-unix-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig 2009-11-13 19:38:45.000000000 +0100
-+++ Makefile.in 2009-11-20 10:00:12.822708367 +0100
+--- Makefile.in.orig 2010-09-08 19:40:48.000000000 +0200
++++ Makefile.in 2010-09-17 16:35:44.992422365 +0200
@@ -55,6 +55,8 @@
# Directory in which to install the include file tcl.h:
@@ -18,17 +18,16 @@
# Flags to pass to the linker
LDFLAGS_DEBUG = @LDFLAGS_DEBUG@
-@@ -541,7 +543,8 @@
+@@ -538,7 +540,7 @@
all: binaries libraries doc
--binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh
-+binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) \
-+ libtcl${SHORT_TCL_VER}.a tclsh
+-binaries: ${LIB_FILE} $(STUB_LIB_FILE) ${TCL_EXE}
++binaries: ${LIB_FILE} $(STUB_LIB_FILE) ${TCL_EXE} libtcl${SHORT_TCL_VER}.a
libraries:
-@@ -552,6 +555,15 @@
+@@ -549,6 +551,15 @@
${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
rm -f $@
@MAKE_LIB@
@@ -44,7 +43,7 @@
${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
rm -f $@
-@@ -700,7 +712,7 @@
+@@ -697,7 +708,7 @@
dltest.marker: ${STUB_LIB_FILE}
cd dltest ; $(MAKE)
@@ -53,7 +52,7 @@
install: $(INSTALL_TARGETS)
-@@ -730,6 +742,13 @@
+@@ -727,10 +738,18 @@
@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
@@INSTALL_LIB@
@chmod 555 "$(LIB_INSTALL_DIR)"/$(LIB_FILE)
@@ -64,13 +63,8 @@
+ @(cd "$(LIB_INSTALL_DIR)"; $(RANLIB) libtcl${SHORT_TCL_VER}.a)
+ @chmod 555 "$(LIB_INSTALL_DIR)"/libtcl${SHORT_TCL_VER}.a
+
- @if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
- echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
- $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
-@@ -737,8 +756,9 @@
- fi
- @echo "Installing tclsh as $(BIN_INSTALL_DIR)/tclsh$(VERSION)"
- @$(INSTALL_PROGRAM) tclsh "$(BIN_INSTALL_DIR)"/tclsh$(VERSION)
+ @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)/"
- @$(INSTALL_DATA) tclConfig.sh "$(CONFIG_INSTALL_DIR)"/tclConfig.sh
+ @echo "Installing tclConfig.sh to $(SCRIPT_INSTALL_DIR)/"
@@ -79,7 +73,7 @@
@if test "$(STUB_LIB_FILE)" != "" ; then \
echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
@INSTALL_STUB_LIB@ ; \
-@@ -746,7 +766,8 @@
+@@ -738,7 +757,8 @@
@EXTRA_INSTALL_BINARIES@
install-libraries: libraries $(INSTALL_TZDATA) install-msgs
@@ -89,7 +83,7 @@
do \
if [ ! -d "$$i" ] ; then \
echo "Making directory $$i"; \
-@@ -755,7 +776,7 @@
+@@ -747,7 +767,7 @@
else true; \
fi; \
done;
@@ -98,7 +92,7 @@
do \
if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
-@@ -768,13 +789,17 @@
+@@ -760,13 +780,17 @@
chmod +x $(SRC_DIR)/../unix/install-sh; \
fi
@echo "Installing header files";
@@ -121,7 +115,7 @@
@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@; \
-@@ -786,22 +811,11 @@
+@@ -778,22 +802,11 @@
do \
$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \
done;
@@ -132,19 +126,19 @@
do \
$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/opt0.4; \
done;
-- @echo "Installing package msgcat 1.4.2 as a Tcl Module";
-- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.4.2.tm;
+- @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 platform 1.0.5 as a Tcl Module";
-- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.5.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::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;
@echo "Installing library encoding directory";
@for i in $(TOP_DIR)/library/encoding/*.enc ; do \
-@@ -813,6 +827,28 @@
+@@ -805,6 +818,28 @@
"$(SCRIPT_INSTALL_DIR)"/tm.tcl; \
fi
@@ -160,20 +154,20 @@
+ 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.2 as a Tcl Module";
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.5/msgcat-1.4.2.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 platform 1.0.5 as a Tcl Module";
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/platform-1.0.5.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::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;
+
- install-tzdata: tclsh
+ install-tzdata: ${TCL_EXE}
@echo "Installing time zone data"
@@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \
-@@ -837,21 +873,26 @@
+@@ -829,21 +864,26 @@
else true; \
fi; \
done;
diff --git a/lang/tcl85/pkg-plist.tm b/lang/tcl85/pkg-plist.tm
index eeb04f0ebd01..3097dc00f69e 100644
--- a/lang/tcl85/pkg-plist.tm
+++ b/lang/tcl85/pkg-plist.tm
@@ -1,7 +1,7 @@
lib/tcl8/8.4/http-2.7.5.tm
lib/tcl8/8.4/platform/shell-1.1.4.tm
-lib/tcl8/8.4/platform-1.0.5.tm
-lib/tcl8/8.5/msgcat-1.4.2.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
@dirrmtry lib/tcl8/8.3
@dirrmtry lib/tcl8/8.4/platform
diff --git a/x11-toolkits/tk85/Makefile b/x11-toolkits/tk85/Makefile
index e41cf73d0f95..4bb6b9914baa 100644
--- a/x11-toolkits/tk85/Makefile
+++ b/x11-toolkits/tk85/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= tk
-PORTVERSION= 8.5.8
-PORTREVISION= 1
+PORTVERSION= 8.5.9
CATEGORIES= x11-toolkits
MASTER_SITES= SF/tcl/Tcl/${PORTVERSION}
PKGNAMESUFFIX?= ${THREADS_SUFFIX}
diff --git a/x11-toolkits/tk85/distinfo b/x11-toolkits/tk85/distinfo
index 701f77747f0c..3878cc2eb77d 100644
--- a/x11-toolkits/tk85/distinfo
+++ b/x11-toolkits/tk85/distinfo
@@ -1,3 +1,3 @@
-MD5 (tk8.5.8-src.tar.gz) = 13bf90602e16fc530e05196431021dc6
-SHA256 (tk8.5.8-src.tar.gz) = 9737da5c30e631281062b6acbb4753840f9e95657c78e37657d9c520589ab2d4
-SIZE (tk8.5.8-src.tar.gz) = 3789533
+MD5 (tk8.5.9-src.tar.gz) = 7cdeb9feb61593f58a0ae61f2497580e
+SHA256 (tk8.5.9-src.tar.gz) = f46b33d41e71ef533140f1814961f0dc22d62aac316df4a4fd3357e1fd788b83
+SIZE (tk8.5.9-src.tar.gz) = 3825659
diff --git a/x11-toolkits/tk85/files/patch-unix::Makefile.in b/x11-toolkits/tk85/files/patch-unix::Makefile.in
index 84cf580e6a54..c9f8803aa6aa 100644
--- a/x11-toolkits/tk85/files/patch-unix::Makefile.in
+++ b/x11-toolkits/tk85/files/patch-unix::Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig 2009-11-13 19:38:48.000000000 +0100
-+++ Makefile.in 2009-11-20 10:44:06.034436785 +0100
+--- Makefile.in.orig 2010-09-02 20:12:14.000000000 +0200
++++ Makefile.in 2010-09-17 16:52:49.592479499 +0200
@@ -65,6 +65,8 @@
# Directory in which to install the include file tk.h:
@@ -36,7 +36,7 @@
# Flags to pass to the linker
LDFLAGS_DEBUG = @LDFLAGS_DEBUG@
-@@ -273,7 +275,7 @@
+@@ -271,7 +273,7 @@
STLIB_LD = @STLIB_LD@
SHLIB_LD = @SHLIB_LD@
SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
@@ -45,7 +45,7 @@
# Additional search flags needed to find the various shared libraries
# at run-time. The first symbol is for use when creating a binary
-@@ -556,6 +558,8 @@
+@@ -554,6 +556,8 @@
$(GENERIC_DIR)/tkIntPlatDecls.h $(GENERIC_DIR)/tkPort.h \
$(TTK_HDRS) $(@TK_WINDOWINGSYSTEM@_PRIVATE_HDRS)
@@ -54,7 +54,7 @@
DEMOPROGS = browse hello ixset rmt rolodex tcolor timer widget
SHELL_ENV = \
-@@ -581,6 +585,12 @@
+@@ -579,6 +583,12 @@
${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} @LIB_RSRC_FILE@
rm -f $@
@MAKE_LIB@
@@ -67,35 +67,34 @@
${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
rm -f $@
-@@ -679,7 +689,7 @@
- gdb ./wish --command=gdb.run
- rm gdb.run
+@@ -685,7 +695,7 @@
+ valgrindshell: tktest@EXEEXT@
+ $(SHELL_ENV) valgrind $(VALGRINDARGS) ./tktest@EXEEXT@ $(SCRIPT)
-INSTALL_TARGETS = install-binaries install-libraries install-demos install-doc @EXTRA_INSTALL@
+INSTALL_TARGETS = install-binaries install-libraries @EXTRA_INSTALL@
install: $(INSTALL_TARGETS)
-@@ -692,7 +702,8 @@
+@@ -698,7 +708,7 @@
# some ranlibs write to current directory, and this might not always be
# possible (e.g. if installing as root).
--install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish
-+install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) \
-+ libtk${SHORT_TK_VER}.a wish
+-install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) wish@EXEEXT@
++install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) wish@EXEEXT@ libtk${SHORT_TK_VER}.a
@for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" \
"$(PKG_INSTALL_DIR)" "$(CONFIG_INSTALL_DIR)" ; \
do \
-@@ -724,10 +735,15 @@
- $(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
- "$(LIB_INSTALL_DIR)"/$(TK_EXP_FILE); \
- fi
+@@ -725,10 +735,15 @@
+ @echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
+ @@INSTALL_LIB@
+ @chmod 555 "$(LIB_INSTALL_DIR)"/$(LIB_FILE)
+ @ln -sf $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.so
+ @echo "Installing libtk${SHORT_TK_VER}.a"
+ @$(INSTALL_DATA) libtk${SHORT_TK_VER}.a $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.a
+ @chmod 555 $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.a
- @echo "Installing wish as $(BIN_INSTALL_DIR)/wish$(VERSION)"
- @$(INSTALL_PROGRAM) wish "$(BIN_INSTALL_DIR)"/wish$(VERSION)
+ @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)/"
- @$(INSTALL_DATA) tkConfig.sh "$(CONFIG_INSTALL_DIR)"/tkConfig.sh
+ @echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/tk$(VERSION)"
@@ -104,7 +103,7 @@
@if test "$(STUB_LIB_FILE)" != "" ; then \
echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
@INSTALL_STUB_LIB@ ; \
-@@ -738,6 +754,7 @@
+@@ -739,6 +754,7 @@
@if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \
XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \
for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}" \
@@ -112,7 +111,7 @@
"$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)"/images \
"$(SCRIPT_INSTALL_DIR)"/msgs "$(SCRIPT_INSTALL_DIR)"/ttk; \
do \
-@@ -752,10 +769,14 @@
+@@ -753,10 +769,14 @@
chmod +x $(SRC_DIR)/install-sh; \
fi
@echo "Installing header files";
@@ -130,7 +129,7 @@
@list='$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)'; for i in $$list ; \
do \
$(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"/X11; \
-@@ -828,19 +849,15 @@
+@@ -829,19 +849,15 @@
else true; \
fi; \
done;
diff --git a/x11-toolkits/tk85/pkg-plist b/x11-toolkits/tk85/pkg-plist
index db7f4870d245..a2ff0ec9c159 100644
--- a/x11-toolkits/tk85/pkg-plist
+++ b/x11-toolkits/tk85/pkg-plist
@@ -192,6 +192,7 @@ lib/tk%%TK_VER%%/ttk/progress.tcl
lib/tk%%TK_VER%%/ttk/scale.tcl
lib/tk%%TK_VER%%/ttk/scrollbar.tcl
lib/tk%%TK_VER%%/ttk/sizegrip.tcl
+lib/tk%%TK_VER%%/ttk/spinbox.tcl
lib/tk%%TK_VER%%/ttk/treeview.tcl
lib/tk%%TK_VER%%/ttk/ttk.tcl
lib/tk%%TK_VER%%/ttk/utils.tcl