From owner-svn-ports-head@FreeBSD.ORG  Thu Jan 16 13:25:24 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5A7C15FE;
 Thu, 16 Jan 2014 13:25:24 +0000 (UTC)
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 46BF21B3E;
 Thu, 16 Jan 2014 13:25:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0GDPOAw008929;
 Thu, 16 Jan 2014 13:25:24 GMT (envelope-from gahr@svn.freebsd.org)
Received: (from gahr@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0GDPN5d008927;
 Thu, 16 Jan 2014 13:25:23 GMT (envelope-from gahr@svn.freebsd.org)
Message-Id: <201401161325.s0GDPN5d008927@svn.freebsd.org>
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Thu, 16 Jan 2014 13:25:23 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r339910 - in head/x11-toolkits/itk: . 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.17
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: Thu, 16 Jan 2014 13:25:24 -0000

Author: gahr
Date: Thu Jan 16 13:25:23 2014
New Revision: 339910
URL: http://svnweb.freebsd.org/changeset/ports/339910
QAT: https://qat.redports.org/buildarchive/r339910/

Log:
  - Rename a variable to avoid fooling the USE_TCL/USE_TK detection script
    at http://people.freebsd.org/~gahr/usetcl.html

Modified:
  head/x11-toolkits/itk/Makefile
  head/x11-toolkits/itk/files/Makefile.lib

Modified: head/x11-toolkits/itk/Makefile
==============================================================================
--- head/x11-toolkits/itk/Makefile	Thu Jan 16 13:05:20 2014	(r339909)
+++ head/x11-toolkits/itk/Makefile	Thu Jan 16 13:25:23 2014	(r339910)
@@ -17,7 +17,7 @@ USES=		tk
 USE_LDCONFIG=	yes
 MAKE_ENV+=	${PLIST_SUB} \
 		SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR} \
-		USE_TK=${TK_SHLIB_VER} TCL_INCLUDEDIR=${TCL_INCLUDEDIR} \
+		TK_SHLIB_VER=${TK_SHLIB_VER} TCL_INCLUDEDIR=${TCL_INCLUDEDIR} \
 		TK_INCLUDEDIR=${TK_INCLUDEDIR}
 
 MAKEFILE=	${FILESDIR}/Makefile.lib

Modified: head/x11-toolkits/itk/files/Makefile.lib
==============================================================================
--- head/x11-toolkits/itk/files/Makefile.lib	Thu Jan 16 13:05:20 2014	(r339909)
+++ head/x11-toolkits/itk/files/Makefile.lib	Thu Jan 16 13:25:23 2014	(r339910)
@@ -14,7 +14,7 @@ CFLAGS+=	-I. -I./../generic \
 		-DHAVE_SYS_FILIO_H=1 \
 		-DRETSIGTYPE=void \
 		-DITK_LIBRARY=\"${ITK_LIBRARY}\"
-LDADD+=		-L${PREFIX}/lib -litcl -L${LOCALBASE}/lib -lX11 -ltk${USE_TK}
+LDADD+=		-L${PREFIX}/lib -litcl -L${LOCALBASE}/lib -lX11 -ltk${TK_SHLIB_VER}
 
 .PATH:		${.CURDIR}/generic