mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-28 01:06:17 +00:00
Revert my previous commit. The problem is not with tcl/tk 8.2
This commit is contained in:
Jean-Marc Zucconi
parent
a4c5653368
commit
be8e2b9ee3
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=24784
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
9
x11/XFree86-4-clients/scripts/configure
vendored
9
x11/XFree86-4-clients/scripts/configure
vendored
@ -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
|
||||
|
||||
9
x11/XFree86-4-libraries/scripts/configure
vendored
9
x11/XFree86-4-libraries/scripts/configure
vendored
@ -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
|
||||
|
||||
9
x11/XFree86-4/scripts/configure
vendored
9
x11/XFree86-4/scripts/configure
vendored
@ -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
|
||||
|
||||
9
x11/XFree86/scripts/configure
vendored
9
x11/XFree86/scripts/configure
vendored
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user