aboutsummaryrefslogtreecommitdiffstats
path: root/x11-toolkits/itk
diff options
context:
space:
mode:
authorgahr <gahr@FreeBSD.org>2014-01-16 21:25:23 +0800
committergahr <gahr@FreeBSD.org>2014-01-16 21:25:23 +0800
commitb9757aad6a02aeddcce269c61fced47fac4e4456 (patch)
tree86d87bbd2273267338ddc8afabf48773c736ce12 /x11-toolkits/itk
parent48077cd0842ed1a79428f2ec5bdc5914b0d8fad6 (diff)
downloadfreebsd-ports-gnome-b9757aad6a02aeddcce269c61fced47fac4e4456.tar.gz
freebsd-ports-gnome-b9757aad6a02aeddcce269c61fced47fac4e4456.tar.zst
freebsd-ports-gnome-b9757aad6a02aeddcce269c61fced47fac4e4456.zip
- Rename a variable to avoid fooling the USE_TCL/USE_TK detection script
at http://people.freebsd.org/~gahr/usetcl.html
Diffstat (limited to 'x11-toolkits/itk')
-rw-r--r--x11-toolkits/itk/Makefile2
-rw-r--r--x11-toolkits/itk/files/Makefile.lib2
2 files changed, 2 insertions, 2 deletions
diff --git a/x11-toolkits/itk/Makefile b/x11-toolkits/itk/Makefile
index 0b9e69832f1b..ff5c018a4806 100644
--- a/x11-toolkits/itk/Makefile
+++ b/x11-toolkits/itk/Makefile
@@ -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
diff --git a/x11-toolkits/itk/files/Makefile.lib b/x11-toolkits/itk/files/Makefile.lib
index 6b0c53620180..c3c303f162ea 100644
--- a/x11-toolkits/itk/files/Makefile.lib
+++ b/x11-toolkits/itk/files/Makefile.lib
@@ -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