Attachment 211245 Details for Bug 243774 – install headers

[patch] install headers

tcl87.diff (text/plain), 6.04 KB, created by Dima Panov on 2020-02-01 10:55:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dima Panov

Created: 2020-02-01 10:55:17 UTC

Size: 6.04 KB

patch

obsolete

>Index: lang/tcl87/Makefile
>===================================================================
>--- lang/tcl87/Makefile	(revision 524751)
>+++ lang/tcl87/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	tcl
> DISTVERSION=	${TCL_VERSION}${TCL_RC}
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	lang
> MASTER_SITES=	SF/tcl/Tcl/${TCL_VERSION} \
> 		TCLTK/tcl8_7
>Index: lang/tcl87/files/patch-unix_Makefile.in
>===================================================================
>--- lang/tcl87/files/patch-unix_Makefile.in	(revision 524751)
>+++ lang/tcl87/files/patch-unix_Makefile.in	(working copy)
>@@ -1,6 +1,15 @@
> --- unix/Makefile.in.orig	2019-11-27 12:28:19 UTC
> +++ unix/Makefile.in
>-@@ -81,7 +81,7 @@ HTML_DIR		= @HTML_DIR@
>+@@ -55,6 +55,8 @@ SCRIPT_INSTALL_DIR	= $(INSTALL_ROOT)$(TCL_LIBRARY)
>+ 
>+ # 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@
>+@@ -81,7 +83,7 @@ HTML_DIR		= @HTML_DIR@
>  HTML_INSTALL_DIR	= $(INSTALL_ROOT)$(HTML_DIR)
>  
>  # Directory in which to install the configuration file tclConfig.sh
>@@ -9,7 +18,7 @@
>  
>  # Directory in which to install bundled packages:
>  PACKAGE_DIR		= @PACKAGE_DIR@
>-@@ -988,7 +988,7 @@ install-binaries: binaries
>+@@ -988,7 +990,7 @@ install-binaries: binaries
>  	@EXTRA_INSTALL_BINARIES@
>  	@echo "Installing pkg-config file to $(LIB_INSTALL_DIR)/pkgconfig/"
>  	@$(INSTALL_DATA_DIR) $(LIB_INSTALL_DIR)/pkgconfig
>@@ -18,7 +27,7 @@
>  
>  install-libraries-zipfs-shared: libraries
>  	@for i in "$(SCRIPT_INSTALL_DIR)"; do \
>-@@ -1014,7 +1014,7 @@ install-libraries: libraries
>+@@ -1014,7 +1016,7 @@ install-libraries: libraries
>  		$(INSTALL_DATA_DIR) "$$i"; \
>  	    fi; \
>  	done
>@@ -27,7 +36,7 @@
>  	    if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
>  		echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
>  		$(INSTALL_DATA_DIR) "$(SCRIPT_INSTALL_DIR)"/$$i; \
>-@@ -1026,28 +1026,31 @@ install-libraries: libraries
>+@@ -1026,28 +1028,31 @@ install-libraries: libraries
>  	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"; \
>  	done
>  	@echo "Installing package cookiejar 0.1 files to $(SCRIPT_INSTALL_DIR)/cookiejar0.1/"
>@@ -65,13 +74,45 @@
>  	@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
>+@@ -1057,7 +1062,10 @@ install-libraries: libraries
>  	    echo "if {![interp issafe]} { ::tcl::tm::roots {$(TCL_MODULE_PATH)} }" >> \
>  	        "$(SCRIPT_INSTALL_DIR)"/tm.tcl; \
>  	fi
> +	echo "::tcl::tm::path add {$(TCL_LIBRARY)}" >> \
> +	    "$(SCRIPT_INSTALL_DIR)"/tm.tcl;
>+ 
> +
>- 
>  install-tzdata:
>  	@for i in tzdata; do \
>+ 	    if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
>+@@ -1132,19 +1140,27 @@ TCL_PRIVATE_HEADERS = $(GENERIC_DIR)/tclInt.h $(GENERI
>+ 	$(GENERIC_DIR)/tclIntPlatDecls.h $(GENERIC_DIR)/tclPort.h \
>+ 	$(GENERIC_DIR)/tclOOInt.h $(GENERIC_DIR)/tclOOIntDecls.h \
>+ 	$(UNIX_DIR)/tclUnixPort.h
>++
>++TCL_INSTALL_HEADERS =	tcl.h tclDecls.h tclInt.h tclOO.h tclOODecls.h \
>++	tclPlatDecls.h tclTomMath.h tclTomMathDecls.h
>++
>+ # Any other headers you find in the Tcl sources are purely part of Tcl's
>+ # implementation, and aren't to be installed.
>+ 
>+ install-headers:
>+-	@for i in "$(INCLUDE_INSTALL_DIR)"; do \
>++	@for i in "$(INCLUDE_INSTALL_DIR)" "$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)"; \
>++	do \
>+ 	    if [ ! -d "$$i" ] ; then \
>+ 		echo "Making directory $$i"; \
>+ 		$(INSTALL_DATA_DIR) "$$i"; \
>+ 	    fi; \
>+ 	done
>+ 	@echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
>+-	@for i in $(TCL_PUBLIC_HEADERS); do \
>+-	    $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \
>++	@${BSD_INSTALL_DATA} $(GENERIC_DIR)/*.h "$(GENERIC_INCLUDE_INSTALL_DIR)"/
>++	@${BSD_INSTALL_DATA} $(UNIX_DIR)/*.h "$(UNIX_INCLUDE_INSTALL_DIR)"/
>++	@for i in $(TCL_INSTALL_HEADERS); do \
>++	    j=`basename $$i` ; \
>++	    ln -sf generic/$$j "$(INCLUDE_INSTALL_DIR)"/$$j ; \
>+ 	done
>+ 
>+ # Optional target to install private headers
>Index: lang/tcl87/pkg-plist
>===================================================================
>--- lang/tcl87/pkg-plist	(revision 524751)
>+++ lang/tcl87/pkg-plist	(working copy)
>@@ -4,6 +4,33 @@
> lib/libtcl%%PKGNAMESUFFIX%%.so
> lib/libtcl%%PKGNAMESUFFIX%%.so.1
> include/tcl%%TCL_VER%%/doc/man.macros
>+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/tclInt.h
>+include/tcl%%TCL_VER%%/generic/tclIntDecls.h
>+include/tcl%%TCL_VER%%/generic/tclIntPlatDecls.h
>+include/tcl%%TCL_VER%%/generic/tclIO.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/tclOOScript.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
> include/tcl%%TCL_VER%%/tclInt.h
>@@ -18,6 +45,8 @@
> include/tcl%%TCL_VER%%/tclTomMath.h
> include/tcl%%TCL_VER%%/tclTomMathDecls.h
> include/tcl%%TCL_VER%%/tclUnixPort.h
>+include/tcl%%TCL_VER%%/unix/tclDTrace.h
>+include/tcl%%TCL_VER%%/unix/tclUnixPort.h
> %%DTRACE%%lib/tcl%%TCL_VER%%/tclDTrace.d
> lib/tcl%%TCL_VER%%/auto.tcl
> lib/tcl%%TCL_VER%%/clock.tcl

Actions: View | Diff

Attachments on bug 243774: 211245