summaryrefslogtreecommitdiff
path: root/lang/tcl87/files/patch-unix_Makefile.in
diff options
context:
space:
mode:
authorPietro Cerutti <gahr@FreeBSD.org>2019-11-28 12:00:08 +0000
committerPietro Cerutti <gahr@FreeBSD.org>2019-11-28 12:00:08 +0000
commit2d3212b14a40bf1f046ce470cd7712073aec9071 (patch)
tree48a8b26473ba18a2b62e8076f28664b204a19cae /lang/tcl87/files/patch-unix_Makefile.in
parentUpdate to 0.6.2. (diff)
lang/tcl87: update to 8.7.a3
Announcement: https://sourceforge.net/p/tcl/mailman/message/36861768/
Diffstat (limited to 'lang/tcl87/files/patch-unix_Makefile.in')
-rw-r--r--lang/tcl87/files/patch-unix_Makefile.in108
1 files changed, 52 insertions, 56 deletions
diff --git a/lang/tcl87/files/patch-unix_Makefile.in b/lang/tcl87/files/patch-unix_Makefile.in
index 06140df6dd0b..3b20dbaaa764 100644
--- a/lang/tcl87/files/patch-unix_Makefile.in
+++ b/lang/tcl87/files/patch-unix_Makefile.in
@@ -1,6 +1,6 @@
---- unix/Makefile.in.orig 2017-09-07 12:54:11 UTC
+--- unix/Makefile.in.orig 2019-11-27 12:28:19 UTC
+++ unix/Makefile.in
-@@ -80,7 +80,7 @@ HTML_DIR = @HTML_DIR@
+@@ -81,7 +81,7 @@ HTML_DIR = @HTML_DIR@
HTML_INSTALL_DIR = $(INSTALL_ROOT)$(HTML_DIR)
# Directory in which to install the configuration file tclConfig.sh
@@ -8,53 +8,64 @@
+CONFIG_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY)
# Directory in which to install bundled packages:
- PACKAGE_DIR = @PACKAGE_DIR@
-@@ -813,7 +813,7 @@ install-binaries: binaries
+ PACKAGE_DIR = @PACKAGE_DIR@
+@@ -988,7 +988,7 @@ install-binaries: binaries
@EXTRA_INSTALL_BINARIES@
@echo "Installing pkg-config file to $(LIB_INSTALL_DIR)/pkgconfig/"
@$(INSTALL_DATA_DIR) $(LIB_INSTALL_DIR)/pkgconfig
- @$(INSTALL_DATA) tcl.pc $(LIB_INSTALL_DIR)/pkgconfig/tcl.pc
+ @$(INSTALL_DATA) tcl.pc $(LIB_INSTALL_DIR)/pkgconfig/tcl${SHORT_TCL_VER}.pc
- install-libraries: libraries
- @for i in "$(SCRIPT_INSTALL_DIR)"; \
-@@ -824,7 +824,7 @@ install-libraries: libraries
- else true; \
- fi; \
- done;
-- @for i in opt0.4 http1.0 encoding ../tcl8 ../tcl8/8.4 ../tcl8/8.4/platform ../tcl8/8.5 ../tcl8/8.6; \
-+ @for i in opt0.4 http1.0 encoding platform; \
- do \
+ install-libraries-zipfs-shared: libraries
+ @for i in "$(SCRIPT_INSTALL_DIR)"; do \
+@@ -1014,7 +1014,7 @@ install-libraries: libraries
+ $(INSTALL_DATA_DIR) "$$i"; \
+ fi; \
+ done
+- @for i in opt0.4 encoding ../tcl8 ../tcl8/8.4 ../tcl8/8.4/platform ../tcl8/8.5 ../tcl8/8.6 ../tcl8/8.7; do \
++ @for i in opt0.4 encoding platform; do \
if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
-@@ -844,21 +844,21 @@ install-libraries: libraries
- $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \
- done;
- @echo "Installing package http 2.8.12 as a Tcl Module";
-- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.12.tm;
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/http-2.8.12.tm;
- @echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/";
- @for i in $(TOP_DIR)/library/opt/*.tcl ; \
- do \
+ $(INSTALL_DATA_DIR) "$(SCRIPT_INSTALL_DIR)"/$$i; \
+@@ -1026,28 +1026,31 @@ install-libraries: libraries
+ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"; \
+ done
+ @echo "Installing package cookiejar 0.1 files to $(SCRIPT_INSTALL_DIR)/cookiejar0.1/"
+- @for i in $(TOP_DIR)/library/cookiejar/*.{tcl,txt.gz}; do \
++ @for i in $(TOP_DIR)/library/cookiejar/*.tcl; do \
+ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/cookiejar0.1; \
+ done
++ @for i in $(TOP_DIR)/library/cookiejar/*.txt.gz; do \
++ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/cookiejar0.1; \
++ done
+ @echo "Installing package http 2.9.1 as a Tcl Module"
+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl \
+- "$(MODULE_INSTALL_DIR)"/tcl8/8.6/http-2.9.1.tm
++ "$(SCRIPT_INSTALL_DIR)"/http-2.9.1.tm
+ @echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/"
+ @for i in $(TOP_DIR)/library/opt/*.tcl; do \
$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/opt0.4; \
- done;
- @echo "Installing package msgcat 1.6.1 as a Tcl Module";
-- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.6.1.tm;
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat-1.6.1.tm;
- @echo "Installing package tcltest 2.4.0 as a Tcl Module";
-- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.4.0.tm;
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest-2.4.0.tm;
-
- @echo "Installing package platform 1.0.14 as a Tcl Module";
-- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.14.tm;
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/platform-1.0.14.tm;
- @echo "Installing package platform::shell 1.1.4 as a Tcl Module";
-- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform/shell-1.1.4.tm;
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/platform/shell-1.1.4.tm;
-
- @echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/";
- @for i in $(TOP_DIR)/library/encoding/*.enc ; do \
-@@ -869,6 +869,9 @@ install-libraries: libraries
+ done
+ @echo "Installing package msgcat 1.7.0 as a Tcl Module"
+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl \
+- "$(MODULE_INSTALL_DIR)"/tcl8/8.7/msgcat-1.7.0.tm
++ "$(SCRIPT_INSTALL_DIR)"/msgcat-1.7.0.tm
+ @echo "Installing package tcltest 2.5.1 as a Tcl Module"
+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl \
+- "$(MODULE_INSTALL_DIR)"/tcl8/8.5/tcltest-2.5.1.tm
++ "$(SCRIPT_INSTALL_DIR)"/tcltest-2.5.1.tm
+ @echo "Installing package platform 1.0.14 as a Tcl Module"
+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl \
+- "$(MODULE_INSTALL_DIR)"/tcl8/8.4/platform-1.0.14.tm
++ "$(SCRIPT_INSTALL_DIR)"/platform-1.0.14.tm
+ @echo "Installing package platform::shell 1.1.4 as a Tcl Module"
+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl \
+- "$(MODULE_INSTALL_DIR)"/tcl8/8.4/platform/shell-1.1.4.tm
++ "$(SCRIPT_INSTALL_DIR)"/platform/shell-1.1.4.tm
+ @echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/"
+ @for i in $(TOP_DIR)/library/encoding/*.enc; do \
+ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/encoding; \
+@@ -1057,6 +1060,9 @@ install-libraries: libraries
echo "if {![interp issafe]} { ::tcl::tm::roots {$(TCL_MODULE_PATH)} }" >> \
"$(SCRIPT_INSTALL_DIR)"/tm.tcl; \
fi
@@ -63,19 +74,4 @@
+
install-tzdata:
- @for i in tzdata; \
-@@ -953,10 +956,13 @@
- done;
- @echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
- @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \
-+ $(GENERIC_DIR)/tclInt.h $(GENERIC_DIR)/tclIntDecls.h \
-+ $(GENERIC_DIR)/tclIntPlatDecls.h $(GENERIC_DIR)/tclPort.h\
- $(GENERIC_DIR)/tclOO.h $(GENERIC_DIR)/tclOODecls.h \
- $(GENERIC_DIR)/tclPlatDecls.h \
- $(GENERIC_DIR)/tclTomMath.h \
-- $(GENERIC_DIR)/tclTomMathDecls.h ; \
-+ $(GENERIC_DIR)/tclTomMathDecls.h \
-+ $(UNIX_DIR)/tclUnixPort.h ; \
- do \
- $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \
- done;
+ @for i in tzdata; do \