Index: .github/workflows/linux-build.yml
==================================================================
--- .github/workflows/linux-build.yml
+++ .github/workflows/linux-build.yml
@@ -1,10 +1,11 @@
 name: Linux
 on:
   push:
     branches:
     - "main"
+    - "core-8-branch"
     - "core-8-6-branch"
     tags:
     - "core-**"
 permissions:
   contents: read
@@ -36,11 +37,11 @@
           path: tk
       - name: Checkout Tcl
         uses: actions/checkout@v4
         with:
           repository: tcltk/tcl
-          ref: core-8-branch
+          ref: main
           path: tcl
       - name: Setup Environment (compiler=${{ matrix.compiler }})
         run: |
           sudo apt-get install libxss-dev libxft-dev
           mkdir "$HOME/install dir"
@@ -140,11 +141,11 @@
           path: tk
       - name: Checkout Tcl
         uses: actions/checkout@v4
         with:
           repository: tcltk/tcl
-          ref: core-8-branch
+          ref: main
           path: tcl
       - name: Setup Environment (compiler=${{ matrix.compiler }})
         run: |
           sudo apt-get install libxss-dev libxft-dev xvfb libicu-dev
           mkdir "$HOME/install dir"

DELETED .github/workflows/linux-with-tcl86-build.yml
Index: .github/workflows/linux-with-tcl86-build.yml
==================================================================
--- .github/workflows/linux-with-tcl86-build.yml
+++ /dev/null
@@ -1,177 +0,0 @@
-name: Linux (with Tcl 8.6)
-on:
-  push:
-    branches:
-    - "main"
-    - "core-8-6-branch"
-    tags:
-    - "core-**"
-permissions:
-  contents: read
-defaults:
-  run:
-    shell: bash
-    working-directory: tk/unix
-env:
-  ERROR_ON_FAILURES: 1
-jobs:
-  build:
-    runs-on: ubuntu-22.04
-    strategy:
-      matrix:
-        compiler:
-          - "gcc"
-          - "clang"
-        cfgopt:
-          - ""
-          - "CFLAGS=-DTK_NO_DEPRECATED=1"
-          - "--disable-shared"
-          - "--disable-xft"
-          - "--disable-xss"
-          - "--enable-symbols"
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          path: tk
-      - name: Checkout Tcl
-        uses: actions/checkout@v4
-        with:
-          repository: tcltk/tcl
-          ref: core-8-6-branch
-          path: tcl
-      - name: Setup Environment (compiler=${{ matrix.compiler }})
-        run: |
-          sudo apt-get install libxss-dev libxft-dev
-          mkdir "$HOME/install dir"
-          touch tk/doc/man.macros tk/generic/tkStubInit.c
-          echo "CFGOPT=$CFGOPT" >> $GITHUB_ENV
-          echo "CC=$COMPILER" >> $GITHUB_ENV
-          echo "TOOL_DIR=$(cd tcl/tools;pwd)" >> $GITHUB_ENV
-          echo "BUILD_CONFIG_ID=$OPTS" >> $GITHUB_ENV
-        working-directory: "."
-        env:
-          CFGOPT: ${{ matrix.cfgopt }}
-          COMPILER: ${{ matrix.compiler }}
-          OPTS: ${{ matrix.compiler }}${{ matrix.cfgopt }}
-      - name: Configure and Build Tcl
-        run: |
-          ./configure $CFGOPT "--prefix=$HOME/install dir" || {
-            cat config.log
-            echo "::warning::Failure during Tcl Configure"
-            exit 1
-          }
-          make all install  || {
-            echo "::warning::Failure during Tcl Build"
-            exit 1
-          }
-          echo "TCL_CONFIG_PATH=`pwd`" >> $GITHUB_ENV
-        working-directory: tcl/unix
-      - name: Configure (opts=${{ matrix.cfgopt }})
-        run: |
-          ./configure $CFGOPT --with-tcl=$TCL_CONFIG_PATH --disable-zipfs "--prefix=$HOME/install dir" || {
-            cat config.log
-            echo "::error::Failure during Configure"
-            exit 1
-          }
-      - name: Build
-        run: |
-          make binaries libraries || {
-            echo "::error::Failure during Build"
-            exit 1
-          }
-      - name: Build Test Harness
-        run: |
-          make tktest || {
-            echo "::error::Failure during Build"
-            exit 1
-          }
-      - name: Test-Drive Installation
-        run: |
-          make install || {
-            echo "::error::Failure during Install"
-            exit 1
-          }
-      - name: Create Distribution Package
-        run: |
-          make dist || {
-            echo "::error::Failure during Distribute"
-            exit 1
-          }
-      - name: Convert Documentation to HTML
-        run: |
-          make html-tk TOOL_DIR=$TOOL_DIR || {
-            echo "::error::Failure during Distribute"
-            exit 1
-          }
-  test:
-    runs-on: ubuntu-22.04
-    strategy:
-      matrix:
-        compiler:
-          - "gcc"
-        cfgopt:
-          - ""
-          - "--disable-xft"
-          - "--enable-symbols"
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          path: tk
-      - name: Checkout Tcl
-        uses: actions/checkout@v4
-        with:
-          repository: tcltk/tcl
-          ref: core-8-6-branch
-          path: tcl
-      - name: Setup Environment (compiler=${{ matrix.compiler }})
-        run: |
-          sudo apt-get install libxss-dev libxft-dev xvfb libicu-dev
-          mkdir "$HOME/install dir"
-          touch tk/doc/man.macros tk/generic/tkStubInit.c
-          echo "CFGOPT=$CFGOPT" >> $GITHUB_ENV
-          echo "CC=$COMPILER" >> $GITHUB_ENV
-        working-directory: "."
-        env:
-          CFGOPT: ${{ matrix.cfgopt }}
-          COMPILER: ${{ matrix.compiler }}
-      - name: Configure and Build Tcl
-        run: |
-          ./configure $CFGOPT "--prefix=$HOME/install dir" || {
-            cat config.log
-            echo "::warning::Failure during Tcl Configure"
-            exit 1
-          }
-          make all install  || {
-            echo "::warning::Failure during Tcl Build"
-            exit 1
-          }
-          echo "TCL_CONFIG_PATH=`pwd`" >> $GITHUB_ENV
-        working-directory: tcl/unix
-      - name: Configure ${{ matrix.cfgopt }}
-        run: |
-          ./configure $CFGOPT --with-tcl=$TCL_CONFIG_PATH "--prefix=$HOME/install dir" || {
-            cat config.log
-            echo "::error::Failure during Configure"
-            exit 1
-          }
-      - name: Build
-        run: |
-          make binaries libraries tktest || {
-            echo "::error::Failure during Build"
-            exit 1
-          }
-      - name: Run Tests
-        run: |
-          xvfb-run --auto-servernum make test-classic | tee out-classic.txt
-          xvfb-run --auto-servernum make test-ttk | tee out-ttk.txt
-          grep -q "Failed	0" out-classic.txt || {
-            echo "::error::Failure during Test"
-            exit 1
-          }
-          grep -q "Failed	0" out-ttk.txt || {
-            echo "::error::Failure during Test"
-            exit 1
-          }
-        timeout-minutes: 15

ADDED   .github/workflows/linux-with-tcl87-build.yml
Index: .github/workflows/linux-with-tcl87-build.yml
==================================================================
--- /dev/null
+++ .github/workflows/linux-with-tcl87-build.yml
@@ -0,0 +1,178 @@
+name: Linux (with Tcl 8.7)
+on:
+  push:
+    branches:
+    - "main"
+    - "core-8-branch"
+    - "core-8-6-branch"
+    tags:
+    - "core-**"
+permissions:
+  contents: read
+defaults:
+  run:
+    shell: bash
+    working-directory: tk/unix
+env:
+  ERROR_ON_FAILURES: 1
+jobs:
+  build:
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        compiler:
+          - "gcc"
+          - "clang"
+        cfgopt:
+          - ""
+          - "CFLAGS=-DTK_NO_DEPRECATED=1"
+          - "--disable-shared"
+          - "--disable-xft"
+          - "--disable-xss"
+          - "--enable-symbols"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          path: tk
+      - name: Checkout Tcl
+        uses: actions/checkout@v4
+        with:
+          repository: tcltk/tcl
+          ref: core-8-branch
+          path: tcl
+      - name: Setup Environment (compiler=${{ matrix.compiler }})
+        run: |
+          sudo apt-get install libxss-dev libxft-dev
+          mkdir "$HOME/install dir"
+          touch tk/doc/man.macros tk/generic/tkStubInit.c
+          echo "CFGOPT=$CFGOPT" >> $GITHUB_ENV
+          echo "CC=$COMPILER" >> $GITHUB_ENV
+          echo "TOOL_DIR=$(cd tcl/tools;pwd)" >> $GITHUB_ENV
+          echo "BUILD_CONFIG_ID=$OPTS" >> $GITHUB_ENV
+        working-directory: "."
+        env:
+          CFGOPT: ${{ matrix.cfgopt }}
+          COMPILER: ${{ matrix.compiler }}
+          OPTS: ${{ matrix.compiler }}${{ matrix.cfgopt }}
+      - name: Configure and Build Tcl
+        run: |
+          ./configure $CFGOPT "--prefix=$HOME/install dir" || {
+            cat config.log
+            echo "::warning::Failure during Tcl Configure"
+            exit 1
+          }
+          make all install  || {
+            echo "::warning::Failure during Tcl Build"
+            exit 1
+          }
+          echo "TCL_CONFIG_PATH=`pwd`" >> $GITHUB_ENV
+        working-directory: tcl/unix
+      - name: Configure (opts=${{ matrix.cfgopt }})
+        run: |
+          ./configure $CFGOPT --with-tcl=$TCL_CONFIG_PATH "--prefix=$HOME/install dir" || {
+            cat config.log
+            echo "::error::Failure during Configure"
+            exit 1
+          }
+      - name: Build
+        run: |
+          make binaries libraries || {
+            echo "::error::Failure during Build"
+            exit 1
+          }
+      - name: Build Test Harness
+        run: |
+          make tktest || {
+            echo "::error::Failure during Build"
+            exit 1
+          }
+      - name: Test-Drive Installation
+        run: |
+          make install || {
+            echo "::error::Failure during Install"
+            exit 1
+          }
+      - name: Create Distribution Package
+        run: |
+          make dist || {
+            echo "::error::Failure during Distribute"
+            exit 1
+          }
+      - name: Convert Documentation to HTML
+        run: |
+          make html-tk TOOL_DIR=$TOOL_DIR || {
+            echo "::error::Failure during Distribute"
+            exit 1
+          }
+  test:
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        compiler:
+          - "gcc"
+        cfgopt:
+          - ""
+          - "--disable-xft"
+          - "--enable-symbols"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          path: tk
+      - name: Checkout Tcl
+        uses: actions/checkout@v4
+        with:
+          repository: tcltk/tcl
+          ref: core-8-branch
+          path: tcl
+      - name: Setup Environment (compiler=${{ matrix.compiler }})
+        run: |
+          sudo apt-get install libxss-dev libxft-dev xvfb libicu-dev
+          mkdir "$HOME/install dir"
+          touch tk/doc/man.macros tk/generic/tkStubInit.c
+          echo "CFGOPT=$CFGOPT" >> $GITHUB_ENV
+          echo "CC=$COMPILER" >> $GITHUB_ENV
+        working-directory: "."
+        env:
+          CFGOPT: ${{ matrix.cfgopt }}
+          COMPILER: ${{ matrix.compiler }}
+      - name: Configure and Build Tcl
+        run: |
+          ./configure $CFGOPT "--prefix=$HOME/install dir" || {
+            cat config.log
+            echo "::warning::Failure during Tcl Configure"
+            exit 1
+          }
+          make all install  || {
+            echo "::warning::Failure during Tcl Build"
+            exit 1
+          }
+          echo "TCL_CONFIG_PATH=`pwd`" >> $GITHUB_ENV
+        working-directory: tcl/unix
+      - name: Configure ${{ matrix.cfgopt }}
+        run: |
+          ./configure $CFGOPT --with-tcl=$TCL_CONFIG_PATH "--prefix=$HOME/install dir" || {
+            cat config.log
+            echo "::error::Failure during Configure"
+            exit 1
+          }
+      - name: Build
+        run: |
+          make binaries libraries tktest || {
+            echo "::error::Failure during Build"
+            exit 1
+          }
+      - name: Run Tests
+        run: |
+          xvfb-run --auto-servernum make test-classic | tee out-classic.txt
+          xvfb-run --auto-servernum make test-ttk | tee out-ttk.txt
+          grep -q "Failed	0" out-classic.txt || {
+            echo "::error::Failure during Test"
+            exit 1
+          }
+          grep -q "Failed	0" out-ttk.txt || {
+            echo "::error::Failure during Test"
+            exit 1
+          }
+        timeout-minutes: 15

DELETED .github/workflows/linux-with-tcl9-build.yml
Index: .github/workflows/linux-with-tcl9-build.yml
==================================================================
--- .github/workflows/linux-with-tcl9-build.yml
+++ /dev/null
@@ -1,177 +0,0 @@
-name: Linux (with Tcl 9.0)
-on:
-  push:
-    branches:
-    - "main"
-    - "core-8-6-branch"
-    tags:
-    - "core-**"
-permissions:
-  contents: read
-defaults:
-  run:
-    shell: bash
-    working-directory: tk/unix
-env:
-  ERROR_ON_FAILURES: 1
-jobs:
-  build:
-    runs-on: ubuntu-22.04
-    strategy:
-      matrix:
-        compiler:
-          - "gcc"
-          - "clang"
-        cfgopt:
-          - ""
-          - "CFLAGS=-DTK_NO_DEPRECATED=1"
-          - "--disable-shared"
-          - "--disable-xft"
-          - "--disable-xss"
-          - "--enable-symbols"
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          path: tk
-      - name: Checkout Tcl
-        uses: actions/checkout@v4
-        with:
-          repository: tcltk/tcl
-          ref: main
-          path: tcl
-      - name: Setup Environment (compiler=${{ matrix.compiler }})
-        run: |
-          sudo apt-get install libxss-dev libxft-dev
-          mkdir "$HOME/install dir"
-          touch tk/doc/man.macros tk/generic/tkStubInit.c
-          echo "CFGOPT=$CFGOPT" >> $GITHUB_ENV
-          echo "CC=$COMPILER" >> $GITHUB_ENV
-          echo "TOOL_DIR=$(cd tcl/tools;pwd)" >> $GITHUB_ENV
-          echo "BUILD_CONFIG_ID=$OPTS" >> $GITHUB_ENV
-        working-directory: "."
-        env:
-          CFGOPT: ${{ matrix.cfgopt }}
-          COMPILER: ${{ matrix.compiler }}
-          OPTS: ${{ matrix.compiler }}${{ matrix.cfgopt }}
-      - name: Configure and Build Tcl
-        run: |
-          ./configure $CFGOPT "--prefix=$HOME/install dir" || {
-            cat config.log
-            echo "::warning::Failure during Tcl Configure"
-            exit 1
-          }
-          make all install  || {
-            echo "::warning::Failure during Tcl Build"
-            exit 1
-          }
-          echo "TCL_CONFIG_PATH=`pwd`" >> $GITHUB_ENV
-        working-directory: tcl/unix
-      - name: Configure (opts=${{ matrix.cfgopt }})
-        run: |
-          ./configure $CFGOPT --with-tcl=$TCL_CONFIG_PATH "--prefix=$HOME/install dir" || {
-            cat config.log
-            echo "::error::Failure during Configure"
-            exit 1
-          }
-      - name: Build
-        run: |
-          make binaries libraries || {
-            echo "::error::Failure during Build"
-            exit 1
-          }
-      - name: Build Test Harness
-        run: |
-          make tktest || {
-            echo "::error::Failure during Build"
-            exit 1
-          }
-      - name: Test-Drive Installation
-        run: |
-          make install || {
-            echo "::error::Failure during Install"
-            exit 1
-          }
-      - name: Create Distribution Package
-        run: |
-          make dist || {
-            echo "::error::Failure during Distribute"
-            exit 1
-          }
-      - name: Convert Documentation to HTML
-        run: |
-          make html-tk TOOL_DIR=$TOOL_DIR || {
-            echo "::error::Failure during Distribute"
-            exit 1
-          }
-  test:
-    runs-on: ubuntu-22.04
-    strategy:
-      matrix:
-        compiler:
-          - "gcc"
-        cfgopt:
-          - ""
-          - "--disable-xft"
-          - "--enable-symbols"
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          path: tk
-      - name: Checkout Tcl
-        uses: actions/checkout@v4
-        with:
-          repository: tcltk/tcl
-          ref: main
-          path: tcl
-      - name: Setup Environment (compiler=${{ matrix.compiler }})
-        run: |
-          sudo apt-get install libxss-dev libxft-dev xvfb libicu-dev
-          mkdir "$HOME/install dir"
-          touch tk/doc/man.macros tk/generic/tkStubInit.c
-          echo "CFGOPT=$CFGOPT" >> $GITHUB_ENV
-          echo "CC=$COMPILER" >> $GITHUB_ENV
-        working-directory: "."
-        env:
-          CFGOPT: ${{ matrix.cfgopt }}
-          COMPILER: ${{ matrix.compiler }}
-      - name: Configure and Build Tcl
-        run: |
-          ./configure $CFGOPT "--prefix=$HOME/install dir" || {
-            cat config.log
-            echo "::warning::Failure during Tcl Configure"
-            exit 1
-          }
-          make all install  || {
-            echo "::warning::Failure during Tcl Build"
-            exit 1
-          }
-          echo "TCL_CONFIG_PATH=`pwd`" >> $GITHUB_ENV
-        working-directory: tcl/unix
-      - name: Configure ${{ matrix.cfgopt }}
-        run: |
-          ./configure $CFGOPT --with-tcl=$TCL_CONFIG_PATH "--prefix=$HOME/install dir" || {
-            cat config.log
-            echo "::error::Failure during Configure"
-            exit 1
-          }
-      - name: Build
-        run: |
-          make binaries libraries tktest || {
-            echo "::error::Failure during Build"
-            exit 1
-          }
-      - name: Run Tests
-        run: |
-          xvfb-run --auto-servernum make test-classic | tee out-classic.txt
-          xvfb-run --auto-servernum make test-ttk | tee out-ttk.txt
-          grep -q "Failed	0" out-classic.txt || {
-            echo "::error::Failure during Test"
-            exit 1
-          }
-          grep -q "Failed	0" out-ttk.txt || {
-            echo "::error::Failure during Test"
-            exit 1
-          }
-        timeout-minutes: 15

Index: .github/workflows/linux-with-tcl91-build.yml
==================================================================
--- .github/workflows/linux-with-tcl91-build.yml
+++ .github/workflows/linux-with-tcl91-build.yml
@@ -1,10 +1,11 @@
 name: Linux (with Tcl 9.1)
 on:
   push:
     branches:
     - "main"
+    - "core-8-branch"
     - "core-8-6-branch"
     tags:
     - "core-**"
 permissions:
   contents: read

Index: .github/workflows/mac-build.yml
==================================================================
--- .github/workflows/mac-build.yml
+++ .github/workflows/mac-build.yml
@@ -1,10 +1,11 @@
 name: macOS
 on:
   push:
     branches:
     - "main"
+    - "core-8-branch"
     - "core-8-6-branch"
     tags:
     - "core-**"
 permissions:
   contents: read
@@ -20,15 +21,15 @@
     steps:
       - name: Check out Tk
         uses: actions/checkout@v4
         with:
           path: tk
-      - name: Check out Tcl 8.7
+      - name: Check out Tcl 9.0
         uses: actions/checkout@v4
         with:
           repository: tcltk/tcl
-          ref: core-8-branch
+          ref: main
           path: tcl
       - name: Prepare checked out repositories
         run: |
           touch tk/generic/tkStubInit.c
           mkdir build
@@ -72,15 +73,15 @@
     steps:
       - name: Check out Tk
         uses: actions/checkout@v4
         with:
           path: tk
-      - name: Check out Tcl 8.7
+      - name: Check out Tcl 9.0
         uses: actions/checkout@v4
         with:
           repository: tcltk/tcl
-          ref: core-8-branch
+          ref: main
           path: tcl
       - name: Prepare checked out repositories
         env:
           SET_DISPLAY: ${{ contains(matrix.options, '--disable-aqua') }}
         run: |

Index: .github/workflows/onefiledist.yml
==================================================================
--- .github/workflows/onefiledist.yml
+++ .github/workflows/onefiledist.yml
@@ -1,10 +1,11 @@
 name: Build Binaries
 on:
   push:
     branches:
     - "main"
+    - "core-8-branch"
     - "core-8-6-branch"
     tags:
     - "core-**"
 permissions:
   contents: read
@@ -21,15 +22,15 @@
     steps:
       - name: Checkout Tk
         uses: actions/checkout@v4
         with:
           path: tk
-      - name: Checkout Tcl 8.7
+      - name: Checkout Tcl 9.0
         uses: actions/checkout@v4
         with:
           repository: tcltk/tcl
-          ref: core-8-branch
+          ref: main
           path: tcl
       - name: Setup Environment
         run: |
           sudo apt-get install libxss-dev libxft-dev
           touch tcl/generic/tclStubInit.c tcl/generic/tclOOStubInit.c
@@ -55,11 +56,11 @@
           make binaries libraries install
         working-directory: tk/unix
         # TODO: need the Tk version separately for distro naming below
       - name: Package
         run: |
-          cp bin/wish8.7 ${BUILD_NAME}
+          cp bin/wish9.0 ${BUILD_NAME}
           chmod +x ${BUILD_NAME}
           tar -cf ${BUILD_NAME}.tar ${BUILD_NAME}
         working-directory: ${{ env.INST_DIR }}
         env:
           BUILD_NAME: wish${{ env.TCL_PATCHLEVEL }}_snapshot
@@ -85,15 +86,15 @@
     steps:
       - name: Checkout Tk
         uses: actions/checkout@v4
         with:
           path: tk
-      - name: Checkout Tcl 8.7
+      - name: Checkout Tcl 9.0
         uses: actions/checkout@v4
         with:
           repository: tcltk/tcl
-          ref: core-8-branch
+          ref: main
           path: tcl
       - name: Checkout create-dmg
         uses: actions/checkout@v4
         with:
           repository: create-dmg/create-dmg
@@ -173,15 +174,15 @@
           install: git mingw-w64-x86_64-toolchain make zip
       - name: Checkout Tk
         uses: actions/checkout@v4
         with:
           path: tk
-      - name: Checkout Tcl 8.7
+      - name: Checkout Tcl 9.0
         uses: actions/checkout@v4
         with:
           repository: tcltk/tcl
-          ref: core-8-branch
+          ref: main
           path: tcl
       - name: Setup Environment
         run: |
           mkdir -p install/combined
           touch tcl/generic/tclStubInit.c tcl/generic/tclOOStubInit.c

Index: .github/workflows/win-build.yml
==================================================================
--- .github/workflows/win-build.yml
+++ .github/workflows/win-build.yml
@@ -1,10 +1,11 @@
 name: Windows
 on:
   push:
     branches:
     - "main"
+    - "core-8-branch"
     - "core-8-6-branch"
     tags:
     - "core-**"
 permissions:
   contents: read
@@ -26,15 +27,15 @@
     steps:
       - name: Checkout Tk
         uses: actions/checkout@v4
         with:
           path: tk
-      - name: Checkout Tcl 8.7
+      - name: Checkout Tcl 9.0
         uses: actions/checkout@v4
         with:
           repository: tcltk/tcl
-          ref: core-8-branch
+          ref: main
           path: tcl
       - name: Init MSVC
         uses: ilammy/msvc-dev-cmd@v1
       - name: Make Install Location
         working-directory: tcl
@@ -115,15 +116,15 @@
         with:
           msystem: MINGW64
           install: git mingw-w64-x86_64-toolchain make zip
       - name: Checkout Tk
         uses: actions/checkout@v4
-      - name: Checkout Tcl 8.7
+      - name: Checkout Tcl 9.0
         uses: actions/checkout@v4
         with:
           repository: tcltk/tcl
-          ref: core-8-branch
+          ref: main
           path: tcl
       - name: Prepare
         run: |
           touch tkStubInit.c
           touch "${HOME}/forWinDialog-5.12.7"

Index: .project
==================================================================
--- .project
+++ .project
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>tk8.7</name>
+	<name>tk9.0</name>
 	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>
 	</buildSpec>

Index: .travis.yml
==================================================================
--- .travis.yml
+++ .travis.yml
@@ -14,11 +14,10 @@
       - tcl8.6-dev
       - libx11-dev
       - libnotify-dev
       - libglib2.0-dev
       - libxss-dev
-      - libxft-dev
       - xvfb
   homebrew:
     packages:
       - tcl-tk
       - libnotify

Index: README.md
==================================================================
--- README.md
+++ README.md
@@ -1,8 +1,8 @@
 # README:  Tk
 
-This is the **Tk 8.7a6** source distribution.
+This is the **Tk 9.0b1** source distribution.
 
 You can get any source release of Tk from [our distribution
 site](https://sourceforge.net/projects/tcl/files/Tcl/).
 
 8.6 (production release, daily build)
@@ -9,10 +9,14 @@
 [![Build Status](https://github.com/tcltk/tk/workflows/Linux/badge.svg?branch=core-8-6-branch)](https://github.com/tcltk/tk/actions?query=workflow%3A%22Linux%22+branch%3Acore-8-6-branch)
 [![Build Status](https://github.com/tcltk/tk/workflows/Windows/badge.svg?branch=core-8-6-branch)](https://github.com/tcltk/tk/actions?query=workflow%3A%22Windows%22+branch%3Acore-8-6-branch)
 [![Build Status](https://github.com/tcltk/tk/workflows/macOS/badge.svg?branch=core-8-6-branch)](https://github.com/tcltk/tk/actions?query=workflow%3A%22macOS%22+branch%3Acore-8-6-branch)
 <br>
 8.7 (in development, daily build))
+[![Build Status](https://github.com/tcltk/tk/workflows/Linux/badge.svg?branch=core-8-branch)](https://github.com/tcltk/tk/actions?query=workflow%3A%22Linux%22+branch%3Acore-8-branch)
+[![Build Status](https://github.com/tcltk/tk/workflows/Windows/badge.svg?branch=core-8-branch)](https://github.com/tcltk/tk/actions?query=workflow%3A%22Windows%22+branch%3Acore-8-branch)
+[![Build Status](https://github.com/tcltk/tk/workflows/macOS/badge.svg?branch=core-8-branch)](https://github.com/tcltk/tk/actions?query=workflow%3A%22macOS%22+branch%3Acore-8-branch)
+9.0 (in development, daily build))
 [![Build Status](https://github.com/tcltk/tk/workflows/Linux/badge.svg?branch=main)](https://github.com/tcltk/tk/actions?query=workflow%3A%22Linux%22+branch%3Amain)
 [![Build Status](https://github.com/tcltk/tk/workflows/Windows/badge.svg?branch=main)](https://github.com/tcltk/tk/actions?query=workflow%3A%22Windows%22+branch%3Amain)
 [![Build Status](https://github.com/tcltk/tk/workflows/macOS/badge.svg?branch=main)](https://github.com/tcltk/tk/actions?query=workflow%3A%22macOS%22+branch%3Amain)
 
 ## <a id="intro">1.</a> Introduction
@@ -19,11 +23,11 @@
 
 This directory contains the sources and documentation for Tk, a
 cross-platform GUI toolkit implemented with the Tcl scripting language.
 
 For details on features, incompatibilities, and potential problems with
-this release, see [the Tcl/Tk 8.7 Web page](https://www.tcl-lang.org/software/tcltk/8.7.html)
+this release, see [the Tcl/Tk 9.0 Web page](https://www.tcl-lang.org/software/tcltk/9.0.html)
 or refer to the "changes" file in this directory, which contains a
 historical record of all changes to Tk.
 
 Tk is maintained, enhanced, and distributed freely by the Tcl community.
 Source code development and tracking of bug reports and feature requests

Index: doc/ttk_panedwindow.n
==================================================================
--- doc/ttk_panedwindow.n
+++ doc/ttk_panedwindow.n
@@ -130,11 +130,11 @@
 .PP
 \fB\-background\fP \fIcolor\fP
 .br
 \fB\-bordercolor\fP \fIcolor\fP
 .br
-\fB\-gripcount\fP \fIcount\fP
+\fB\-gripsize\fP \fIsize\fP (number of screen units)
 .br
 \fB\-handlepad\fP \fIamount\fP
 .br
 \fB\-handlesize\fP \fIamount\fP
 .br

Index: doc/ttk_scrollbar.n
==================================================================
--- doc/ttk_scrollbar.n
+++ doc/ttk_scrollbar.n
@@ -164,11 +164,11 @@
 .br
 \fB\-darkcolor\fP \fIcolor\fP (color of the dark part of the 3D relief)
 .br
 \fB\-foreground\fP \fIcolor\fP
 .br
-\fB\-gripcount\fP \fIcount\fP (number of lines on the thumb)
+\fB\-gripsize\fP \fIsize\fP (number of screen units)
 .br
 \fB\-lightcolor\fP \fIcolor\fP (color of the light part of the 3D relief)
 .br
 \fB\-troughcolor\fP \fIcolor\fP
 .PP

Index: generic/tk.h
==================================================================
--- generic/tk.h
+++ generic/tk.h
@@ -15,12 +15,12 @@
 
 #ifndef _TK
 #define _TK
 
 #include <tcl.h>
-#if (TCL_MAJOR_VERSION < 8) || (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION < 6)
-#	error Tk 8.7 must be compiled with tcl.h from Tcl 8.6 or better
+#if (TCL_MAJOR_VERSION < 8) || (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION < 7)
+#	error Tk 9.0 must be compiled with tcl.h from Tcl 8.7 or better
 #endif
 
 #ifndef EXTERN
 #   define EXTERN extern TCL_STORAGE_CLASS
 #endif
@@ -64,21 +64,20 @@
  * You may also need to update some of these files when the numbers change for
  * the version of Tcl that this release of Tk is compiled against.
  */
 
 #ifndef TK_MAJOR_VERSION
-#   define TK_MAJOR_VERSION 8
-#endif
-#if TK_MAJOR_VERSION != 8
-#   error "This header-file is for Tk 8 only"
-#endif
-#define TK_MINOR_VERSION	7
-#define TK_RELEASE_LEVEL	TCL_ALPHA_RELEASE
-#define TK_RELEASE_SERIAL	6
-
-#define TK_VERSION		"8.7"
-#define TK_PATCH_LEVEL		"8.7a6"
+#   define TK_MAJOR_VERSION 9
+#endif
+#if TK_MAJOR_VERSION == 9
+#   define TK_MINOR_VERSION	0
+#   define TK_RELEASE_LEVEL	TCL_BETA_RELEASE
+#   define TK_RELEASE_SERIAL	0
+
+#   define TK_VERSION		"9.0"
+#   define TK_PATCH_LEVEL		"9.0b1"
+#endif /* TK_MAJOR_VERSION */
 
 /*
  * A special definition used to allow this header file to be included from
  * windows or mac resource files so that they can obtain version information.
  * RC_INVOKED is defined by default by the windows RC tool and manually set
@@ -144,18 +143,10 @@
 /*
  * Additional types exported to clients.
  */
 
 typedef const char *Tk_Uid;
-
-#if (TCL_MAJOR_VERSION < 9) && (TCL_MINOR_VERSION < 7)
-#   ifndef Tcl_Size
-#	define Tcl_Size int
-#   endif
-#   define TCL_SIZE_MAX INT_MAX
-#   define TCL_SIZE_MODIFIER ""
-#endif
 
 /*
  *----------------------------------------------------------------------
  *
  * The enum below defines the valid types for Tk configuration options as

Index: generic/ttk/ttkClamTheme.c
==================================================================
--- generic/ttk/ttkClamTheme.c
+++ generic/ttk/ttkClamTheme.c
@@ -543,20 +543,20 @@
  */
 
 typedef struct {
     Tcl_Obj 	*lightColorObj;
     Tcl_Obj 	*borderColorObj;
-    Tcl_Obj 	*gripCountObj;
+    Tcl_Obj 	*gripSizeObj;
 } GripElement;
 
 static const Ttk_ElementOptionSpec GripElementOptions[] = {
     { "-lightcolor", TK_OPTION_COLOR,
 	offsetof(GripElement,lightColorObj), LIGHT_COLOR },
     { "-bordercolor", TK_OPTION_COLOR,
 	offsetof(GripElement,borderColorObj), DARKEST_COLOR },
-    { "-gripcount", TK_OPTION_PIXELS,
-	offsetof(GripElement,gripCountObj), "5" },
+    { "-gripsize", TK_OPTION_PIXELS,
+	offsetof(GripElement,gripSizeObj), "7.5p" },
     { NULL, TK_OPTION_BOOLEAN, 0, NULL }
 };
 
 static void GripElementSize(
     void *clientData, void *elementRecord, Tk_Window tkwin,
@@ -565,12 +565,11 @@
     Ttk_Orient orient = (Ttk_Orient)PTR2INT(clientData);
     GripElement *grip = (GripElement *)elementRecord;
     int gripSize = 0;
     (void)paddingPtr;
 
-    Tk_GetPixelsFromObj(NULL, tkwin, grip->gripCountObj, &gripSize);
-    gripSize *= 2;
+    Tk_GetPixelsFromObj(NULL, tkwin, grip->gripSizeObj, &gripSize);
     if (orient == TTK_ORIENT_HORIZONTAL) {
 	*widthPtr = gripSize;
     } else {
 	*heightPtr = gripSize;
     }
@@ -587,12 +586,11 @@
     GC darkGC = Ttk_GCForColor(tkwin,grip->borderColorObj,d);
     int gripPad = 1, gripSize = 0;
     int i;
     (void)state;
 
-    Tk_GetPixelsFromObj(NULL, tkwin, grip->gripCountObj, &gripSize);
-    gripSize *= 2;
+    Tk_GetPixelsFromObj(NULL, tkwin, grip->gripSizeObj, &gripSize);
 
     if (orient == TTK_ORIENT_HORIZONTAL) {
 	int x = b.x + (b.width - gripSize) / 2;
 	int y1 = b.y + gripPad, y2 = b.y + b.height - gripPad - 1 + w;
 	for (i=0; i<gripSize; ++i) {
@@ -631,11 +629,11 @@
     Tcl_Obj 	*troughColorObj;
     Tcl_Obj 	*lightColorObj;
     Tcl_Obj 	*darkColorObj;
     Tcl_Obj 	*arrowColorObj;
     Tcl_Obj 	*arrowSizeObj;
-    Tcl_Obj 	*gripCountObj;
+    Tcl_Obj 	*gripSizeObj;
     Tcl_Obj 	*sliderlengthObj;
 } ScrollbarElement;
 
 static const Ttk_ElementOptionSpec ScrollbarElementOptions[] = {
     { "-orient", TK_OPTION_ANY,
@@ -652,12 +650,12 @@
 	offsetof(ScrollbarElement,darkColorObj), DARK_COLOR },
     { "-arrowcolor", TK_OPTION_COLOR,
 	offsetof(ScrollbarElement,arrowColorObj), "#000000" },
     { "-arrowsize", TK_OPTION_PIXELS,
 	offsetof(ScrollbarElement,arrowSizeObj), STR(SCROLLBAR_THICKNESS) },
-    { "-gripcount", TK_OPTION_PIXELS,
-	offsetof(ScrollbarElement,gripCountObj), "5" },
+    { "-gripsize", TK_OPTION_PIXELS,
+	offsetof(ScrollbarElement,gripSizeObj), "7.5p" },
     { "-sliderlength", TK_OPTION_PIXELS,
 	offsetof(ScrollbarElement,sliderlengthObj), "30" },
     { NULL, TK_OPTION_BOOLEAN, 0, NULL }
 };
 
@@ -718,12 +716,11 @@
 
     /*
      * Draw grip:
      */
     TtkGetOrientFromObj(NULL, sb->orientObj, &orient);
-    Tk_GetPixelsFromObj(NULL, tkwin, sb->gripCountObj, &gripSize);
-    gripSize *= 2;
+    Tk_GetPixelsFromObj(NULL, tkwin, sb->gripSizeObj, &gripSize);
     lightGC = Ttk_GCForColor(tkwin,sb->lightColorObj,d);
     darkGC = Ttk_GCForColor(tkwin,sb->borderColorObj,d);
 
     if (orient == TTK_ORIENT_HORIZONTAL) {
 	dx = 1; dy = 0;

Index: generic/ttk/ttkClassicTheme.c
==================================================================
--- generic/ttk/ttkClassicTheme.c
+++ generic/ttk/ttkClassicTheme.c
@@ -218,11 +218,11 @@
 	offsetof(IndicatorElement,backgroundObj), DEFAULT_BACKGROUND },
     { "-indicatorcolor", TK_OPTION_BORDER,
 	offsetof(IndicatorElement,colorObj), DEFAULT_BACKGROUND },
     { "-indicatorrelief", TK_OPTION_RELIEF,
 	offsetof(IndicatorElement,reliefObj), "raised" },
-    { "-indicatordiameter", TK_OPTION_PIXELS,
+    { "-indicatorsize", TK_OPTION_PIXELS,
 	offsetof(IndicatorElement,sizeObj), "9p" },
     { "-indicatormargin", TK_OPTION_STRING,
 	offsetof(IndicatorElement,marginObj), "0 2 4 2" },
     { "-borderwidth", TK_OPTION_PIXELS,
 	offsetof(IndicatorElement,borderWidthObj), DEFAULT_BORDERWIDTH },

Index: generic/ttk/ttkDefaultTheme.c
==================================================================
--- generic/ttk/ttkDefaultTheme.c
+++ generic/ttk/ttkDefaultTheme.c
@@ -1205,11 +1205,11 @@
 } TreeitemIndicator;
 
 static const Ttk_ElementOptionSpec TreeitemIndicatorOptions[] = {
     { "-foreground", TK_OPTION_COLOR,
 	offsetof(TreeitemIndicator,colorObj), DEFAULT_FOREGROUND },
-    { "-diameter", TK_OPTION_PIXELS,
+    { "-size", TK_OPTION_PIXELS,
 	offsetof(TreeitemIndicator,sizeObj), "6.75p" },
     { "-indicatormargins", TK_OPTION_STRING,
 	offsetof(TreeitemIndicator,marginObj), "2 2 4 2" },
     { NULL, TK_OPTION_BOOLEAN, 0, NULL }
 };

Index: library/tk.tcl
==================================================================
--- library/tk.tcl
+++ library/tk.tcl
@@ -9,11 +9,11 @@
 #
 # See the file "license.terms" for information on usage and redistribution of
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 # Verify that we have Tk binary and script components from the same release
-package require -exact tk  8.7a6
+package require -exact tk  9.0b1
 
 # Create a ::tk namespace
 namespace eval ::tk {
     # Set up the msgcat commands
     namespace eval msgcat {

Index: library/ttk/clamTheme.tcl
==================================================================
--- library/ttk/clamTheme.tcl
+++ library/ttk/clamTheme.tcl
@@ -143,17 +143,17 @@
 
 	ttk::style configure TLabelframe \
 	    -labeloutside true -labelmargins {0 0 0 3p} \
 	    -borderwidth 2 -relief raised
 
-	ttk::style configure TScrollbar -gripcount 3.75p \
+	ttk::style configure TScrollbar -gripsize 7.5p \
 	    -arrowsize 10.5p -width 10.5p
 
-	ttk::style configure TScale -gripcount 3.75p \
+	ttk::style configure TScale -gripsize 7.5p \
 	    -arrowsize 10.5p -sliderlength 22.5p
 
 	ttk::style configure TProgressbar -background $colors(-frame) \
 	    -arrowsize 10.5p -sliderlength 22.5p
 
-	ttk::style configure Sash -sashthickness 4.5p -gripcount 7.5p
+	ttk::style configure Sash -sashthickness 4.5p -gripsize 15p
     }
 }

Index: unix/Makefile.in
==================================================================
--- unix/Makefile.in
+++ unix/Makefile.in
@@ -110,11 +110,11 @@
 
 # The directory containing the Tcl library archive file appropriate
 # for this version of Tk:
 TCL_BIN_DIR		= @TCL_BIN_DIR@
 
-# The linker flags needed to link in the Tcl library (ex: -ltcl8.7)
+# The linker flags needed to link in the Tcl library (ex: -ltcl9.0)
 TCL_LIB_FLAG		= @TCL_LIB_FLAG@
 
 # Flag, 1: we're building a shared lib, 0 we're not
 TK_SHARED_BUILD		= @TK_SHARED_BUILD@
 

Index: unix/configure
==================================================================
--- unix/configure
+++ unix/configure
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for tk 8.7.
+# Generated by GNU Autoconf 2.71 for tk 9.0.
 #
 #
 # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
 # Inc.
 #
@@ -606,12 +606,12 @@
 MAKEFLAGS=
 
 # Identity of this package.
 PACKAGE_NAME='tk'
 PACKAGE_TARNAME='tk'
-PACKAGE_VERSION='8.7'
-PACKAGE_STRING='tk 8.7'
+PACKAGE_VERSION='9.0'
+PACKAGE_STRING='tk 9.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
 # Factoring default headers for most tests.
 ac_includes_default="\
@@ -1380,11 +1380,11 @@
 #
 if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures tk 8.7 to adapt to many kinds of systems.
+\`configure' configures tk 9.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
 To assign environment variables (e.g., CC, CFLAGS...), specify them as
 VAR=VALUE.  See below for descriptions of some of the useful variables.
@@ -1446,11 +1446,11 @@
 _ACEOF
 fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of tk 8.7:";;
+     short | recursive ) echo "Configuration of tk 9.0:";;
    esac
   cat <<\_ACEOF
 
 Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
@@ -1562,11 +1562,11 @@
 fi
 
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-tk configure 8.7
+tk configure 9.0
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
@@ -1918,11 +1918,11 @@
 
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by tk $as_me 8.7, which was
+It was created by tk $as_me 9.0, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
 
 _ACEOF
@@ -2580,14 +2580,14 @@
 
 
 
 
 
-TK_VERSION=8.7
-TK_MAJOR_VERSION=8
-TK_MINOR_VERSION=7
-TK_PATCH_LEVEL="a6"
+TK_VERSION=9.0
+TK_MAJOR_VERSION=9
+TK_MINOR_VERSION=0
+TK_PATCH_LEVEL="b1"
 VERSION=${TK_VERSION}
 LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv"
 
 #--------------------------------------------------------------------
 # Find and load the tclConfig.sh file
@@ -2676,15 +2676,15 @@
 			`ls -d ${exec_prefix}/lib 2>/dev/null` \
 			`ls -d ${prefix}/lib 2>/dev/null` \
 			`ls -d /usr/local/lib 2>/dev/null` \
 			`ls -d /usr/contrib/lib 2>/dev/null` \
 			`ls -d /usr/pkg/lib 2>/dev/null` \
-			`ls -d /usr/lib/tcl8.7 2>/dev/null` \
+			`ls -d /usr/lib/tcl9.0 2>/dev/null` \
 			`ls -d /usr/lib 2>/dev/null` \
 			`ls -d /usr/lib64 2>/dev/null` \
-			`ls -d /usr/local/lib/tcl8.7 2>/dev/null` \
-			`ls -d /usr/local/lib/tcl/tcl8.7 2>/dev/null` \
+			`ls -d /usr/local/lib/tcl9.0 2>/dev/null` \
+			`ls -d /usr/local/lib/tcl/tcl9.0 2>/dev/null` \
 			; do
 		    if test -f "$i/tclConfig.sh" ; then
 			ac_cv_c_tclconfig="`(cd $i; pwd)`"
 			break
 		    fi
@@ -2778,16 +2778,12 @@
 
 
 
 
 if test "${TCL_MAJOR_VERSION}" -lt 9 ; then
-if test "${TCL_MAJOR_VERSION}" -ne 8 ; then
-    as_fn_error $? "${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6+
-Found config for Tcl ${TCL_VERSION}" "$LINENO" 5
-fi
-if test "${TCL_MINOR_VERSION}" -lt 6 ; then
-    as_fn_error $? "${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6+
+if test "${TCL_MINOR_VERSION}" -lt 7 ; then
+    as_fn_error $? "${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.7+
 Found config for Tcl ${TCL_VERSION}" "$LINENO" 5
 fi
 fi
 
 
@@ -8917,21 +8913,12 @@
 #       The statements below define various symbols relating to Tk
 #       stub support.
 #--------------------------------------------------------------------
 
 # Replace ${VERSION} with contents of ${TK_VERSION}
-if test "${TCL_MAJOR_VERSION}" -gt 8 ; then
     TK_STUB_LIB_FILE="libtkstub.a"
     TK_STUB_LIB_FLAG="-ltkstub"
-else
-    eval "TK_STUB_LIB_FILE=libtkstub${TK_UNSHARED_LIB_SUFFIX}"
-if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
-    TK_STUB_LIB_FLAG="-ltkstub${TK_VERSION}"
-else
-    TK_STUB_LIB_FLAG="-ltkstub`echo ${TK_VERSION} | tr -d .`"
-fi
-fi
 eval "TK_STUB_LIB_DIR=\"${libdir}\""
 
 TK_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_STUB_LIB_FLAG}"
 TK_STUB_LIB_SPEC="-L${TK_STUB_LIB_DIR} ${TK_STUB_LIB_FLAG}"
 TK_BUILD_STUB_LIB_PATH="`pwd`/${TK_STUB_LIB_FILE}"
@@ -9549,11 +9536,11 @@
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # Save the log message, to keep $0 and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by tk $as_me 8.7, which was
+This file was extended by tk $as_me 9.0, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS
@@ -9608,11 +9595,11 @@
 ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"`
 ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-tk config.status 8.7
+tk config.status 9.0
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 
 Copyright (C) 2021 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation

Index: unix/configure.ac
==================================================================
--- unix/configure.ac
+++ unix/configure.ac
@@ -1,11 +1,11 @@
 ! /bin/bash -norc
 dnl	This file is an input file used by the GNU "autoconf" program to
 dnl	generate the file "configure", which is run during Tk installation
 dnl	to configure the system for the local environment.
 
-AC_INIT([tk],[8.7])
+AC_INIT([tk],[9.0])
 AC_PREREQ([2.69])
 
 dnl This is only used when included from macosx/configure.ac
 m4_ifdef([SC_USE_CONFIG_HEADERS], [
     AC_CONFIG_HEADERS([tkConfig.h:../unix/tkConfig.h.in])
@@ -21,14 +21,14 @@
     /* override */ #undef PACKAGE_VERSION
     /* override */ #undef PACKAGE_STRING
     #endif /* _TKCONFIG */])
 ])
 
-TK_VERSION=8.7
-TK_MAJOR_VERSION=8
-TK_MINOR_VERSION=7
-TK_PATCH_LEVEL="a6"
+TK_VERSION=9.0
+TK_MAJOR_VERSION=9
+TK_MINOR_VERSION=0
+TK_PATCH_LEVEL="b1"
 VERSION=${TK_VERSION}
 LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv"
 
 #--------------------------------------------------------------------
 # Find and load the tclConfig.sh file
@@ -36,16 +36,12 @@
 
 SC_PATH_TCLCONFIG
 SC_LOAD_TCLCONFIG
 
 if test "${TCL_MAJOR_VERSION}" -lt 9 ; then
-if test "${TCL_MAJOR_VERSION}" -ne 8 ; then
-    AC_MSG_ERROR([${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6+
-Found config for Tcl ${TCL_VERSION}])
-fi
-if test "${TCL_MINOR_VERSION}" -lt 6 ; then
-    AC_MSG_ERROR([${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6+
+if test "${TCL_MINOR_VERSION}" -lt 7 ; then
+    AC_MSG_ERROR([${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.7+
 Found config for Tcl ${TCL_VERSION}])
 fi
 fi
 
 SC_PROG_TCLSH
@@ -712,21 +708,12 @@
 #       The statements below define various symbols relating to Tk
 #       stub support.
 #--------------------------------------------------------------------
 
 # Replace ${VERSION} with contents of ${TK_VERSION}
-if test "${TCL_MAJOR_VERSION}" -gt 8 ; then
     TK_STUB_LIB_FILE="libtkstub.a"
     TK_STUB_LIB_FLAG="-ltkstub"
-else
-    eval "TK_STUB_LIB_FILE=libtkstub${TK_UNSHARED_LIB_SUFFIX}"
-if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
-    TK_STUB_LIB_FLAG="-ltkstub${TK_VERSION}"
-else
-    TK_STUB_LIB_FLAG="-ltkstub`echo ${TK_VERSION} | tr -d .`"
-fi
-fi
 eval "TK_STUB_LIB_DIR=\"${libdir}\""
 
 TK_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_STUB_LIB_FLAG}"
 TK_STUB_LIB_SPEC="-L${TK_STUB_LIB_DIR} ${TK_STUB_LIB_FLAG}"
 TK_BUILD_STUB_LIB_PATH="`pwd`/${TK_STUB_LIB_FILE}"

Index: unix/tcl.m4
==================================================================
--- unix/tcl.m4
+++ unix/tcl.m4
@@ -91,15 +91,15 @@
 			`ls -d ${exec_prefix}/lib 2>/dev/null` \
 			`ls -d ${prefix}/lib 2>/dev/null` \
 			`ls -d /usr/local/lib 2>/dev/null` \
 			`ls -d /usr/contrib/lib 2>/dev/null` \
 			`ls -d /usr/pkg/lib 2>/dev/null` \
-			`ls -d /usr/lib/tcl8.7 2>/dev/null` \
+			`ls -d /usr/lib/tcl9.0 2>/dev/null` \
 			`ls -d /usr/lib 2>/dev/null` \
 			`ls -d /usr/lib64 2>/dev/null` \
-			`ls -d /usr/local/lib/tcl8.7 2>/dev/null` \
-			`ls -d /usr/local/lib/tcl/tcl8.7 2>/dev/null` \
+			`ls -d /usr/local/lib/tcl9.0 2>/dev/null` \
+			`ls -d /usr/local/lib/tcl/tcl9.0 2>/dev/null` \
 			; do
 		    if test -f "$i/tclConfig.sh" ; then
 			ac_cv_c_tclconfig="`(cd $i; pwd)`"
 			break
 		    fi
@@ -224,15 +224,15 @@
 			`ls -d ${exec_prefix}/lib 2>/dev/null` \
 			`ls -d ${prefix}/lib 2>/dev/null` \
 			`ls -d /usr/local/lib 2>/dev/null` \
 			`ls -d /usr/contrib/lib 2>/dev/null` \
 			`ls -d /usr/pkg/lib 2>/dev/null` \
-			`ls -d /usr/lib/tk8.7 2>/dev/null` \
+			`ls -d /usr/lib/tk9.0 2>/dev/null` \
 			`ls -d /usr/lib 2>/dev/null` \
 			`ls -d /usr/lib64 2>/dev/null` \
-			`ls -d /usr/local/lib/tk8.7 2>/dev/null` \
-			`ls -d /usr/local/lib/tcl/tk8.7 2>/dev/null` \
+			`ls -d /usr/local/lib/tk9.0 2>/dev/null` \
+			`ls -d /usr/local/lib/tcl/tk9.0 2>/dev/null` \
 			; do
 		    if test -f "$i/tkConfig.sh" ; then
 			ac_cv_c_tkconfig="`(cd $i; pwd)`"
 			break
 		    fi

Index: unix/tk.spec
==================================================================
--- unix/tk.spec
+++ unix/tk.spec
@@ -2,19 +2,19 @@
 
 %{!?directory:%define directory /usr/local}
 
 Name:          tk
 Summary:       Tk graphical toolkit for the Tcl scripting language.
-Version:       8.7a6
+Version:       9.0b1
 Release:       2
 License:       BSD
 Group:         Development/Languages
 Source:        http://prdownloads.sourceforge.net/tcl/tk%{version}-src.tar.gz
 URL:           https://www.tcl-lang.org/
 Buildroot:     /var/tmp/%{name}%{version}
-Buildrequires: XFree86-devel tcl >= 8.6.0
-Requires:      tcl >= 8.6.0
+Buildrequires: XFree86-devel tcl >= 8.7.0
+Requires:      tcl >= 8.7.0
 
 %description
 The Tcl (Tool Command Language) provides a powerful platform for
 creating integration applications that tie together diverse
 applications, protocols, devices, and frameworks.  When paired with

Index: win/README
==================================================================
--- win/README
+++ win/README
@@ -1,6 +1,6 @@
-Tk 8.7 for Windows
+Tk 9.0 for Windows
 
 Originally by Scott Stanton while at Sun Microsystems Labs
 
 This is the directory where you configure and compile the Windows
 version of Tk.  This directory also contains source files for Tk

Index: win/configure
==================================================================
--- win/configure
+++ win/configure
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for tk 8.7.
+# Generated by GNU Autoconf 2.71 for tk 9.0.
 #
 #
 # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
 # Inc.
 #
@@ -606,12 +606,12 @@
 MAKEFLAGS=
 
 # Identity of this package.
 PACKAGE_NAME='tk'
 PACKAGE_TARNAME='tk'
-PACKAGE_VERSION='8.7'
-PACKAGE_STRING='tk 8.7'
+PACKAGE_VERSION='9.0'
+PACKAGE_STRING='tk 9.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
 ac_unique_file="../generic/tk.h"
 # Factoring default headers for most tests.
@@ -1362,11 +1362,11 @@
 #
 if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures tk 8.7 to adapt to many kinds of systems.
+\`configure' configures tk 9.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
 To assign environment variables (e.g., CC, CFLAGS...), specify them as
 VAR=VALUE.  See below for descriptions of some of the useful variables.
@@ -1424,11 +1424,11 @@
 _ACEOF
 fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of tk 8.7:";;
+     short | recursive ) echo "Configuration of tk 9.0:";;
    esac
   cat <<\_ACEOF
 
 Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
@@ -1522,11 +1522,11 @@
 fi
 
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-tk configure 8.7
+tk configure 9.0
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
@@ -1726,11 +1726,11 @@
 
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by tk $as_me 8.7, which was
+It was created by tk $as_me 9.0, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
 
 _ACEOF
@@ -2391,14 +2391,14 @@
 # The following define is needed when building with Cygwin since newer
 # versions of autoconf incorrectly set SHELL to /bin/bash instead of
 # /bin/sh. The bash shell seems to suffer from some strange failures.
 SHELL=/bin/sh
 
-TK_VERSION=8.7
-TK_MAJOR_VERSION=8
-TK_MINOR_VERSION=7
-TK_PATCH_LEVEL="a6"
+TK_VERSION=9.0
+TK_MAJOR_VERSION=9
+TK_MINOR_VERSION=0
+TK_PATCH_LEVEL="b1"
 VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
 
 #------------------------------------------------------------------------
 # Handle the --prefix=... option
 #------------------------------------------------------------------------
@@ -4035,19 +4035,14 @@
 
 
 
 
 if test "${TCL_MAJOR_VERSION}" -lt 9 ; then
-if test "${TCL_MAJOR_VERSION}" != "${TK_MAJOR_VERSION}"; then
-    as_fn_error $? "${TCL_BIN_DIR}/tclConfig.sh is for Tcl ${TCL_VERSION}.
-Tk ${TK_VERSION}${TK_PATCH_LEVEL} needs Tcl 8.6+.
-Use --with-tcl= option to indicate location of tclConfig.sh file for Tcl 8.6 or better." "$LINENO" 5
-fi
-if test "${TCL_MINOR_VERSION}" -lt 6; then
-    as_fn_error $? "${TCL_BIN_DIR}/tclConfig.sh is for Tcl ${TCL_VERSION}.
-Tk ${TK_VERSION}${TK_PATCH_LEVEL} needs Tcl 8.6+.
-Use --with-tcl= option to indicate location of tclConfig.sh file for Tcl 8.6 or better." "$LINENO" 5
+if test "${TCL_MINOR_VERSION}" -lt 7; then
+    as_fn_error $? "${TCL_BIN_DIR}/tclConfig.sh is for Tcl ${TCL_VERSION}.
+Tk ${TK_VERSION}${TK_PATCH_LEVEL} needs Tcl 8.7+.
+Use --with-tcl= option to indicate location of tclConfig.sh file for Tcl 8.7 or better." "$LINENO" 5
 fi
 fi
 
 #--------------------------------------------------------------------
 # The statements below define a collection of compile flags.  This
@@ -5795,15 +5790,11 @@
 else
  eval "TK_LIB_FILE=${LIBPREFIX}tcl9tk${VER}${DLLSUFFIX}.a"
 fi
 fi
 
-if test "${TCL_MAJOR_VERSION}" -gt 8 ; then
-    eval "TK_STUB_LIB_FILE=${LIBPREFIX}tkstub${LIBSUFFIX}" ;
-else
-    eval "TK_STUB_LIB_FILE=${LIBPREFIX}tkstub${VER}${LIBSUFFIX}" ;
-fi
+eval "TK_STUB_LIB_FILE=${LIBPREFIX}tkstub${LIBSUFFIX}" ;
 # FIXME: All of this var junk needs to be done in tcl.m4 !!!!
 # I left out the other vars that also need to get defined here.
 # we also need to double check about spaces in path names
 TK_LIB_FLAG="-l"
 if test "${TCL_MAJOR_VERSION}" -gt 8 ; then
@@ -6473,11 +6464,11 @@
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # Save the log message, to keep $0 and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by tk $as_me 8.7, which was
+This file was extended by tk $as_me 9.0, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS
@@ -6528,11 +6519,11 @@
 ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"`
 ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-tk config.status 8.7
+tk config.status 9.0
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 
 Copyright (C) 2021 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation

Index: win/configure.ac
==================================================================
--- win/configure.ac
+++ win/configure.ac
@@ -1,23 +1,23 @@
 #! /bin/bash -norc
 # This file is an input file used by the GNU "autoconf" program to
 # generate the file "configure", which is run during Tk installation
 # to configure the system for the local environment.
 
-AC_INIT([tk],[8.7])
+AC_INIT([tk],[9.0])
 AC_CONFIG_SRCDIR([../generic/tk.h])
 AC_PREREQ([2.69])
 
 # The following define is needed when building with Cygwin since newer
 # versions of autoconf incorrectly set SHELL to /bin/bash instead of
 # /bin/sh. The bash shell seems to suffer from some strange failures.
 SHELL=/bin/sh
 
-TK_VERSION=8.7
-TK_MAJOR_VERSION=8
-TK_MINOR_VERSION=7
-TK_PATCH_LEVEL="a6"
+TK_VERSION=9.0
+TK_MAJOR_VERSION=9
+TK_MINOR_VERSION=0
+TK_PATCH_LEVEL="b1"
 VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
 
 #------------------------------------------------------------------------
 # Handle the --prefix=... option
 #------------------------------------------------------------------------
@@ -75,19 +75,14 @@
 
 SC_PATH_TCLCONFIG($TK_PATCH_LEVEL)
 SC_LOAD_TCLCONFIG
 
 if test "${TCL_MAJOR_VERSION}" -lt 9 ; then
-if test "${TCL_MAJOR_VERSION}" != "${TK_MAJOR_VERSION}"; then
-    AC_MSG_ERROR([${TCL_BIN_DIR}/tclConfig.sh is for Tcl ${TCL_VERSION}.
-Tk ${TK_VERSION}${TK_PATCH_LEVEL} needs Tcl 8.6+.
-Use --with-tcl= option to indicate location of tclConfig.sh file for Tcl 8.6 or better.])
-fi
-if test "${TCL_MINOR_VERSION}" -lt 6; then
-    AC_MSG_ERROR([${TCL_BIN_DIR}/tclConfig.sh is for Tcl ${TCL_VERSION}.
-Tk ${TK_VERSION}${TK_PATCH_LEVEL} needs Tcl 8.6+.
-Use --with-tcl= option to indicate location of tclConfig.sh file for Tcl 8.6 or better.])
+if test "${TCL_MINOR_VERSION}" -lt 7; then
+    AC_MSG_ERROR([${TCL_BIN_DIR}/tclConfig.sh is for Tcl ${TCL_VERSION}.
+Tk ${TK_VERSION}${TK_PATCH_LEVEL} needs Tcl 8.7+.
+Use --with-tcl= option to indicate location of tclConfig.sh file for Tcl 8.7 or better.])
 fi
 fi
 
 #--------------------------------------------------------------------
 # The statements below define a collection of compile flags.  This
@@ -245,15 +240,11 @@
 else
  eval "TK_LIB_FILE=${LIBPREFIX}tcl9tk${VER}${DLLSUFFIX}.a"
 fi
 fi
 
-if test "${TCL_MAJOR_VERSION}" -gt 8 ; then
-    eval "TK_STUB_LIB_FILE=${LIBPREFIX}tkstub${LIBSUFFIX}" ;
-else
-    eval "TK_STUB_LIB_FILE=${LIBPREFIX}tkstub${VER}${LIBSUFFIX}" ;
-fi
+eval "TK_STUB_LIB_FILE=${LIBPREFIX}tkstub${LIBSUFFIX}" ;
 # FIXME: All of this var junk needs to be done in tcl.m4 !!!!
 # I left out the other vars that also need to get defined here.
 # we also need to double check about spaces in path names
 TK_LIB_FLAG="-l"
 if test "${TCL_MAJOR_VERSION}" -gt 8 ; then

Index: win/rules.vc
==================================================================
--- win/rules.vc
+++ win/rules.vc
@@ -1238,15 +1238,11 @@
 TKIMPLIBNAME	= tk$(TK_VERSION)$(SUFX).lib
 !else
 TKLIBNAME	= tcl9tk$(TK_VERSION)$(SUFX).$(EXT)
 TKIMPLIBNAME	= tcl9tk$(TK_VERSION)$(SUFX).lib
 !endif
-!if $(TK_MAJOR_VERSION) == 8
 TKSTUBLIBNAME	= tkstub$(TK_VERSION).lib
-!else
-TKSTUBLIBNAME	= tkstub.lib
-!endif
 
 !if $(DOING_TK)
 WISH 		= $(OUT_DIR)\$(WISHNAME)
 TKSTUBLIB	= $(OUT_DIR)\$(TKSTUBLIBNAME)
 TKIMPLIB	= $(OUT_DIR)\$(TKIMPLIBNAME)

Index: win/tcl.m4
==================================================================
--- win/tcl.m4
+++ win/tcl.m4
@@ -983,17 +983,17 @@
 #	Defines the following vars:
 #		TCL_BIN_DIR	Full path to the tcl build dir.
 #------------------------------------------------------------------------
 
 AC_DEFUN([SC_WITH_TCL], [
-    if test -d ../../tcl8.7$1/win;  then
-	TCL_BIN_DEFAULT=../../tcl8.7$1/win
+    if test -d ../../tcl9.0$1/win;  then
+	TCL_BIN_DEFAULT=../../tcl9.0$1/win
     else
-	TCL_BIN_DEFAULT=../../tcl8.7/win
+	TCL_BIN_DEFAULT=../../tcl9.0/win
     fi
 
-    AC_ARG_WITH(tcl, [  --with-tcl=DIR          use Tcl 8.7 binaries from DIR],
+    AC_ARG_WITH(tcl, [  --with-tcl=DIR          use Tcl 9.0 binaries from DIR],
 	    TCL_BIN_DIR=$withval, TCL_BIN_DIR=`cd $TCL_BIN_DEFAULT; pwd`)
     if test ! -d $TCL_BIN_DIR; then
 	AC_MSG_ERROR(Tcl directory $TCL_BIN_DIR does not exist)
     fi
     if test ! -f $TCL_BIN_DIR/Makefile; then