- Convert existing ports to a new bsd.tcl.mk order

PR:		ports/109097
Submitted by:	Martin Matuska <martin@matuska.org>
Tested on:	pointyhat exp-run

5 files changed, 9 insertions, 16 deletions

diff --git a/x11-toolkits/py-tktreectrl/Makefile b/x11-toolkits/py-tktreectrl/Makefile
index 378fc68b2b0f..64fc89bad6f6 100644
--- a/x11-toolkits/py-tktreectrl/Makefile
+++ b/x11-toolkits/py-tktreectrl/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	treectrl.0:${PORTSDIR}/x11-toolkits/tktreectrl
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter \
 		${PYTHON_SITELIBDIR}/Pmw/__init__.py:${PORTSDIR}/x11-toolkits/pmw
 
-USE_TK=		yes
+USE_TK_RUN=	yes
 USE_ZIP=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
diff --git a/x11-toolkits/tile/Makefile b/x11-toolkits/tile/Makefile
index 0104b3dfe3bf..ee05999271d8 100644
--- a/x11-toolkits/tile/Makefile
+++ b/x11-toolkits/tile/Makefile
@@ -13,12 +13,11 @@ MASTER_SITES=	SF/tktable
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Themed widget set for Tk
 
-LIB_DEPENDS=	tk${USE_TK}.1:${PORTSDIR}/x11-toolkits/tk${USE_TK}
-
 USE_TK=		yes
+
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-tcl=${LOCALBASE}/lib/tcl${TK_VER} \
-		--with-tk=${LOCALBASE}/lib/tk${TK_VER} \
+CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} \
+		--with-tk=${TK_LIBDIR} \
 		--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \
 		--exec-prefix=${PREFIX} --enable-shared
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} ${TCL_INCLUDES} ${TK_INCLUDES}"
diff --git a/x11-toolkits/tkdnd/Makefile b/x11-toolkits/tkdnd/Makefile
index 2c5351a8b3b1..0481170d6845 100644
--- a/x11-toolkits/tkdnd/Makefile
+++ b/x11-toolkits/tkdnd/Makefile
@@ -15,8 +15,6 @@ MASTER_SITES=	CSME
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Native drag and drop capabilities
 
-LIB_DEPENDS=	tk${USE_TK}.1:${PORTSDIR}/x11-toolkits/tk${USE_TK}
-
 USE_BZIP2=	yes
 USE_TK=		yes
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/tktray/Makefile b/x11-toolkits/tktray/Makefile
index 974392b7beb5..111044249154 100644
--- a/x11-toolkits/tktray/Makefile
+++ b/x11-toolkits/tktray/Makefile
@@ -14,8 +14,6 @@ DISTNAME=	${TKPKG}
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	System tray icon support
 
-LIB_DEPENDS=	tk${USE_TK}.1:${PORTSDIR}/x11-toolkits/tk${USE_TK}
-
 USE_TK=		yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} --with-tk=${TK_LIBDIR} \
diff --git a/x11-toolkits/tktreectrl/Makefile b/x11-toolkits/tktreectrl/Makefile
index ea7e965ea60c..6da8b262a1ac 100644
--- a/x11-toolkits/tktreectrl/Makefile
+++ b/x11-toolkits/tktreectrl/Makefile
@@ -13,19 +13,17 @@ MASTER_SITES=	SF
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Multi-column hierarchical listbox widget
 
-LIB_DEPENDS=	tk${USE_TK}.1:${PORTSDIR}/x11-toolkits/tk${USE_TK}
-
 USE_TK=		yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-tcl=${LOCALBASE}/lib/tcl${TK_VER} \
-		--with-tk=${LOCALBASE}/lib/tk${TK_VER} \
+CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} \
+		--with-tk=${TK_LIBDIR} \
 		--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \
 		--mandir=${MANPREFIX}/man \
 		--exec-prefix=${PREFIX} --enable-shared
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} ${TCL_INCLUDES} ${TK_INCLUDES}"
-TCL_INCLUDES=	-I${LOCALBASE}/include/tcl${TK_VER} -I${LOCALBASE}/include/tcl${TK_VER}/generic
-TK_INCLUDES=	-I${LOCALBASE}/include/tk${TK_VER} -I${LOCALBASE}/include/tk${TK_VER}/generic \
-		-I${LOCALBASE}/include/tk${TK_VER}/unix
+TCL_INCLUDES=	-I${TCL_INCLUDEDIR} -I${TCL_INCLUDEDIR}/generic
+TK_INCLUDES=	-I${TK_INCLUDEDIR} -I${TK_INCLUDEDIR}/generic \
+		-I${TK_INCLUDEDIR}/unix
 TKPKG=		treectrl${PORTVERSION}
 TKLIBVER=	2.2
 PLIST_SUB=	VER=${PORTVERSION} TKPKG=${TKPKG} TKLIBVER=${TKLIBVER}