5 files changed, 19 insertions, 15 deletions

diff --git a/x11-toolkits/tk86-thread/Makefile b/x11-toolkits/tk86-thread/Makefile
index fba21cbd4643..15ae5b051072 100644
--- a/x11-toolkits/tk86-thread/Makefile
+++ b/x11-toolkits/tk86-thread/Makefile
@@ -7,6 +7,6 @@
 
 BUILDING_TK_THREADS=	yes
 
-MASTERDIR=	${.CURDIR}/../tk85
+MASTERDIR=	${.CURDIR}/../tk86
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/tk86/Makefile b/x11-toolkits/tk86/Makefile
index 67031587f27e..b74b14285b57 100644
--- a/x11-toolkits/tk86/Makefile
+++ b/x11-toolkits/tk86/Makefile
@@ -6,23 +6,23 @@
 #
 
 PORTNAME=	tk
-PORTVERSION=	8.5.6
+PORTVERSION=	8.6.b.1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tcl
 PKGNAMESUFFIX?=	${THREADS_SUFFIX}
-DISTNAME=	${PORTNAME}${PORTVERSION}-src
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.b.1/b1/}-src
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Graphical toolkit for TCL
 
-LATEST_LINK?=	tk85
+LATEST_LINK?=	tk86
 USE_XORG=	x11
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}/unix
 GNU_CONFIGURE=	yes
-TK_VER=		8.5
-SHORT_TK_VER=	85
+TK_VER=		8.6
+SHORT_TK_VER=	86
 CONFIGURE_ARGS=	--enable-shared --includedir=${PREFIX}/include/tk${TK_VER}
 CONFIGURE_ENV=	PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk${SHORT_TK_VER}.so.1
 MAKE_ENV=	SHORT_TK_VER=${SHORT_TK_VER}
@@ -35,7 +35,7 @@ SUB_FILES=	pkgIndex.tcl
 .if !defined(BUILDING_TK_THREADS)
 USE_TCL=	${SHORT_TK_VER}
 
-OPTIONS=	TK85_MAN "Install tk 8.5 manpages" off \
+OPTIONS=	TK86_MAN "Install tk 8.6 manpages" off \
 		XFT "Use Xft fonts" on \
 		DEMOS "Install demos" off
 .else
@@ -60,7 +60,7 @@ CONFIGURE_ARGS+=	--disable-xft
 CONFIGURE_ARGS+=	--enable-threads --with-tcl=${LOCALBASE}/lib/tcl${TK_VER}${THREADS_SUFFIX}
 CONFIGURE_ENV+=		PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 			ac_cv_path_tclsh="${LOCALBASE}/bin/tclsh${TK_VER}${THREADS_SUFFIX}"
-LATEST_LINK=		tk85${THREADS_SUFFIX}
+LATEST_LINK=		tk86${THREADS_SUFFIX}
 SUB_LIST+=		TK_PROVIDE="; package provide Tk-threads ${TK_VER}"
 .else
 CONFIGURE_ARGS+=	--disable-threads --with-tcl=${LOCALBASE}/lib/tcl${TK_VER} \
@@ -75,7 +75,7 @@ PLIST_SUB+=	DEMOS=""
 PLIST_SUB+=	DEMOS="@comment "
 .endif
 
-.if defined(NO_INSTALL_MANPAGES) || !defined(WITH_TK85_MAN)
+.if defined(NO_INSTALL_MANPAGES) || !defined(WITH_TK86_MAN)
 
 PLIST_SUB+=	INSTMAN='@comment '
 
@@ -442,7 +442,7 @@ do-install:
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/pkgIndex.tcl ${PREFIX}/lib/tk${TK_VER}${THREADS_SUFFIX}/
-.if !defined(BUILDING_TK_THREADS) && !defined(NO_INSTALL_MANPAGES) && defined(WITH_TK85_MAN)
+.if !defined(BUILDING_TK_THREADS) && !defined(NO_INSTALL_MANPAGES) && defined(WITH_TK86_MAN)
 	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/../doc/man.macros ${DATADIR}
 . for mp in ${MAN1} ${MAN3} ${MANN}
diff --git a/x11-toolkits/tk86/distinfo b/x11-toolkits/tk86/distinfo
index 18a4b35fe3ee..dd50494b1b83 100644
--- a/x11-toolkits/tk86/distinfo
+++ b/x11-toolkits/tk86/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.6b1-src.tar.gz) = 1f2a8deb93cf0815b2c8cc1214ca85c9
+SHA256 (tk8.6b1-src.tar.gz) = 78a06dfd954dee6f9cb739c3cd7deb9adeea567db6ef2aa902b10cc89896ef07
+SIZE (tk8.6b1-src.tar.gz) = 3876137
diff --git a/x11-toolkits/tk86/files/pkgIndex.tcl.in b/x11-toolkits/tk86/files/pkgIndex.tcl.in
index 954c05521c10..f645860b4269 100644
--- a/x11-toolkits/tk86/files/pkgIndex.tcl.in
+++ b/x11-toolkits/tk86/files/pkgIndex.tcl.in
@@ -1,3 +1,3 @@
 # Tcl package index file, version 1.0
 
-package ifneeded Tk%%THREADS_SUFFIX%% 8.5 "[list load "[file join [file dirname $dir] libtk85%%THREADS_SUFFIX%%.so.1]" Tk]%%TK_PROVIDE%%"
+package ifneeded Tk%%THREADS_SUFFIX%% 8.6 "[list load "[file join [file dirname $dir] libtk86%%THREADS_SUFFIX%%.so.1]" Tk]%%TK_PROVIDE%%"
diff --git a/x11-toolkits/tk86/pkg-plist b/x11-toolkits/tk86/pkg-plist
index c603b6773ca9..5539b76f583e 100644
--- a/x11-toolkits/tk86/pkg-plist
+++ b/x11-toolkits/tk86/pkg-plist
@@ -3,6 +3,7 @@ include/tk%%TK_VER%%/generic/default.h
 include/tk%%TK_VER%%/generic/ks_names.h
 include/tk%%TK_VER%%/generic/tk.h
 include/tk%%TK_VER%%/generic/tk3d.h
+include/tk%%TK_VER%%/generic/tkBusy.h
 include/tk%%TK_VER%%/generic/tkButton.h
 include/tk%%TK_VER%%/generic/tkCanvas.h
 include/tk%%TK_VER%%/generic/tkColor.h
@@ -10,6 +11,7 @@ include/tk%%TK_VER%%/generic/tkDecls.h
 include/tk%%TK_VER%%/generic/tkEntry.h
 include/tk%%TK_VER%%/generic/tkFileFilter.h
 include/tk%%TK_VER%%/generic/tkFont.h
+include/tk%%TK_VER%%/generic/tkImgPhoto.h
 include/tk%%TK_VER%%/generic/tkInt.h
 include/tk%%TK_VER%%/generic/tkIntDecls.h
 include/tk%%TK_VER%%/generic/tkIntPlatDecls.h
@@ -125,6 +127,7 @@ lib/tk%%TK_VER%%/console.tcl
 lib/tk%%TK_VER%%/dialog.tcl
 lib/tk%%TK_VER%%/entry.tcl
 lib/tk%%TK_VER%%/focus.tcl
+lib/tk%%TK_VER%%/fontchooser.tcl
 lib/tk%%TK_VER%%/images/README
 lib/tk%%TK_VER%%/images/logo.eps
 lib/tk%%TK_VER%%/images/logo100.gif
@@ -163,7 +166,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
@@ -192,9 +194,11 @@ 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
+lib/tk%%TK_VER%%/ttk/vistaTheme.tcl
 lib/tk%%TK_VER%%/ttk/winTheme.tcl
 lib/tk%%TK_VER%%/ttk/xpTheme.tcl
 lib/tk%%TK_VER%%/unsupported.tcl