aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorgahr <gahr@FreeBSD.org>2013-05-21 21:46:08 +0800
committergahr <gahr@FreeBSD.org>2013-05-21 21:46:08 +0800
commit55a5cfef151c4407184245c2cc190cd33ab27ec3 (patch)
treee1af4b5cf680b6b12aaf6d40506e42b7f6e1e53c /net
parent8c8dc966a1f72002820f1c501fab0cb9f59d4f8a (diff)
downloadfreebsd-ports-gnome-55a5cfef151c4407184245c2cc190cd33ab27ec3.tar.gz
freebsd-ports-gnome-55a5cfef151c4407184245c2cc190cd33ab27ec3.tar.zst
freebsd-ports-gnome-55a5cfef151c4407184245c2cc190cd33ab27ec3.zip
- Fix build with Tcl/Tk 8.6
Reported by: miwi (Tcl/Tk 8.6 exp-run latecomers) Approved by: portmgr
Diffstat (limited to 'net')
-rw-r--r--net/nam/files/patch-main.cc38
1 files changed, 38 insertions, 0 deletions
diff --git a/net/nam/files/patch-main.cc b/net/nam/files/patch-main.cc
new file mode 100644
index 000000000000..b46dcf8654a9
--- /dev/null
+++ b/net/nam/files/patch-main.cc
@@ -0,0 +1,38 @@
+--- main.cc.orig 2013-05-21 15:33:25.000000000 +0200
++++ main.cc 2013-05-21 15:40:33.000000000 +0200
+@@ -222,7 +222,7 @@
+
+ static int cmd_version(ClientData , Tcl_Interp* tcl, int , CONST84 char **)
+ {
+- tcl->result = version;
++ Tcl_SetObjResult(tcl, Tcl_NewStringObj(version, -1));
+ return (TCL_OK);
+ }
+
+@@ -331,7 +331,7 @@
+
+ Tcl_Interp *interp = Tcl_CreateInterp();
+ if (Tcl_Init(interp) == TCL_ERROR) {
+- printf("%s\n", interp->result);
++ printf("%s\n", Tcl_GetStringResult(interp));
+ abort();
+ }
+
+@@ -350,7 +350,7 @@
+ #endif
+
+ if (Otcl_Init(interp) == TCL_ERROR) {
+- printf("%s\n", interp->result);
++ printf("%s\n", Tcl_GetStringResult(interp));
+ abort();
+ }
+ #ifdef HAVE_LIBTCLDBG
+@@ -372,7 +372,7 @@
+ if (Tk_Init(tcl.interp()) == TCL_OK)
+ tk = Tk_MainWindow(tcl.interp());
+ if (tk == 0) {
+- fprintf(stderr, "nam: %s\n", interp->result);
++ fprintf(stderr, "nam: %s\n", Tcl_GetStringResult(interp));
+ exit(1);
+ }
+ tcl.tkmain(tk);