lang/tcl87: update to fossil checkin f1c99ff14c

Restructure a bit the installation so that it matches more what upstream
provides.

Changelog: http://core.tcl.tk/tcl/timeline?from=f590914719&to=f1c99ff14c&sbs=1

7 files changed, 25 insertions, 159 deletions

diff --git a/lang/tcl87/Makefile b/lang/tcl87/Makefile
index 6b3d7cba3054..0f1fc7b19479 100644
--- a/lang/tcl87/Makefile
+++ b/lang/tcl87/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tcl
-DISTVERSION=	8.7.a0.20170426
+DISTVERSION=	8.7.a0.20170524
 PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://core.tcl.tk/tcl/tarball/
@@ -32,13 +32,13 @@ OPTIONS_EXCLUDE+=	DTRACE
 
 OPTIONS_EXCLUDE_FreeBSD_10=	DTRACE
 
-FOSSIL_CHECKIN=	f590914719
+FOSSIL_CHECKIN=	f1c99ff14c
 
 PATCH_WRKSRC=	${WRKDIR}/Tcl_Source_Code
 WRKSRC=		${PATCH_WRKSRC}/unix
 
 ALL_TARGET=	all
-INSTALL_TARGET=	install-strip install-libraries
+INSTALL_TARGET=	install-strip
 TEST_TARGET=	test-tcl
 
 USE_LDCONFIG=	yes
@@ -89,5 +89,9 @@ post-configure:
 	${REINPLACE_CMD} \
 		-e 's,-DNO_MEMMOVE=1,,' -e 's,-DNO_STRING_H=1,,' \
 		-e 's,^COMPAT_OBJS.*,,' ${WRKSRC}/Makefile
+post-install:
+	# Make sure users of USES=tcl:87 are able to look up the library
+	${LN} -s libtcl${TCL_VER}.so ${STAGEDIR}${PREFIX}/lib/libtcl${PKGNAMESUFFIX}.so
+	${LN} -s libtcl${PKGNAMESUFFIX}.so ${STAGEDIR}${PREFIX}/lib/libtcl${PKGNAMESUFFIX}.so.1
 
 .include <bsd.port.mk>
diff --git a/lang/tcl87/distinfo b/lang/tcl87/distinfo
index 0e995e0ec26e..bf3450eaf6ee 100644
--- a/lang/tcl87/distinfo
+++ b/lang/tcl87/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493214151
-SHA256 (Tcl+Source+Code.tar.gz?uuid=f590914719) = bc361e30952738f8cdd3211604edca63f48a4b7415884aba4787ee40e40d02da
-SIZE (Tcl+Source+Code.tar.gz?uuid=f590914719) = 6694594
+TIMESTAMP = 1495624201
+SHA256 (Tcl+Source+Code.tar.gz?uuid=f1c99ff14c) = 82670b87b2b03090195008ce6a41b10248720e75948e3703b52e2e85e7330896
+SIZE (Tcl+Source+Code.tar.gz?uuid=f1c99ff14c) = 6825206
diff --git a/lang/tcl87/files/patch-generic-tclPort.h b/lang/tcl87/files/patch-generic-tclPort.h
deleted file mode 100644
index 7d09093db7b7..000000000000
--- a/lang/tcl87/files/patch-generic-tclPort.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- generic/tclPort.h.orig	2016-06-01 12:03:50 UTC
-+++ generic/tclPort.h
-@@ -20,7 +20,7 @@
- #if defined(_WIN32)
- #   include "tclWinPort.h"
- #else
--#   include "tclUnixPort.h"
-+#   include "../unix/tclUnixPort.h"
- #endif
- #include "tcl.h"
- 
diff --git a/lang/tcl87/files/patch-unix-Makefile.in b/lang/tcl87/files/patch-unix-Makefile.in
index e453dd47b891..1f4e748e2a28 100644
--- a/lang/tcl87/files/patch-unix-Makefile.in
+++ b/lang/tcl87/files/patch-unix-Makefile.in
@@ -1,15 +1,6 @@
---- unix/Makefile.in.orig	2016-06-01 12:03:50 UTC
+--- unix/Makefile.in.orig	2017-04-20 14:47:01 UTC
 +++ unix/Makefile.in
-@@ -54,6 +54,8 @@ SCRIPT_INSTALL_DIR	= $(INSTALL_ROOT)$(TC
- 
- # Directory in which to install the include file tcl.h:
- INCLUDE_INSTALL_DIR	= $(INSTALL_ROOT)$(includedir)
-+GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic
-+UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix
- 
- # Path to the private tcl header dir:
- PRIVATE_INCLUDE_DIR	= @PRIVATE_INCLUDE_DIR@
-@@ -80,10 +82,10 @@ HTML_DIR		= @HTML_DIR@
+@@ -80,10 +80,10 @@ HTML_DIR		= @HTML_DIR@
  HTML_INSTALL_DIR	= $(INSTALL_ROOT)$(HTML_DIR)
  
  # Directory in which to install the configuration file tclConfig.sh
@@ -22,38 +13,16 @@
  
  # Package search path.
  TCL_PACKAGE_PATH	= @TCL_PACKAGE_PATH@
-@@ -612,9 +614,9 @@ SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $
+@@ -613,7 +613,7 @@ SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $
  # Start of rules
  #--------------------------------------------------------------------------
  
 -all: binaries libraries doc packages
 +all: binaries libraries doc
  
--binaries: ${LIB_FILE} ${TCL_EXE}
-+binaries: ${LIB_FILE} ${TCL_EXE} libtcl${SHORT_TCL_VER}.a
- 
- libraries:
- 
-@@ -625,6 +627,12 @@ doc:
- ${LIB_FILE}: ${STUB_LIB_FILE} ${OBJS}
- 	rm -f $@
- 	@MAKE_LIB@
-+	@ln -sf ${LIB_FILE} ./libtcl${SHORT_TCL_VER}.so
-+
-+libtcl${SHORT_TCL_VER}.a: ${OBJS}
-+	rm -f libtcl${SHORT_TCL_VER}.a
-+	ar cr libtcl${SHORT_TCL_VER}.a ${OBJS}
-+	${RANLIB} libtcl${SHORT_TCL_VER}.a
- 
- ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
- 	@if test "x${LIB_FILE}" = "xlibtcl${MAJOR_VERSION}.${MINOR_VERSION}.dll"; then \
-@@ -768,13 +776,13 @@ trace-test: ${TCLTEST_EXE}
- # Installation rules
- #--------------------------------------------------------------------------
+ binaries: ${LIB_FILE} ${TCL_EXE}
  
--INSTALL_BASE_TARGETS = install-binaries install-libraries install-msgs $(INSTALL_TZDATA)
-+INSTALL_BASE_TARGETS = install-binaries install-msgs $(INSTALL_TZDATA)
- INSTALL_DOC_TARGETS = install-doc
+@@ -774,8 +774,8 @@ INSTALL_DOC_TARGETS = install-doc
  INSTALL_PACKAGE_TARGETS = install-packages
  INSTALL_DEV_TARGETS = install-headers
  INSTALL_EXTRA_TARGETS = @EXTRA_INSTALL@
@@ -64,19 +33,7 @@
  
  install: $(INSTALL_TARGETS)
  
-@@ -796,6 +804,11 @@ install-binaries: binaries
- 	@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
- 	@@INSTALL_LIB@
- 	@chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)"
-+	@ln -sf $(LIB_FILE) "$(DLL_INSTALL_DIR)"/libtcl${SHORT_TCL_VER}.so
-+	@echo "Installing libtcl${SHORT_TCL_VER}.a to $(DLL_INSTALL_DIR)"
-+	@$(INSTALL_DATA) libtcl${SHORT_TCL_VER}.a "$(DLL_INSTALL_DIR)"/libtcl${SHORT_TCL_VER}.a
-+	@(cd "$(DLL_INSTALL_DIR)" && ${RANLIB} libtcl${SHORT_TCL_VER}.a)
-+	@chmod 555 "$(DLL_INSTALL_DIR)"/libtcl${SHORT_TCL_VER}.a
- 	@echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}"
- 	@$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}"
- 	@echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/"
-@@ -808,12 +821,17 @@ install-binaries: binaries
+@@ -809,12 +809,17 @@ install-binaries: binaries
  	    @INSTALL_STUB_LIB@ ; \
  	fi
  	@EXTRA_INSTALL_BINARIES@
@@ -98,7 +55,7 @@
  	    do \
  	    if [ ! -d "$$i" ] ; then \
  		echo "Making directory $$i"; \
-@@ -821,7 +839,13 @@ install-libraries: libraries
+@@ -822,7 +827,13 @@ install-libraries: libraries
  		else true; \
  		fi; \
  	    done;
@@ -113,12 +70,12 @@
  	    do \
  	    if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
  		echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
-@@ -841,31 +865,31 @@ install-libraries: libraries
+@@ -842,31 +853,31 @@ install-libraries: libraries
  	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \
  	    done;
- 	@echo "Installing package http 2.8.10 as a Tcl Module";
--	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.10.tm;
-+	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/http-2.8.10.tm;
+ 	@echo "Installing package http 2.8.11 as a Tcl Module";
+-	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.11.tm;
++	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/http-2.8.11.tm;
  	@echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/";
  	@for i in $(TOP_DIR)/library/opt/*.tcl ; \
  	    do \
@@ -155,39 +112,3 @@
  
  install-tzdata:
  	@for i in tzdata; \
-@@ -940,7 +964,7 @@ install-doc: doc
- 	done
- 
- install-headers:
--	@for i in "$(INCLUDE_INSTALL_DIR)"; \
-+	@for i in "$(INCLUDE_INSTALL_DIR)" "$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)"; \
- 	    do \
- 	    if [ ! -d "$$i" ] ; then \
- 		echo "Making directory $$i"; \
-@@ -949,14 +973,19 @@ install-headers:
- 		fi; \
- 	    done;
- 	@echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
--	@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 ; \
--	    do \
--	    $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \
-+	@for i in $(GENERIC_DIR)/*.h; do \
-+	    $(INSTALL_DATA) $$i "$(GENERIC_INCLUDE_INSTALL_DIR)"/; \
-+	    done;
-+	@for i in $(UNIX_DIR)/*.h; do \
-+	    $(INSTALL_DATA) $$i "$(UNIX_INCLUDE_INSTALL_DIR)"/; \
- 	    done;
-+	@ln -sf generic/tcl.h "$(INCLUDE_INSTALL_DIR)"/tcl.h
-+	@ln -sf generic/tclDecls.h "$(INCLUDE_INSTALL_DIR)"/tclDecls.h
-+	@ln -sf generic/tclPlatDecls.h "$(INCLUDE_INSTALL_DIR)"/tclPlatDecls.h
-+	@ln -sf generic/tclOO.h "$(INCLUDE_INSTALL_DIR)"/tclOO.h
-+	@ln -sf generic/tclOODecls.h "$(INCLUDE_INSTALL_DIR)"/tclOODecls.h
-+	@ln -sf generic/tclTomMath.h "$(INCLUDE_INSTALL_DIR)"/tclTomMath.h
-+	@ln -sf generic/tclTomMathDecls.h "$(INCLUDE_INSTALL_DIR)"/tclTomMathDecls.h
- 
- # Optional target to install private headers
- install-private-headers:
diff --git a/lang/tcl87/files/patch-unix-configure b/lang/tcl87/files/patch-unix-configure
deleted file mode 100644
index 4edb085d7d98..000000000000
--- a/lang/tcl87/files/patch-unix-configure
+++ /dev/null
@@ -1,19 +0,0 @@
---- unix/configure.orig	2016-06-01 12:03:50 UTC
-+++ unix/configure
-@@ -5843,15 +5843,11 @@ fi
- 		CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
- 		LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
- fi
--	    case $system in
--	    FreeBSD-3.*)
- 		# Version numbers are dot-stripped by system policy.
- 		TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
- 		UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
--		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
-+		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1'
- 		TCL_LIB_VERSIONS_OK=nodots
--		;;
--	    esac
- 	    ;;
- 	Darwin-*)
- 	    CFLAGS_OPTIMIZE="-Os"
diff --git a/lang/tcl87/files/patch-unix-installManPage b/lang/tcl87/files/patch-unix-installManPage
index a56d7826439b..33374d0f402f 100644
--- a/lang/tcl87/files/patch-unix-installManPage
+++ b/lang/tcl87/files/patch-unix-installManPage
@@ -1,4 +1,4 @@
---- unix/installManPage.orig	2016-06-01 12:03:50 UTC
+--- unix/installManPage.orig	2017-04-20 14:47:01 UTC
 +++ unix/installManPage
 @@ -100,7 +100,7 @@ SrcDir=`dirname $ManPage`
  
diff --git a/lang/tcl87/pkg-plist b/lang/tcl87/pkg-plist
index bcb95bea7671..e2aaa4bc8fca 100644
--- a/lang/tcl87/pkg-plist
+++ b/lang/tcl87/pkg-plist
@@ -1,45 +1,16 @@
 bin/tclsh%%TCL_VER%%
-lib/libtcl%%PKGNAMESUFFIX%%.a
+lib/libtclstub%%TCL_VER%%.a
+lib/libtcl%%TCL_VER%%.so
 lib/libtcl%%PKGNAMESUFFIX%%.so
 lib/libtcl%%PKGNAMESUFFIX%%.so.1
-lib/libtclstub%%PKGNAMESUFFIX%%.a
-include/tcl%%TCL_VER%%/generic/regcustom.h
-include/tcl%%TCL_VER%%/generic/regerrs.h
-include/tcl%%TCL_VER%%/generic/regex.h
-include/tcl%%TCL_VER%%/generic/regguts.h
-include/tcl%%TCL_VER%%/generic/tcl.h
-include/tcl%%TCL_VER%%/generic/tclCompile.h
-include/tcl%%TCL_VER%%/generic/tclDecls.h
-include/tcl%%TCL_VER%%/generic/tclFileSystem.h
-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/tclParse.h
-include/tcl%%TCL_VER%%/generic/tclPlatDecls.h
-include/tcl%%TCL_VER%%/generic/tclPort.h
-include/tcl%%TCL_VER%%/generic/tclRegexp.h
-include/tcl%%TCL_VER%%/generic/tclStringRep.h
-include/tcl%%TCL_VER%%/generic/tclStringTrim.h
-include/tcl%%TCL_VER%%/generic/tclTomMath.h
-include/tcl%%TCL_VER%%/generic/tclTomMathDecls.h
-include/tcl%%TCL_VER%%/generic/tclTomMathInt.h
-include/tcl%%TCL_VER%%/generic/tommath.h
 include/tcl%%TCL_VER%%/tcl.h
 include/tcl%%TCL_VER%%/tclDecls.h
-%%DTRACE%%include/tcl%%TCL_VER%%/unix/tclDTrace.h
 include/tcl%%TCL_VER%%/tclOO.h
 include/tcl%%TCL_VER%%/tclOODecls.h
 include/tcl%%TCL_VER%%/tclPlatDecls.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
-%%MODULES%%lib/tcl%%TCL_VER%%/http-2.8.10.tm
+%%MODULES%%lib/tcl%%TCL_VER%%/http-2.8.11.tm
 %%MODULES%%lib/tcl%%TCL_VER%%/http1.0/http.tcl
 %%MODULES%%lib/tcl%%TCL_VER%%/http1.0/pkgIndex.tcl
 %%MODULES%%lib/tcl%%TCL_VER%%/msgcat-1.6.0.tm