5 files changed, 47 insertions, 28 deletions

diff --git a/lang/tcl86-thread/Makefile b/lang/tcl86-thread/Makefile
index ce77356ffcae..4ffeec160d89 100644
--- a/lang/tcl86-thread/Makefile
+++ b/lang/tcl86-thread/Makefile
@@ -7,6 +7,6 @@
 
 BUILDING_TCL_THREADS=	yes
 
-MASTERDIR=	${.CURDIR}/../tcl85
+MASTERDIR=	${.CURDIR}/../tcl86
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/lang/tcl86/Makefile b/lang/tcl86/Makefile
index f8fbe9a7e3c0..be67f327aaad 100644
--- a/lang/tcl86/Makefile
+++ b/lang/tcl86/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	tcl
-PORTVERSION=	8.5.6
+PORTVERSION=	8.6.b.1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tcl
 PKGNAMESUFFIX?=		${THREADS_SUFFIX}${PKGNAMESUFFIX2}
-DISTNAME=	${PORTNAME}${PORTVERSION}-src
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.b.1/b1/}-src
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Tool Command Language
@@ -23,7 +23,7 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --without-tzdata --includedir=${PREFIX}/include/tcl${TCL_VER}
 CONFIGURE_ENV=	PORTSDIR=${PORTSDIR}
-TCL_VER=	8.5
+TCL_VER=	8.6
 SHORT_TCL_VER=	${TCL_VER:S/8./8/}
 MAKE_ENV=	SHORT_TCL_VER=${SHORT_TCL_VER} LANG=C LC_ALL=C	# LANG=C is required for some of UTF-using tests
 NOPRECIOUSMAKEVARS=	Too many _MLINKS for README.html
@@ -31,7 +31,7 @@ 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=	TCL86_MAN "Install tcl 8.6 manpages" off \
 		TZDATA "Install tcl timezone data" off
 .else
 USE_TCL=	${SHORT_TCL_VER}
@@ -65,7 +65,7 @@ CONFIGURE_ENV+=		PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS
 
 CONFIGURE_ARGS+=	--disable-threads
 
-.if defined(NO_INSTALL_MANPAGES) || !defined(WITH_TCL85_MAN)
+.if defined(NO_INSTALL_MANPAGES) || !defined(WITH_TCL86_MAN)
 
 PLIST_SUB+=	INSTMAN='@comment '
 
@@ -697,7 +697,7 @@ MLINKS=	Access.3 Tcl_Access.3 \
 .endif
 .endif # defined(BUILDING_TCL_THREADS)
 
-LATEST_LINK=	tcl85${THREADS_SUFFIX}
+LATEST_LINK=	tcl86${THREADS_SUFFIX}
 
 TCLBASE?=	${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK}
 
@@ -720,9 +720,9 @@ post-patch:
 BLACKHOLE!=	${SYSCTL} -n net.inet.tcp.blackhole || ${TRUE}
 
 post-configure:
-	${REINPLACE_CMD} \
-		-e 's|${WRKDIRPREFIX}${.CURDIR}|$${WRKDIRPREFIX}${TCLBASE}|' \
-		${WRKSRC}/tclConfig.sh
+#	${REINPLACE_CMD} \
+#		-e 's|${WRKDIRPREFIX}${.CURDIR}|${WRKDIRPREFIX}${TCLBASE}|' \
+#		${WRKSRC}/tclConfig.sh
 	${REINPLACE_CMD} \
 		-e 's,-DNO_MEMMOVE=1,,' -e 's,-DNO_STRING_H=1,,' \
 		-e 's,^COMPAT_OBJS.*,,' ${WRKSRC}/Makefile
@@ -745,7 +745,7 @@ 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)
+.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TCL86_MAN)
 	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/../doc/man.macros ${DATADIR}
 . for mp in ${MAN1} ${MAN3} ${MANN}
diff --git a/lang/tcl86/distinfo b/lang/tcl86/distinfo
index d3ddbfb43db1..78afb938f8f2 100644
--- a/lang/tcl86/distinfo
+++ b/lang/tcl86/distinfo
@@ -1,3 +1,3 @@
-MD5 (tcl8.5.6-src.tar.gz) = d0b0b3ff7600ff63135c710b575265cd
-SHA256 (tcl8.5.6-src.tar.gz) = 246d09da115307c60f1c91fcfcef8518952e166de058b6aef7fbcffa76ca150e
-SIZE (tcl8.5.6-src.tar.gz) = 4409651
+MD5 (tcl8.6b1-src.tar.gz) = 1df2d758c41c3f8d8bb42364837b61d6
+SHA256 (tcl8.6b1-src.tar.gz) = 1e944aa7e3b9134bedc9cf7ccf26396d70643fe427ec6870424f395f70046abe
+SIZE (tcl8.6b1-src.tar.gz) = 5295473
diff --git a/lang/tcl86/files/patch-unix-Makefile.in b/lang/tcl86/files/patch-unix-Makefile.in
index 333badbf8c00..cd967be5b7d0 100644
--- a/lang/tcl86/files/patch-unix-Makefile.in
+++ b/lang/tcl86/files/patch-unix-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	2008-03-28 19:41:53.000000000 +0100
-+++ Makefile.in	2008-04-02 11:49:46.000000000 +0200
+--- Makefile.in.orig	2008-12-22 18:45:06.000000000 +0100
++++ Makefile.in	2009-01-22 11:33:50.707552793 +0100
 @@ -55,6 +55,8 @@
  
  # Directory in which to install the include file tcl.h:
@@ -9,7 +9,7 @@
  
  # Path to the private tcl header dir:
  PRIVATE_INCLUDE_DIR	= @PRIVATE_INCLUDE_DIR@
-@@ -98,7 +100,7 @@
+@@ -101,7 +103,7 @@
  #CFLAGS			= $(CFLAGS_DEBUG)
  #CFLAGS			= $(CFLAGS_OPTIMIZE)
  #CFLAGS			= $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
@@ -18,9 +18,12 @@
  
  # Flags to pass to the linker
  LDFLAGS_DEBUG		= @LDFLAGS_DEBUG@
-@@ -538,7 +540,8 @@
+@@ -579,9 +581,10 @@
+ SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $(UNIX_SRCS) $(NOTIFY_SRCS) \
+ 	$(OO_SRCS) $(STUB_SRCS) @PLAT_SRCS@ @ZLIB_SRCS@
  
- all: binaries libraries doc
+-all: binaries libraries doc packages
++all: binaries libraries doc
  
 -binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh
 +binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) \
@@ -28,7 +31,7 @@
  
  libraries:
  
-@@ -549,6 +552,15 @@
+@@ -592,6 +595,15 @@
  ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
  	rm -f $@
  	@MAKE_LIB@
@@ -44,16 +47,16 @@
  
  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
  	rm -f $@
-@@ -697,7 +709,7 @@
+@@ -726,7 +738,7 @@
  dltest.marker: ${STUB_LIB_FILE}
  	cd dltest ; $(MAKE)
  
--INSTALL_TARGETS = install-binaries install-libraries install-doc @EXTRA_INSTALL@
+-INSTALL_TARGETS = install-binaries install-libraries install-doc install-packages @EXTRA_INSTALL@
 +INSTALL_TARGETS = install-binaries install-libraries @EXTRA_INSTALL@
  
  install: $(INSTALL_TARGETS)
  
-@@ -726,6 +738,13 @@
+@@ -755,6 +767,13 @@
  	@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
  	@@INSTALL_LIB@
  	@chmod 555 "$(LIB_INSTALL_DIR)"/$(LIB_FILE)
@@ -67,7 +70,7 @@
  	@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
  	    echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
  	    $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
-@@ -733,8 +752,9 @@
+@@ -762,8 +781,9 @@
  	    fi
  	@echo "Installing tclsh as $(BIN_INSTALL_DIR)/tclsh$(VERSION)"
  	@$(INSTALL_PROGRAM) tclsh "$(BIN_INSTALL_DIR)"/tclsh$(VERSION)
@@ -79,7 +82,7 @@
  	@if test "$(STUB_LIB_FILE)" != "" ; then \
  	    echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
  	    @INSTALL_STUB_LIB@ ; \
-@@ -742,7 +762,8 @@
+@@ -771,7 +791,8 @@
  	@EXTRA_INSTALL_BINARIES@
  
  install-libraries: libraries $(INSTALL_TZDATA) install-msgs
@@ -89,11 +92,12 @@
  	    do \
  	    if [ ! -d "$$i" ] ; then \
  		echo "Making directory $$i"; \
-@@ -764,13 +785,17 @@
- 	    chmod +x $(SRC_DIR)/../unix/install-sh; \
+@@ -793,14 +814,21 @@
+ 	    chmod +x $(UNIX_DIR)/install-sh; \
  	    fi
  	@echo "Installing header files";
 -	@for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \
+-		$(GENERIC_DIR)/tclOO.h $(GENERIC_DIR)/tclOODecls.h \
 -		$(GENERIC_DIR)/tclPlatDecls.h \
 -		$(GENERIC_DIR)/tclTomMath.h \
 -		$(GENERIC_DIR)/tclTomMathDecls.h ; \
@@ -109,10 +113,14 @@
 +	@ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tcl.h "$(INCLUDE_INSTALL_DIR)"/tcl.h
 +	@ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tclDecls.h "$(INCLUDE_INSTALL_DIR)"/tclDecls.h
 +	@ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tclPlatDecls.h "$(INCLUDE_INSTALL_DIR)"/tclPlatDecls.h
++	@ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tclOO.h "$(INCLUDE_INSTALL_DIR)"/tclOO.h
++	@ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tclOODecls.h "$(INCLUDE_INSTALL_DIR)"/tclOODecls.h
++	@ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tclTomMath.h "$(INCLUDE_INSTALL_DIR)"/tclTomMath.h
++	@ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tclTomMathDecls.h "$(INCLUDE_INSTALL_DIR)"/tclTomMathDecls.h
  	@echo "Installing library files to $(SCRIPT_INSTALL_DIR)";
  	@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex \
  		$(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix @DTRACE_SRC@; \
-@@ -838,18 +863,27 @@
+@@ -868,18 +896,27 @@
  	    done;
  	@echo "Installing and cross-linking top-level (.1) docs";
  	@for i in $(TOP_DIR)/doc/*.1; do \
diff --git a/lang/tcl86/pkg-plist b/lang/tcl86/pkg-plist
index 467e0aaf0c9b..e679e0de86fe 100644
--- a/lang/tcl86/pkg-plist
+++ b/lang/tcl86/pkg-plist
@@ -11,6 +11,10 @@ include/tcl%%TCL_VER%%/generic/tclIO.h
 include/tcl%%TCL_VER%%/generic/tclInt.h
 include/tcl%%TCL_VER%%/generic/tclIntDecls.h
 include/tcl%%TCL_VER%%/generic/tclIntPlatDecls.h
+include/tcl%%TCL_VER%%/generic/tclOO.h
+include/tcl%%TCL_VER%%/generic/tclOODecls.h
+include/tcl%%TCL_VER%%/generic/tclOOInt.h
+include/tcl%%TCL_VER%%/generic/tclOOIntDecls.h
 include/tcl%%TCL_VER%%/generic/tclPlatDecls.h
 include/tcl%%TCL_VER%%/generic/tclPort.h
 include/tcl%%TCL_VER%%/generic/tclRegexp.h
@@ -20,6 +24,10 @@ include/tcl%%TCL_VER%%/generic/tommath.h
 include/tcl%%TCL_VER%%/tcl.h
 include/tcl%%TCL_VER%%/tclDecls.h
 include/tcl%%TCL_VER%%/tclPlatDecls.h
+include/tcl%%TCL_VER%%/tclOO.h
+include/tcl%%TCL_VER%%/tclOODecls.h
+include/tcl%%TCL_VER%%/tclTomMath.h
+include/tcl%%TCL_VER%%/tclTomMathDecls.h
 include/tcl%%TCL_VER%%/unix/tclUnixPort.h
 include/tcl%%TCL_VER%%/unix/tclUnixThrd.h
 lib/libtcl%%SHORT_TCL_VER%%.a
@@ -354,6 +362,7 @@ lib/tcl%%TCL_VER%%/tclIndex
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Argentina/La_Rioja
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Argentina/Mendoza
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Argentina/Rio_Gallegos
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Argentina/Salta
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Argentina/San_Juan
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Argentina/San_Luis
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Argentina/Tucuman
@@ -460,6 +469,7 @@ lib/tcl%%TCL_VER%%/tclIndex
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Resolute
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Rio_Branco
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Rosario
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Santarem
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Santiago
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Santo_Domingo
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Sao_Paulo
@@ -855,6 +865,7 @@ lib/tcl8/8.5/tcltest-2.3.0.tm
 @dirrmtry lib/tcl8/8.4/platform
 @dirrmtry lib/tcl8/8.4
 @dirrmtry lib/tcl8/8.5
+@dirrmtry lib/tcl8/8.6
 @dirrmtry lib/tcl8
 @dirrm include/tcl%%TCL_VER%%/unix
 @dirrm include/tcl%%TCL_VER%%/generic