From owner-svn-ports-head@FreeBSD.ORG  Tue May 21 13:46:09 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 2E5858CA;
 Tue, 21 May 2013 13:46:09 +0000 (UTC)
 (envelope-from gahr@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 209FA207;
 Tue, 21 May 2013 13:46:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4LDk8I3003587;
 Tue, 21 May 2013 13:46:08 GMT (envelope-from gahr@svn.freebsd.org)
Received: (from gahr@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4LDk8lC003586;
 Tue, 21 May 2013 13:46:08 GMT (envelope-from gahr@svn.freebsd.org)
Message-Id: <201305211346.r4LDk8lC003586@svn.freebsd.org>
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Tue, 21 May 2013 13:46:08 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r318696 - head/net/nam/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 May 2013 13:46:09 -0000

Author: gahr
Date: Tue May 21 13:46:08 2013
New Revision: 318696
URL: http://svnweb.freebsd.org/changeset/ports/318696

Log:
  - Fix build with Tcl/Tk 8.6
  
  Reported by:	miwi (Tcl/Tk 8.6 exp-run latecomers)
  Approved by:	portmgr

Added:
  head/net/nam/files/patch-main.cc   (contents, props changed)

Added: head/net/nam/files/patch-main.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nam/files/patch-main.cc	Tue May 21 13:46:08 2013	(r318696)
@@ -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);