From owner-svn-ports-branches@freebsd.org  Fri Jul 29 07:22:55 2016
Return-Path: <owner-svn-ports-branches@freebsd.org>
Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 06590BA752C;
 Fri, 29 Jul 2016 07:22:55 +0000 (UTC) (envelope-from dbn@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C661F1707;
 Fri, 29 Jul 2016 07:22:54 +0000 (UTC) (envelope-from dbn@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6T7Msm9062846;
 Fri, 29 Jul 2016 07:22:54 GMT (envelope-from dbn@FreeBSD.org)
Received: (from dbn@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6T7MrJL062845;
 Fri, 29 Jul 2016 07:22:53 GMT (envelope-from dbn@FreeBSD.org)
Message-Id: <201607290722.u6T7MrJL062845@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dbn set sender to dbn@FreeBSD.org
 using -f
From: David Naylor <dbn@FreeBSD.org>
Date: Fri, 29 Jul 2016 07:22:53 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r419229 - branches/2016Q3/Mk/Uses
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Jul 2016 07:22:55 -0000

Author: dbn
Date: Fri Jul 29 07:22:53 2016
New Revision: 419229
URL: https://svnweb.freebsd.org/changeset/ports/419229

Log:
  MFH: r418990
  
  Mk/Uses/tcl.mk: fix stage-qa linking error.
  
   - If a port links to libtk then it will always also link to libtcl.  Include
     libtcl in the LIB_DEPENDS when linking to libtk.
   - Fix indentation of '.if' statements
  
  PR:		211261
  Approved by:	ports-secteam (feld), gahr

Modified:
  branches/2016Q3/Mk/Uses/tcl.mk
Directory Properties:
  branches/2016Q3/   (props changed)

Modified: branches/2016Q3/Mk/Uses/tcl.mk
==============================================================================
--- branches/2016Q3/Mk/Uses/tcl.mk	Fri Jul 29 05:43:30 2016	(r419228)
+++ branches/2016Q3/Mk/Uses/tcl.mk	Fri Jul 29 07:22:53 2016	(r419229)
@@ -184,12 +184,13 @@ _TCLTK_WRAPPER_PORT=	wish:x11-toolkits/t
 .endif
 
 # Construct the correct dependency lines (Tcl/Tk)
-.  if ${_TCLTK_PORT} == "tcl"
+.if ${_TCLTK_PORT} == "tcl"
 _TCLTK_EXE_LINE=	tclsh${TCL_VER}:lang/tcl${_TCLTK_WANTED_VERSION}
 _TCLTK_LIB_LINE=	libtcl${TCL_SHLIB_VER}.so:lang/tcl${_TCLTK_WANTED_VERSION}
-.  elif ${_TCLTK_PORT} == "tk"
+.elif ${_TCLTK_PORT} == "tk"
 _TCLTK_EXE_LINE=	wish${TK_VER}:x11-toolkits/tk${_TCLTK_WANTED_VERSION}
-_TCLTK_LIB_LINE=	libtk${TK_SHLIB_VER}.so:x11-toolkits/tk${_TCLTK_WANTED_VERSION}
+_TCLTK_LIB_LINE=	libtk${TK_SHLIB_VER}.so:x11-toolkits/tk${_TCLTK_WANTED_VERSION} \
+			libtcl${TCL_SHLIB_VER}.so:lang/tcl${_TCLTK_WANTED_VERSION}
 .endif
 
 .if ${tcl_ARGS:Mbuild}