1 files changed, 18 insertions, 8 deletions

diff --git a/lang/tcl86/Makefile b/lang/tcl86/Makefile
index 67606a72590a..a53260084dfd 100644
--- a/lang/tcl86/Makefile
+++ b/lang/tcl86/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	tcl
-PORTVERSION=	8.5.a.5
-PORTREVISION=	5
+PORTVERSION=	8.5.a.6
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tcl
@@ -19,10 +18,10 @@ COMMENT=	Tool Command Language (development version)
 
 PATCH_DIST_ARGS=	-d ${WRKDIR}/${DISTNAME} -E ${PATCH_DIST_STRIP}
 WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION:S/.a./a/}/unix
-ALL_TARGET=	all test
+ALL_TARGET=	all
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-shared --includedir=${PREFIX}/include/tcl${TCL_VER}
+CONFIGURE_ARGS=	--enable-shared --without-tzdata --includedir=${PREFIX}/include/tcl${TCL_VER}
 CONFIGURE_ENV=	PORTSDIR=${PORTSDIR}
 TCL_VER=	8.5
 SHORT_TCL_VER=	${TCL_VER:S/8./8/}
@@ -32,7 +31,8 @@ PLIST_SUB=	TCL_VER=${TCL_VER} SHORT_TCL_VER=${SHORT_TCL_VER}
 EXTRACT_AFTER_ARGS=|${TAR} -xpf - --exclude compat/
 
 .if !defined(BUILDING_TCL_THREADS)
-OPTIONS=	TCL85_MAN "Install tcl 8.5 manpages" off
+OPTIONS=	TCL85_MAN "Install tcl 8.5 manpages" off \
+		TZDATA "Install tcl timezone data" off
 .else
 USE_TCL=	${SHORT_TCL_VER}
 PLIST=		${PKGDIR}/pkg-plist.threads
@@ -41,6 +41,12 @@ THREADS_SUFFIX=		-threads
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_TZDATA)
+PLIST_SUB+=		TZDATA=""
+.else
+PLIST_SUB+=		TZDATA="@comment "
+.endif
+
 .if defined(BUILDING_TCL_THREADS)
 . if (${ARCH} == "ia64")
 BROKEN=	does not compile on ia64
@@ -96,9 +102,10 @@ MANN=	Tcl.n after.n append.n apply.n array.n bgerror.n binary.n break.n \
 	foreach.n format.n gets.n glob.n global.n history.n http.n if.n incr.n \
 	info.n interp.n join.n lappend.n lassign.n library.n lindex.n \
 	linsert.n list.n llength.n load.n lrange.n lrepeat.n lreplace.n \
-	lsearch.n lset.n lsort.n mathfunc.n memory.n  msgcat.n namespace.n \
-	open.n package.n packagens.n pid.n pkgMkIndex.n proc.n puts.n pwd.n \
-	re_syntax.n read.n refchan.n regexp.n registry.n regsub.n rename.n \
+	lreverse.n lsearch.n lset.n lsort.n mathfunc.n mathop.n memory.n \
+	msgcat.n namespace.n open.n package.n packagens.n pid.n pkgMkIndex.n \
+	platform.n platform_shell.n proc.n puts.n pwd.n re_syntax.n read.n \
+	refchan.n regexp.n registry.n regsub.n rename.n \
 	return.n safe.n scan.n seek.n set.n socket.n source.n split.n string.n \
 	subst.n switch.n tcltest.n tclvars.n tell.n time.n tm.n trace.n \
 	unknown.n unload.n unset.n update.n uplevel.n upvar.n variable.n vwait.n \
@@ -735,6 +742,9 @@ do-install:
 	@${LN} -s ${PREFIX}/lib/tcl${TCL_VER}/tclConfig${THREADS_SUFFIX}.sh ${PREFIX}/lib/tcl${TCL_VER}${THREADS_SUFFIX}/tclConfig.sh
 .else
 post-install:
+.if defined(WITH_TZDATA)
+	@cd ${WRKSRC} && ${MAKE} -f Makefile install-tzdata ${MAKE_ENV}
+.endif
 .if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TCL85_MAN)
 	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/../doc/man.macros ${DATADIR}