Support Tk in USES=tk:tea. Convert more ports + minor fixes and modernization.

6 files changed, 15 insertions, 43 deletions

diff --git a/lang/expect/Makefile b/lang/expect/Makefile
index 502c0a2a9783..85c777e40ed1 100644
--- a/lang/expect/Makefile
+++ b/lang/expect/Makefile
@@ -14,25 +14,16 @@ LIBEXPECT_VER=	${PORTVERSION:S/.//g}
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
-USES=		tcl autoreconf
+USES=		tcl:tea autoreconf
 USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-shared \
-		--exec-prefix=${PREFIX} \
-		--datadir=${DATADIR} \
-		--with-tclconfig=${TCL_LIBDIR} \
-		--with-tclinclude=${TCL_INCLUDEDIR}
-CONFIGURE_ENV=	ac_cv_sys_long_file_names=yes
+CONFIGURE_ARGS=	--datadir=${DATADIR}
 PLIST_SUB+=	EXPECT_VER=${PORTVERSION} \
 		LIBEXPECT_VER=${LIBEXPECT_VER}
+TEST_TARGET=	test
 
 post-install:
 	${LN} -sf expect${PORTVERSION}/libexpect${LIBEXPECT_VER}.so \
 		${STAGEDIR}${PREFIX}/lib/libexpect.so.1
-	${LN} -sf libexpect.so.1 \
-		${STAGEDIR}${PREFIX}/lib/libexpect.so
-
-do-test:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} test
+	${LN} -sf libexpect.so.1 ${STAGEDIR}${PREFIX}/lib/libexpect.so
 
 .include <bsd.port.mk>
diff --git a/lang/itcl/Makefile b/lang/itcl/Makefile
index 50542ae4cce8..50551dbf383c 100644
--- a/lang/itcl/Makefile
+++ b/lang/itcl/Makefile
@@ -11,19 +11,13 @@ DISTNAME=	itcl${PORTVERSION}
 MAINTAINER=	erik@bz.bzflag.bz
 COMMENT=	Object-oriented extension to Tcl [incr Tcl]
 
-USES+=		tcl
+USES+=		tcl:84+,tea
 
 USE_LDCONFIG=	${PREFIX}/lib/itcl${PORTVERSION:R}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION}
+TEST_TARGET=	test
 
-GNU_CONFIGURE=	yes
-CFLAGS+=	-I${TCL_INCLUDEDIR}/generic
-CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} \
-		--with-tclinclude=${TCL_INCLUDEDIR} \
-		--prefix=${PREFIX} \
-		--exec-prefix=${PREFIX}
-CONFIGURE_ENV+=	ac_cv_c_tclh=${TCL_INCLUDEDIR}/unix
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
 		VERSION=${PORTVERSION:R} \
 		MAJOR=${PORTVERSION:R:R} \
@@ -36,10 +30,6 @@ post-patch:
 	${REINPLACE_CMD} -E '/^includedir/s|/include|/include/itcl${PORTVERSION:R}|' \
 	    ${WRKSRC}/${CONFIGURE_SCRIPT}
 
-post-build test:
-	(cd ${WRKSRC} && ${SETENV} ITCL_LIBRARY=${WRKSRC}/library \
-		${TCLSH} tests/all.tcl -load "load ./libitcl.so.1")
-
 post-install:
 	${LN} -s libitcl.so.1 \
 	    ${STAGEDIR}${PREFIX}/lib/${PORTNAME}${PORTVERSION:R}/libitcl${PORTVERSION:R:S/.//}.so
diff --git a/lang/itcl4/Makefile b/lang/itcl4/Makefile
index b480a5b95b0b..cfa44dd6d7fd 100644
--- a/lang/itcl4/Makefile
+++ b/lang/itcl4/Makefile
@@ -11,14 +11,9 @@ DISTNAME=	itcl${PORTVERSION}
 MAINTAINER=	tcltk@FreeBSD.org
 COMMENT=	Object-oriented extension to Tcl [incr Tcl]
 
-USES+=		tcl:86
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-tcl=${TCL_LIBDIR} \
-		--with-tclinclude=${TCL_INCLUDEDIR} \
-		--includedir=${PREFIX}/include/itcl${PORTVERSION:R}
+USES+=		tcl:86,tea
+CONFIGURE_ARGS+=--includedir=${PREFIX}/include/itcl${PORTVERSION:R}
 PLIST_SUB+=	PKGVER=${PORTVERSION}
-
-do-test:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} test
+TEST_TARGET=	test
 
 .include <bsd.port.mk>
diff --git a/lang/itcl4/files/patch-Makefile.in b/lang/itcl4/files/patch-Makefile.in
index f1f824d3fbb9..07bfff8bc7a2 100644
--- a/lang/itcl4/files/patch-Makefile.in
+++ b/lang/itcl4/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2014-08-02 18:11:59.564717000 +0200
-+++ Makefile.in	2014-08-29 16:09:56.000000000 +0200
-@@ -93,7 +93,7 @@
+--- Makefile.in.orig	2013-11-21 20:49:06 UTC
++++ Makefile.in
+@@ -93,7 +93,7 @@ INSTALL_DATA_DIR = ${INSTALL} -d -m 755
  INSTALL_PROGRAM	= ${INSTALL} -m 755
  INSTALL_DATA	= ${INSTALL} -m 644
  INSTALL_SCRIPT	= ${INSTALL_PROGRAM}
@@ -9,7 +9,7 @@
  
  PACKAGE_NAME	= @PACKAGE_NAME@
  PACKAGE_VERSION	= @PACKAGE_VERSION@
-@@ -222,11 +222,12 @@
+@@ -222,11 +222,12 @@ install-doc: doc
  	@$(INSTALL_DATA_DIR) $(DESTDIR)$(mandir)/mann
  	@echo "Installing documentation in $(DESTDIR)$(mandir)"
  	@cd $(srcdir)/doc; for i in *.n; do \
diff --git a/lang/itcl4/pkg-descr b/lang/itcl4/pkg-descr
index 46b503e4082e..19459017b59e 100644
--- a/lang/itcl4/pkg-descr
+++ b/lang/itcl4/pkg-descr
@@ -2,4 +2,4 @@
 C++, and [incr Tcl] provides a similar object model, including multiple
 inheritence and public and private classes and variables.
 
-http://core.tcl.tk/itcl
+WWW: http://core.tcl.tk/itcl
diff --git a/lang/nx/Makefile b/lang/nx/Makefile
index f7719b37fa04..f0ab9cb317d6 100644
--- a/lang/nx/Makefile
+++ b/lang/nx/Makefile
@@ -16,12 +16,8 @@ OPTIONS_DEFINE=	DOCS
 
 CONFLICTS=	xotcl-1.*
 
-USES+=		gmake tcl:85+
+USES+=		gmake tcl:85+,tea
 USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--exec-prefix=${PREFIX} \
-		--with-tcl=${TCL_LIBDIR} \
-		--with-tclinclude=${TCL_INCLUDEDIR}
 TEST_TARGET=	test
 PLIST_SUB+=	PKGNAME=${DISTNAME}
 PORTDOCS=	*