summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Price <steve@FreeBSD.org>1999-11-29 03:46:11 +0000
committerSteve Price <steve@FreeBSD.org>1999-11-29 03:46:11 +0000
commit1ff0d34fb6c4dfe3f80a675613336f01fa3d3122 (patch)
tree1701ddf64c38165c452f6524153393d074f6ca65
parentUpdate to Tcl/Tk version 8.2 and fix for gcc 2.95. (diff)
Update to Tcl/Tk version 8.2.
Submitted by: Ade Lovett <ade@lovett.com>
Notes
Notes: svn path=/head/; revision=23485
-rw-r--r--net/nam/Makefile1
-rw-r--r--net/nam/files/patch-aa2
-rw-r--r--net/nam/files/patch-ab10
3 files changed, 12 insertions, 1 deletions
diff --git a/net/nam/Makefile b/net/nam/Makefile
index ad570fe9a6c6..7efcedd0901a 100644
--- a/net/nam/Makefile
+++ b/net/nam/Makefile
@@ -21,6 +21,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/nam/files/patch-aa b/net/nam/files/patch-aa
index 3cadbd5b012d..2a7985ece390 100644
--- a/net/nam/files/patch-aa
+++ b/net/nam/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/nam/files/patch-ab b/net/nam/files/patch-ab
new file mode 100644
index 000000000000..f395264509d6
--- /dev/null
+++ b/net/nam/files/patch-ab
@@ -0,0 +1,10 @@
+--- main.cc.orig Sun Nov 28 17:24:15 1999
++++ main.cc Sun Nov 28 17:25:10 1999
+@@ -52,6 +52,7 @@
+
+ extern "C" {
+ #include <tk.h>
++extern int Tk_WmCmd (ClientData clientData, Tcl_Interp *interp, int argc, char **argv);
+ }
+
+ static void