Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 16 Jan 2014 13:25:23 +0000 (UTC)
From:      Pietro Cerutti <gahr@FreeBSD.org>
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
Message-ID:  <201401161325.s0GDPN5d008927@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401161325.s0GDPN5d008927>