- Update to 8.5.7

4 files changed, 25 insertions, 26 deletions

diff --git a/x11-toolkits/tk85/Makefile b/x11-toolkits/tk85/Makefile
index b8d8bd4a7691..ceb9672c7d53 100644
--- a/x11-toolkits/tk85/Makefile
+++ b/x11-toolkits/tk85/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	tk
-PORTVERSION=	8.5.6
-PORTREVISION=	1
+PORTVERSION=	8.5.7
+#PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tcl
diff --git a/x11-toolkits/tk85/distinfo b/x11-toolkits/tk85/distinfo
index 18a4b35fe3ee..dd1cc2fab190 100644
--- a/x11-toolkits/tk85/distinfo
+++ b/x11-toolkits/tk85/distinfo
@@ -1,3 +1,3 @@
-MD5 (tk8.5.6-src.tar.gz) = 7da2e00adddc7eed6080df904579d94e
-SHA256 (tk8.5.6-src.tar.gz) = dc918b89039d21cab4c09eddaf60abcc41e57f7bff4216a811237c1de3505907
-SIZE (tk8.5.6-src.tar.gz) = 3778532
+MD5 (tk8.5.7-src.tar.gz) = 0764f63ae2106b4774c4ecb0ef391610
+SHA256 (tk8.5.7-src.tar.gz) = d9366ed397c4bde96550ec9d30a8fcf67878cf26937cae93e580726a87d7af30
+SIZE (tk8.5.7-src.tar.gz) = 3779867
diff --git a/x11-toolkits/tk85/files/patch-unix::Makefile.in b/x11-toolkits/tk85/files/patch-unix::Makefile.in
index c83f973ce6e7..50788acdf7f8 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	2008-12-22 19:52:02.000000000 +0100
-+++ Makefile.in	2009-02-26 12:14:06.265332033 +0100
+--- Makefile.in.orig	2009-04-15 16:11:42.000000000 +0200
++++ Makefile.in	2009-04-23 22:09:05.000000000 +0200
 @@ -65,6 +65,8 @@
  
  # Directory in which to install the include file tk.h:
@@ -9,7 +9,7 @@
  
  # Path to the private tk header dir:
  PRIVATE_INCLUDE_DIR	= @PRIVATE_INCLUDE_DIR@
-@@ -95,7 +97,7 @@
+@@ -98,7 +100,7 @@
  # 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):
@@ -18,7 +18,7 @@
  
  # The directory containing the platform specific Tcl sources and headers
  # appropriate for this version of Tk:
-@@ -109,7 +111,7 @@
+@@ -112,7 +114,7 @@
  TCL_LIB_FLAG		= @TCL_LIB_FLAG@
  
  # Flag, 1: we're building a shared lib, 0 we're not
@@ -27,7 +27,7 @@
  
  # Subdirectory of $(libdir) containing the pkgIndex.tcl file for loadable Tk
  TK_PKG_DIR		= @TK_PKG_DIR@
-@@ -132,7 +134,7 @@
+@@ -135,7 +137,7 @@
  #CFLAGS			= $(CFLAGS_DEBUG)
  #CFLAGS			= $(CFLAGS_OPTIMIZE)
  #CFLAGS			= $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
@@ -36,7 +36,7 @@
  
  # Flags to pass to the linker
  LDFLAGS_DEBUG		= @LDFLAGS_DEBUG@
-@@ -267,7 +269,7 @@
+@@ -270,7 +272,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
-@@ -550,6 +552,8 @@
+@@ -553,6 +555,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 square tcolor timer widget
  
  SHELL_ENV = \
-@@ -575,6 +579,12 @@
+@@ -578,6 +582,12 @@
  ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} @LIB_RSRC_FILE@
  	rm -f $@
  	@MAKE_LIB@
@@ -67,7 +67,7 @@
  
  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
  	rm -f $@
-@@ -674,7 +684,7 @@
+@@ -677,7 +687,7 @@
  	gdb ./wish --command=gdb.run
  	rm gdb.run
  
@@ -76,17 +76,17 @@
  
  install: $(INSTALL_TARGETS)
  
-@@ -687,7 +697,8 @@
+@@ -690,7 +700,8 @@
  # 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
- 	@for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" "$(PKG_INSTALL_DIR)"; \
+ 	@for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" \
+ 	    "$(PKG_INSTALL_DIR)" "$(CONFIG_INSTALL_DIR)" ; \
  	    do \
- 	    if [ ! -d "$$i" ] ; then \
-@@ -718,10 +729,15 @@
+@@ -722,10 +733,15 @@
  	    $(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
  			"$(LIB_INSTALL_DIR)"/$(TK_EXP_FILE); \
  	    fi
@@ -96,15 +96,15 @@
 +	@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 tkConfig.sh to $(LIB_INSTALL_DIR)/"
--	@$(INSTALL_DATA) tkConfig.sh "$(LIB_INSTALL_DIR)"/tkConfig.sh
-+	@echo "Installing tkConfig.sh to $(LIB_INSTALL_DIR)/tk$(VERSION)"
-+	@mkdir -p "$(LIB_INSTALL_DIR)"/tk$(VERSION)
+-	@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)"
++	@mkdir -p "$(CONFIG_INSTALL_DIR)"/tk$(VERSION)
 +	@$(INSTALL_DATA) tkConfig.sh "$(LIB_INSTALL_DIR)"/tk$(VERSION)/tkConfig.sh
  	@if test "$(STUB_LIB_FILE)" != "" ; then \
  	    echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
  	    @INSTALL_STUB_LIB@ ; \
-@@ -732,6 +748,7 @@
+@@ -736,6 +752,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 +112,7 @@
  		"$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)"/images \
  		"$(SCRIPT_INSTALL_DIR)"/msgs "$(SCRIPT_INSTALL_DIR)"/ttk; \
  	    do \
-@@ -746,10 +763,14 @@
+@@ -750,10 +767,14 @@
  	    chmod +x $(SRC_DIR)/install-sh; \
  	    fi
  	@echo "Installing header files";
@@ -130,7 +130,7 @@
  	@list='$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)'; for i in $$list ; \
  	    do \
  	    $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"/X11; \
-@@ -827,19 +848,15 @@
+@@ -831,19 +852,15 @@
  		else true; \
  		fi; \
  	    done;
diff --git a/x11-toolkits/tk85/pkg-plist b/x11-toolkits/tk85/pkg-plist
index 70c84ad8fa18..8406aacb3450 100644
--- a/x11-toolkits/tk85/pkg-plist
+++ b/x11-toolkits/tk85/pkg-plist
@@ -163,7 +163,6 @@ lib/tk%%TK_VER%%/optMenu.tcl
 lib/tk%%TK_VER%%/palette.tcl
 lib/tk%%TK_VER%%/panedwindow.tcl
 lib/tk%%TK_VER%%/pkgIndex.tcl
-lib/tk%%TK_VER%%/prolog.ps
 lib/tk%%TK_VER%%/safetk.tcl
 lib/tk%%TK_VER%%/scale.tcl
 lib/tk%%TK_VER%%/scrlbar.tcl