Revert my previous commit. The problem is not with tcl/tk 8.2

6 files changed, 42 insertions, 12 deletions

diff --git a/x11-servers/XFree86-4-Server-snap/scripts/configure b/x11-servers/XFree86-4-Server-snap/scripts/configure
index c9a05b229697..5dcca08200f0 100644
--- a/x11-servers/XFree86-4-Server-snap/scripts/configure
+++ b/x11-servers/XFree86-4-Server-snap/scripts/configure
@@ -36,7 +36,7 @@ rm -f $F
 
 # Tk detection
 tkversion=
-for v in 42 80 81 42jp 80jp; do
+for v in 42 80 81 82 42jp 80jp; do
   if [ -f /usr/local/lib/libtk$v.a ]; then
     tkversion=$v
     case $tkversion in
@@ -65,6 +65,11 @@ for v in 42 80 81 42jp 80jp; do
         tclLversion=8.1
         tkLversion=8.1
         ;;
+      82)
+        tclversion=82
+        tclLversion=8.2
+        tkLversion=8.2
+        ;;
     esac
   fi
 done
@@ -108,7 +113,7 @@ else
 cat <<EOF
 *** I don't see the static library for tk version $tkversion in /usr/local/lib.
 *** XF86Setup will not be installed. If you want to build this program
-*** install tk 4.2, 8.0 or 8.1 first (does not work with versions 8.2 and 8.3)
+*** install tk 4.2 or 8.x first.
 
 EOF
 fi
diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure
index c9a05b229697..5dcca08200f0 100644
--- a/x11-servers/XFree86-4-Server/scripts/configure
+++ b/x11-servers/XFree86-4-Server/scripts/configure
@@ -36,7 +36,7 @@ rm -f $F
 
 # Tk detection
 tkversion=
-for v in 42 80 81 42jp 80jp; do
+for v in 42 80 81 82 42jp 80jp; do
   if [ -f /usr/local/lib/libtk$v.a ]; then
     tkversion=$v
     case $tkversion in
@@ -65,6 +65,11 @@ for v in 42 80 81 42jp 80jp; do
         tclLversion=8.1
         tkLversion=8.1
         ;;
+      82)
+        tclversion=82
+        tclLversion=8.2
+        tkLversion=8.2
+        ;;
     esac
   fi
 done
@@ -108,7 +113,7 @@ else
 cat <<EOF
 *** I don't see the static library for tk version $tkversion in /usr/local/lib.
 *** XF86Setup will not be installed. If you want to build this program
-*** install tk 4.2, 8.0 or 8.1 first (does not work with versions 8.2 and 8.3)
+*** install tk 4.2 or 8.x first.
 
 EOF
 fi
diff --git a/x11/XFree86-4-clients/scripts/configure b/x11/XFree86-4-clients/scripts/configure
index c9a05b229697..5dcca08200f0 100644
--- a/x11/XFree86-4-clients/scripts/configure
+++ b/x11/XFree86-4-clients/scripts/configure
@@ -36,7 +36,7 @@ rm -f $F
 
 # Tk detection
 tkversion=
-for v in 42 80 81 42jp 80jp; do
+for v in 42 80 81 82 42jp 80jp; do
   if [ -f /usr/local/lib/libtk$v.a ]; then
     tkversion=$v
     case $tkversion in
@@ -65,6 +65,11 @@ for v in 42 80 81 42jp 80jp; do
         tclLversion=8.1
         tkLversion=8.1
         ;;
+      82)
+        tclversion=82
+        tclLversion=8.2
+        tkLversion=8.2
+        ;;
     esac
   fi
 done
@@ -108,7 +113,7 @@ else
 cat <<EOF
 *** I don't see the static library for tk version $tkversion in /usr/local/lib.
 *** XF86Setup will not be installed. If you want to build this program
-*** install tk 4.2, 8.0 or 8.1 first (does not work with versions 8.2 and 8.3)
+*** install tk 4.2 or 8.x first.
 
 EOF
 fi
diff --git a/x11/XFree86-4-libraries/scripts/configure b/x11/XFree86-4-libraries/scripts/configure
index c9a05b229697..5dcca08200f0 100644
--- a/x11/XFree86-4-libraries/scripts/configure
+++ b/x11/XFree86-4-libraries/scripts/configure
@@ -36,7 +36,7 @@ rm -f $F
 
 # Tk detection
 tkversion=
-for v in 42 80 81 42jp 80jp; do
+for v in 42 80 81 82 42jp 80jp; do
   if [ -f /usr/local/lib/libtk$v.a ]; then
     tkversion=$v
     case $tkversion in
@@ -65,6 +65,11 @@ for v in 42 80 81 42jp 80jp; do
         tclLversion=8.1
         tkLversion=8.1
         ;;
+      82)
+        tclversion=82
+        tclLversion=8.2
+        tkLversion=8.2
+        ;;
     esac
   fi
 done
@@ -108,7 +113,7 @@ else
 cat <<EOF
 *** I don't see the static library for tk version $tkversion in /usr/local/lib.
 *** XF86Setup will not be installed. If you want to build this program
-*** install tk 4.2, 8.0 or 8.1 first (does not work with versions 8.2 and 8.3)
+*** install tk 4.2 or 8.x first.
 
 EOF
 fi
diff --git a/x11/XFree86-4/scripts/configure b/x11/XFree86-4/scripts/configure
index c9a05b229697..5dcca08200f0 100644
--- a/x11/XFree86-4/scripts/configure
+++ b/x11/XFree86-4/scripts/configure
@@ -36,7 +36,7 @@ rm -f $F
 
 # Tk detection
 tkversion=
-for v in 42 80 81 42jp 80jp; do
+for v in 42 80 81 82 42jp 80jp; do
   if [ -f /usr/local/lib/libtk$v.a ]; then
     tkversion=$v
     case $tkversion in
@@ -65,6 +65,11 @@ for v in 42 80 81 42jp 80jp; do
         tclLversion=8.1
         tkLversion=8.1
         ;;
+      82)
+        tclversion=82
+        tclLversion=8.2
+        tkLversion=8.2
+        ;;
     esac
   fi
 done
@@ -108,7 +113,7 @@ else
 cat <<EOF
 *** I don't see the static library for tk version $tkversion in /usr/local/lib.
 *** XF86Setup will not be installed. If you want to build this program
-*** install tk 4.2, 8.0 or 8.1 first (does not work with versions 8.2 and 8.3)
+*** install tk 4.2 or 8.x first.
 
 EOF
 fi
diff --git a/x11/XFree86/scripts/configure b/x11/XFree86/scripts/configure
index c9a05b229697..5dcca08200f0 100644
--- a/x11/XFree86/scripts/configure
+++ b/x11/XFree86/scripts/configure
@@ -36,7 +36,7 @@ rm -f $F
 
 # Tk detection
 tkversion=
-for v in 42 80 81 42jp 80jp; do
+for v in 42 80 81 82 42jp 80jp; do
   if [ -f /usr/local/lib/libtk$v.a ]; then
     tkversion=$v
     case $tkversion in
@@ -65,6 +65,11 @@ for v in 42 80 81 42jp 80jp; do
         tclLversion=8.1
         tkLversion=8.1
         ;;
+      82)
+        tclversion=82
+        tclLversion=8.2
+        tkLversion=8.2
+        ;;
     esac
   fi
 done
@@ -108,7 +113,7 @@ else
 cat <<EOF
 *** I don't see the static library for tk version $tkversion in /usr/local/lib.
 *** XF86Setup will not be installed. If you want to build this program
-*** install tk 4.2, 8.0 or 8.1 first (does not work with versions 8.2 and 8.3)
+*** install tk 4.2 or 8.x first.
 
 EOF
 fi