- Update to 8.5.0

- Make demos installation optional (WITH_DEMOS)

12 files changed, 244 insertions, 186 deletions

diff --git a/x11-toolkits/tk85/Makefile b/x11-toolkits/tk85/Makefile
index b3629db58ffe..02eed830ec4c 100644
--- a/x11-toolkits/tk85/Makefile
+++ b/x11-toolkits/tk85/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	tk
-PORTVERSION=	8.5.b.1
+PORTVERSION=	8.5.0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tcl
 PKGNAMESUFFIX?=	${THREADS_SUFFIX}
-DISTNAME=	${PORTNAME}${PORTVERSION:S/.b./b/}-src
+DISTNAME=	${PORTNAME}${PORTVERSION}-src
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Graphical toolkit for TCL
@@ -36,7 +36,8 @@ SUB_FILES=	pkgIndex.tcl
 USE_TCL=	${SHORT_TK_VER}
 
 OPTIONS=	TK85_MAN "Install tk 8.5 manpages" off \
-		XFT "Use Xft fonts" on
+		XFT "Use Xft fonts" on \
+		DEMOS "Install demos" off
 .else
 USE_TK=		${SHORT_TK_VER}
 PLIST=		${PKGDIR}/pkg-plist.threads
@@ -67,6 +68,13 @@ CONFIGURE_ARGS+=	--disable-threads --with-tcl=${LOCALBASE}/lib/tcl${TK_VER} \
 
 SUB_LIST+=		TK_PROVIDE=""
 
+.if defined(WITH_DEMOS)
+INSTALL_TARGET+=	install install-demos
+PLIST_SUB+=	DEMOS=""
+.else
+PLIST_SUB+=	DEMOS="@comment "
+.endif
+
 .if defined(NO_INSTALL_MANPAGES) || !defined(WITH_TK85_MAN)
 
 PLIST_SUB+=	INSTMAN='@comment '
diff --git a/x11-toolkits/tk85/distinfo b/x11-toolkits/tk85/distinfo
index fe0d08101fa1..eea982ecdbca 100644
--- a/x11-toolkits/tk85/distinfo
+++ b/x11-toolkits/tk85/distinfo
@@ -1,3 +1,3 @@
-MD5 (tk8.5b1-src.tar.gz) = 49430237b7d938a8cd2a761b3ccfe1b6
-SHA256 (tk8.5b1-src.tar.gz) = 7401f2fdb08d3f1ad0b2fb429d3f3e0d91930c8f61f694585e954b7d2b26b7c8
-SIZE (tk8.5b1-src.tar.gz) = 3701685
+MD5 (tk8.5.0-src.tar.gz) = bc217c45ed6b2f5b8d3120df63fa13bd
+SHA256 (tk8.5.0-src.tar.gz) = ef75421a4b7d74d4d934c700d4d7649733cd1ecbbfb233eb6ffadfebe7f412c6
+SIZE (tk8.5.0-src.tar.gz) = 3755427
diff --git a/x11-toolkits/tk85/files/patch-unix::Makefile.in b/x11-toolkits/tk85/files/patch-unix::Makefile.in
index 41cb203401c0..0d659d3f789e 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	2007-09-24 18:09:13.000000000 +0200
-+++ Makefile.in	2007-09-27 20:55:50.000000000 +0200
+--- Makefile.in.orig	2007-12-17 18:57:25.000000000 +0100
++++ Makefile.in	2007-12-29 22:02:15.000000000 +0100
 @@ -65,6 +65,8 @@
  
  # Directory in which to install the include file tk.h:
@@ -23,7 +23,7 @@
  
  # Flag, 1: we're building a shared lib, 0 we're not
 -TK_SHARED_BUILD		= @TK_SHARED_BUILD@
-+TK_SHARED_BUILD		= #@TK_SHARED_BUILD@
++TK_SHARED_BUILD		= ##@TK_SHARED_BUILD@
  
  # Subdirectory of $(libdir) containing the pkgIndex.tcl file for loadable Tk
  TK_PKG_DIR		= @TK_PKG_DIR@
@@ -72,7 +72,7 @@
  	rm gdb.run
  
 -INSTALL_TARGETS = install-binaries install-libraries install-demos install-doc @EXTRA_INSTALL@
-+INSTALL_TARGETS = install-binaries install-libraries install-demos @EXTRA_INSTALL@
++INSTALL_TARGETS = install-binaries install-libraries @EXTRA_INSTALL@
  
  install: $(INSTALL_TARGETS)
  
diff --git a/x11-toolkits/tk85/files/patch-unix::configure b/x11-toolkits/tk85/files/patch-unix::configure
index ea2ea6bed575..fe54d378c066 100644
--- a/x11-toolkits/tk85/files/patch-unix::configure
+++ b/x11-toolkits/tk85/files/patch-unix::configure
@@ -1,6 +1,6 @@
---- configure.orig	2007-09-24 18:09:13.000000000 +0200
-+++ configure	2007-09-27 20:50:38.000000000 +0200
-@@ -3535,6 +3535,7 @@
+--- configure.orig	2007-12-17 18:57:25.000000000 +0100
++++ configure	2007-12-29 14:17:55.000000000 +0100
+@@ -3536,6 +3536,7 @@
  # Threads support - this auto-enables if Tcl was compiled threaded
  #------------------------------------------------------------------------
  
@@ -8,22 +8,26 @@
  
      # Check whether --enable-threads or --disable-threads was given.
  if test "${enable_threads+set}" = set; then
-@@ -5694,20 +5695,20 @@
+@@ -5828,7 +5829,7 @@
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS=""
 -	    LDFLAGS="$LDFLAGS -export-dynamic"
 +	    LDFLAGS=""
- 	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- 	    if test "${TCL_THREADS}" = "1" ; then
+ 	    if test $doRpath = yes; then
+ 
+ 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+@@ -5839,16 +5840,16 @@
+ 
  		# The -pthread needs to go in the CFLAGS, not LIBS
  		LIBS=`echo $LIBS | sed s/-pthread//`
 -		CFLAGS="$CFLAGS -pthread"
 -	    	LDFLAGS="$LDFLAGS -pthread"
 +		CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
 +	    	LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
- 	    fi
+ 
+ fi
+ 
  	    case $system in
 -	    FreeBSD-3.*)
 +	    FreeBSD-*)
diff --git a/x11-toolkits/tk85/pkg-descr b/x11-toolkits/tk85/pkg-descr
index b38c81c9491d..63fe66f5b010 100644
--- a/x11-toolkits/tk85/pkg-descr
+++ b/x11-toolkits/tk85/pkg-descr
@@ -1,6 +1,11 @@
 This is Tk version 8.5, a GUI toolkit for Tcl.
 
-The best way to get started with Tcl is to read ``Tcl and the Tk
-Toolkit'' by John K. Ousterhout, Addison-Wesley, ISBN 0-201-63337-X.
+Tk is a graphical user interface toolkit that takes developing desktop 
+applications to a higher level than conventional approaches. Tk is the 
+standard GUI not only for Tcl, but for many other dynamic languages, and can 
+produce rich, native applications that run unchanged across Windows, Mac OS X, 
+Linux and more.
+
+A full set of manual pages is also provided with this port.
 
 WWW: http://www.tcl.tk/
diff --git a/x11-toolkits/tk85/pkg-plist b/x11-toolkits/tk85/pkg-plist
index 10e049ca7489..8d5671dd5aac 100644
--- a/x11-toolkits/tk85/pkg-plist
+++ b/x11-toolkits/tk85/pkg-plist
@@ -40,77 +40,87 @@ lib/tk%%TK_VER%%/choosedir.tcl
 lib/tk%%TK_VER%%/clrpick.tcl
 lib/tk%%TK_VER%%/comdlg.tcl
 lib/tk%%TK_VER%%/console.tcl
-lib/tk%%TK_VER%%/demos/README
-lib/tk%%TK_VER%%/demos/anilabel.tcl
-lib/tk%%TK_VER%%/demos/aniwave.tcl
-lib/tk%%TK_VER%%/demos/arrow.tcl
-lib/tk%%TK_VER%%/demos/bind.tcl
-lib/tk%%TK_VER%%/demos/bitmap.tcl
-lib/tk%%TK_VER%%/demos/browse
-lib/tk%%TK_VER%%/demos/button.tcl
-lib/tk%%TK_VER%%/demos/check.tcl
-lib/tk%%TK_VER%%/demos/clrpick.tcl
-lib/tk%%TK_VER%%/demos/colors.tcl
-lib/tk%%TK_VER%%/demos/cscroll.tcl
-lib/tk%%TK_VER%%/demos/ctext.tcl
-lib/tk%%TK_VER%%/demos/dialog1.tcl
-lib/tk%%TK_VER%%/demos/dialog2.tcl
-lib/tk%%TK_VER%%/demos/en.msg
-lib/tk%%TK_VER%%/demos/entry1.tcl
-lib/tk%%TK_VER%%/demos/entry2.tcl
-lib/tk%%TK_VER%%/demos/entry3.tcl
-lib/tk%%TK_VER%%/demos/filebox.tcl
-lib/tk%%TK_VER%%/demos/floor.tcl
-lib/tk%%TK_VER%%/demos/form.tcl
-lib/tk%%TK_VER%%/demos/goldberg.tcl
-lib/tk%%TK_VER%%/demos/hello
-lib/tk%%TK_VER%%/demos/hscale.tcl
-lib/tk%%TK_VER%%/demos/icon.tcl
-lib/tk%%TK_VER%%/demos/image1.tcl
-lib/tk%%TK_VER%%/demos/image2.tcl
-lib/tk%%TK_VER%%/demos/images/earth.gif
-lib/tk%%TK_VER%%/demos/images/earthris.gif
-lib/tk%%TK_VER%%/demos/images/face.xbm
-lib/tk%%TK_VER%%/demos/images/flagdown.xbm
-lib/tk%%TK_VER%%/demos/images/flagup.xbm
-lib/tk%%TK_VER%%/demos/images/gray25.xbm
-lib/tk%%TK_VER%%/demos/images/letters.xbm
-lib/tk%%TK_VER%%/demos/images/noletter.xbm
-lib/tk%%TK_VER%%/demos/images/pattern.xbm
-lib/tk%%TK_VER%%/demos/images/tcllogo.gif
-lib/tk%%TK_VER%%/demos/images/teapot.ppm
-lib/tk%%TK_VER%%/demos/items.tcl
-lib/tk%%TK_VER%%/demos/ixset
-lib/tk%%TK_VER%%/demos/label.tcl
-lib/tk%%TK_VER%%/demos/labelframe.tcl
-lib/tk%%TK_VER%%/demos/license.terms
-lib/tk%%TK_VER%%/demos/menu.tcl
-lib/tk%%TK_VER%%/demos/menubu.tcl
-lib/tk%%TK_VER%%/demos/msgbox.tcl
-lib/tk%%TK_VER%%/demos/nl.msg
-lib/tk%%TK_VER%%/demos/paned1.tcl
-lib/tk%%TK_VER%%/demos/paned2.tcl
-lib/tk%%TK_VER%%/demos/pendulum.tcl
-lib/tk%%TK_VER%%/demos/plot.tcl
-lib/tk%%TK_VER%%/demos/puzzle.tcl
-lib/tk%%TK_VER%%/demos/radio.tcl
-lib/tk%%TK_VER%%/demos/rmt
-lib/tk%%TK_VER%%/demos/rolodex
-lib/tk%%TK_VER%%/demos/ruler.tcl
-lib/tk%%TK_VER%%/demos/sayings.tcl
-lib/tk%%TK_VER%%/demos/search.tcl
-lib/tk%%TK_VER%%/demos/spin.tcl
-lib/tk%%TK_VER%%/demos/square
-lib/tk%%TK_VER%%/demos/states.tcl
-lib/tk%%TK_VER%%/demos/style.tcl
-lib/tk%%TK_VER%%/demos/tclIndex
-lib/tk%%TK_VER%%/demos/tcolor
-lib/tk%%TK_VER%%/demos/text.tcl
-lib/tk%%TK_VER%%/demos/timer
-lib/tk%%TK_VER%%/demos/twind.tcl
-lib/tk%%TK_VER%%/demos/unicodeout.tcl
-lib/tk%%TK_VER%%/demos/vscale.tcl
-lib/tk%%TK_VER%%/demos/widget
+%%DEMOS%%lib/tk%%TK_VER%%/demos/README
+%%DEMOS%%lib/tk%%TK_VER%%/demos/anilabel.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/aniwave.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/arrow.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/bind.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/bitmap.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/browse
+%%DEMOS%%lib/tk%%TK_VER%%/demos/button.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/check.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/clrpick.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/colors.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/combo.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/cscroll.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/ctext.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/dialog1.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/dialog2.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/en.msg
+%%DEMOS%%lib/tk%%TK_VER%%/demos/entry1.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/entry2.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/entry3.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/filebox.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/floor.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/form.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/goldberg.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/hello
+%%DEMOS%%lib/tk%%TK_VER%%/demos/hscale.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/icon.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/image1.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/image2.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/images/earth.gif
+%%DEMOS%%lib/tk%%TK_VER%%/demos/images/earthris.gif
+%%DEMOS%%lib/tk%%TK_VER%%/demos/images/face.xbm
+%%DEMOS%%lib/tk%%TK_VER%%/demos/images/flagdown.xbm
+%%DEMOS%%lib/tk%%TK_VER%%/demos/images/flagup.xbm
+%%DEMOS%%lib/tk%%TK_VER%%/demos/images/gray25.xbm
+%%DEMOS%%lib/tk%%TK_VER%%/demos/images/letters.xbm
+%%DEMOS%%lib/tk%%TK_VER%%/demos/images/noletter.xbm
+%%DEMOS%%lib/tk%%TK_VER%%/demos/images/pattern.xbm
+%%DEMOS%%lib/tk%%TK_VER%%/demos/images/tcllogo.gif
+%%DEMOS%%lib/tk%%TK_VER%%/demos/images/teapot.ppm
+%%DEMOS%%lib/tk%%TK_VER%%/demos/items.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/ixset
+%%DEMOS%%lib/tk%%TK_VER%%/demos/label.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/labelframe.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/license.terms
+%%DEMOS%%lib/tk%%TK_VER%%/demos/mclist.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/menu.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/menubu.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/msgbox.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/nl.msg
+%%DEMOS%%lib/tk%%TK_VER%%/demos/paned1.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/paned2.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/pendulum.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/plot.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/puzzle.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/radio.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/rmt
+%%DEMOS%%lib/tk%%TK_VER%%/demos/rolodex
+%%DEMOS%%lib/tk%%TK_VER%%/demos/ruler.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/sayings.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/search.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/spin.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/square
+%%DEMOS%%lib/tk%%TK_VER%%/demos/states.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/style.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/tclIndex
+%%DEMOS%%lib/tk%%TK_VER%%/demos/tcolor
+%%DEMOS%%lib/tk%%TK_VER%%/demos/text.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/textpeer.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/timer
+%%DEMOS%%lib/tk%%TK_VER%%/demos/toolbar.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/tree.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/ttkbut.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/ttkmenu.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/twind.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/unicodeout.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/vscale.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/widget
 lib/tk%%TK_VER%%/dialog.tcl
 lib/tk%%TK_VER%%/entry.tcl
 lib/tk%%TK_VER%%/focus.tcl
@@ -132,6 +142,7 @@ lib/tk%%TK_VER%%/menu.tcl
 lib/tk%%TK_VER%%/mkpsenc.tcl
 lib/tk%%TK_VER%%/msgbox.tcl
 lib/tk%%TK_VER%%/msgs/cs.msg
+lib/tk%%TK_VER%%/msgs/da.msg
 lib/tk%%TK_VER%%/msgs/de.msg
 lib/tk%%TK_VER%%/msgs/el.msg
 lib/tk%%TK_VER%%/msgs/en.msg
@@ -139,6 +150,7 @@ lib/tk%%TK_VER%%/msgs/en_gb.msg
 lib/tk%%TK_VER%%/msgs/eo.msg
 lib/tk%%TK_VER%%/msgs/es.msg
 lib/tk%%TK_VER%%/msgs/fr.msg
+lib/tk%%TK_VER%%/msgs/hu.msg
 lib/tk%%TK_VER%%/msgs/it.msg
 lib/tk%%TK_VER%%/msgs/nl.msg
 lib/tk%%TK_VER%%/msgs/pl.msg
@@ -189,8 +201,8 @@ lib/tk%%TK_VER%%/xmfbox.tcl
 %%INSTMAN%%%%DATADIR%%/man.macros
 %%INSTMAN%%@dirrm %%DATADIR%%
 @dirrm lib/tk%%TK_VER%%/ttk
-@dirrm lib/tk%%TK_VER%%/demos/images
-@dirrm lib/tk%%TK_VER%%/demos
+%%DEMOS%%@dirrm lib/tk%%TK_VER%%/demos/images
+%%DEMOS%%@dirrm lib/tk%%TK_VER%%/demos
 @dirrm lib/tk%%TK_VER%%/images
 @dirrm lib/tk%%TK_VER%%/msgs
 @dirrm lib/tk%%TK_VER%%
diff --git a/x11-toolkits/tk86/Makefile b/x11-toolkits/tk86/Makefile
index b3629db58ffe..02eed830ec4c 100644
--- a/x11-toolkits/tk86/Makefile
+++ b/x11-toolkits/tk86/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	tk
-PORTVERSION=	8.5.b.1
+PORTVERSION=	8.5.0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tcl
 PKGNAMESUFFIX?=	${THREADS_SUFFIX}
-DISTNAME=	${PORTNAME}${PORTVERSION:S/.b./b/}-src
+DISTNAME=	${PORTNAME}${PORTVERSION}-src
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Graphical toolkit for TCL
@@ -36,7 +36,8 @@ SUB_FILES=	pkgIndex.tcl
 USE_TCL=	${SHORT_TK_VER}
 
 OPTIONS=	TK85_MAN "Install tk 8.5 manpages" off \
-		XFT "Use Xft fonts" on
+		XFT "Use Xft fonts" on \
+		DEMOS "Install demos" off
 .else
 USE_TK=		${SHORT_TK_VER}
 PLIST=		${PKGDIR}/pkg-plist.threads
@@ -67,6 +68,13 @@ CONFIGURE_ARGS+=	--disable-threads --with-tcl=${LOCALBASE}/lib/tcl${TK_VER} \
 
 SUB_LIST+=		TK_PROVIDE=""
 
+.if defined(WITH_DEMOS)
+INSTALL_TARGET+=	install install-demos
+PLIST_SUB+=	DEMOS=""
+.else
+PLIST_SUB+=	DEMOS="@comment "
+.endif
+
 .if defined(NO_INSTALL_MANPAGES) || !defined(WITH_TK85_MAN)
 
 PLIST_SUB+=	INSTMAN='@comment '
diff --git a/x11-toolkits/tk86/distinfo b/x11-toolkits/tk86/distinfo
index fe0d08101fa1..eea982ecdbca 100644
--- a/x11-toolkits/tk86/distinfo
+++ b/x11-toolkits/tk86/distinfo
@@ -1,3 +1,3 @@
-MD5 (tk8.5b1-src.tar.gz) = 49430237b7d938a8cd2a761b3ccfe1b6
-SHA256 (tk8.5b1-src.tar.gz) = 7401f2fdb08d3f1ad0b2fb429d3f3e0d91930c8f61f694585e954b7d2b26b7c8
-SIZE (tk8.5b1-src.tar.gz) = 3701685
+MD5 (tk8.5.0-src.tar.gz) = bc217c45ed6b2f5b8d3120df63fa13bd
+SHA256 (tk8.5.0-src.tar.gz) = ef75421a4b7d74d4d934c700d4d7649733cd1ecbbfb233eb6ffadfebe7f412c6
+SIZE (tk8.5.0-src.tar.gz) = 3755427
diff --git a/x11-toolkits/tk86/files/patch-unix::Makefile.in b/x11-toolkits/tk86/files/patch-unix::Makefile.in
index 41cb203401c0..0d659d3f789e 100644
--- a/x11-toolkits/tk86/files/patch-unix::Makefile.in
+++ b/x11-toolkits/tk86/files/patch-unix::Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	2007-09-24 18:09:13.000000000 +0200
-+++ Makefile.in	2007-09-27 20:55:50.000000000 +0200
+--- Makefile.in.orig	2007-12-17 18:57:25.000000000 +0100
++++ Makefile.in	2007-12-29 22:02:15.000000000 +0100
 @@ -65,6 +65,8 @@
  
  # Directory in which to install the include file tk.h:
@@ -23,7 +23,7 @@
  
  # Flag, 1: we're building a shared lib, 0 we're not
 -TK_SHARED_BUILD		= @TK_SHARED_BUILD@
-+TK_SHARED_BUILD		= #@TK_SHARED_BUILD@
++TK_SHARED_BUILD		= ##@TK_SHARED_BUILD@
  
  # Subdirectory of $(libdir) containing the pkgIndex.tcl file for loadable Tk
  TK_PKG_DIR		= @TK_PKG_DIR@
@@ -72,7 +72,7 @@
  	rm gdb.run
  
 -INSTALL_TARGETS = install-binaries install-libraries install-demos install-doc @EXTRA_INSTALL@
-+INSTALL_TARGETS = install-binaries install-libraries install-demos @EXTRA_INSTALL@
++INSTALL_TARGETS = install-binaries install-libraries @EXTRA_INSTALL@
  
  install: $(INSTALL_TARGETS)
  
diff --git a/x11-toolkits/tk86/files/patch-unix::configure b/x11-toolkits/tk86/files/patch-unix::configure
index ea2ea6bed575..fe54d378c066 100644
--- a/x11-toolkits/tk86/files/patch-unix::configure
+++ b/x11-toolkits/tk86/files/patch-unix::configure
@@ -1,6 +1,6 @@
---- configure.orig	2007-09-24 18:09:13.000000000 +0200
-+++ configure	2007-09-27 20:50:38.000000000 +0200
-@@ -3535,6 +3535,7 @@
+--- configure.orig	2007-12-17 18:57:25.000000000 +0100
++++ configure	2007-12-29 14:17:55.000000000 +0100
+@@ -3536,6 +3536,7 @@
  # Threads support - this auto-enables if Tcl was compiled threaded
  #------------------------------------------------------------------------
  
@@ -8,22 +8,26 @@
  
      # Check whether --enable-threads or --disable-threads was given.
  if test "${enable_threads+set}" = set; then
-@@ -5694,20 +5695,20 @@
+@@ -5828,7 +5829,7 @@
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS=""
 -	    LDFLAGS="$LDFLAGS -export-dynamic"
 +	    LDFLAGS=""
- 	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- 	    if test "${TCL_THREADS}" = "1" ; then
+ 	    if test $doRpath = yes; then
+ 
+ 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+@@ -5839,16 +5840,16 @@
+ 
  		# The -pthread needs to go in the CFLAGS, not LIBS
  		LIBS=`echo $LIBS | sed s/-pthread//`
 -		CFLAGS="$CFLAGS -pthread"
 -	    	LDFLAGS="$LDFLAGS -pthread"
 +		CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
 +	    	LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
- 	    fi
+ 
+ fi
+ 
  	    case $system in
 -	    FreeBSD-3.*)
 +	    FreeBSD-*)
diff --git a/x11-toolkits/tk86/pkg-descr b/x11-toolkits/tk86/pkg-descr
index b38c81c9491d..63fe66f5b010 100644
--- a/x11-toolkits/tk86/pkg-descr
+++ b/x11-toolkits/tk86/pkg-descr
@@ -1,6 +1,11 @@
 This is Tk version 8.5, a GUI toolkit for Tcl.
 
-The best way to get started with Tcl is to read ``Tcl and the Tk
-Toolkit'' by John K. Ousterhout, Addison-Wesley, ISBN 0-201-63337-X.
+Tk is a graphical user interface toolkit that takes developing desktop 
+applications to a higher level than conventional approaches. Tk is the 
+standard GUI not only for Tcl, but for many other dynamic languages, and can 
+produce rich, native applications that run unchanged across Windows, Mac OS X, 
+Linux and more.
+
+A full set of manual pages is also provided with this port.
 
 WWW: http://www.tcl.tk/
diff --git a/x11-toolkits/tk86/pkg-plist b/x11-toolkits/tk86/pkg-plist
index 10e049ca7489..8d5671dd5aac 100644
--- a/x11-toolkits/tk86/pkg-plist
+++ b/x11-toolkits/tk86/pkg-plist
@@ -40,77 +40,87 @@ lib/tk%%TK_VER%%/choosedir.tcl
 lib/tk%%TK_VER%%/clrpick.tcl
 lib/tk%%TK_VER%%/comdlg.tcl
 lib/tk%%TK_VER%%/console.tcl
-lib/tk%%TK_VER%%/demos/README
-lib/tk%%TK_VER%%/demos/anilabel.tcl
-lib/tk%%TK_VER%%/demos/aniwave.tcl
-lib/tk%%TK_VER%%/demos/arrow.tcl
-lib/tk%%TK_VER%%/demos/bind.tcl
-lib/tk%%TK_VER%%/demos/bitmap.tcl
-lib/tk%%TK_VER%%/demos/browse
-lib/tk%%TK_VER%%/demos/button.tcl
-lib/tk%%TK_VER%%/demos/check.tcl
-lib/tk%%TK_VER%%/demos/clrpick.tcl
-lib/tk%%TK_VER%%/demos/colors.tcl
-lib/tk%%TK_VER%%/demos/cscroll.tcl
-lib/tk%%TK_VER%%/demos/ctext.tcl
-lib/tk%%TK_VER%%/demos/dialog1.tcl
-lib/tk%%TK_VER%%/demos/dialog2.tcl
-lib/tk%%TK_VER%%/demos/en.msg
-lib/tk%%TK_VER%%/demos/entry1.tcl
-lib/tk%%TK_VER%%/demos/entry2.tcl
-lib/tk%%TK_VER%%/demos/entry3.tcl
-lib/tk%%TK_VER%%/demos/filebox.tcl
-lib/tk%%TK_VER%%/demos/floor.tcl
-lib/tk%%TK_VER%%/demos/form.tcl
-lib/tk%%TK_VER%%/demos/goldberg.tcl
-lib/tk%%TK_VER%%/demos/hello
-lib/tk%%TK_VER%%/demos/hscale.tcl
-lib/tk%%TK_VER%%/demos/icon.tcl
-lib/tk%%TK_VER%%/demos/image1.tcl
-lib/tk%%TK_VER%%/demos/image2.tcl
-lib/tk%%TK_VER%%/demos/images/earth.gif
-lib/tk%%TK_VER%%/demos/images/earthris.gif
-lib/tk%%TK_VER%%/demos/images/face.xbm
-lib/tk%%TK_VER%%/demos/images/flagdown.xbm
-lib/tk%%TK_VER%%/demos/images/flagup.xbm
-lib/tk%%TK_VER%%/demos/images/gray25.xbm
-lib/tk%%TK_VER%%/demos/images/letters.xbm
-lib/tk%%TK_VER%%/demos/images/noletter.xbm
-lib/tk%%TK_VER%%/demos/images/pattern.xbm
-lib/tk%%TK_VER%%/demos/images/tcllogo.gif
-lib/tk%%TK_VER%%/demos/images/teapot.ppm
-lib/tk%%TK_VER%%/demos/items.tcl
-lib/tk%%TK_VER%%/demos/ixset
-lib/tk%%TK_VER%%/demos/label.tcl
-lib/tk%%TK_VER%%/demos/labelframe.tcl
-lib/tk%%TK_VER%%/demos/license.terms
-lib/tk%%TK_VER%%/demos/menu.tcl
-lib/tk%%TK_VER%%/demos/menubu.tcl
-lib/tk%%TK_VER%%/demos/msgbox.tcl
-lib/tk%%TK_VER%%/demos/nl.msg
-lib/tk%%TK_VER%%/demos/paned1.tcl
-lib/tk%%TK_VER%%/demos/paned2.tcl
-lib/tk%%TK_VER%%/demos/pendulum.tcl
-lib/tk%%TK_VER%%/demos/plot.tcl
-lib/tk%%TK_VER%%/demos/puzzle.tcl
-lib/tk%%TK_VER%%/demos/radio.tcl
-lib/tk%%TK_VER%%/demos/rmt
-lib/tk%%TK_VER%%/demos/rolodex
-lib/tk%%TK_VER%%/demos/ruler.tcl
-lib/tk%%TK_VER%%/demos/sayings.tcl
-lib/tk%%TK_VER%%/demos/search.tcl
-lib/tk%%TK_VER%%/demos/spin.tcl
-lib/tk%%TK_VER%%/demos/square
-lib/tk%%TK_VER%%/demos/states.tcl
-lib/tk%%TK_VER%%/demos/style.tcl
-lib/tk%%TK_VER%%/demos/tclIndex
-lib/tk%%TK_VER%%/demos/tcolor
-lib/tk%%TK_VER%%/demos/text.tcl
-lib/tk%%TK_VER%%/demos/timer
-lib/tk%%TK_VER%%/demos/twind.tcl
-lib/tk%%TK_VER%%/demos/unicodeout.tcl
-lib/tk%%TK_VER%%/demos/vscale.tcl
-lib/tk%%TK_VER%%/demos/widget
+%%DEMOS%%lib/tk%%TK_VER%%/demos/README
+%%DEMOS%%lib/tk%%TK_VER%%/demos/anilabel.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/aniwave.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/arrow.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/bind.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/bitmap.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/browse
+%%DEMOS%%lib/tk%%TK_VER%%/demos/button.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/check.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/clrpick.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/colors.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/combo.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/cscroll.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/ctext.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/dialog1.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/dialog2.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/en.msg
+%%DEMOS%%lib/tk%%TK_VER%%/demos/entry1.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/entry2.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/entry3.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/filebox.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/floor.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/form.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/goldberg.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/hello
+%%DEMOS%%lib/tk%%TK_VER%%/demos/hscale.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/icon.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/image1.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/image2.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/images/earth.gif
+%%DEMOS%%lib/tk%%TK_VER%%/demos/images/earthris.gif
+%%DEMOS%%lib/tk%%TK_VER%%/demos/images/face.xbm
+%%DEMOS%%lib/tk%%TK_VER%%/demos/images/flagdown.xbm
+%%DEMOS%%lib/tk%%TK_VER%%/demos/images/flagup.xbm
+%%DEMOS%%lib/tk%%TK_VER%%/demos/images/gray25.xbm
+%%DEMOS%%lib/tk%%TK_VER%%/demos/images/letters.xbm
+%%DEMOS%%lib/tk%%TK_VER%%/demos/images/noletter.xbm
+%%DEMOS%%lib/tk%%TK_VER%%/demos/images/pattern.xbm
+%%DEMOS%%lib/tk%%TK_VER%%/demos/images/tcllogo.gif
+%%DEMOS%%lib/tk%%TK_VER%%/demos/images/teapot.ppm
+%%DEMOS%%lib/tk%%TK_VER%%/demos/items.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/ixset
+%%DEMOS%%lib/tk%%TK_VER%%/demos/label.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/labelframe.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/license.terms
+%%DEMOS%%lib/tk%%TK_VER%%/demos/mclist.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/menu.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/menubu.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/msgbox.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/nl.msg
+%%DEMOS%%lib/tk%%TK_VER%%/demos/paned1.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/paned2.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/pendulum.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/plot.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/puzzle.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/radio.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/rmt
+%%DEMOS%%lib/tk%%TK_VER%%/demos/rolodex
+%%DEMOS%%lib/tk%%TK_VER%%/demos/ruler.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/sayings.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/search.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/spin.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/square
+%%DEMOS%%lib/tk%%TK_VER%%/demos/states.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/style.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/tclIndex
+%%DEMOS%%lib/tk%%TK_VER%%/demos/tcolor
+%%DEMOS%%lib/tk%%TK_VER%%/demos/text.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/textpeer.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/timer
+%%DEMOS%%lib/tk%%TK_VER%%/demos/toolbar.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/tree.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/ttkbut.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/ttkmenu.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/twind.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/unicodeout.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/vscale.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/widget
 lib/tk%%TK_VER%%/dialog.tcl
 lib/tk%%TK_VER%%/entry.tcl
 lib/tk%%TK_VER%%/focus.tcl
@@ -132,6 +142,7 @@ lib/tk%%TK_VER%%/menu.tcl
 lib/tk%%TK_VER%%/mkpsenc.tcl
 lib/tk%%TK_VER%%/msgbox.tcl
 lib/tk%%TK_VER%%/msgs/cs.msg
+lib/tk%%TK_VER%%/msgs/da.msg
 lib/tk%%TK_VER%%/msgs/de.msg
 lib/tk%%TK_VER%%/msgs/el.msg
 lib/tk%%TK_VER%%/msgs/en.msg
@@ -139,6 +150,7 @@ lib/tk%%TK_VER%%/msgs/en_gb.msg
 lib/tk%%TK_VER%%/msgs/eo.msg
 lib/tk%%TK_VER%%/msgs/es.msg
 lib/tk%%TK_VER%%/msgs/fr.msg
+lib/tk%%TK_VER%%/msgs/hu.msg
 lib/tk%%TK_VER%%/msgs/it.msg
 lib/tk%%TK_VER%%/msgs/nl.msg
 lib/tk%%TK_VER%%/msgs/pl.msg
@@ -189,8 +201,8 @@ lib/tk%%TK_VER%%/xmfbox.tcl
 %%INSTMAN%%%%DATADIR%%/man.macros
 %%INSTMAN%%@dirrm %%DATADIR%%
 @dirrm lib/tk%%TK_VER%%/ttk
-@dirrm lib/tk%%TK_VER%%/demos/images
-@dirrm lib/tk%%TK_VER%%/demos
+%%DEMOS%%@dirrm lib/tk%%TK_VER%%/demos/images
+%%DEMOS%%@dirrm lib/tk%%TK_VER%%/demos
 @dirrm lib/tk%%TK_VER%%/images
 @dirrm lib/tk%%TK_VER%%/msgs
 @dirrm lib/tk%%TK_VER%%