aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Price <steve@FreeBSD.org>1999-11-28 18:32:45 +0000
committerSteve Price <steve@FreeBSD.org>1999-11-28 18:32:45 +0000
commitbc087374d35aa9c841dd63d44e9c9697702921ed (patch)
tree9bfffecdf0e79fc2f3af0e2a2f1044536ad164ca
parent3689fb2140698b1b4eff0933fe730262b161f533 (diff)
downloadports-bc087374d35aa9c841dd63d44e9c9697702921ed.tar.gz
ports-bc087374d35aa9c841dd63d44e9c9697702921ed.zip
Notes
-rw-r--r--astro/tkseti/Makefile6
-rw-r--r--astro/tkseti/files/patch-aa2
-rw-r--r--astro/x3arth/Makefile4
-rw-r--r--astro/x3arth/files/patch-ab4
-rw-r--r--audio/rosegarden/Makefile2
-rw-r--r--audio/rosegarden/files/patch-aa2
-rw-r--r--audio/rosegarden/files/patch-ab2
-rw-r--r--audio/rosegarden/files/patch-ac2
-rw-r--r--audio/rosegarden/files/patch-ad2
-rw-r--r--audio/rosegarden/files/patch-ae2
-rw-r--r--audio/rosegarden/files/patch-af2
-rw-r--r--audio/rosegarden/files/patch-ag4
-rw-r--r--audio/rosegarden/files/patch-ah4
-rw-r--r--audio/rosegarden/files/patch-aj2
-rw-r--r--audio/snowstar/Makefile2
-rw-r--r--audio/snowstar/files/patch-aa8
-rw-r--r--audio/splaytk/Makefile2
-rw-r--r--audio/splaytk/files/patch-aa2
-rw-r--r--audio/tclmidi/Makefile6
-rw-r--r--audio/tclmidi/files/patch-aa2
-rw-r--r--audio/xmpeg3/Makefile4
-rw-r--r--audio/xmpeg3/files/patch-aa2
-rw-r--r--cad/tkgate/Makefile5
-rw-r--r--converters/xdeview/Makefile6
-rw-r--r--converters/xdeview/files/patch-aa73
-rw-r--r--converters/xdeview/files/patch-ac23
-rw-r--r--deskutils/cbb/Makefile2
-rw-r--r--deskutils/cbb/files/patch-012
-rw-r--r--deskutils/zorro/Makefile4
-rw-r--r--deskutils/zorro/files/patch-aa2
-rw-r--r--devel/SpecTcl/Makefile4
-rw-r--r--devel/SpecTcl/files/patch-aa2
-rw-r--r--devel/SpecTcl/files/patch-ab2
-rw-r--r--devel/clig/Makefile8
-rw-r--r--devel/qtk/Makefile6
-rw-r--r--devel/swarm/Makefile8
-rw-r--r--devel/swarm/files/patch-ad71
-rw-r--r--devel/tclcl/Makefile4
-rw-r--r--devel/tclcl/files/patch-aa2
-rw-r--r--devel/tkcvs/Makefile4
-rw-r--r--devel/tkcvs/files/patch-aa4
-rw-r--r--devel/tkref/Makefile6
-rw-r--r--devel/vtcl/Makefile4
-rw-r--r--devel/vtcl/files/patch-aa2
-rw-r--r--devel/vtcl/files/patch-ab2
-rw-r--r--editors/e93/Makefile6
-rw-r--r--emulators/frodo/Makefile5
-rw-r--r--emulators/frodo/files/patch-C64_x.i2
-rw-r--r--emulators/hfsutils/Makefile4
-rw-r--r--finance/cbb/Makefile2
-rw-r--r--finance/cbb/files/patch-012
-rw-r--r--games/awele/Makefile6
-rw-r--r--games/awele/files/patch-aa4
-rw-r--r--games/bogged/Makefile2
-rw-r--r--games/bogged/files/patch-aa2
-rw-r--r--games/dontspace/Makefile6
-rw-r--r--games/ifm/Makefile3
-rw-r--r--games/merlin/Makefile2
-rw-r--r--games/merlin/files/patch-aa2
-rw-r--r--games/tksol/Makefile4
-rw-r--r--games/tksol/files/patch-a2
-rw-r--r--games/tvp/Makefile19
-rw-r--r--games/tvp/files/patch-aa32
-rw-r--r--games/tvp/files/patch-ab11
-rw-r--r--games/xchain/Makefile2
-rw-r--r--games/xchain/files/patch-aa2
-rw-r--r--graphics/geomview/Makefile5
-rw-r--r--graphics/geomview/files/patch-aa4
-rw-r--r--graphics/graphviz/Makefile4
-rw-r--r--graphics/libimg/Makefile8
-rw-r--r--graphics/libimg/files/patch-aa8
-rw-r--r--graphics/libimg/pkg-plist5
-rw-r--r--graphics/py-opengl/Makefile2
-rw-r--r--graphics/py-opengl/files/Setup.add.togl4
-rw-r--r--graphics/py-opengl/files/Setup.base4
-rw-r--r--graphics/togl/Makefile10
-rw-r--r--graphics/togl/files/patch-aa8
-rw-r--r--graphics/togl/pkg-plist6
-rw-r--r--irc/quirc/Makefile4
-rw-r--r--irc/tkirc/Makefile6
-rw-r--r--lang/itcl/Makefile9
-rw-r--r--lang/itcl/files/Makefile.lib2
-rw-r--r--lang/itcl/files/patch-ah11
-rw-r--r--lang/itcl/pkg-plist4
-rw-r--r--lang/otcl/Makefile9
-rw-r--r--lang/otcl/pkg-plist3
-rw-r--r--lang/p5-Tcl/Makefile2
-rw-r--r--lang/p5-Tcl/files/patch-aa4
-rw-r--r--lang/ruby-tcltklib/Makefile4
-rw-r--r--lang/ruby14-tcltklib/Makefile4
-rw-r--r--mbone/imm/Makefile4
-rw-r--r--mbone/imm/files/Makefile.freebsd4
-rw-r--r--mbone/sdr/Makefile4
-rw-r--r--mbone/sdr/files/patch-ab11
-rw-r--r--misc/tkcron/Makefile4
-rw-r--r--misc/tkcron/files/Makefile6
-rw-r--r--misc/tkinfo/Makefile4
-rw-r--r--misc/tkinfo/files/patch-aa2
-rw-r--r--misc/tkrunit/Makefile2
-rw-r--r--misc/tkrunit/files/patch-aa2
-rw-r--r--net-im/tik/Makefile6
-rw-r--r--net-im/tik/files/tik2
-rw-r--r--net-mgmt/scotty3/Makefile8
-rw-r--r--net/imm/Makefile4
-rw-r--r--net/imm/files/Makefile.freebsd4
-rw-r--r--net/ns/Makefile3
-rw-r--r--net/ns/files/patch-aa2
-rw-r--r--net/ns2/Makefile3
-rw-r--r--net/ns2/files/patch-aa2
-rw-r--r--net/ppxp/Makefile22
-rw-r--r--net/scotty/Makefile8
-rw-r--r--net/scotty3/Makefile8
-rw-r--r--net/sdr/Makefile4
-rw-r--r--net/sdr/files/patch-ab11
-rw-r--r--net/tik/Makefile6
-rw-r--r--net/tik/files/tik2
-rw-r--r--net/ttt/Makefile6
-rw-r--r--sysutils/lavaps/Makefile4
-rw-r--r--www/grail/Makefile2
-rw-r--r--x11-fm/x-files/Makefile8
-rw-r--r--x11-fm/x-files/files/patch-aa2
-rw-r--r--x11-fm/x-files/scripts/mktclIndex2
-rw-r--r--x11-toolkits/blt/Makefile12
-rw-r--r--x11-toolkits/itk/Makefile11
-rw-r--r--x11-toolkits/itk/files/Makefile.lib4
-rw-r--r--x11-toolkits/itk/pkg-plist4
-rw-r--r--x11-toolkits/iwidgets/Makefile6
-rw-r--r--x11-toolkits/p5-Tcl-Tk/Makefile4
-rw-r--r--x11-toolkits/p5-Tcl-Tk/files/patch-aa4
-rw-r--r--x11-toolkits/p5-TclTk/Makefile4
-rw-r--r--x11-toolkits/p5-TclTk/files/patch-aa4
-rw-r--r--x11-toolkits/ruby-tk/Makefile4
-rw-r--r--x11-toolkits/ruby14-tk/Makefile4
133 files changed, 517 insertions, 270 deletions
diff --git a/astro/tkseti/Makefile b/astro/tkseti/Makefile
index b5c5cb766148..e2bf9a1a644d 100644
--- a/astro/tkseti/Makefile
+++ b/astro/tkseti/Makefile
@@ -1,5 +1,5 @@
# Ports collection makefile for: tkseti
-# Version required: 1.36
+# Version required: 1.42
# Date created: 30 Jun 1999
# Whom: Brett Taylor <brett@peloton.physics.montana.edu>
#
@@ -7,12 +7,12 @@
#
DISTNAME= tkseti-1.46
-CATEGORIES= astro tk80
+CATEGORIES= astro tk82
MASTER_SITES= http://www.cuug.ab.ca/~macdonal/tkseti/
MAINTAINER= brett@peloton.runet.edu
-RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80 \
+RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82 \
setiathome:${PORTSDIR}/astro/setiathome
NO_BUILD= yes
diff --git a/astro/tkseti/files/patch-aa b/astro/tkseti/files/patch-aa
index f8218da2f32e..6a16b7ea0f7f 100644
--- a/astro/tkseti/files/patch-aa
+++ b/astro/tkseti/files/patch-aa
@@ -4,7 +4,7 @@
#!/bin/sh
# the next line restarts using wish \
-exec wish "$0" ${1+"$@"}
-+exec wish8.0 "$0" ${1+"$@"}
++exec wish8.2 "$0" ${1+"$@"}
#############################################################################
# Visual Tcl v1.20 Project
#
diff --git a/astro/x3arth/Makefile b/astro/x3arth/Makefile
index 5884a58fd438..c99aefe1eaad 100644
--- a/astro/x3arth/Makefile
+++ b/astro/x3arth/Makefile
@@ -7,13 +7,13 @@
#
DISTNAME= x3arth-1.1
-CATEGORIES= astro
+CATEGORIES= astro tcl82
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= X11/desktop
MAINTAINER= cpiazza@FreeBSD.org
-RUN_DEPENDS= ${LOCALBASE}/bin/tclsh8.0:${PORTSDIR}/lang/tcl80 \
+RUN_DEPENDS= ${LOCALBASE}/bin/tclsh8.2:${PORTSDIR}/lang/tcl82 \
${X11BASE}/bin/xv:${PORTSDIR}/graphics/xv
USE_X_PREFIX= yes
diff --git a/astro/x3arth/files/patch-ab b/astro/x3arth/files/patch-ab
index 3665e6446e1e..6525c01dc8e9 100644
--- a/astro/x3arth/files/patch-ab
+++ b/astro/x3arth/files/patch-ab
@@ -4,8 +4,8 @@
#!/bin/sh
-# the next line restarts using tclsh \
-exec tclsh "$0" "$@"
-+# the next line restarts using tclsh8.0 \
-+exec tclsh8.0 "$0" "$@"
++# the next line restarts using tclsh8.2 \
++exec tclsh8.2 "$0" "$@"
set usage "x3arth \[<satellite> \[-c \[file\] | -b\]\] \n\
<satellite> : GMS-5, FY-2, GOES-8, GOES-9, GOES-10 or METEOSAT-7\n\
diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile
index 5775d28c2e96..60c6ae46bf98 100644
--- a/audio/rosegarden/Makefile
+++ b/audio/rosegarden/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/tclmidi/tclmidi31.so:$(PORTSDIR)/audio/tclmidi
GNU_CONFIGURE= yes
USE_AUTOCONF= yes
USE_X_PREFIX= yes
-CONFIGURE_ARGS= --with-tclincl=${LOCALBASE}/include/tcl8.0/
+CONFIGURE_ARGS= --with-tclincl=${LOCALBASE}/include/tcl8.2/
CONFIGURE_ENV= LIBS="-L${PREFIX}/lib"
do-install:
diff --git a/audio/rosegarden/files/patch-aa b/audio/rosegarden/files/patch-aa
index 6378b96bdcd0..6d5caa4573e8 100644
--- a/audio/rosegarden/files/patch-aa
+++ b/audio/rosegarden/files/patch-aa
@@ -25,7 +25,7 @@
if test $TCL_CHECK -eq 1
then
- AC_PATH_PROG(TCLSH, tclsh)
-+ AC_PATH_PROG(TCLSH, tclsh8.0)
++ AC_PATH_PROG(TCLSH, tclsh8.2)
if test -n "$TCLSH"
then
# Check Tcl version:
diff --git a/audio/rosegarden/files/patch-ab b/audio/rosegarden/files/patch-ab
index c079741f5dd1..7efb85e26044 100644
--- a/audio/rosegarden/files/patch-ab
+++ b/audio/rosegarden/files/patch-ab
@@ -5,7 +5,7 @@
pkgIndex.tcl : Petal.so Petal.tcl
@echo "The error message for Petal.tcl is normal"
- echo "pkg_mkIndex . Petal.so Petal.tcl" | tclsh
-+ echo "pkg_mkIndex . Petal.so Petal.tcl" | tclsh8.0
++ echo "pkg_mkIndex . Petal.so Petal.tcl" | tclsh8.2
petaleditor/pkgIndex.tcl : petaleditor/PetalEditor.tcl
cd petaleditor; make
diff --git a/audio/rosegarden/files/patch-ac b/audio/rosegarden/files/patch-ac
index e04e0eadef01..8e87a7aaa9ce 100644
--- a/audio/rosegarden/files/patch-ac
+++ b/audio/rosegarden/files/patch-ac
@@ -5,5 +5,5 @@
pkgIndex.tcl : PetalEditor.tcl
@echo "The error message for PetalEditor.tcl is normal"
- echo "pkg_mkIndex . PetalEditor.tcl" | tclsh
-+ echo "pkg_mkIndex . PetalEditor.tcl" | tclsh8.0
++ echo "pkg_mkIndex . PetalEditor.tcl" | tclsh8.2
diff --git a/audio/rosegarden/files/patch-ad b/audio/rosegarden/files/patch-ad
index 815a1db29be8..99328e2196ef 100644
--- a/audio/rosegarden/files/patch-ad
+++ b/audio/rosegarden/files/patch-ad
@@ -51,7 +51,7 @@ Index: do-install
$install -c ./petal/petalmidi/PetalMidi.tcl $ROSELIBDIR/petal
-( cd $ROSELIBDIR/petal ; echo "pkg_mkIndex . Petal.so *.tcl" | tclsh )
-+( cd $ROSELIBDIR/petal ; echo "pkg_mkIndex . Petal.so *.tcl" | tclsh8.0 )
++( cd $ROSELIBDIR/petal ; echo "pkg_mkIndex . Petal.so *.tcl" | tclsh8.2 )
$install -d $ROSELIBDIR/rosepetal-filters
$install -c ./petal/harmonizer.tcl $ROSELIBDIR/rosepetal-filters
diff --git a/audio/rosegarden/files/patch-ae b/audio/rosegarden/files/patch-ae
index 9be375d06cbb..99a28434b000 100644
--- a/audio/rosegarden/files/patch-ae
+++ b/audio/rosegarden/files/patch-ae
@@ -5,7 +5,7 @@
-# the next line restarts using tclsh \
-exec tclsh "$0" "$@"
+# the next line restarts using tclsh8.0 \
-+exec tclsh8.0 "$0" "$@"
++exec tclsh8.2 "$0" "$@"
package require "Petal"
PetalInit
diff --git a/audio/rosegarden/files/patch-af b/audio/rosegarden/files/patch-af
index 0fd1360e7738..44b5c22b0614 100644
--- a/audio/rosegarden/files/patch-af
+++ b/audio/rosegarden/files/patch-af
@@ -5,7 +5,7 @@
#include <ctype.h>
#include <string.h>
-#include <tcl.h>
-+#include <tcl8.0/tcl.h>
++#include <tcl8.2/tcl.h>
#define NB_MODES 7
#define NB_TONALITIES 17 /* names, actually */
diff --git a/audio/rosegarden/files/patch-ag b/audio/rosegarden/files/patch-ag
index 904d093fb3dd..807599badbe7 100644
--- a/audio/rosegarden/files/patch-ag
+++ b/audio/rosegarden/files/patch-ag
@@ -5,8 +5,8 @@
# FilterName: Harmonize
-# the next line restarts using tclsh \
-exec tclsh "$0" "$@"
-+# the next line restarts using tclsh8.0 \
-+exec tclsh8.0 "$0" "$@"
++# the next line restarts using tclsh8.2 \
++exec tclsh8.2 "$0" "$@"
# Trivial harmonizer
diff --git a/audio/rosegarden/files/patch-ah b/audio/rosegarden/files/patch-ah
index 40fd06cb7f90..dfabe8df7d82 100644
--- a/audio/rosegarden/files/patch-ah
+++ b/audio/rosegarden/files/patch-ah
@@ -5,8 +5,8 @@
# FilterName: Instantiate Pattern
-# the next line restarts using tclsh \
-exec tclsh "$0" "$@"
-+# the next line restarts using tclsh8.0 \
-+exec tclsh8.0 "$0" "$@"
++# the next line restarts using tclsh8.2 \
++exec tclsh8.2 "$0" "$@"
# Pattern instantiator (very dumb)
# Main staff is the pattern,
diff --git a/audio/rosegarden/files/patch-aj b/audio/rosegarden/files/patch-aj
index 4b6f08fa0584..fca6882c3c57 100644
--- a/audio/rosegarden/files/patch-aj
+++ b/audio/rosegarden/files/patch-aj
@@ -5,5 +5,5 @@
pkgIndex.tcl : PetalMidi.tcl
@echo "The error message for PetalMidi.tcl is normal"
- echo "pkg_mkIndex . PetalMidi.tcl" | tclsh
-+ echo "pkg_mkIndex . PetalMidi.tcl" | tclsh8.0
++ echo "pkg_mkIndex . PetalMidi.tcl" | tclsh8.2
diff --git a/audio/snowstar/Makefile b/audio/snowstar/Makefile
index c6d90301a530..04963f6adc38 100644
--- a/audio/snowstar/Makefile
+++ b/audio/snowstar/Makefile
@@ -13,7 +13,7 @@ EXTRACT_SUFX= .tar
MAINTAINER= fenner@FreeBSD.Org
RUN_DEPENDS= rio:${PORTSDIR}/audio/rio \
- wish8.0:${PORTSDIR}/x11-toolkits/tk80
+ wish8.2:${PORTSDIR}/x11-toolkits/tk82
NO_BUILD= true
NO_WRKSUBDIR= true
diff --git a/audio/snowstar/files/patch-aa b/audio/snowstar/files/patch-aa
new file mode 100644
index 000000000000..f7971a8c1974
--- /dev/null
+++ b/audio/snowstar/files/patch-aa
@@ -0,0 +1,8 @@
+--- snowstar.tcl.orig Thu Nov 4 12:23:29 1999
++++ snowstar.tcl Thu Nov 4 12:24:19 1999
+@@ -1,4 +1,4 @@
+-#!/usr/bin/wish
++#!/usr/local/bin/wish8.2
+ wm title . "Snowstar 0.75.5"
+ wm minsize . 320 240
+ wm resizable . 1 1
diff --git a/audio/splaytk/Makefile b/audio/splaytk/Makefile
index f41055083311..a6ac4e63d66d 100644
--- a/audio/splaytk/Makefile
+++ b/audio/splaytk/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= apps/sound/players
MAINTAINER= brett@peloton.runet.edu
RUN_DEPENDS= splay:${PORTSDIR}/audio/splay \
- wish8.0:${PORTSDIR}/x11-toolkits/tk80
+ wish8.2:${PORTSDIR}/x11-toolkits/tk82
WRKSRC= ${WRKDIR}/splay-tk-2.0
diff --git a/audio/splaytk/files/patch-aa b/audio/splaytk/files/patch-aa
index cc2366b89bd3..9f19c941bb7f 100644
--- a/audio/splaytk/files/patch-aa
+++ b/audio/splaytk/files/patch-aa
@@ -5,7 +5,7 @@
--- 1,9 ----
+ #!/bin/sh
+ # start up wish \
-+ exec wish8.0 "$0" "$@"
++ exec wish8.2 "$0" "$@"
+
+ set libdir /usr/local/lib/splay-tk
+ set images ${libdir}
diff --git a/audio/tclmidi/Makefile b/audio/tclmidi/Makefile
index ae6e9e9cd3ea..ac5ed6d328c0 100644
--- a/audio/tclmidi/Makefile
+++ b/audio/tclmidi/Makefile
@@ -14,11 +14,11 @@ MASTER_SITES= ftp://ftp.unina.it/pub/Other/music/midi/PROGRAMS/ \
MAINTAINER= shanee@augusta.de
-LIB_DEPENDS= tcl80.1:${PORTSDIR}/lang/tcl80
+LIB_DEPENDS= tcl82.1:${PORTSDIR}/lang/tcl82
-MAKE_ENV= TCL_GENERIC_DIR=${LOCALBASE}/include/tcl8.0
+MAKE_ENV= TCL_GENERIC_DIR=${LOCALBASE}/include/tcl8.2
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-tclsh=${LOCALBASE}/bin/tclsh8.0
+CONFIGURE_ARGS= --with-tclsh=${LOCALBASE}/bin/tclsh8.2
MAN1= mplay.1 mrec.1 tclmidi.1 minfo.1 midtotcl.1
MANN= midiconf.n midievnt.n midifree.n midiget.n midigrep.n \
diff --git a/audio/tclmidi/files/patch-aa b/audio/tclmidi/files/patch-aa
index 04e74821da4d..9a53e78ef542 100644
--- a/audio/tclmidi/files/patch-aa
+++ b/audio/tclmidi/files/patch-aa
@@ -5,7 +5,7 @@
# The directory containing the Tcl library archive file appropriate
# for this version of Tk:
-TCL_BIN_DIR = @TCL_BIN_DIR@
-+TCL_BIN_DIR = ${LOCALBASE}/lib/tcl8.0
++TCL_BIN_DIR = ${LOCALBASE}/lib/tcl8.2
#----------------------------------------------------------------
# The information below is modified by the configure script when
diff --git a/audio/xmpeg3/Makefile b/audio/xmpeg3/Makefile
index 5959ea1ee503..049f24639796 100644
--- a/audio/xmpeg3/Makefile
+++ b/audio/xmpeg3/Makefile
@@ -8,14 +8,14 @@
DISTNAME= xmp3_1.0.0
PKGNAME= xmpeg3-1.0
-CATEGORIES= audio tk80
+CATEGORIES= audio tk82
MASTER_SITES= ftp://ftp.funet.fi/pub/sci/audio/mpeg/amp/
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
RUN_DEPENDS= amp:${PORTSDIR}/audio/amp \
- wish8.0:${PORTSDIR}/x11-toolkits/tk80
+ wish8.2:${PORTSDIR}/x11-toolkits/tk82
WRKSRC= ${WRKDIR}/xmpeg3
NO_BUILD= yes
diff --git a/audio/xmpeg3/files/patch-aa b/audio/xmpeg3/files/patch-aa
index 1b290d64d6c9..123e9dc38c80 100644
--- a/audio/xmpeg3/files/patch-aa
+++ b/audio/xmpeg3/files/patch-aa
@@ -1,7 +1,7 @@
--- xmpeg3.orig Tue Mar 25 13:21:26 1997
+++ xmpeg3 Thu Oct 30 16:00:48 1997
@@ -1,3 +1,4 @@
-+#!@@PREFIX@@/bin/wish8.0
++#!@@PREFIX@@/bin/wish8.2
#############################################################################
# Visual Tcl v1.07 Project
#
diff --git a/cad/tkgate/Makefile b/cad/tkgate/Makefile
index 8d8ac95cb063..4594518ad38f 100644
--- a/cad/tkgate/Makefile
+++ b/cad/tkgate/Makefile
@@ -13,12 +13,15 @@ EXTRACT_SUFX= .tgz
MAINTAINER= hansen@cmu.edu
-LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
+LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
VERSION= 0.9
PLIST_SUB+= VERSION=${VERSION}
USE_IMAKE= yes
+post-extract:
+ @(cd ${WRKSRC}; find . -name .depend -delete)
+
post-patch:
@${PERL} -pi -e 's:__PREFIX__:${PREFIX}:g' ${WRKSRC}/config.h
@${PERL} -pi -e 's:__LOCALBASE__:${LOCALBASE}:g' ${WRKSRC}/config.h
diff --git a/converters/xdeview/Makefile b/converters/xdeview/Makefile
index 80c0008589c3..c5a94c0dbc64 100644
--- a/converters/xdeview/Makefile
+++ b/converters/xdeview/Makefile
@@ -8,19 +8,19 @@
DISTNAME= uudeview-0.5.13
PKGNAME= xdeview-0.5.13
-CATEGORIES= converters tk80
+CATEGORIES= converters tk82
MASTER_SITES= ftp://tsx-11.mit.edu/pub/linux/sources/usr.bin/ \
http://www.informatik.uni-frankfurt.de/~fp/uudeview/Apps/frank/
MAINTAINER= hoek@FreeBSD.org
-LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80 \
+LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82 \
uu.1:${PORTSDIR}/converters/uulib
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-tcl="${PREFIX}" --enable-tk="${PREFIX}"
# Season to taste --- anything over tcl7.5
-CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include/tcl8.0 -I${PREFIX}/include/tk8.0"
+CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include/tcl8.2 -I${PREFIX}/include/tk8.2"
ALL_TARGET= xdeview
INSTALL_TARGET= install-tcl
diff --git a/converters/xdeview/files/patch-aa b/converters/xdeview/files/patch-aa
index e68426775ef5..99062a06bd52 100644
--- a/converters/xdeview/files/patch-aa
+++ b/converters/xdeview/files/patch-aa
@@ -1,5 +1,74 @@
---- ./configure.org Thu Jan 9 06:22:00 1997
-+++ ./configure Sun Mar 30 04:25:11 1997
+--- configure.orig Thu Jan 9 08:22:00 1997
++++ configure Thu Nov 4 11:29:23 1999
+@@ -2193,7 +2193,7 @@
+
+ if test "$have_tk" = "yes" ; then
+ echo $ac_n "checking for -ltk$tk_major.$tk_minor""... $ac_c" 1>&6
+-ac_lib_var=`echo tk$tk_major.$tk_minor'_'Tk_Main | tr './+\055' '__p_'`
++ac_lib_var=`echo tk$tk_major.$tk_minor'_'Tk_MainEx | tr './+\055' '__p_'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2205,11 +2205,11 @@
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+-char Tk_Main();
++char Tk_MainEx();
+
+ int main() { return 0; }
+ int t() {
+-Tk_Main()
++Tk_MainEx()
+ ; return 0; }
+ EOF
+ if { (eval echo configure:2216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+@@ -2233,7 +2233,7 @@
+
+ if test "$have_tk_lib" = "no" ; then
+ echo $ac_n "checking for -ltk$tk_major$tk_minor""... $ac_c" 1>&6
+-ac_lib_var=`echo tk$tk_major$tk_minor'_'Tk_Main | tr './+\055' '__p_'`
++ac_lib_var=`echo tk$tk_major$tk_minor'_'Tk_MainEx | tr './+\055' '__p_'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2245,11 +2245,11 @@
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+-char Tk_Main();
++char Tk_MainEx();
+
+ int main() { return 0; }
+ int t() {
+-Tk_Main()
++Tk_MainEx()
+ ; return 0; }
+ EOF
+ if { (eval echo configure:2256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+@@ -2274,7 +2274,7 @@
+ fi
+ if test "$have_tk_lib" = "no" ; then
+ echo $ac_n "checking for -ltk""... $ac_c" 1>&6
+-ac_lib_var=`echo tk'_'Tk_Main | tr './+\055' '__p_'`
++ac_lib_var=`echo tk'_'Tk_MainEx | tr './+\055' '__p_'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2286,11 +2286,11 @@
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+-char Tk_Main();
++char Tk_MainEx();
+
+ int main() { return 0; }
+ int t() {
+-Tk_Main()
++Tk_MainEx()
+ ; return 0; }
+ EOF
+ if { (eval echo configure:2297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
@@ -3148,7 +3148,7 @@
fi
diff --git a/converters/xdeview/files/patch-ac b/converters/xdeview/files/patch-ac
new file mode 100644
index 000000000000..781256ff61f5
--- /dev/null
+++ b/converters/xdeview/files/patch-ac
@@ -0,0 +1,23 @@
+--- tcl/uuwish.c.orig Thu Jun 6 14:41:11 1996
++++ tcl/uuwish.c Thu Nov 4 11:34:43 1999
+@@ -78,19 +78,7 @@
+ int
+ main (int argc, char *argv[])
+ {
+-#ifdef HAVE_TK
+- Tk_Main
+-#else
+-#ifdef HAVE_TCL
+- Tcl_Main
+-#endif
+-#endif
+- (argc, argv
+-#ifdef TMAIN_THREE
+- , Tcl_AppInit
+-#endif
+- );
+-
++ Tk_MainEx( argc, argv, Tcl_AppInit, Tcl_CreateInterp() );
+ return 0;
+ }
+
diff --git a/deskutils/cbb/Makefile b/deskutils/cbb/Makefile
index 5915c9157d6c..5f28bf5e3282 100644
--- a/deskutils/cbb/Makefile
+++ b/deskutils/cbb/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.me.umn.edu/pub/finance/ \
MAINTAINER= kline@thought.org
-RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82
NO_BUILD= yes
USE_PERL5= yes
diff --git a/deskutils/cbb/files/patch-01 b/deskutils/cbb/files/patch-01
index 9658330ab0b8..9d52612aaa75 100644
--- a/deskutils/cbb/files/patch-01
+++ b/deskutils/cbb/files/patch-01
@@ -14,7 +14,7 @@
install:
- $(PERL) install.pl
+ $(PERL) install.pl --prefix ${PREFIX} --libdir ${PREFIX}/lib/cbb \
-+ --perlpath ${PERL5} --wishpath ${PREFIX}/bin/wish8.0
++ --perlpath ${PERL5} --wishpath ${PREFIX}/bin/wish8.2
docs/cbb-man.dvi: docs/cbb-man.tex
(cd docs; \
diff --git a/deskutils/zorro/Makefile b/deskutils/zorro/Makefile
index 8e24b8e48334..9a6fb049e2fc 100644
--- a/deskutils/zorro/Makefile
+++ b/deskutils/zorro/Makefile
@@ -8,12 +8,12 @@
DISTNAME= zorro-1.1p8
PKGNAME= zorro-1.1.8
-CATEGORIES= deskutils tk80
+CATEGORIES= deskutils tk82
MASTER_SITES= ftp://ftp.neosoft.com/pub/tcl/sorted/apps/zorro-1.1p8/
MAINTAINER= shanee@augusta.de
-LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
+LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
NO_BUILD= yes
diff --git a/deskutils/zorro/files/patch-aa b/deskutils/zorro/files/patch-aa
index 02f645527961..4874763fbe63 100644
--- a/deskutils/zorro/files/patch-aa
+++ b/deskutils/zorro/files/patch-aa
@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
# AUTHOR: Lindsay Marshall <lindsay.marshall@newcastle.ac.uk>
--- 1,6 ----
-! #!/usr/local/bin/wish8.0
+! #!/usr/local/bin/wish8.2
#
! # Version 1.1 Patch 8
#
diff --git a/devel/SpecTcl/Makefile b/devel/SpecTcl/Makefile
index 8ebc6ccad5ca..7b66553d320c 100644
--- a/devel/SpecTcl/Makefile
+++ b/devel/SpecTcl/Makefile
@@ -8,12 +8,12 @@
DISTNAME= SpecTcl1.1
PKGNAME= SpecTcl-1.1
-CATEGORIES= devel tk80
+CATEGORIES= devel tk82
MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/guitools/
MAINTAINER= andreas@FreeBSD.org
-RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82
NO_BUILD= yes
diff --git a/devel/SpecTcl/files/patch-aa b/devel/SpecTcl/files/patch-aa
index da3ccd3320fc..affca9a72e0b 100644
--- a/devel/SpecTcl/files/patch-aa
+++ b/devel/SpecTcl/files/patch-aa
@@ -9,7 +9,7 @@
# Change WISH to the pathname of your tk4.1a2 (or >) wish binary
-WISH=`which wish`
-+WISH=wish8.0
++WISH=wish8.2
env SPECTCL_DIR=$DIR $WISH $DIR/main.tk $@ &
echo "Starting SpecTcl 1.1"
diff --git a/devel/SpecTcl/files/patch-ab b/devel/SpecTcl/files/patch-ab
index 989a413e26ae..c7098ea79486 100644
--- a/devel/SpecTcl/files/patch-ab
+++ b/devel/SpecTcl/files/patch-ab
@@ -9,7 +9,7 @@
# Change WISH to the pathname of your tk4.1a2 (or >) wish binary
-WISH=`which wish`
-+WISH=wish8.0
++WISH=wish8.2
env SPECTCL_DIR=$DIR $WISH $DIR/main.tk -java $@ &
echo "Starting SpecTcl 1.0"
diff --git a/devel/clig/Makefile b/devel/clig/Makefile
index 272284e3e418..1fd8daa7c778 100644
--- a/devel/clig/Makefile
+++ b/devel/clig/Makefile
@@ -7,20 +7,20 @@
#
DISTNAME= clig-1.1.3
-CATEGORIES= devel tcl80
+CATEGORIES= devel tcl82
MASTER_SITES= http://wsd.iitb.fhg.de/~kir/clighome/
MAINTAINER= billf@FreeBSD.org
# This should work with any version of tcl. See also ${MAKE_ENV}.
-BUILD_DEPENDS= ${PREFIX}/bin/tclsh8.0:${PORTSDIR}/lang/tcl80
-RUN_DEPENDS= ${PREFIX}/bin/tclsh8.0:${PORTSDIR}/lang/tcl80
+BUILD_DEPENDS= ${PREFIX}/bin/tclsh8.2:${PORTSDIR}/lang/tcl82
+RUN_DEPENDS= ${PREFIX}/bin/tclsh8.2:${PORTSDIR}/lang/tcl82
MAN1= clig.1
NO_BUILD= yes
MAKEFILE= makefile
-MAKE_ENV= tclsh=${PREFIX}/bin/tclsh8.0
+MAKE_ENV= tclsh=${PREFIX}/bin/tclsh8.2
PLIST_SUB= VERSION=${DISTNAME}
do-patch:
diff --git a/devel/qtk/Makefile b/devel/qtk/Makefile
index a8680cbcf34c..d00eac500460 100644
--- a/devel/qtk/Makefile
+++ b/devel/qtk/Makefile
@@ -8,18 +8,18 @@
DISTNAME= qtk
PKGNAME= qtk-0.50
-CATEGORIES= devel
+CATEGORIES= devel tk82
MASTER_SITES= http://www.psn.net/~andrews/dist/
MAINTAINER= andrews@technologist.com
-RUN_DEPENDS= ${LOCALBASE}/bin/wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS= ${LOCALBASE}/bin/wish8.2:${PORTSDIR}/x11-toolkits/tk82
NO_BUILD= YES
USE_X_PREFIX= YES
-WISH= ${LOCALBASE}/bin/wish8.0
+WISH= ${LOCALBASE}/bin/wish8.2
post-patch:
@${SED} 's:/usr/bin/wish:${WISH}:' \
diff --git a/devel/swarm/Makefile b/devel/swarm/Makefile
index 656310a5129d..355c51fb3541 100644
--- a/devel/swarm/Makefile
+++ b/devel/swarm/Makefile
@@ -20,10 +20,10 @@ LIB_DEPENDS= ffi.2:${PORTSDIR}/devel/libffi \
USE_GMAKE= yes
USE_LIBTOOL= yes
CONFIGURE_ARGS= --with-defaultdir=${PREFIX} \
- --with-tclincludedir=${PREFIX}/include/tcl8.0 \
- --with-tkincludedir=${PREFIX}/include/tk8.0 \
- --with-tclscriptdir=${PREFIX}/lib/tcl8.0 \
- --with-tkscriptdir=${PREFIX}/lib/tk8.0
+ --with-tclincludedir=${PREFIX}/include/tcl8.2 \
+ --with-tkincludedir=${PREFIX}/include/tk8.2 \
+ --with-tclscriptdir=${PREFIX}/lib/tcl8.2 \
+ --with-tkscriptdir=${PREFIX}/lib/tk8.2
post-install:
@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
diff --git a/devel/swarm/files/patch-ad b/devel/swarm/files/patch-ad
index 78fc06e9bfeb..eb4cf476a7f0 100644
--- a/devel/swarm/files/patch-ad
+++ b/devel/swarm/files/patch-ad
@@ -1,5 +1,5 @@
---- configure.orig Sun May 30 22:01:25 1999
-+++ configure Sun May 30 22:01:47 1999
+--- configure.orig Mon Feb 8 13:59:28 1999
++++ configure Thu Nov 4 12:42:01 1999
@@ -1105,7 +1105,7 @@
test -n "$OBJC" || OBJC="$CC"
@@ -9,3 +9,70 @@
# Check whether --enable-shared or --disable-shared was given.
+@@ -1394,8 +1394,8 @@
+ # Actually configure libtool. ac_aux_dir is where install-sh is found.
+ CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+ LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
+-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
++${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
++$libtool_flags --no-verify --disable-ltlibs /usr/local/share/libtool/ltmain.sh $host \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+
+ # Redirect the config.log output again, so that the ltconfig log is not
+@@ -2647,8 +2647,8 @@
+ if test -n "$with_tcldir" ; then
+ PATH=${with_tcldir}/bin:$PATH
+ fi
+-# Extract the first word of "tclsh8.0", so it can be a program name with args.
+-set dummy tclsh8.0; ac_word=$2
++# Extract the first word of "tclsh8.2", so it can be a program name with args.
++set dummy tclsh8.2; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+ echo "configure:2654: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_tclsh8_found'+set}'`\" = set"; then
+@@ -2711,7 +2711,7 @@
+ fi
+ tclLibrary=''
+ if test $tclsh8_found = yes; then
+- tclLibrary=`echo "puts [info library]" | tclsh8.0`
++ tclLibrary=`echo "puts [info library]" | tclsh8.2`
+ else
+ if test $tclsh_found = yes; then
+ tclLibrary=`echo "puts [info library]" | tclsh`
+@@ -2814,7 +2814,7 @@
+ break
+ fi
+ else
+- for version in 81 8.1 80 8.0 76 7.6 7.5 7.4 ''; do
++ for version in 82 8.2 80 8.0 76 7.6 7.5 7.4 ''; do
+ if test -r $expand_dir/libtcl${version}${suffix}; then
+ tcllibdir=$dir
+ tcllibname=tcl$version
+@@ -2901,7 +2901,7 @@
+ POTENTIALINCDIR=`dirname $POTENTIALINCDIR`
+ INCPLACES="$INCPLACES \
+ $tclincludedir \
+- $POTENTIALINCDIR/tk8.1/include \
++ $POTENTIALINCDIR/tk8.2/include \
+ $POTENTIALINCDIR/tk8.0/include \
+ $POTENTIALINCDIR/tk4.2/include \
+ $POTENTIALINCDIR/tk4.1/include \
+@@ -2939,7 +2939,7 @@
+ POTENTIALLIBDIR=`dirname $tcllibdir`
+ POTENTIALLIBDIR=`dirname $POTENTIALLIBDIR`
+ LIBPLACES="`dirname $tkincludedir`/lib $tcllibdir $POTENTIALLIBDIR/tk/lib \
+- $POTENTIALLIBDIR/tk8.1/lib \
++ $POTENTIALLIBDIR/tk8.2/lib \
+ $POTENTIALLIBDIR/tk8.0/lib \
+ $POTENTIALLIBDIR/tk4.2/lib \
+ $POTENTIALLIBDIR/tk4.1/lib \
+@@ -2960,7 +2960,7 @@
+ break
+ fi
+ else
+- for version in 81 8.1 80 8.0 42 4.2 4.1 4.0 ''; do
++ for version in 82 8.2 80 8.0 42 4.2 4.1 4.0 ''; do
+ if test -r $expand_dir/libtk${version}${suffix}; then
+ tklibdir=$dir
+ tklibname=tk${version}
diff --git a/devel/tclcl/Makefile b/devel/tclcl/Makefile
index 5fca48851fe6..01eef8a0b5c4 100644
--- a/devel/tclcl/Makefile
+++ b/devel/tclcl/Makefile
@@ -13,12 +13,14 @@ MASTER_SITES= http://www-mash.cs.berkeley.edu/dist/
MAINTAINER= obonilla@fisicc-ufm.edu
-LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80 \
+LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82 \
otcl.1:${PORTSDIR}/lang/otcl
WRKSRC= ${WRKDIR}/${PKGNAME}
GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --with-tcl-ver=8.2 --with-tk-ver=8.2
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/tcl2c++ ${PREFIX}/bin
${INSTALL_SCRIPT} ${WRKSRC}/otcldoc ${PREFIX}/bin
diff --git a/devel/tclcl/files/patch-aa b/devel/tclcl/files/patch-aa
index f2a445e4631b..6a72d98a93ce 100644
--- a/devel/tclcl/files/patch-aa
+++ b/devel/tclcl/files/patch-aa
@@ -5,7 +5,7 @@
# the exec restarts using tclsh which in turn ignores
# the command because of this backslash: \
-exec tclsh "$0" "$@"
-+exec tclsh8.0 "$0" "$@"
++exec tclsh8.2 "$0" "$@"
#
# otcldoc - a simple script for translating otcl classes into
diff --git a/devel/tkcvs/Makefile b/devel/tkcvs/Makefile
index 532f5fef5ff2..cc6c41c42747 100644
--- a/devel/tkcvs/Makefile
+++ b/devel/tkcvs/Makefile
@@ -7,13 +7,13 @@
#
DISTNAME= tkcvs-6.0
-CATEGORIES= devel tk80
+CATEGORIES= devel tk82
MASTER_SITES= http://www.neosoft.com/tcl/ftparchive/sorted/apps/tkcvs-6.0/ \
http://ftp.sunet.se/pub/lang/tcl/sorted/apps/tkcvs-6.0/
MAINTAINER= shanee@augusta.de
-LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
+LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
NO_BUILD= yes
MAN1= tkcvs.1 tkdiff.1
diff --git a/devel/tkcvs/files/patch-aa b/devel/tkcvs/files/patch-aa
index 2fbced5d12af..da2a59dc3e5e 100644
--- a/devel/tkcvs/files/patch-aa
+++ b/devel/tkcvs/files/patch-aa
@@ -22,14 +22,14 @@
# Find a Tk interpreter.
-WISH=`which wish4.0`
-+WISH=`which wish8.0`
++WISH=`which wish8.2`
if [ ! -f $WISH ]; then
- WISH=`which wish4.1`
+ WISH=`which wish4.0`
fi
if [ ! -f $WISH ]; then
- echo "I cant find a Tk interpreter on your system"
-+ echo "I cant find a usefull Tk interpreter on your system"
++ echo "I cant find a useful Tk interpreter on your system"
exit 1
fi
diff --git a/devel/tkref/Makefile b/devel/tkref/Makefile
index c32fabc41d78..49b95cf12dfe 100644
--- a/devel/tkref/Makefile
+++ b/devel/tkref/Makefile
@@ -7,18 +7,18 @@
#
DISTNAME= tkref-1.01
-CATEGORIES= devel tk80
+CATEGORIES= devel tk82
MASTER_SITES= http://gtcs.com/softdist/ \
${MASTER_SITE_LOCAL}
MAINTAINER= bgingery@gtcs.com
-RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82
NO_BUILD= yes
do-patch:
- perl -pi -e "s|/usr/local/bin/wish4.1|${PREFIX}/bin/wish8.0|;" \
+ perl -pi -e "s|/usr/local/bin/wish4.1|${PREFIX}/bin/wish8.2|;" \
${WRKDIR}/TkRef
do-install:
diff --git a/devel/vtcl/Makefile b/devel/vtcl/Makefile
index dca827849f70..ede945c72e7b 100644
--- a/devel/vtcl/Makefile
+++ b/devel/vtcl/Makefile
@@ -7,12 +7,12 @@
#
DISTNAME= vtcl-1.2.0
-CATEGORIES= devel tk80
+CATEGORIES= devel tk82
MASTER_SITES= ftp://ftp.neuron.com/pub/vtcl/development/1.2/
MAINTAINER= vanilla@FreeBSD.org
-RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82
NO_BUILD= yes
diff --git a/devel/vtcl/files/patch-aa b/devel/vtcl/files/patch-aa
index 24429d80af1b..f9195dad9133 100644
--- a/devel/vtcl/files/patch-aa
+++ b/devel/vtcl/files/patch-aa
@@ -2,7 +2,7 @@
+++ vt.tcl Thu Oct 8 01:31:27 1998
@@ -1,4 +1,4 @@
-#!/usr/bin/wish -f
-+#!/usr/local/bin/wish8.0 -f
++#!/usr/local/bin/wish8.2 -f
# $Id: vt.tcl,v 1.20 1998/02/02 05:11:27 stewart Exp $
##############################################################################
diff --git a/devel/vtcl/files/patch-ab b/devel/vtcl/files/patch-ab
index 635081de2706..aa9f6b5c1d54 100644
--- a/devel/vtcl/files/patch-ab
+++ b/devel/vtcl/files/patch-ab
@@ -5,7 +5,7 @@
-PATH_TO_WISH=/usr/bin/wish
-VTCL_HOME=/usr/local/vt
-+PATH_TO_WISH=/usr/local/bin/wish8.0
++PATH_TO_WISH=/usr/local/bin/wish8.2
+VTCL_HOME=/usr/local/lib/vtcl
export PATH_TO_WISH
diff --git a/editors/e93/Makefile b/editors/e93/Makefile
index 512c5023873c..da43aa03c1fb 100644
--- a/editors/e93/Makefile
+++ b/editors/e93/Makefile
@@ -1,5 +1,5 @@
# New ports collection makefile for: e93
-# Version required: 1.2r6X
+# Version required: 1.2r7X
# Date created: 21 June 1995
# Whom: Satoshi Asami (asami)
#
@@ -8,13 +8,13 @@
DISTNAME= e93-1.2r7X
PKGNAME= e93-1.2.7
-CATEGORIES= editors tcl80
+CATEGORIES= editors tcl82
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= editors
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= tcl80.1:${PORTSDIR}/lang/tcl80
+LIB_DEPENDS= tcl82.1:${PORTSDIR}/lang/tcl82
MAKEFILE= makefile
USE_X_PREFIX= yes
diff --git a/emulators/frodo/Makefile b/emulators/frodo/Makefile
index 17f42d2f4344..cc99648e4362 100644
--- a/emulators/frodo/Makefile
+++ b/emulators/frodo/Makefile
@@ -4,15 +4,16 @@
# Whom: dirk.meyer@dinoex.sub.org
#
# $FreeBSD$
+#
DISTNAME= FrodoV4_1a.Src
PKGNAME= frodo-4.1
-CATEGORIES= emulators tk80
+CATEGORIES= emulators tk82
MASTER_SITES= ftp://sunsite.unc.edu/pub/micro/commodore/crossplatform/emulators/unix/
MAINTAINER= dirk.meyer@dinoex.sub.org
-RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82
USE_X_PREFIX= YES
ALL_TARGET= Frodo
diff --git a/emulators/frodo/files/patch-C64_x.i b/emulators/frodo/files/patch-C64_x.i
index 89e4dcde6989..39818e62e134 100644
--- a/emulators/frodo/files/patch-C64_x.i
+++ b/emulators/frodo/files/patch-C64_x.i
@@ -5,7 +5,7 @@
#else
// try to start up Tk gui.
- gui = new CmdPipe("wish", "TkGui.tcl");
-+ gui = new CmdPipe("wish8.0", "TkGui.tcl");
++ gui = new CmdPipe("wish8.2", "TkGui.tcl");
if (gui) {
if (gui->fail) {
delete gui; gui = 0;
diff --git a/emulators/hfsutils/Makefile b/emulators/hfsutils/Makefile
index 745004e2cb11..0f18311dd17a 100644
--- a/emulators/hfsutils/Makefile
+++ b/emulators/hfsutils/Makefile
@@ -7,12 +7,12 @@
#
DISTNAME= hfsutils-3.2.6
-CATEGORIES= emulators tk80
+CATEGORIES= emulators tk82
MASTER_SITES= ftp://ftp.mars.org/pub/hfs/
MAINTAINER= vanilla@FreeBSD.org
-LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
+LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-tcl --with-tk
diff --git a/finance/cbb/Makefile b/finance/cbb/Makefile
index 5915c9157d6c..5f28bf5e3282 100644
--- a/finance/cbb/Makefile
+++ b/finance/cbb/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.me.umn.edu/pub/finance/ \
MAINTAINER= kline@thought.org
-RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82
NO_BUILD= yes
USE_PERL5= yes
diff --git a/finance/cbb/files/patch-01 b/finance/cbb/files/patch-01
index 9658330ab0b8..9d52612aaa75 100644
--- a/finance/cbb/files/patch-01
+++ b/finance/cbb/files/patch-01
@@ -14,7 +14,7 @@
install:
- $(PERL) install.pl
+ $(PERL) install.pl --prefix ${PREFIX} --libdir ${PREFIX}/lib/cbb \
-+ --perlpath ${PERL5} --wishpath ${PREFIX}/bin/wish8.0
++ --perlpath ${PERL5} --wishpath ${PREFIX}/bin/wish8.2
docs/cbb-man.dvi: docs/cbb-man.tex
(cd docs; \
diff --git a/games/awele/Makefile b/games/awele/Makefile
index 81cbc562d87d..709e48ad0031 100644
--- a/games/awele/Makefile
+++ b/games/awele/Makefile
@@ -8,13 +8,13 @@
DISTNAME= awele
PKGNAME= awele-1.0
-CATEGORIES= games tk80
-MASTER_SITES= http://www-rocq.inria.fr/air/ftp/Jean-Paul/
+CATEGORIES= games tk82
+MASTER_SITES= http://www-air.inria.fr/ftp/Jean-Paul/
EXTRACT_SUFX= 1.0.tgz
MAINTAINER= tg@FreeBSD.org
-LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
+LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
USE_IMAKE= yes
NO_INSTALL_MANPAGES= yes
diff --git a/games/awele/files/patch-aa b/games/awele/files/patch-aa
index 3879b3204e68..49b3146ec235 100644
--- a/games/awele/files/patch-aa
+++ b/games/awele/files/patch-aa
@@ -11,10 +11,10 @@
XCOMM libs, includes
XCOMM TK_LIB AND TK_INCLUDE stand for tk and tcl
- TK_LIB = -L/usr/local/lib -ltk -ltcl
-+ TK_LIB = -L@@LOCALBASE@@/lib -ltk80 -ltcl80
++ TK_LIB = -L@@LOCALBASE@@/lib -ltk82 -ltcl82
XCOMM TK_LIB = -L/usr/local/lib -ltk4.0 -ltcl7.4
- TK_INCLUDE = -I/usr/local/include
-+ TK_INCLUDE = -I@@LOCALBASE@@/include/tcl8.0 -I@@LOCALBASE@@/include/tk8.0
++ TK_INCLUDE = -I@@LOCALBASE@@/include/tcl8.2 -I@@LOCALBASE@@/include/tk8.2
DEFINES = $(TK_INCLUDE)
LOCAL_LIBRARIES = $(TK_LIB) -lX11 -lm
XCOMM ANSI-C compiler
diff --git a/games/bogged/Makefile b/games/bogged/Makefile
index 1bff553948ea..ac5115c81a01 100644
--- a/games/bogged/Makefile
+++ b/games/bogged/Makefile
@@ -14,7 +14,7 @@ EXTRACT_SUFX= .gz
MAINTAINER= andy@icc.surw.chel.su
-RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82
EXTRACT_CMD= ${CP}
EXTRACT_BEFORE_ARGS=
diff --git a/games/bogged/files/patch-aa b/games/bogged/files/patch-aa
index f303074519f5..c34a7d5be4fd 100644
--- a/games/bogged/files/patch-aa
+++ b/games/bogged/files/patch-aa
@@ -4,7 +4,7 @@
#!/bin/sh
# the next line restarts using wish \
-exec wish "$0" "$@"
-+exec wish8.0 "$0" "$@"
++exec wish8.2 "$0" "$@"
#
# Bogged is Copyright 1998 Todd David Rudick
diff --git a/games/dontspace/Makefile b/games/dontspace/Makefile
index 6546ce166cd6..7fcd8f117b7b 100644
--- a/games/dontspace/Makefile
+++ b/games/dontspace/Makefile
@@ -7,17 +7,17 @@
#
DISTNAME= dontspace-1.2
-CATEGORIES= games tk80
+CATEGORIES= games tk82
MASTER_SITES= http://www.isi.edu/~johnh/SOFTWARE/JACOBY/
MAINTAINER= johnh@isi.edu
-RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82
GNU_CONFIGURE= Yes
CONFIGURE_ARGS= --bindir=${PREFIX}/bin --datadir=${PREFIX}/share/games \
--mandir=${PREFIX}/man
-CONFIGURE_ENV= WISHX=${PREFIX}/bin/wish8.0
+CONFIGURE_ENV= WISHX=${PREFIX}/bin/wish8.2
MAN6= dontspace.6
.include <bsd.port.mk>
diff --git a/games/ifm/Makefile b/games/ifm/Makefile
index d2e3acbe8ad6..00a52b6528e2 100644
--- a/games/ifm/Makefile
+++ b/games/ifm/Makefile
@@ -20,11 +20,12 @@ EXTRACT_SUFX= .tgz
MAINTAINER= dchapes@ddm.on.ca
-RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82
WRKSRC= ${WRKDIR}/${PKGNAME}
USE_GMAKE= yes
GNU_CONFIGURE= yes
+CONFIGURE_ENV= WISH=${LOCALBASE}/bin/wish8.2
post-install:
install-info ${PREFIX}/info/ifm.info ${PREFIX}/info/dir
diff --git a/games/merlin/Makefile b/games/merlin/Makefile
index bb1b33560df3..992078232b35 100644
--- a/games/merlin/Makefile
+++ b/games/merlin/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://outoften.doc.ic.ac.uk/~np2/software/download/
MAINTAINER= andy@icc.surw.chel.su
-RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82
NO_BUILD= yes
USE_X_PREFIX= yes
diff --git a/games/merlin/files/patch-aa b/games/merlin/files/patch-aa
index 8f594d5f95ad..589bb717c3fe 100644
--- a/games/merlin/files/patch-aa
+++ b/games/merlin/files/patch-aa
@@ -2,7 +2,7 @@
+++ merlin Sun Aug 23 18:09:17 1998
@@ -1,4 +1,4 @@
-#!/usr/local/bin/wish4.1
-+#!/usr/local/bin/wish8.0
++#!/usr/local/bin/wish8.2
#
# Merlin - a pointless puzzle game
#
diff --git a/games/tksol/Makefile b/games/tksol/Makefile
index 3d5bae520608..e30da487d821 100644
--- a/games/tksol/Makefile
+++ b/games/tksol/Makefile
@@ -7,13 +7,13 @@
#
DISTNAME= tksol-1.0
-CATEGORIES= games tk80
+CATEGORIES= games tk82
MASTER_SITES= ftp://ftp.cs.umd.edu/pub/misc_software/tksol/
EXTRACT_SUFX= .tar.Z
MAINTAINER= tg@FreeBSD.org
-RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82
PATCH_STRIP= -p1
WRKSRC= ${WRKDIR}/release
diff --git a/games/tksol/files/patch-a b/games/tksol/files/patch-a
index f68768b2b93c..81c49ebb0bd7 100644
--- a/games/tksol/files/patch-a
+++ b/games/tksol/files/patch-a
@@ -14,7 +14,7 @@
# Absolute pathname of the wish executable #
############################################
-WISH = /usr/imports/bin/wish
-+WISH = ${PREFIX}/bin/wish8.0
++WISH = ${PREFIX}/bin/wish8.2
####################################################
# Directory where the script tksol will be located #
diff --git a/games/tvp/Makefile b/games/tvp/Makefile
index f8f7e9ea6922..89addc832f67 100644
--- a/games/tvp/Makefile
+++ b/games/tvp/Makefile
@@ -7,19 +7,22 @@
#
DISTNAME= tvp-0.9.7.1
-CATEGORIES= games tk80
+CATEGORIES= games tk82
MASTER_SITES= http://www3.sympatico.ca/john.vanderhoek/tim/src/president/
MAINTAINER= hoek@FreeBSD.org
# Comment-out this (and CFLAGS) to compile only the CLI and ansi interfaces
-LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --enable-carddir=${PREFIX}/share/games/tvp
-# Comment-out this (and LIB_DEPENDS) to compile only the CLI and ansi interfaces
-CFLAGS+= -lX11 -lm -ltcl80 -ltk80 \
- -L ${LOCALBASE}/lib -L ${X11BASE}/lib
+LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
+
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --enable-carddir=${PREFIX}/share/games/tvp
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/tcl8.2 \
+ -I${LOCALBASE}/include/tk8.2" \
+ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib \
+ -ltcl82 -ltk82 -lX11 -lm"
+#CFLAGS+= -lX11 -lm -ltcl82 -ltk82 \
+# -L${LOCALBASE}/lib -L${X11BASE}/lib
MAN6= tvp.6
MLINKS= tvp.6 xprez.6 - aprez.6 - prez.6
diff --git a/games/tvp/files/patch-aa b/games/tvp/files/patch-aa
index 59f93db9d802..9dfeeecaee08 100644
--- a/games/tvp/files/patch-aa
+++ b/games/tvp/files/patch-aa
@@ -1,20 +1,38 @@
---- configure.orig Thu Oct 23 08:34:26 1997
-+++ configure Thu Oct 23 08:36:34 1997
-@@ -1306,7 +1306,7 @@
+--- configure.orig Tue Aug 19 20:57:12 1997
++++ configure Wed Nov 3 17:33:31 1999
+@@ -1306,10 +1306,10 @@
WINDLL=true
TCLTK=""
-for tkver in 42 4.2 41 4.1 80 8.0
-+for tkver in 80 8.0 42 4.2 41 4.1
++for tkver in 82
do
- echo $ac_n "checking for Tk_Main in -ltk${tkver}""... $ac_c" 1>&6
- echo "configure:1313: checking for Tk_Main in -ltk${tkver}" >&5
+- echo $ac_n "checking for Tk_Main in -ltk${tkver}""... $ac_c" 1>&6
+-echo "configure:1313: checking for Tk_Main in -ltk${tkver}" >&5
++ echo $ac_n "checking for Tk_MainEx in -ltk${tkver}""... $ac_c" 1>&6
++echo "configure:1313: checking for Tk_MainEx in -ltk${tkver}" >&5
+ ac_lib_var=`echo tk${tkver}'_'Tk_Main | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1322,10 +1322,10 @@
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+-char Tk_Main();
++char Tx_MainEx();
+
+ int main() {
+-Tk_Main()
++Tk_MainEx()
+ ; return 0; }
+ EOF
+ if { (eval echo configure:1332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
@@ -1345,7 +1345,7 @@
echo "$ac_t""yes" 1>&6
WINDLL=false
- for tclver in 76 7.6 75 7.5 80 8.0
-+ for tclver in 80 8.0 76 7.6 75 7.5
++ for tclver in 82
do
echo $ac_n "checking for Tcl_Main in -ltcl${tclver}""... $ac_c" 1>&6
echo "configure:1352: checking for Tcl_Main in -ltcl${tclver}" >&5
diff --git a/games/tvp/files/patch-ab b/games/tvp/files/patch-ab
new file mode 100644
index 000000000000..7fb1a6f40f19
--- /dev/null
+++ b/games/tvp/files/patch-ab
@@ -0,0 +1,11 @@
+--- xprez/xpwish.c.orig Sat Jun 28 17:38:35 1997
++++ xprez/xpwish.c Wed Nov 3 17:45:12 1999
+@@ -37,7 +37,7 @@
+
+ int
+ main (int argc, char **argv) {
+- Tk_Main (argc, argv, Tcl_AppInit);
++ Tk_MainEx (argc, argv, Tcl_AppInit, Tcl_CreateInterp());
+
+ return 0;
+ }
diff --git a/games/xchain/Makefile b/games/xchain/Makefile
index d89a285bb434..dd726f96c4a1 100644
--- a/games/xchain/Makefile
+++ b/games/xchain/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://thor.cam.ac.uk/~ac212/xchain/
MAINTAINER= andy@icc.surw.chel.su
-RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82
USE_X_PREFIX= yes
WRKSRC= ${WRKDIR}/xchain-1.0
diff --git a/games/xchain/files/patch-aa b/games/xchain/files/patch-aa
index 3e1b5892e65a..37d8a233a25a 100644
--- a/games/xchain/files/patch-aa
+++ b/games/xchain/files/patch-aa
@@ -5,7 +5,7 @@
#include <time.h>
-#define DEF_WISH_PATH "/usr/bin/wish"
-+#define DEF_WISH_PATH "/usr/local/bin/wish8.0"
++#define DEF_WISH_PATH "/usr/local/bin/wish8.2"
void wprintf(char *, ...);
void draw_screen(void);
diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile
index 7c378759f740..6b2d098cb8cc 100644
--- a/graphics/geomview/Makefile
+++ b/graphics/geomview/Makefile
@@ -4,9 +4,10 @@
# Whom: fenner
#
# $FreeBSD$
+#
DISTNAME= geomview-1.6.1
-CATEGORIES= graphics tk80
+CATEGORIES= graphics tk82
MASTER_SITES= ftp://ftp.geom.umn.edu/pub/software/geomview/ \
ftp://ftp-sfb288.math.tu-berlin.de/pub/geomview/
DISTFILES= geomview-1.6.1-src.tar.gz
@@ -15,7 +16,7 @@ MAINTAINER= fenner@freebsd.org
LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms \
MesaGL.14:${PORTSDIR}/graphics/Mesa3 \
- tk80.1:${PORTSDIR}/x11-toolkits/tk80
+ tk82.1:${PORTSDIR}/x11-toolkits/tk82
WRKSRC= ${WRKDIR}/Geomview
REQUIRES_MOTIF= yes
diff --git a/graphics/geomview/files/patch-aa b/graphics/geomview/files/patch-aa
index 8f9026969a27..ef5c8bc62565 100644
--- a/graphics/geomview/files/patch-aa
+++ b/graphics/geomview/files/patch-aa
@@ -36,8 +36,8 @@
# indicate cc options to find tk-related libraries and include-files.
-# TKLIBS = -L/usr/local/lib -ltk -ltcl -L${SYSXLIBDIR} -lX11
-# TKINC = -I/u/share/include
-+TKLIBS = -L${LOCALBASE}/lib -ltk80 -ltcl80 -L${SYSXLIBDIR} -lX11
-+TKINC = -I${LOCALBASE}/include/tcl8.0 -I${LOCALBASE}/include/tk8.0
++TKLIBS = -L${LOCALBASE}/lib -ltk82 -ltcl82 -L${SYSXLIBDIR} -lX11
++TKINC = -I${LOCALBASE}/include/tcl8.2 -I${LOCALBASE}/include/tk8.2
# Choose or adapt one of the following sets of definitions.
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index e21b7c20c2e1..061a51a56f11 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -8,13 +8,13 @@
DISTNAME= gviz15
PKGNAME= graphviz-1.5
-CATEGORIES= graphics tk80
+CATEGORIES= graphics tk82
MASTER_SITES= http://www.research.att.com/sw/tools/graphviz/
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
+LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
FETCH_ARGS= -b
WRKSRC= ${WRKDIR}/gv1.5
diff --git a/graphics/libimg/Makefile b/graphics/libimg/Makefile
index ae11ab1dd7a8..0592ca14fe17 100644
--- a/graphics/libimg/Makefile
+++ b/graphics/libimg/Makefile
@@ -8,12 +8,12 @@
DISTNAME= img1.2.2
PKGNAME= libimg-1.2.2
-CATEGORIES= graphics tk80
+CATEGORIES= graphics tk82
MASTER_SITES= ftp://ftp.neosoft.com/pub/tcl/sorted/packages-8.0/graphics/Img/1.2/
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80 \
+LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82 \
png.3:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff
@@ -23,11 +23,11 @@ WRKSRC= ${WRKDIR}/img1.2.2
ALL_TARGET= default
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-tcl=${PREFIX}/lib/tcl8.0 --with-tk=${PREFIX}/lib/tk8.0 \
+CONFIGURE_ARGS= --with-tcl=${PREFIX}/lib/tcl8.2 --with-tk=${PREFIX}/lib/tk8.2 \
--disable-stubs
post-install:
- ${LN} -sf ${PREFIX}/lib/Img1.2/libimg1.2.so.1 ${PREFIX}/lib/libimg.so.1
+ ${LN} -sf ${PREFIX}/lib/Img1.2/libimg82.so.1 ${PREFIX}/lib/libimg.so.1
${LN} -sf ${PREFIX}/lib/libimg.so.1 ${PREFIX}/lib/libimg.so
.include <bsd.port.mk>
diff --git a/graphics/libimg/files/patch-aa b/graphics/libimg/files/patch-aa
index e1c91b9fab91..3cbccff2d2e4 100644
--- a/graphics/libimg/files/patch-aa
+++ b/graphics/libimg/files/patch-aa
@@ -6,8 +6,8 @@
TCL_INC_DIR=${TCL_EXEC_PREFIX}/include
-elif test -d ${TCL_EXEC_PREFIX}/include -a -f ${TCL_EXEC_PREFIX}/include/tcl.h; then
- TCL_INC_DIR=${TCL_EXEC_PREFIX}/include
-+elif test -d ${TCL_EXEC_PREFIX}/include -a -f ${TCL_EXEC_PREFIX}/include/tcl8.0/tcl.h; then
-+ TCL_INC_DIR=${TCL_EXEC_PREFIX}/include/tcl8.0
++elif test -d ${TCL_EXEC_PREFIX}/include -a -f ${TCL_EXEC_PREFIX}/include/tcl8.2/tcl.h; then
++ TCL_INC_DIR=${TCL_EXEC_PREFIX}/include/tcl8.2
else
TCL_INC_DIR=$prefix/include
fi
@@ -17,8 +17,8 @@
TK_INC_DIR=${TK_EXEC_PREFIX}/include
-elif test -d ${TK_EXEC_PREFIX}/include -a -f ${TK_EXEC_PREFIX}/include/tk.h; then
- TK_INC_DIR=${TK_EXEC_PREFIX}/include
-+elif test -d ${TK_EXEC_PREFIX}/include -a -f ${TK_EXEC_PREFIX}/include/tk8.0/tk.h; then
-+ TK_INC_DIR=${TK_EXEC_PREFIX}/include/tk8.0
++elif test -d ${TK_EXEC_PREFIX}/include -a -f ${TK_EXEC_PREFIX}/include/tk8.2/tk.h; then
++ TK_INC_DIR=${TK_EXEC_PREFIX}/include/tk8.2
else
TK_INC_DIR=$prefix/include
fi
diff --git a/graphics/libimg/pkg-plist b/graphics/libimg/pkg-plist
index c33f5e299748..95f1b27510c4 100644
--- a/graphics/libimg/pkg-plist
+++ b/graphics/libimg/pkg-plist
@@ -1,6 +1,7 @@
lib/Img1.2/pkgIndex.tcl
-lib/Img1.2/libimg1.2.so.1
+lib/Img1.2/libimg82.so.1
lib/libimg.so.1
lib/libimg.so
-@dirrm lib/Img1.2
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+@dirrm lib/Img1.2
diff --git a/graphics/py-opengl/Makefile b/graphics/py-opengl/Makefile
index ae645b573f04..c6fff53f21a0 100644
--- a/graphics/py-opengl/Makefile
+++ b/graphics/py-opengl/Makefile
@@ -43,7 +43,7 @@ SETUP_FILES= ${FILESDIR}/Setup.base
WITH_TOGL?= yes
.if defined(WITH_TOGL) && $(WITH_TOGL) == yes
SETUP_FILES+= ${FILESDIR}/Setup.add.togl
-LIB_DEPENDS+= tk80.1:${PORTSDIR}/x11-toolkits/tk80
+LIB_DEPENDS+= tk82.1:${PORTSDIR}/x11-toolkits/tk82
.endif
.include <bsd.port.pre.mk>
diff --git a/graphics/py-opengl/files/Setup.add.togl b/graphics/py-opengl/files/Setup.add.togl
index 515627ecf0c3..4468da3a6f16 100644
--- a/graphics/py-opengl/files/Setup.add.togl
+++ b/graphics/py-opengl/files/Setup.add.togl
@@ -8,8 +8,8 @@ togl \
# This must match the name of the Togl source directory
-I./Togl-1.5 \
# These must match the version you have installed
- -ILOCALBASE/include/tcl8.0 -ILOCALBASE/include/tk8.0 \
- -LLOCALBASE/lib -ltk80 -ltcl80 \
+ -ILOCALBASE/include/tcl8.2 -ILOCALBASE/include/tk8.2 \
+ -LLOCALBASE/lib -ltk82 -ltcl82 \
# You'll definitely need these (or maybe edit them for MesaGL/MesaGLU:
-IX11BASE/include -LX11BASE/lib \
-lGLU -lGL \
diff --git a/graphics/py-opengl/files/Setup.base b/graphics/py-opengl/files/Setup.base
index 307813f557e8..ebd688b1b21f 100644
--- a/graphics/py-opengl/files/Setup.base
+++ b/graphics/py-opengl/files/Setup.base
@@ -57,8 +57,8 @@ _glutmodule.c # putting this at the end for \ reasons
## # This must match the name of the Togl source directory
## -I./Togl-1.5 \
## # These must match the version you have installed
-## -ILOCALBASE/include/tcl8.0 -ILOCALBASE/include/tk8.0 \
-## -LLOCALBASE/lib -ltk80 -ltcl80 \
+## -ILOCALBASE/include/tcl8.2 -ILOCALBASE/include/tk8.2 \
+## -LLOCALBASE/lib -ltk82 -ltcl82 \
## # You'll definitely need these (or maybe edit them for MesaGL/MesaGLU:
## -IX11BASE/include -LX11BASE/lib \
## -lGLU -lGL \
diff --git a/graphics/togl/Makefile b/graphics/togl/Makefile
index 5238a0a229e4..b14a683f11fe 100644
--- a/graphics/togl/Makefile
+++ b/graphics/togl/Makefile
@@ -8,19 +8,19 @@
DISTNAME= Togl-1.5
PKGNAME= togl-1.5
-CATEGORIES= graphics tk80
+CATEGORIES= graphics tk82
MASTER_SITES= ftp://ftp.mesa3d.org/mesa/misc/ \
ftp://ftp.cs.umd.edu/pub/faculty/bederson/
MAINTAINER= aa8vb@ipass.net
-LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80 \
- tcl80.1:${PORTSDIR}/lang/tcl80 \
+LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82 \
+ tcl82.1:${PORTSDIR}/lang/tcl82 \
MesaGL.14:${PORTSDIR}/graphics/Mesa3
ALL_TARGET= default
-TOGL_INSTDIR= ${PREFIX}/lib/tk8.0/${DISTNAME}
+TOGL_INSTDIR= ${PREFIX}/lib/tk8.2/${DISTNAME}
.include <bsd.port.pre.mk>
@@ -28,6 +28,6 @@ do-install:
${MKDIR} ${TOGL_INSTDIR}
${INSTALL_DATA} ${WRKSRC}/libtogl.so.1.3 ${TOGL_INSTDIR}/Togl.so
${ECHO} 'package ifneeded Togl 1.5 [list load [file join $$dir Togl.so]]'\
- > ${PREFIX}/lib/tk8.0/${DISTNAME}/pkgIndex.tcl
+ > ${PREFIX}/lib/tk8.2/${DISTNAME}/pkgIndex.tcl
.include <bsd.port.post.mk>
diff --git a/graphics/togl/files/patch-aa b/graphics/togl/files/patch-aa
index bc5ff3eef199..f822268bc903 100644
--- a/graphics/togl/files/patch-aa
+++ b/graphics/togl/files/patch-aa
@@ -20,9 +20,9 @@
-# Where to find tcl.h, tk.h, OpenGL/Mesa headers, etc:
-INCLUDES = -I/usr/local/include -I/usr/include/tcl
+# Where to find tc.hl, tk.h, OpenGL/Mesa headers, etc:
-+INCLUDES = -I/usr/local/include/tcl8.0 \
-+ -I/usr/local/include/tk8.0 \
-+ -I/usr/local/include/tk8.0/generic \
++INCLUDES = -I/usr/local/include/tcl8.2 \
++ -I/usr/local/include/tk8.2 \
++ -I/usr/local/include/tk8.2/generic \
+ -I/usr/X11R6/include \
+ -I/usr/include/tcl
@@ -33,7 +33,7 @@
# Libraries to link with (-ldl for Linux only?):
-LIBS = -ltk -ltcl -lGLU -lGL -L/usr/X11/lib -lX11 -lXmu -lXext -lXt -lm -ldl
-+LIBS = -ltk80 -ltcl80 -lGLU -lGL -lX11 -lXmu -lXext -lXt -lm
++LIBS = -ltk82 -ltcl82 -lGLU -lGL -lX11 -lXmu -lXext -lXt -lm
TK_FLAGS =
diff --git a/graphics/togl/pkg-plist b/graphics/togl/pkg-plist
index 6bc36d9d7b00..ac9a7d007722 100644
--- a/graphics/togl/pkg-plist
+++ b/graphics/togl/pkg-plist
@@ -1,4 +1,4 @@
-lib/tk8.0/Togl-1.5/Togl.so
-lib/tk8.0/Togl-1.5/pkgIndex.tcl
-@dirrm lib/tk8.0/Togl-1.5
+lib/tk8.2/Togl-1.5/Togl.so
+lib/tk8.2/Togl-1.5/pkgIndex.tcl
+@dirrm lib/tk8.2/Togl-1.5
diff --git a/irc/quirc/Makefile b/irc/quirc/Makefile
index a162f139efcf..8ffbdb836d94 100644
--- a/irc/quirc/Makefile
+++ b/irc/quirc/Makefile
@@ -7,13 +7,13 @@
#
DISTNAME= quirc-0.9.79
-CATEGORIES= irc tk80
+CATEGORIES= irc tk82
MASTER_SITES= http://www.quirc.org/ \
http://patearl.powersurfr.com/quirc/
MAINTAINER= cpiazza@FreeBSD.org
-LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
+LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
USE_XLIB= yes
GNU_CONFIGURE= yes
diff --git a/irc/tkirc/Makefile b/irc/tkirc/Makefile
index 3f042f1ca0f1..33c76655fb5a 100644
--- a/irc/tkirc/Makefile
+++ b/irc/tkirc/Makefile
@@ -8,19 +8,19 @@
DISTNAME= tkirc1.202
PKGNAME= tkirc-1.202
-CATEGORIES= irc tk80
+CATEGORIES= irc tk82
MASTER_SITES= ftp://ftp.informatik.uni-oldenburg.de/pub/tkirc/
MAINTAINER= green@FreeBSD.org
RUN_DEPENDS= irc:${PORTSDIR}/irc/ircII \
- wish8.0:${PORTSDIR}/x11-toolkits/tk80
+ wish8.2:${PORTSDIR}/x11-toolkits/tk82
WRKSRC= ${WRKDIR}/tkirc
NO_BUILD= yes
post-patch:
- perl -pi.orig -e 's/wish/wish8.0/' ${WRKSRC}/tkirc
+ perl -pi.orig -e 's/wish/wish8.2/' ${WRKSRC}/tkirc
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/tkirc ${PREFIX}/bin
diff --git a/lang/itcl/Makefile b/lang/itcl/Makefile
index 441262072731..f97d3be040ad 100644
--- a/lang/itcl/Makefile
+++ b/lang/itcl/Makefile
@@ -13,11 +13,11 @@ MASTER_SITES= ftp://ftp.tcltk.com/pub/itcl/
MAINTAINER= dmlb@ragnet.demon.co.uk
-LIB_DEPENDS= tcl80.1:${PORTSDIR}/lang/tcl80
+LIB_DEPENDS= tcl82.1:${PORTSDIR}/lang/tcl82
WRKSRC= ${WRKDIR}/itcl3.0.1/itcl/unix
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --enable-shared --with-tcl=${PREFIX}/lib/tcl8.0
+CONFIGURE_ARGS= --enable-shared --with-tcl=${PREFIX}/lib/tcl8.2
CONFIGURE_ENV= PORTSDIR=${PORTSDIR} ITCL_LIB_FILE=${ITCL_LIB_FILE}
SHLIB_MAJOR= 1
@@ -32,11 +32,7 @@ MANN+= itcl.n itcl_class.n itcl_info.n itclvars.n local.n scope.n
.include <bsd.port.pre.mk>
-.if ${PORTOBJFORMAT} == "elf"
ITCL_LIB_FILE= ${ITCL_LIB}.${SHLIB_MAJOR}
-.else
-ITCL_LIB_FILE= ${ITCL_LIB}.${SHLIB_MAJOR}.${SHLIB_MINOR}
-.endif
post-configure:
@${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}
@@ -48,6 +44,7 @@ pre-build:
TCL_PREFIX=${PREFIX}
post-install:
+ ${LN} -sf ${PREFIX}/bin/itclsh3.0 ${PREFIX}/bin/itclsh
${LN} -sf ${ITCL_LIB_FILE} ${PREFIX}/lib/${ITCL_LIB}
${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
diff --git a/lang/itcl/files/Makefile.lib b/lang/itcl/files/Makefile.lib
index 31ec14d6f3b6..0cdabb9d2199 100644
--- a/lang/itcl/files/Makefile.lib
+++ b/lang/itcl/files/Makefile.lib
@@ -2,7 +2,7 @@ NOPROFILE= yes
LIB= itcl30
ITCL_LIBRARY= ${PREFIX}/lib/itcl3.0
CFLAGS+= -I. -I./../generic \
- -I${TCL_PREFIX}/include/tcl8.0/generic \
+ -I${TCL_PREFIX}/include/tcl8.2/generic \
-DHAVE_GETCWD=1 -DNO_VALUES_H=1 -DHAVE_UNISTD_H=1 -DUSE_TERMIOS=1\
-DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_TM_ZONE=1\
-DHAVE_TM_GMTOFF=1 -DHAVE_ST_BLKSIZE=1 -DSTDC_HEADERS=1\
diff --git a/lang/itcl/files/patch-ah b/lang/itcl/files/patch-ah
new file mode 100644
index 000000000000..aaea8c0f53cb
--- /dev/null
+++ b/lang/itcl/files/patch-ah
@@ -0,0 +1,11 @@
+--- ../generic/itcl_ensemble.c.orig Sat Aug 8 16:38:24 1998
++++ ../generic/itcl_ensemble.c Wed Nov 3 15:05:39 1999
+@@ -1626,7 +1626,7 @@
+ * another "ensemble" command. Use the current ensemble as
+ * the parent, and find or create an ensemble part within it.
+ */
+- ensName = TclGetStringFromObj(objv[1], (int*)NULL);
++ ensName = Tcl_GetStringFromObj(objv[1], (int*)NULL);
+
+ if (ensData) {
+ if (FindEnsemblePart(interp, ensData, ensName, &ensPart) != TCL_OK) {
diff --git a/lang/itcl/pkg-plist b/lang/itcl/pkg-plist
index 41b7956fb369..18bf49fe247d 100644
--- a/lang/itcl/pkg-plist
+++ b/lang/itcl/pkg-plist
@@ -1,8 +1,10 @@
bin/itclsh3.0
+@exec /bin/ln -s %D/%F %B/itclsh
+@unexec rm %B/itclsh
include/itcl3.0/generic/itcl.h
include/itcl3.0/generic/itclInt.h
include/itcl3.0/itcl.h
-lib/libitcl30.so.1.1
+lib/libitcl30.so.1
lib/libitcl30.so
lib/libitcl30.a
@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
diff --git a/lang/otcl/Makefile b/lang/otcl/Makefile
index 2587aa845095..8d1cbf7fd5a1 100644
--- a/lang/otcl/Makefile
+++ b/lang/otcl/Makefile
@@ -12,9 +12,14 @@ MASTER_SITES= http://www-mash.cs.berkeley.edu/dist/
MAINTAINER= obonilla@fisicc-ufm.edu
-LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
+LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --includedir=${PREFIX}/include/tcl8.0/generic
+CONFIGURE_ARGS= --includedir=${PREFIX}/include/tcl8.2/generic \
+ --with-tcl-ver=8.2
+
+post-install:
+ ${LN} -sf libotcl.so.1 ${PREFIX}/lib/libotcl.so
+ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
.include <bsd.port.mk>
diff --git a/lang/otcl/pkg-plist b/lang/otcl/pkg-plist
index f0f24c23686e..00574abc8478 100644
--- a/lang/otcl/pkg-plist
+++ b/lang/otcl/pkg-plist
@@ -3,3 +3,6 @@ bin/owish
include/otcl.h
lib/libotcl.a
lib/libotcl.so.1
+lib/libotcl.so
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
diff --git a/lang/p5-Tcl/Makefile b/lang/p5-Tcl/Makefile
index 431fc884cc7a..7eed48144a64 100644
--- a/lang/p5-Tcl/Makefile
+++ b/lang/p5-Tcl/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= Tcl
MAINTAINER= jfitz@FreeBSD.org
-LIB_DEPENDS= tcl80.1:${PORTSDIR}/lang/tcl80
+LIB_DEPENDS= tcl82.1:${PORTSDIR}/lang/tcl82
USE_PERL5= YES
diff --git a/lang/p5-Tcl/files/patch-aa b/lang/p5-Tcl/files/patch-aa
index d79a7ddd4d64..f2bc4835e595 100644
--- a/lang/p5-Tcl/files/patch-aa
+++ b/lang/p5-Tcl/files/patch-aa
@@ -6,6 +6,6 @@
VERSION => "b2",
- LIBS => ["-ltcl -lm"],
- INC => "-I/usr/local/include -I/usr/include/tcl"
-+ LIBS => ["-L$ENV{PREFIX}/lib -ltcl80 -lm"],
-+ INC => "-I$ENV{PREFIX}/include -I$ENV{PREFIX}/include/tcl8.0"
++ LIBS => ["-L$ENV{PREFIX}/lib -ltcl82 -lm"],
++ INC => "-I$ENV{PREFIX}/include -I$ENV{PREFIX}/include/tcl8.2"
);
diff --git a/lang/ruby-tcltklib/Makefile b/lang/ruby-tcltklib/Makefile
index 728ad15994f0..062ab1af3eb3 100644
--- a/lang/ruby-tcltklib/Makefile
+++ b/lang/ruby-tcltklib/Makefile
@@ -45,8 +45,8 @@ EXAMPLESDIR= ${PREFIX}/share/examples/ruby
# Set these vars as the version numbers (without decimal points) of Tcl/Tk
# you want to use with Ruby/Tk.
# e.g.: make TCL_VERSION=42 TK_VERSION=76 WITH_TCL_JP=yes build
-TCL_VERSION?= 80
-TK_VERSION?= 80
+TCL_VERSION?= 82
+TK_VERSION?= 82
.if defined(WITH_TCL_JP)
TCL_CATEGORY= japanese
TK_CATEGORY= japanese
diff --git a/lang/ruby14-tcltklib/Makefile b/lang/ruby14-tcltklib/Makefile
index 728ad15994f0..062ab1af3eb3 100644
--- a/lang/ruby14-tcltklib/Makefile
+++ b/lang/ruby14-tcltklib/Makefile
@@ -45,8 +45,8 @@ EXAMPLESDIR= ${PREFIX}/share/examples/ruby
# Set these vars as the version numbers (without decimal points) of Tcl/Tk
# you want to use with Ruby/Tk.
# e.g.: make TCL_VERSION=42 TK_VERSION=76 WITH_TCL_JP=yes build
-TCL_VERSION?= 80
-TK_VERSION?= 80
+TCL_VERSION?= 82
+TK_VERSION?= 82
.if defined(WITH_TCL_JP)
TCL_CATEGORY= japanese
TK_CATEGORY= japanese
diff --git a/mbone/imm/Makefile b/mbone/imm/Makefile
index 618e626d7331..9506e8bb2ea1 100644
--- a/mbone/imm/Makefile
+++ b/mbone/imm/Makefile
@@ -8,13 +8,13 @@
DISTNAME= imm.source
PKGNAME= imm-3.5a1
-CATEGORIES= mbone tk80
+CATEGORIES= mbone tk82
MASTER_SITES= ftp://ftp.hawaii.edu/paccom/imm-3.5a1/
EXTRACT_SUFX= .tar.Z
MAINTAINER= fenner@freebsd.org
-LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
+LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
WRKSRC= ${WRKDIR}/mnm
USE_X_PREFIX= yes
diff --git a/mbone/imm/files/Makefile.freebsd b/mbone/imm/files/Makefile.freebsd
index 51724b551d01..ae7ce6434e6f 100644
--- a/mbone/imm/files/Makefile.freebsd
+++ b/mbone/imm/files/Makefile.freebsd
@@ -1,11 +1,11 @@
# Some versions of make, like SGI's, use the following variable to
# determine which shell to use for executing commands:
SHELL = /bin/sh
-INCLUDE_DIR = -I${PREFIX}/include -I${LOCALBASE}/include/tcl8.0 -I${LOCALBASE}/include/tk8.0
+INCLUDE_DIR = -I${PREFIX}/include -I${LOCALBASE}/include/tcl8.2 -I${LOCALBASE}/include/tk8.2
# Libraries to use when linking:
LIBS = -lm
-TKLIBS= -L$(PREFIX)/lib -L${LOCALBASE}/lib -ltk80 -ltcl80 -lX11
+TKLIBS= -L$(PREFIX)/lib -L${LOCALBASE}/lib -ltk82 -ltcl82 -lX11
TARGET = ../freebsd
diff --git a/mbone/sdr/Makefile b/mbone/sdr/Makefile
index fec63590f30b..4c2d3d686b27 100644
--- a/mbone/sdr/Makefile
+++ b/mbone/sdr/Makefile
@@ -7,12 +7,12 @@
#
DISTNAME= sdr-2.7
-CATEGORIES= mbone tk80
+CATEGORIES= mbone tk82
MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/2.7/
MAINTAINER= fenner@FreeBSD.org
-LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
+LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
HAS_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/mbone/sdr/files/patch-ab b/mbone/sdr/files/patch-ab
new file mode 100644
index 000000000000..c894da39c0cc
--- /dev/null
+++ b/mbone/sdr/files/patch-ab
@@ -0,0 +1,11 @@
+--- sdr/src/Makefile.template.orig Tue May 25 16:27:44 1999
++++ sdr/src/Makefile.template Thu Nov 4 11:05:39 1999
+@@ -88,7 +88,7 @@
+ $(SDR_UI_FILES): tcl2c
+
+ parsed_plugins.tcl: ../src/plugin2tcl.tcl
+- tclsh8.0 ../src/plugin2tcl.tcl
++ tclsh8.2 ../src/plugin2tcl.tcl
+
+ uweb: $(WWWOBJS)
+ $(CC) -ggdb -o uweb $(WWWOBJS) $(LIBS)
diff --git a/misc/tkcron/Makefile b/misc/tkcron/Makefile
index a2a57e87790e..d4811e53ac20 100644
--- a/misc/tkcron/Makefile
+++ b/misc/tkcron/Makefile
@@ -7,13 +7,13 @@
#
DISTNAME= tkcron-2.12
-CATEGORIES= misc tk80
+CATEGORIES= misc tk82
MASTER_SITES= ftp://ftp.neosoft.com/languages/tcl/alcatel/code/
EXTRACT_SUFX= .tcl.gz
MAINTAINER= sander@haldjas.folklore.ee
-RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82
EXTRACT_CMD= ${GZIP_CMD}
EXTRACT_BEFORE_ARGS= -cd
diff --git a/misc/tkcron/files/Makefile b/misc/tkcron/files/Makefile
index b46a3ce43f0b..b18a1dee335f 100644
--- a/misc/tkcron/files/Makefile
+++ b/misc/tkcron/files/Makefile
@@ -1,10 +1,14 @@
+#
+# $FreeBSD$
+#
+
BINDIR= ${PREFIX}/bin
WISHDIR?= ${BINDIR}
all: tkcron
tkcron:
- sed -e "\:/usr/local/bin/wish: s;;${BINDIR}/wish8.0;g" tkcron.tcl > tkcron
+ sed -e "\:/usr/local/bin/wish: s;;${BINDIR}/wish8.2;g" tkcron.tcl > tkcron
install: all
install ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} tkcron ${BINDIR}
diff --git a/misc/tkinfo/Makefile b/misc/tkinfo/Makefile
index b6a561d959a1..00a17f7c0514 100644
--- a/misc/tkinfo/Makefile
+++ b/misc/tkinfo/Makefile
@@ -7,12 +7,12 @@
#
DISTNAME= tkinfo-2.4
-CATEGORIES= misc tk80
+CATEGORIES= misc tk82
MASTER_SITES= http://math-www.uni-paderborn.de/~axel/tkinfo/
MAINTAINER= tg@FreeBSD.org
-RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82
NO_BUILD= yes
MAN1= tkinfo.1
diff --git a/misc/tkinfo/files/patch-aa b/misc/tkinfo/files/patch-aa
index 06b17a94ae6a..acf185103e7c 100644
--- a/misc/tkinfo/files/patch-aa
+++ b/misc/tkinfo/files/patch-aa
@@ -4,7 +4,7 @@
#!/bin/sh
# This is a Tcl/Tk script to be interpreted by wish (Tk4.0 or better): \
-exec wish "$0" "$@"
-+exec wish8.0 "$0" "$@"
++exec wish8.2 "$0" "$@"
##########################################################################
# Version of TkInfo:
diff --git a/misc/tkrunit/Makefile b/misc/tkrunit/Makefile
index 8fd67876ec5f..38ea9cfb7386 100644
--- a/misc/tkrunit/Makefile
+++ b/misc/tkrunit/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.cs.columbia.edu/~etgold/software/tkRunIt/
MAINTAINER= steve@farrell.org
-RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82
NO_BUILD= yes
diff --git a/misc/tkrunit/files/patch-aa b/misc/tkrunit/files/patch-aa
index 538125555eee..d9484f6adf27 100644
--- a/misc/tkrunit/files/patch-aa
+++ b/misc/tkrunit/files/patch-aa
@@ -4,7 +4,7 @@
#!/bin/sh
# the next line restarts using wish \
- exec wish "$0" "$@"
-+ exec wish8.0 "$0" "$@"
++ exec wish8.2 "$0" "$@"
#!/usr/local/bin/wish
## runit (tkRunIt) 12/4/98
diff --git a/net-im/tik/Makefile b/net-im/tik/Makefile
index 39c00acae2ae..0ec799cf9c63 100644
--- a/net-im/tik/Makefile
+++ b/net-im/tik/Makefile
@@ -7,14 +7,14 @@
#
DISTNAME= tik-0.59
-CATEGORIES= net tk80
+CATEGORIES= net tk82
MASTER_SITES= http://www.aim.aol.com/tik/ \
http://www.nectar.com/distfiles/
MAINTAINER= astralblue@usa.net
-RUN_DEPENDS= tclsh8.0:${PORTSDIR}/lang/tcl80 \
- wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS= tclsh8.2:${PORTSDIR}/lang/tcl82 \
+ wish8.2:${PORTSDIR}/x11-toolkits/tk82
NO_BUILD= yes
WRKSRC= ${WRKDIR}/tik
diff --git a/net-im/tik/files/tik b/net-im/tik/files/tik
index cb9d056c7af3..a17f2b8bbb63 100644
--- a/net-im/tik/files/tik
+++ b/net-im/tik/files/tik
@@ -1,2 +1,2 @@
#!/bin/sh
-exec wish8.0 @PREFIX@/share/tik/tik.tcl
+exec wish8.2 @PREFIX@/share/tik/tik.tcl
diff --git a/net-mgmt/scotty3/Makefile b/net-mgmt/scotty3/Makefile
index bb31ba598f61..1b24aa63aa23 100644
--- a/net-mgmt/scotty3/Makefile
+++ b/net-mgmt/scotty3/Makefile
@@ -7,16 +7,16 @@
#
DISTNAME= scotty-2.1.9
-CATEGORIES= net tk80
+CATEGORIES= net tk82
MASTER_SITES= ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/
MAINTAINER= phk@freebsd.org
-LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
+LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-tcl-config=/usr/local/lib/tcl8.0 \
- --with-tk-config=/usr/local/lib/tk8.0
+CONFIGURE_ARGS= --with-tcl-config=/usr/local/lib/tcl8.2 \
+ --with-tk-config=/usr/local/lib/tk8.2
WRKSRC=${WRKDIR}/${DISTNAME}/unix
diff --git a/net/imm/Makefile b/net/imm/Makefile
index 618e626d7331..9506e8bb2ea1 100644
--- a/net/imm/Makefile
+++ b/net/imm/Makefile
@@ -8,13 +8,13 @@
DISTNAME= imm.source
PKGNAME= imm-3.5a1
-CATEGORIES= mbone tk80
+CATEGORIES= mbone tk82
MASTER_SITES= ftp://ftp.hawaii.edu/paccom/imm-3.5a1/
EXTRACT_SUFX= .tar.Z
MAINTAINER= fenner@freebsd.org
-LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
+LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
WRKSRC= ${WRKDIR}/mnm
USE_X_PREFIX= yes
diff --git a/net/imm/files/Makefile.freebsd b/net/imm/files/Makefile.freebsd
index 51724b551d01..ae7ce6434e6f 100644
--- a/net/imm/files/Makefile.freebsd
+++ b/net/imm/files/Makefile.freebsd
@@ -1,11 +1,11 @@
# Some versions of make, like SGI's, use the following variable to
# determine which shell to use for executing commands:
SHELL = /bin/sh
-INCLUDE_DIR = -I${PREFIX}/include -I${LOCALBASE}/include/tcl8.0 -I${LOCALBASE}/include/tk8.0
+INCLUDE_DIR = -I${PREFIX}/include -I${LOCALBASE}/include/tcl8.2 -I${LOCALBASE}/include/tk8.2
# Libraries to use when linking:
LIBS = -lm
-TKLIBS= -L$(PREFIX)/lib -L${LOCALBASE}/lib -ltk80 -ltcl80 -lX11
+TKLIBS= -L$(PREFIX)/lib -L${LOCALBASE}/lib -ltk82 -ltcl82 -lX11
TARGET = ../freebsd
diff --git a/net/ns/Makefile b/net/ns/Makefile
index 9786f2395d40..849d511a1008 100644
--- a/net/ns/Makefile
+++ b/net/ns/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www-mash.cs.berkeley.edu/dist/vint/
MAINTAINER= obonilla@fisicc-ufm.edu
BUILD_DEPENDS= ${PREFIX}/lib/libtclcl.a:${PORTSDIR}/devel/tclcl
-RUN_DEPENDS= ${PREFIX}/bin/tclsh8.0:${PORTSDIR}/lang/tcl80
+RUN_DEPENDS= ${PREFIX}/bin/tclsh8.2:${PORTSDIR}/lang/tcl82
MAN1= ns.1
MANCOMPRESSED= no
@@ -22,6 +22,7 @@ MANCOMPRESSED= no
WRKSRC= ${WRKDIR}/${PKGNAME}
GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --with-tcl-ver=8.2 --with-tk-ver=8.2
ALL_TARGET=
diff --git a/net/ns/files/patch-aa b/net/ns/files/patch-aa
index 74f6728fd3c9..d95a0b774e29 100644
--- a/net/ns/files/patch-aa
+++ b/net/ns/files/patch-aa
@@ -5,7 +5,7 @@
# $d/bin is for the ns-allinone distribution (kind of hacky, isn't it?)
PATH=$PATH:$d/unix:$d/bin
-for ac_prog in tclsh$TCL_VERS tclsh tclsh$TCL_OLD_VERS
-+for ac_prog in tclsh$TCL_VERS tclsh8.0 tclsh$TCL_OLD_VERS
++for ac_prog in tclsh$TCL_VERS tclsh8.2 tclsh$TCL_OLD_VERS
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
diff --git a/net/ns2/Makefile b/net/ns2/Makefile
index 9786f2395d40..849d511a1008 100644
--- a/net/ns2/Makefile
+++ b/net/ns2/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www-mash.cs.berkeley.edu/dist/vint/
MAINTAINER= obonilla@fisicc-ufm.edu
BUILD_DEPENDS= ${PREFIX}/lib/libtclcl.a:${PORTSDIR}/devel/tclcl
-RUN_DEPENDS= ${PREFIX}/bin/tclsh8.0:${PORTSDIR}/lang/tcl80
+RUN_DEPENDS= ${PREFIX}/bin/tclsh8.2:${PORTSDIR}/lang/tcl82
MAN1= ns.1
MANCOMPRESSED= no
@@ -22,6 +22,7 @@ MANCOMPRESSED= no
WRKSRC= ${WRKDIR}/${PKGNAME}
GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --with-tcl-ver=8.2 --with-tk-ver=8.2
ALL_TARGET=
diff --git a/net/ns2/files/patch-aa b/net/ns2/files/patch-aa
index 74f6728fd3c9..d95a0b774e29 100644
--- a/net/ns2/files/patch-aa
+++ b/net/ns2/files/patch-aa
@@ -5,7 +5,7 @@
# $d/bin is for the ns-allinone distribution (kind of hacky, isn't it?)
PATH=$PATH:$d/unix:$d/bin
-for ac_prog in tclsh$TCL_VERS tclsh tclsh$TCL_OLD_VERS
-+for ac_prog in tclsh$TCL_VERS tclsh8.0 tclsh$TCL_OLD_VERS
++for ac_prog in tclsh$TCL_VERS tclsh8.2 tclsh$TCL_OLD_VERS
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
diff --git a/net/ppxp/Makefile b/net/ppxp/Makefile
index 97dff64d0e89..d1d1e131821c 100644
--- a/net/ppxp/Makefile
+++ b/net/ppxp/Makefile
@@ -9,7 +9,7 @@
#
DISTNAME= ppxp-0.99072807
-CATEGORIES= net tk80
+CATEGORIES= net tk82
.if defined(USE_TCLJP)
CATEGORIES+= japanese
.endif
@@ -28,11 +28,11 @@ LIB_DEPENDS+= tcl80jp.1:${PORTSDIR}/japanese/tcl80
RUN_DEPENDS= wish8.0jp:${PORTSDIR}/japanese/tk80 \
tclsh8.0jp:${PORTSDIR}/japanese/tcl80
.else
-BUILD_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80 \
- tclsh8.0:${PORTSDIR}/lang/tcl80
-LIB_DEPENDS+= tcl80.1:${PORTSDIR}/lang/tcl80
-RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80 \
- tclsh8.0:${PORTSDIR}/lang/tcl80
+BUILD_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82 \
+ tclsh8.2:${PORTSDIR}/lang/tcl82
+LIB_DEPENDS+= tcl82.1:${PORTSDIR}/lang/tcl82
+RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82 \
+ tclsh8.2:${PORTSDIR}/lang/tcl82
.endif
WRKSRC= ${WRKDIR}/ppxp
@@ -46,11 +46,11 @@ CONFIGURE_ARGS+= --with-tclsh=${PREFIX}/bin/tclsh8.0jp \
--with-tcl-config=${PREFIX}/lib/tcl8.0jp/tclConfig.sh \
--with-tk-config=${PREFIX}/lib/tk8.0jp/tkConfig.sh
.else
-CONFIGURE_ARGS+= --with-tclsh=${PREFIX}/bin/tclsh8.0 \
- --with-wish=${PREFIX}/bin/wish8.0 \
- --with-tcl-includes=${PREFIX}/include/tcl8.0 \
- --with-tcl-config=${PREFIX}/lib/tcl8.0/tclConfig.sh \
- --with-tk-config=${PREFIX}/lib/tk8.0/tkConfig.sh
+CONFIGURE_ARGS+= --with-tclsh=${PREFIX}/bin/tclsh8.2 \
+ --with-wish=${PREFIX}/bin/wish8.2 \
+ --with-tcl-includes=${PREFIX}/include/tcl8.2 \
+ --with-tcl-config=${PREFIX}/lib/tcl8.2/tclConfig.sh \
+ --with-tk-config=${PREFIX}/lib/tk8.2/tkConfig.sh
.endif
MAN1= PPxP.1 plast.1
MAN5= ppxp-files.5
diff --git a/net/scotty/Makefile b/net/scotty/Makefile
index bb31ba598f61..1b24aa63aa23 100644
--- a/net/scotty/Makefile
+++ b/net/scotty/Makefile
@@ -7,16 +7,16 @@
#
DISTNAME= scotty-2.1.9
-CATEGORIES= net tk80
+CATEGORIES= net tk82
MASTER_SITES= ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/
MAINTAINER= phk@freebsd.org
-LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
+LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-tcl-config=/usr/local/lib/tcl8.0 \
- --with-tk-config=/usr/local/lib/tk8.0
+CONFIGURE_ARGS= --with-tcl-config=/usr/local/lib/tcl8.2 \
+ --with-tk-config=/usr/local/lib/tk8.2
WRKSRC=${WRKDIR}/${DISTNAME}/unix
diff --git a/net/scotty3/Makefile b/net/scotty3/Makefile
index bb31ba598f61..1b24aa63aa23 100644
--- a/net/scotty3/Makefile
+++ b/net/scotty3/Makefile
@@ -7,16 +7,16 @@
#
DISTNAME= scotty-2.1.9
-CATEGORIES= net tk80
+CATEGORIES= net tk82
MASTER_SITES= ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/
MAINTAINER= phk@freebsd.org
-LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
+LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-tcl-config=/usr/local/lib/tcl8.0 \
- --with-tk-config=/usr/local/lib/tk8.0
+CONFIGURE_ARGS= --with-tcl-config=/usr/local/lib/tcl8.2 \
+ --with-tk-config=/usr/local/lib/tk8.2
WRKSRC=${WRKDIR}/${DISTNAME}/unix
diff --git a/net/sdr/Makefile b/net/sdr/Makefile
index fec63590f30b..4c2d3d686b27 100644
--- a/net/sdr/Makefile
+++ b/net/sdr/Makefile
@@ -7,12 +7,12 @@
#
DISTNAME= sdr-2.7
-CATEGORIES= mbone tk80
+CATEGORIES= mbone tk82
MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/2.7/
MAINTAINER= fenner@FreeBSD.org
-LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
+LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
HAS_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/net/sdr/files/patch-ab b/net/sdr/files/patch-ab
new file mode 100644
index 000000000000..c894da39c0cc
--- /dev/null
+++ b/net/sdr/files/patch-ab
@@ -0,0 +1,11 @@
+--- sdr/src/Makefile.template.orig Tue May 25 16:27:44 1999
++++ sdr/src/Makefile.template Thu Nov 4 11:05:39 1999
+@@ -88,7 +88,7 @@
+ $(SDR_UI_FILES): tcl2c
+
+ parsed_plugins.tcl: ../src/plugin2tcl.tcl
+- tclsh8.0 ../src/plugin2tcl.tcl
++ tclsh8.2 ../src/plugin2tcl.tcl
+
+ uweb: $(WWWOBJS)
+ $(CC) -ggdb -o uweb $(WWWOBJS) $(LIBS)
diff --git a/net/tik/Makefile b/net/tik/Makefile
index 39c00acae2ae..0ec799cf9c63 100644
--- a/net/tik/Makefile
+++ b/net/tik/Makefile
@@ -7,14 +7,14 @@
#
DISTNAME= tik-0.59
-CATEGORIES= net tk80
+CATEGORIES= net tk82
MASTER_SITES= http://www.aim.aol.com/tik/ \
http://www.nectar.com/distfiles/
MAINTAINER= astralblue@usa.net
-RUN_DEPENDS= tclsh8.0:${PORTSDIR}/lang/tcl80 \
- wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS= tclsh8.2:${PORTSDIR}/lang/tcl82 \
+ wish8.2:${PORTSDIR}/x11-toolkits/tk82
NO_BUILD= yes
WRKSRC= ${WRKDIR}/tik
diff --git a/net/tik/files/tik b/net/tik/files/tik
index cb9d056c7af3..a17f2b8bbb63 100644
--- a/net/tik/files/tik
+++ b/net/tik/files/tik
@@ -1,2 +1,2 @@
#!/bin/sh
-exec wish8.0 @PREFIX@/share/tik/tik.tcl
+exec wish8.2 @PREFIX@/share/tik/tik.tcl
diff --git a/net/ttt/Makefile b/net/ttt/Makefile
index 15131c99b0e5..9e5c21dc45a8 100644
--- a/net/ttt/Makefile
+++ b/net/ttt/Makefile
@@ -7,15 +7,15 @@
#
DISTNAME= ttt-1.4
-CATEGORIES= net tk80
+CATEGORIES= net tk82
MASTER_SITES= ftp://ftp.csl.sony.co.jp/pub/kjc/
MAINTAINER= kjc@csl.sony.co.jp
# the tcl/tk LIB_DEPENDS has to match that of ports/x11-toolkits/blt.
LIB_DEPENDS= BLT24.2:${PORTSDIR}/x11-toolkits/blt \
- tcl80.1:${PORTSDIR}/lang/tcl80 \
- tk80.1:${PORTSDIR}/x11-toolkits/tk80
+ tcl82.1:${PORTSDIR}/lang/tcl82 \
+ tk82.1:${PORTSDIR}/x11-toolkits/tk82
GNU_CONFIGURE= yes
INSTALL_TARGET= install install-man
diff --git a/sysutils/lavaps/Makefile b/sysutils/lavaps/Makefile
index 41bc7b42e096..bb5154d501da 100644
--- a/sysutils/lavaps/Makefile
+++ b/sysutils/lavaps/Makefile
@@ -4,7 +4,6 @@
# Date created: 11-Oct-99
# Whom: johnh@isi.edu
#
-# $Id: Makefile,v 1.4 1997/05/06 22:47:03 johnh Exp johnh $
# $FreeBSD$
#
@@ -14,10 +13,11 @@ MASTER_SITES= http://www.isi.edu/~johnh/SOFTWARE/LAVAPS/
MAINTAINER= johnh@isi.edu
-LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
+LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
GNU_CONFIGURE= yes
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include"
+CONFIGURE_ARGS= --with-tcl-ver=8.2 --with-tk-ver=8.2
USE_NEWGCC= yes
MAN1= lavaps.1
diff --git a/www/grail/Makefile b/www/grail/Makefile
index ab5d5798d264..ec25eb799795 100644
--- a/www/grail/Makefile
+++ b/www/grail/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= nectar@freebsd.org
BUILD_DEPENDS= python:${PORTSDIR}/lang/python
RUN_DEPENDS= python:${PORTSDIR}/lang/python
-LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
+LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
WRKSRC= ${WRKDIR}/${PKGNAME}
diff --git a/x11-fm/x-files/Makefile b/x11-fm/x-files/Makefile
index 6376efcd20b6..adc7a18b7be9 100644
--- a/x11-fm/x-files/Makefile
+++ b/x11-fm/x-files/Makefile
@@ -8,20 +8,20 @@
DISTNAME= X-Files-2.00b1
PKGNAME= x-files-2.00b1
-CATEGORIES= x11-fm tk80
+CATEGORIES= x11-fm tk82
MASTER_SITES= http://www.hut.fi/~mkivinie/X-Files/data/
MAINTAINER= dmaddox@conterra.com
-BUILD_DEPENDS= tclsh8.0:${PORTSDIR}/lang/tcl80
-RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
+BUILD_DEPENDS= tclsh8.2:${PORTSDIR}/lang/tcl82
+RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82
WRKSRC= ${WRKDIR}/X-Files
NO_BUILD= yes
USE_X_PREFIX= yes
pre-install:
- @tclsh8.0 ${SCRIPTDIR}/mktclIndex ${WRKSRC}
+ @tclsh8.2 ${SCRIPTDIR}/mktclIndex ${WRKSRC}
@${RM} -f ${WRKSRC}/xfinstall.tcl
@${SED} s#@X11BASE@#${X11BASE}# <${WRKSRC}/X-Files.tcl >${WRKSRC}/tmpfile
@${MV} ${WRKSRC}/tmpfile ${WRKSRC}/X-Files.tcl
diff --git a/x11-fm/x-files/files/patch-aa b/x11-fm/x-files/files/patch-aa
index 23235b79535b..6b163d2fed05 100644
--- a/x11-fm/x-files/files/patch-aa
+++ b/x11-fm/x-files/files/patch-aa
@@ -4,7 +4,7 @@
+#!/bin/sh
+# The main file for the X-Files
+# The next line is executed by /bin/sh, but not Tcl \
-+exec wish8.0 $0 ${1+"$@"}
++exec wish8.2 $0 ${1+"$@"}
+set xf(xf_home) "@X11BASE@/lib/X11/X-Files/"
proc MAIN {argc argv} {
global xf xf_image env menu tk_version
diff --git a/x11-fm/x-files/scripts/mktclIndex b/x11-fm/x-files/scripts/mktclIndex
index 7307c7db1460..879a5bb403c7 100644
--- a/x11-fm/x-files/scripts/mktclIndex
+++ b/x11-fm/x-files/scripts/mktclIndex
@@ -1,3 +1,3 @@
-#!tclsh8.0
+#!tclsh8.2
pkg_mkIndex $argv be.tcl bgexec.tcl ee.tcl fae.tcl ftpl.tcl re.tcl vfs.tcl xf_sel.tcl
exit
diff --git a/x11-toolkits/blt/Makefile b/x11-toolkits/blt/Makefile
index 324e46be8963..0265b88e071f 100644
--- a/x11-toolkits/blt/Makefile
+++ b/x11-toolkits/blt/Makefile
@@ -8,12 +8,12 @@
DISTNAME= BLT2.4m
PKGNAME= blt-2.4m
-CATEGORIES= x11-toolkits tk80
+CATEGORIES= x11-toolkits tk82
MASTER_SITES= ftp://ftp.tcltk.com/pub/blt/
MAINTAINER= kjc@csl.sony.co.jp
-LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
+LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
WRKSRC= ${WRKDIR}/blt2.4m
GNU_CONFIGURE= yes
@@ -24,14 +24,8 @@ MANN= BLT.n barchart.n beep.n bgexec.n bitmap.n \
.include <bsd.port.pre.mk>
-.if ${PORTOBJFORMAT} == "elf"
-SO_VERSION= 2
-.else
-SO_VERSION= 2.4
-.endif
-
post-install:
- ${LN} -sf libBLT24.so.${SO_VERSION} ${PREFIX}/lib/libBLT24.so
+ ${LN} -sf libBLT24.so.2 ${PREFIX}/lib/libBLT24.so
${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
.include <bsd.port.post.mk>
diff --git a/x11-toolkits/itk/Makefile b/x11-toolkits/itk/Makefile
index f40c8ba87bb2..f33fecb428e9 100644
--- a/x11-toolkits/itk/Makefile
+++ b/x11-toolkits/itk/Makefile
@@ -8,17 +8,17 @@
DISTNAME= itcl3.0.1
PKGNAME= itk-3.0.1
-CATEGORIES= x11-toolkits tk80
+CATEGORIES= x11-toolkits tk82
MASTER_SITES= ftp://ftp.tcltk.com/pub/itcl/
MAINTAINER= dmlb@ragnet.demon.co.uk
-LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80 \
+LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82 \
itcl30.1:${PORTSDIR}/lang/itcl
WRKSRC= ${WRKDIR}/itcl3.0.1/itk/unix
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --enable-shared --with-tcl=${PREFIX}/lib/tcl8.0 --with-itcl=${PREFIX}/lib/itcl3.0 --with-tk=${PREFIX}/lib/tk8.0
+CONFIGURE_ARGS= --enable-shared --with-tcl=${PREFIX}/lib/tcl8.2 --with-itcl=${PREFIX}/lib/itcl3.0 --with-tk=${PREFIX}/lib/tk8.2
CONFIGURE_ENV= PORTSDIR=${PORTSDIR} ITK_LIB_FILE=${ITK_LIB_FILE}
SHLIB_MAJOR= 1
@@ -32,11 +32,7 @@ MANN= Archetype.n Toplevel.n Widget.n itk.n itkvars.n usual.n
.include <bsd.port.pre.mk>
-.if ${PORTOBJFORMAT} == "elf"
ITK_LIB_FILE= ${ITK_LIB}.${SHLIB_MAJOR}
-.else
-ITK_LIB_FILE= ${ITK_LIB}.${SHLIB_MAJOR}.${SHLIB_MINOR}
-.endif
post-configure:
@${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}
@@ -48,6 +44,7 @@ pre-build:
TCL_PREFIX=${PREFIX} ITCL_PREFIX=${PREFIX} TK_PREFIX=${PREFIX}
post-install:
+ ${LN} -sf itkwish3.0 ${PREFIX}/bin/itkwish
${LN} -sf ${ITK_LIB_FILE} ${PREFIX}/lib/${ITK_LIB}
${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
diff --git a/x11-toolkits/itk/files/Makefile.lib b/x11-toolkits/itk/files/Makefile.lib
index 2eed56b86d2e..9f362ba9fcd8 100644
--- a/x11-toolkits/itk/files/Makefile.lib
+++ b/x11-toolkits/itk/files/Makefile.lib
@@ -2,9 +2,9 @@ NOPROFILE= yes
LIB= itk30
ITK_LIBRARY= ${PREFIX}/lib/itk3.0
CFLAGS+= -I. -I./../generic \
- -I${TCL_PREFIX}/include/tcl8.0/generic \
+ -I${TCL_PREFIX}/include/tcl8.2/generic \
-I${ITCL_PREFIX}/include/itcl3.0/generic \
- -I${TK_PREFIX}/include/tk8.0/generic \
+ -I${TK_PREFIX}/include/tk8.2/generic \
-I/usr/X11R6/include \
-DHAVE_GETCWD=1 -DNO_VALUES_H=1 -DHAVE_UNISTD_H=1 -DUSE_TERMIOS=1\
-DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_TM_ZONE=1\
diff --git a/x11-toolkits/itk/pkg-plist b/x11-toolkits/itk/pkg-plist
index 46c5ee8e56bc..c75e1f7edd39 100644
--- a/x11-toolkits/itk/pkg-plist
+++ b/x11-toolkits/itk/pkg-plist
@@ -1,7 +1,9 @@
bin/itkwish3.0
+@exec /bin/ln -s %D/%F %B/itkwish
+@unexec rm %B/itkwish
include/itk3.0/generic/itk.h
include/itk3.0/itk.h
-lib/libitk30.so.1.1
+lib/libitk30.so.1
lib/libitk30.so
lib/libitk30.a
@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
diff --git a/x11-toolkits/iwidgets/Makefile b/x11-toolkits/iwidgets/Makefile
index 70957f96345a..92a3d74516c7 100644
--- a/x11-toolkits/iwidgets/Makefile
+++ b/x11-toolkits/iwidgets/Makefile
@@ -8,18 +8,18 @@
DISTNAME= itcl3.0.1
PKGNAME= iwidgets-3.0.0
-CATEGORIES= x11-toolkits tk80
+CATEGORIES= x11-toolkits tk82
MASTER_SITES= ftp://ftp.tcltk.com/pub/itcl/
MAINTAINER= dmlb@ragnet.demon.co.uk
-LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80 \
+LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82 \
itcl30.1:${PORTSDIR}/lang/itcl \
itk30.1:${PORTSDIR}/x11-toolkits/itk
WRKSRC= ${WRKDIR}/itcl3.0.1/iwidgets3.0.0/unix
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-tcl=${PREFIX}/lib/tcl8.0 --with-itcl=${PREFIX}/lib/itcl3.0 --with-tk=${PREFIX}/lib/tk8.0 --with-itk=${PREFIX}/lib/itk3.0
+CONFIGURE_ARGS= --with-tcl=${PREFIX}/lib/tcl8.2 --with-itcl=${PREFIX}/lib/itcl3.0 --with-tk=${PREFIX}/lib/tk8.2 --with-itk=${PREFIX}/lib/itk3.0
CONFIGURE_ENV= PORTSDIR=${PORTSDIR}
MANN= buttonbox.n calendar.n canvasprintbox.n canvasprintdialog.n \
diff --git a/x11-toolkits/p5-Tcl-Tk/Makefile b/x11-toolkits/p5-Tcl-Tk/Makefile
index b08af10819d2..63c0bbba40e2 100644
--- a/x11-toolkits/p5-Tcl-Tk/Makefile
+++ b/x11-toolkits/p5-Tcl-Tk/Makefile
@@ -7,14 +7,14 @@
DISTNAME= TclTk-b2
PKGNAME= p5-Tcl-Tk-b2
-CATEGORIES= x11-toolkits lang perl5 tk80
+CATEGORIES= x11-toolkits lang perl5 tk82
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Tcl
MAINTAINER= jfitz@FreeBSD.org
BUILD_DEPENDS= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/i386-freebsd/Tcl.pm:${PORTSDIR}/lang/p5-Tcl
-LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
+LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
USE_PERL5= YES
diff --git a/x11-toolkits/p5-Tcl-Tk/files/patch-aa b/x11-toolkits/p5-Tcl-Tk/files/patch-aa
index 090e6d5585f1..d916d5e67b56 100644
--- a/x11-toolkits/p5-Tcl-Tk/files/patch-aa
+++ b/x11-toolkits/p5-Tcl-Tk/files/patch-aa
@@ -6,6 +6,6 @@
DISTNAME => "TclTk",
- LIBS => ["-ltk -ltcl -L/usr/X11R6/lib -lX11 -lm"],
- INC => "-I/usr/local/include -I/usr/include/tcl");
-+ LIBS => ["-L$ENV{PREFIX}/lib -L$ENV{X11BASE}/lib -ltk80 -ltcl80 -lX11 -lm"],
-+ INC => "-I$ENV{PREFIX}/include -I$ENV{PREFIX}/include/tcl8.0 -I$ENV{PREFIX}/include/tk8.0 -I$ENV{X11BASE}/include");
++ LIBS => ["-L$ENV{PREFIX}/lib -L$ENV{X11BASE}/lib -ltk82 -ltcl82 -lX11 -lm"],
++ INC => "-I$ENV{PREFIX}/include -I$ENV{PREFIX}/include/tcl8.2 -I$ENV{PREFIX}/include/tk8.2 -I$ENV{X11BASE}/include");
#sub MY::tool_autosplit { "AUTOSPLITFILE = :" }
diff --git a/x11-toolkits/p5-TclTk/Makefile b/x11-toolkits/p5-TclTk/Makefile
index b08af10819d2..63c0bbba40e2 100644
--- a/x11-toolkits/p5-TclTk/Makefile
+++ b/x11-toolkits/p5-TclTk/Makefile
@@ -7,14 +7,14 @@
DISTNAME= TclTk-b2
PKGNAME= p5-Tcl-Tk-b2
-CATEGORIES= x11-toolkits lang perl5 tk80
+CATEGORIES= x11-toolkits lang perl5 tk82
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Tcl
MAINTAINER= jfitz@FreeBSD.org
BUILD_DEPENDS= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/i386-freebsd/Tcl.pm:${PORTSDIR}/lang/p5-Tcl
-LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
+LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
USE_PERL5= YES
diff --git a/x11-toolkits/p5-TclTk/files/patch-aa b/x11-toolkits/p5-TclTk/files/patch-aa
index 090e6d5585f1..d916d5e67b56 100644
--- a/x11-toolkits/p5-TclTk/files/patch-aa
+++ b/x11-toolkits/p5-TclTk/files/patch-aa
@@ -6,6 +6,6 @@
DISTNAME => "TclTk",
- LIBS => ["-ltk -ltcl -L/usr/X11R6/lib -lX11 -lm"],
- INC => "-I/usr/local/include -I/usr/include/tcl");
-+ LIBS => ["-L$ENV{PREFIX}/lib -L$ENV{X11BASE}/lib -ltk80 -ltcl80 -lX11 -lm"],
-+ INC => "-I$ENV{PREFIX}/include -I$ENV{PREFIX}/include/tcl8.0 -I$ENV{PREFIX}/include/tk8.0 -I$ENV{X11BASE}/include");
++ LIBS => ["-L$ENV{PREFIX}/lib -L$ENV{X11BASE}/lib -ltk82 -ltcl82 -lX11 -lm"],
++ INC => "-I$ENV{PREFIX}/include -I$ENV{PREFIX}/include/tcl8.2 -I$ENV{PREFIX}/include/tk8.2 -I$ENV{X11BASE}/include");
#sub MY::tool_autosplit { "AUTOSPLITFILE = :" }
diff --git a/x11-toolkits/ruby-tk/Makefile b/x11-toolkits/ruby-tk/Makefile
index 728ad15994f0..062ab1af3eb3 100644
--- a/x11-toolkits/ruby-tk/Makefile
+++ b/x11-toolkits/ruby-tk/Makefile
@@ -45,8 +45,8 @@ EXAMPLESDIR= ${PREFIX}/share/examples/ruby
# Set these vars as the version numbers (without decimal points) of Tcl/Tk
# you want to use with Ruby/Tk.
# e.g.: make TCL_VERSION=42 TK_VERSION=76 WITH_TCL_JP=yes build
-TCL_VERSION?= 80
-TK_VERSION?= 80
+TCL_VERSION?= 82
+TK_VERSION?= 82
.if defined(WITH_TCL_JP)
TCL_CATEGORY= japanese
TK_CATEGORY= japanese
diff --git a/x11-toolkits/ruby14-tk/Makefile b/x11-toolkits/ruby14-tk/Makefile
index 728ad15994f0..062ab1af3eb3 100644
--- a/x11-toolkits/ruby14-tk/Makefile
+++ b/x11-toolkits/ruby14-tk/Makefile
@@ -45,8 +45,8 @@ EXAMPLESDIR= ${PREFIX}/share/examples/ruby
# Set these vars as the version numbers (without decimal points) of Tcl/Tk
# you want to use with Ruby/Tk.
# e.g.: make TCL_VERSION=42 TK_VERSION=76 WITH_TCL_JP=yes build
-TCL_VERSION?= 80
-TK_VERSION?= 80
+TCL_VERSION?= 82
+TK_VERSION?= 82
.if defined(WITH_TCL_JP)
TCL_CATEGORY= japanese
TK_CATEGORY= japanese