From 8926ff3d5007512d298d5a1de618309b67deec9f Mon Sep 17 00:00:00 2001
From: Martin Matuska <mm@FreeBSD.org>
Date: Thu, 5 Apr 2007 12:37:59 +0000
Subject: [PATCH] - updated maintainer e-mail address. - switched to new
 bsd.tcl.mk infrastructure.

Approved by:	garga (mentor)
---
 lang/xotcl/Makefile    | 16 ++++++----------
 www/aolserver/Makefile | 16 ++++++----------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/lang/xotcl/Makefile b/lang/xotcl/Makefile
index 17d1f6ecb01b..f0057a4187d9 100644
--- a/lang/xotcl/Makefile
+++ b/lang/xotcl/Makefile
@@ -11,16 +11,12 @@ PORTREVISION=	4
 CATEGORIES?=	lang tcl84
 MASTER_SITES=	http://media.wu-wien.ac.at/download/
 
-MAINTAINER=	martin@matuska.org
+MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Object-oriented scripting language based on Tcl
 
-USE_TCL_VER?=	84
+USE_TCL=		84+
+USE_TCL_THREADS=	yes
 
-.if ${USE_TCL_VER} != 84 && ${USE_TCL_VER} != 85
-IGNORE=	supported values for USE_TCL_VER are only 84 and 85
-.endif
-
-LIB_DEPENDS+=	tcl${USE_TCL_VER}-threads:${PORTSDIR}/lang/tcl${USE_TCL_VER}-thread
 INSTALL_TARGET=	install
 ALL_TARGET=	all test-nohttp
 USE_GMAKE=	yes
@@ -70,12 +66,12 @@ MAN1=			xotclsh.1
 CONFIGURE_ARGS+=	--exec-prefix=${PREFIX} \
 			--libdir=${PREFIX}/lib \
 			--enable-threads \
-			--with-tcl=${LOCALBASE}/lib/tcl${USE_TCL_VER:S/8/8./}-threads \
-			--with-tclinclude=${LOCALBASE}/include/tcl${USE_TCL_VER:S/8/8./}/generic/ \
+			--with-tcl=${TCL_LIBDIR} \
+			--with-tclinclude=${TCL_INCLUDEDIR}/generic/ \
 			--with-xotclsh
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|$${TCL_MINOR_VERSION}$${TCL_DBGX}|$${TCL_MINOR_VERSION}$${TCL_DBGX}-threads|g' \
+	@${REINPLACE_CMD} -e 's|TCLSH_PROG=".*"|TCLSH_PROG="${TCLSH}"|g' \
 		${WRKSRC}/configure
 
 .if defined(AOLSERVER_XOTCL) # Install for aolserver module
diff --git a/www/aolserver/Makefile b/www/aolserver/Makefile
index 4248c6d66ca0..c6a7b3f9202a 100644
--- a/www/aolserver/Makefile
+++ b/www/aolserver/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	aolserver
 DIST_SUBDIR=	aolserver
 DISTVERSIONSUFFIX=	-src
 
-MAINTAINER=	martin@matuska.org
+MAINTAINER=	mm@FreeBSD.org
 COMMENT=	A multithreaded web server with embedded TCL interpreter
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
@@ -37,15 +37,11 @@ SUB_VARS=	AOLSERVERUSER=${AOLSERVERUSER} \
 SUB_LIST+=	${SUB_VARS} AOLSERVERBASE=${AOLSERVERBASE}
 PLIST_SUB+=	${SUB_VARS} AOLSERVERBASE=${AOLSERVERBASE:S/${TARGETDIR}\///}
 
-USE_TCL_VER?=	84
+USE_TCL=		84+
+USE_TCL_THREADS=	yes
+
 ONLY_FOR_ARCHS=	i386 amd64
 
-.if ${USE_TCL_VER} != 84 && ${USE_TCL_VER} != 85
-IGNORE=		supported values for USE_TCL_VER are only 84 and 85
-.endif
-
-LIB_DEPENDS+=	tcl${USE_TCL_VER}-threads:${PORTSDIR}/lang/tcl${USE_TCL_VER}-thread
-
 OPTIONS=	HTMLDOCS "Install HTML documentation" off \
 		TESTS "Install tests in examples directory" off
 
@@ -55,9 +51,9 @@ OPTIONS=	HTMLDOCS "Install HTML documentation" off \
 BROKEN=		does not compile on ia64
 .endif
 
-CONFIGURE_ENV+=		TCLSH=${LOCALBASE}/bin/tclsh${USE_TCL_VER:S/8/8./}-threads
+CONFIGURE_ENV+=		TCLSH=${TCLSH}
 CONFIGURE_ARGS+=	--prefix=${AOLSERVERBASE} \
-			--with-tcl=${LOCALBASE}/lib/tcl${USE_TCL_VER:S/8/8./}-threads
+			--with-tcl=${TCL_LIBDIR}
 
 .if !defined(NO_INSTALL_MANPAGES)
 INSTALL_TARGET=	install install-man