15 files changed, 72 insertions, 142 deletions

diff --git a/x11-toolkits/blt/Makefile b/x11-toolkits/blt/Makefile
index 898f45b4f397..1d0786ede54e 100644
--- a/x11-toolkits/blt/Makefile
+++ b/x11-toolkits/blt/Makefile
@@ -15,13 +15,12 @@ LICENSE=	MIT
 
 WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION:R}
 
-USES=		gmake jpeg shebangfix tk zip
+USES=		gmake jpeg shebangfix tk:tea zip
 SHEBANG_FILES=	demos/scripts/xcolors.tcl
 SHEBANG_LANG=	bltwish
 bltwish_OLD_CMD=../bltwish
 bltwish_CMD=	${PREFIX}/bin/bltwish # installed by this port, so not LOCALBASE
 USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
 CFLAGS+=	-I${TCL_INCLUDEDIR}/generic \
 		-I${TK_INCLUDEDIR}/generic \
 		-I${TK_INCLUDEDIR}/unix
@@ -30,13 +29,7 @@ MAKE_JOBS_UNSAFE=yes
 PLIST_SUB+=	BLTVER=${PORTVERSION:R} \
 		BLTSHORTVER=${PORTVERSION:R:S/.//}
 
-CONFIGURE_ARGS+=--prefix=${PREFIX} \
-		--exec_prefix=${PREFIX} \
-		--enable-jpeg=${LOCALBASE} \
-		--with-tcl=${TCL_LIBDIR} \
-		--with-tk=${TK_LIBDIR} \
-		--with-tcllibs=${LOCALBASE}/lib \
-		--with-tklibs=${LOCALBASE}/lib
+CONFIGURE_ARGS=	--enable-jpeg=${LOCALBASE} \
 
 post-patch:
 	${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} \
diff --git a/x11-toolkits/iwidgets/Makefile b/x11-toolkits/iwidgets/Makefile
index f2b13036b85f..05997d5534a3 100644
--- a/x11-toolkits/iwidgets/Makefile
+++ b/x11-toolkits/iwidgets/Makefile
@@ -14,12 +14,8 @@ COMMENT=	Iwidgets - [incr Widgets] companion to [incr Tk]
 LIB_DEPENDS=	libitk.so:x11-toolkits/itk
 
 NO_BUILD=	yes
-HAS_CONFIGURE=	yes
-USES=		tk
-CONFIGURE_ARGS=	--prefix=${PREFIX} \
-		--with-tcl=${TCL_LIBDIR} \
-		--with-tk=${TK_LIBDIR} \
-		--with-itcl=${LOCALBASE}
+USES=		tk:tea
+CONFIGURE_ARGS=	--with-itcl=${LOCALBASE}
 SUB_LIST=	IWIDGETS=${DISTNAME}
 SUB_FILES=	pkg-message
 PLIST_SUB=	IWIDGETS=${DISTNAME}
diff --git a/x11-toolkits/tile/Makefile b/x11-toolkits/tile/Makefile
index a004438ac39e..85af2009b74b 100644
--- a/x11-toolkits/tile/Makefile
+++ b/x11-toolkits/tile/Makefile
@@ -12,15 +12,8 @@ COMMENT=	Themed widget set for Tk
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/license.terms
 
-USES=		autoreconf tk
+USES=		autoreconf tk:tea
 
-GNU_CONFIGURE=	yes
-TKPKG=		${PORTNAME}${PORTVERSION}
-PLIST_SUB=	VER=${PORTVERSION} TKPKG=${TKPKG}
-
-CONFIGURE_ARGS+=--with-tcl=${TCL_LIBDIR} \
-		--with-tk=${TK_LIBDIR} \
-		--exec-prefix=${PREFIX} --enable-shared
 CONFIGURE_ENV+=	TCL_INCLUDEDIR="${TCL_INCLUDEDIR}" \
 		TK_INCLUDEDIR="${TK_INCLUDEDIR}"
 
diff --git a/x11-toolkits/tile/pkg-plist b/x11-toolkits/tile/pkg-plist
index ffa060c24e25..751340f42bf0 100644
--- a/x11-toolkits/tile/pkg-plist
+++ b/x11-toolkits/tile/pkg-plist
@@ -1,32 +1,32 @@
 include/tkTheme.h
 include/ttkDecls.h
 lib/libttkstub.a
-lib/%%TKPKG%%/altTheme.tcl
-lib/%%TKPKG%%/aquaTheme.tcl
-lib/%%TKPKG%%/button.tcl
-lib/%%TKPKG%%/clamTheme.tcl
-lib/%%TKPKG%%/classicTheme.tcl
-lib/%%TKPKG%%/combobox.tcl
-lib/%%TKPKG%%/cursors.tcl
-lib/%%TKPKG%%/defaults.tcl
-lib/%%TKPKG%%/dialog.tcl
-lib/%%TKPKG%%/entry.tcl
-lib/%%TKPKG%%/fonts.tcl
-lib/%%TKPKG%%/icons.tcl
-lib/%%TKPKG%%/keynav.tcl
-lib/%%TKPKG%%/menubutton.tcl
-lib/%%TKPKG%%/notebook.tcl
-lib/%%TKPKG%%/paned.tcl
-lib/%%TKPKG%%/pkgIndex.tcl
-lib/%%TKPKG%%/progress.tcl
-lib/%%TKPKG%%/scale.tcl
-lib/%%TKPKG%%/scrollbar.tcl
-lib/%%TKPKG%%/sizegrip.tcl
-lib/%%TKPKG%%/spinbox.tcl
-lib/%%TKPKG%%/tile.so
-lib/%%TKPKG%%/tile.tcl
-lib/%%TKPKG%%/treeview.tcl
-lib/%%TKPKG%%/utils.tcl
-lib/%%TKPKG%%/vistaTheme.tcl
-lib/%%TKPKG%%/winTheme.tcl
-lib/%%TKPKG%%/xpTheme.tcl
+lib/%%TCL_PKG%%/altTheme.tcl
+lib/%%TCL_PKG%%/aquaTheme.tcl
+lib/%%TCL_PKG%%/button.tcl
+lib/%%TCL_PKG%%/clamTheme.tcl
+lib/%%TCL_PKG%%/classicTheme.tcl
+lib/%%TCL_PKG%%/combobox.tcl
+lib/%%TCL_PKG%%/cursors.tcl
+lib/%%TCL_PKG%%/defaults.tcl
+lib/%%TCL_PKG%%/dialog.tcl
+lib/%%TCL_PKG%%/entry.tcl
+lib/%%TCL_PKG%%/fonts.tcl
+lib/%%TCL_PKG%%/icons.tcl
+lib/%%TCL_PKG%%/keynav.tcl
+lib/%%TCL_PKG%%/menubutton.tcl
+lib/%%TCL_PKG%%/notebook.tcl
+lib/%%TCL_PKG%%/paned.tcl
+lib/%%TCL_PKG%%/pkgIndex.tcl
+lib/%%TCL_PKG%%/progress.tcl
+lib/%%TCL_PKG%%/scale.tcl
+lib/%%TCL_PKG%%/scrollbar.tcl
+lib/%%TCL_PKG%%/sizegrip.tcl
+lib/%%TCL_PKG%%/spinbox.tcl
+lib/%%TCL_PKG%%/tile.so
+lib/%%TCL_PKG%%/tile.tcl
+lib/%%TCL_PKG%%/treeview.tcl
+lib/%%TCL_PKG%%/utils.tcl
+lib/%%TCL_PKG%%/vistaTheme.tcl
+lib/%%TCL_PKG%%/winTheme.tcl
+lib/%%TCL_PKG%%/xpTheme.tcl
diff --git a/x11-toolkits/tix/Makefile b/x11-toolkits/tix/Makefile
index cecc5e60cc99..bbf661b73c06 100644
--- a/x11-toolkits/tix/Makefile
+++ b/x11-toolkits/tix/Makefile
@@ -13,17 +13,7 @@ COMMENT=	Extension to the Tk toolkit
 
 WRKSRC=		${WRKDIR}/Tix${DISTVERSION}
 USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-USES=		tk
-CONFIGURE_ARGS=	--enable-shared --enable-sam \
-		--with-tclconfig="${TCL_LIBDIR}" \
-		--with-tkconfig="${TK_LIBDIR}" \
-		--with-tclinclude="${TCL_INCLUDEDIR}" \
-		--with-tkinclude="${TK_INCLUDEDIR}" \
-		--prefix=${PREFIX} \
-		--exec-prefix=${PREFIX}
-# this should probably be added to bsd.port.mk
-CONFIGURE_ENV=	PREFIX=${PREFIX}
+USES=		tk:tea
 
 TIX_LIB=	libTix${PORTVERSION}.so
 TIX_LIB_FILE=	${TIX_LIB}.0
diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile
index 11f52fbbae29..1becf7c9c5b2 100644
--- a/x11-toolkits/tk84/Makefile
+++ b/x11-toolkits/tk84/Makefile
@@ -25,14 +25,11 @@ WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION}/unix
 ALL_TARGET=	all
 INSTALL_TARGET=	install
 
-USES+=		tcl:${SHORT_TK_VER}
+USES+=		tcl:${SHORT_TK_VER},tea
 USE_LDCONFIG=	yes
 USE_XORG=	x11
 CFLAGS+=	-I${TCL_INCLUDEDIR}/generic
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-shared \
-		--enable-man-suffix=.${MAN_SUFFIX} \
-		--with-tcl=${TCL_LIBDIR} \
+CONFIGURE_ARGS=	--enable-man-suffix=.${MAN_SUFFIX} \
 		--includedir=${PREFIX}/include/tk${TK_VER}
 
 CONFIGURE_ENV=	PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk${SHORT_TK_VER}.so.1
diff --git a/x11-toolkits/tk85/Makefile b/x11-toolkits/tk85/Makefile
index aa4eb5efab95..9f324634acc1 100644
--- a/x11-toolkits/tk85/Makefile
+++ b/x11-toolkits/tk85/Makefile
@@ -16,18 +16,15 @@ LICENSE_NAME=	Tcl/Tk License
 LICENSE_FILE=	${WRKSRC}/../license.terms
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-USES+=		tcl:${SHORT_TK_VER}
+USES+=		tcl:${SHORT_TK_VER},tea
 USE_XORG=	x11 xft xscrnsaver
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}/unix
-GNU_CONFIGURE=	yes
 TK_VER=		${PORTVERSION:R}
 SHORT_TK_VER=	${TK_VER:S/.//}
-CONFIGURE_ARGS=	--enable-shared \
-		--enable-xss \
+CONFIGURE_ARGS=	--enable-xss \
 		--enable-xft \
 		--enable-man-suffix=.${MAN_SUFFIX} \
-		--with-tcl=${TCL_LIBDIR} \
 		--includedir=${PREFIX}/include/tk${TK_VER}
 
 CONFIGURE_ENV=	PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk${SHORT_TK_VER}.so.1 \
diff --git a/x11-toolkits/tk86/Makefile b/x11-toolkits/tk86/Makefile
index d32d171201ba..524db990797f 100644
--- a/x11-toolkits/tk86/Makefile
+++ b/x11-toolkits/tk86/Makefile
@@ -29,14 +29,11 @@ ALL_TARGET=	all
 INSTALL_TARGET=	install-strip
 
 USE_LDCONFIG=	yes
-USES+=		tcl:${SHORT_TK_VER}
+USES+=		tcl:${SHORT_TK_VER},tea
 USE_XORG=	x11 xft xscrnsaver
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-shared \
-		--enable-xss \
+CONFIGURE_ARGS=	--enable-xss \
 		--enable-xft \
 		--enable-man-suffix=.${MAN_SUFFIX} \
-		--with-tcl=${TCL_LIBDIR} \
 		--includedir=${PREFIX}/include/tk${TK_VER}
 
 CONFIGURE_ENV=	PORTSDIR=${PORTSDIR}
diff --git a/x11-toolkits/tkdnd/Makefile b/x11-toolkits/tkdnd/Makefile
index 9fa5e7d106d3..1bbc27468f17 100644
--- a/x11-toolkits/tkdnd/Makefile
+++ b/x11-toolkits/tkdnd/Makefile
@@ -10,18 +10,11 @@ DISTNAME=	${PORTNAME}${PORTVERSION}-src
 MAINTAINER=	tcltk@FreeBSD.org
 COMMENT=	Native drag and drop capabilities for Tk
 
-USES+=		tk:85+
+USES+=		tk:85+,tea
 USE_XORG=	x11 xext
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--exec-prefix=${PREFIX} \
-		--with-tcl=${TCL_LIBDIR} \
-		--with-tk=${TK_LIBDIR} \
-		--with-tclinclude=${TCL_INCLUDEDIR} \
-		--with-tkinclude=${TK_INCLUDEDIR}
 
-TKPKG=		${PORTNAME}${PORTVERSION}
-PLIST_SUB=	TKPKG=${TKPKG}
-USE_LDCONFIG=	${PREFIX}/lib/${TKPKG}
+TCL_PKG=	${PORTNAME}${PORTVERSION}
+USE_LDCONFIG=	${PREFIX}/lib/${TCL_PKG}
 WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION}
 
 post-install:
diff --git a/x11-toolkits/tkdnd/pkg-plist b/x11-toolkits/tkdnd/pkg-plist
index 2a2057b4fcc1..0ccbc3fb1622 100644
--- a/x11-toolkits/tkdnd/pkg-plist
+++ b/x11-toolkits/tkdnd/pkg-plist
@@ -1,9 +1,9 @@
-lib/%%TKPKG%%/libtkdnd.so.1
-lib/%%TKPKG%%/pkgIndex.tcl
-lib/%%TKPKG%%/tkdnd.tcl
-lib/%%TKPKG%%/tkdnd_compat.tcl
-lib/%%TKPKG%%/tkdnd_generic.tcl
-lib/%%TKPKG%%/tkdnd_macosx.tcl
-lib/%%TKPKG%%/tkdnd_unix.tcl
-lib/%%TKPKG%%/tkdnd_windows.tcl
+lib/%%TCL_PKG%%/libtkdnd.so.1
+lib/%%TCL_PKG%%/pkgIndex.tcl
+lib/%%TCL_PKG%%/tkdnd.tcl
+lib/%%TCL_PKG%%/tkdnd_compat.tcl
+lib/%%TCL_PKG%%/tkdnd_generic.tcl
+lib/%%TCL_PKG%%/tkdnd_macosx.tcl
+lib/%%TCL_PKG%%/tkdnd_unix.tcl
+lib/%%TCL_PKG%%/tkdnd_windows.tcl
 man/mann/tkDND.n.gz
diff --git a/x11-toolkits/tktable/Makefile b/x11-toolkits/tktable/Makefile
index 30b79433e305..53f4d1affb3a 100644
--- a/x11-toolkits/tktable/Makefile
+++ b/x11-toolkits/tktable/Makefile
@@ -16,26 +16,10 @@ LICENSE_NAME=	Tcl/Tk License
 LICENSE_FILE=	${WRKSRC}/license.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-USES+=		tk
+USES+=		tk:tea
+TCL_PKG=	${DISTNAME}
 USE_LDCONFIG=	${PREFIX}/lib/${DISTNAME}
-
-GNU_CONFIGURE=	yes
-
-PLIST_SUB=	DISTNAME=${DISTNAME}
-
-CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} \
-		--with-tk=${TK_LIBDIR} \
-		--with-tclinclude=${TCL_INCLUDEDIR} \
-		--with-tkinclude=${TK_INCLUDEDIR} \
-		--with-x \
-		--prefix=${PREFIX} \
-		--exec-prefix=${PREFIX}
-
-.if defined(MAINTAINER_MODE)
-test: build
-	(cd ${WRKSRC};  \
-	${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test)
-.endif
+TEST_TARGET=	test
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/FreeBSD-\*/FreeBSD-*|DragonFly-*/' \
diff --git a/x11-toolkits/tktable/pkg-plist b/x11-toolkits/tktable/pkg-plist
index 32e205b061ae..37cdd9c252fc 100644
--- a/x11-toolkits/tktable/pkg-plist
+++ b/x11-toolkits/tktable/pkg-plist
@@ -1,4 +1,4 @@
-lib/%%DISTNAME%%/lib%%DISTNAME%%.so
-lib/%%DISTNAME%%/tktable.py
-lib/%%DISTNAME%%/tkTable.tcl
-lib/%%DISTNAME%%/pkgIndex.tcl
+lib/%%TCL_PKG%%/lib%%TCL_PKG%%.so
+lib/%%TCL_PKG%%/tktable.py
+lib/%%TCL_PKG%%/tkTable.tcl
+lib/%%TCL_PKG%%/pkgIndex.tcl
diff --git a/x11-toolkits/tktray/Makefile b/x11-toolkits/tktray/Makefile
index 21ee31a91eab..e9676533ea33 100644
--- a/x11-toolkits/tktray/Makefile
+++ b/x11-toolkits/tktray/Makefile
@@ -10,16 +10,11 @@ DISTNAME=	${PORTNAME}${PORTVERSION}
 MAINTAINER=	tcltk@FreeBSD.org
 COMMENT=	System tray icon support
 
-USES+=		tk
+USES+=		tk:tea
 USE_XORG=	x11 xext
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	-exec-prefix=${PREFIX} \
-		--with-tcl=${TCL_LIBDIR} \
-		--with-tk=${TK_LIBDIR}
-TKPKG=		${PORTNAME}${PORTVERSION}
 
-PLIST_FILES=	lib/${TKPKG}/libtktray.so.1 \
-		lib/${TKPKG}/pkgIndex.tcl \
+PLIST_FILES=	lib/${TCL_PKG}/libtktray.so.1 \
+		lib/${TCL_PKG}/pkgIndex.tcl \
 		man/mann/${PORTNAME}.n.gz
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/tktreectrl/Makefile b/x11-toolkits/tktreectrl/Makefile
index c5814c2c11b1..762df1aac24b 100644
--- a/x11-toolkits/tktreectrl/Makefile
+++ b/x11-toolkits/tktreectrl/Makefile
@@ -9,16 +9,11 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multi-column hierarchical listbox widget
 
-USES=		tk:86
+USES=		tk:86,tea
 USE_XORG=	x11
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-tcl=${TCL_LIBDIR} \
-		--with-tk=${TK_LIBDIR} \
-		--exec-prefix=${PREFIX} \
-		--enable-shared
-TKPKG=		treectrl${PORTVERSION}
-USE_LDCONFIG=	${PREFIX}/lib/${TKPKG}
-PLIST_SUB=	TKPKG=${TKPKG}
+TCL_PKG=	treectrl${PORTVERSION}
+USE_LDCONFIG=	${PREFIX}/lib/${TCL_PKG}
+PLIST_SUB=	TCL_PKG=${TCL_PKG}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/FreeBSD-\*/FreeBSD-*|DragonFly-*/' \
diff --git a/x11-toolkits/tktreectrl/pkg-plist b/x11-toolkits/tktreectrl/pkg-plist
index 8583e14bdc0d..da6bf6a6252d 100644
--- a/x11-toolkits/tktreectrl/pkg-plist
+++ b/x11-toolkits/tktreectrl/pkg-plist
@@ -1,7 +1,7 @@
-lib/%%TKPKG%%/filelist-bindings.tcl
-lib/%%TKPKG%%/htmldoc/What-is-New-in-TkTreeCtrl.html
-lib/%%TKPKG%%/htmldoc/treectrl.html
-lib/%%TKPKG%%/libtreectrl.so.1
-lib/%%TKPKG%%/pkgIndex.tcl
-lib/%%TKPKG%%/treectrl.tcl
+lib/%%TCL_PKG%%/filelist-bindings.tcl
+lib/%%TCL_PKG%%/htmldoc/What-is-New-in-TkTreeCtrl.html
+lib/%%TCL_PKG%%/htmldoc/treectrl.html
+lib/%%TCL_PKG%%/libtreectrl.so.1
+lib/%%TCL_PKG%%/pkgIndex.tcl
+lib/%%TCL_PKG%%/treectrl.tcl
 man/mann/treectrl.n.gz