From owner-svn-ports-all@FreeBSD.ORG  Wed Sep 18 20:07:28 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 5F2C4B61;
 Wed, 18 Sep 2013 20:07:28 +0000 (UTC) (envelope-from mi@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4C9FC233C;
 Wed, 18 Sep 2013 20:07:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8IK7S9b023371;
 Wed, 18 Sep 2013 20:07:28 GMT (envelope-from mi@svn.freebsd.org)
Received: (from mi@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8IK7Sdl023370;
 Wed, 18 Sep 2013 20:07:28 GMT (envelope-from mi@svn.freebsd.org)
Message-Id: <201309182007.r8IK7Sdl023370@svn.freebsd.org>
From: Mikhail Teterin <mi@FreeBSD.org>
Date: Wed, 18 Sep 2013 20:07:28 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r327573 - head/devel/tcl-trf/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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Sep 2013 20:07:28 -0000

Author: mi
Date: Wed Sep 18 20:07:27 2013
New Revision: 327573
URL: http://svnweb.freebsd.org/changeset/ports/327573

Log:
  Fix the build in case, a stricter compiler and Tcl-8.6 are used. Keep compatibility
  with Tcl-8.4, however.
  
  Notified by:	pkg-fallout@

Modified:
  head/devel/tcl-trf/files/patch-warnings

Modified: head/devel/tcl-trf/files/patch-warnings
==============================================================================
--- head/devel/tcl-trf/files/patch-warnings	Wed Sep 18 18:39:14 2013	(r327572)
+++ head/devel/tcl-trf/files/patch-warnings	Wed Sep 18 20:07:27 2013	(r327573)
@@ -19,7 +19,7 @@
  Trf_InitStubs(interp, version, exact)
      Tcl_Interp *interp;
 --- generic/registry.c	2009-06-18 00:54:44.000000000 -0400
-+++ generic/registry.c	2009-07-12 21:05:24.000000000 -0400
++++ generic/registry.c	2013-09-18 15:16:57.000000000 -0400
 @@ -1405,5 +1405,5 @@
     * [Bug 2788106].
     */
@@ -27,3 +27,25 @@
 +  ckfree((void *)trans);
  
    DONE (TrfClose);
+@@ -1835,5 +1835,4 @@
+   TrfTransformationInstance* trans = (TrfTransformationInstance*) instanceData;
+   int         result;
+-  Tcl_Channel parent;
+   int         newLoc;
+ 
+@@ -1841,6 +1840,4 @@
+   PRINT ("(Mode = %d, Offset = %ld)\n", mode, offset); FL;
+ 
+-  parent = DOWNC (trans);
+-
+   /*
+    * Several things to look at before deciding what to do.
+@@ -3398,5 +3395,7 @@
+      * blowing the stack.
+      */
+-
++#if TCL_MAJOR_VERSION > 8 || TCL_MINOR_VERSION > 4
++    const
++#endif
+     Tcl_ChannelType*    parentType     = Tcl_GetChannelType  (parent);
+     Tcl_DriverSeekProc* parentSeekProc = Tcl_ChannelSeekProc (parentType);