Attachment 211246 Details for Bug 243775 – update to 8.7a3

[patch] update to 8.7a3

tk87.diff (text/plain), 6.93 KB, created by Dima Panov on 2020-02-01 10:57:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dima Panov

Created: 2020-02-01 10:57:06 UTC

Size: 6.93 KB

patch

obsolete

>Index: x11-toolkits/tk87/Makefile
>===================================================================
>--- x11-toolkits/tk87/Makefile	(revision 524751)
>+++ x11-toolkits/tk87/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	tk
>-DISTVERSION=	8.7a1
>+DISTVERSION=	8.7a3
> CATEGORIES=	x11-toolkits
> MASTER_SITES=	SF/tcl/Tcl/${DISTVERSION} \
> 		TCLTK/tcl8_7
>Index: x11-toolkits/tk87/distinfo
>===================================================================
>--- x11-toolkits/tk87/distinfo	(revision 524751)
>+++ x11-toolkits/tk87/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1504851372
>-SHA256 (tk8.7a1-src.tar.gz) = 131e4bae43a15dff0324c0479358bb42cfd7b8de0e1ca8d93c9207643c7144dd
>-SIZE (tk8.7a1-src.tar.gz) = 4308746
>+TIMESTAMP = 1580548188
>+SHA256 (tk8.7a3-src.tar.gz) = 2580ea3d9bc46e175cca01de97868d64806bc754af2f06943261416fcdadf07c
>+SIZE (tk8.7a3-src.tar.gz) = 4617709
>Index: x11-toolkits/tk87/files/patch-unix-Makefile.in
>===================================================================
>--- x11-toolkits/tk87/files/patch-unix-Makefile.in	(revision 524751)
>+++ x11-toolkits/tk87/files/patch-unix-Makefile.in	(working copy)
>@@ -1,5 +1,14 @@
> --- Makefile.in.orig	2017-09-03 10:29:26 UTC
> +++ Makefile.in
>+@@ -64,6 +64,8 @@ SCRIPT_INSTALL_DIR	= $(INSTALL_ROOT)$(TK_LIBRARY)
>+ 
>+ # Directory in which to install the include file tk.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 tk header dir:
>+ PRIVATE_INCLUDE_DIR	= @PRIVATE_INCLUDE_DIR@
> @@ -92,7 +94,7 @@ HTML_DIR		= @HTML_DIR@
>  HTML_INSTALL_DIR	= $(INSTALL_ROOT)$(HTML_DIR)
>  
>@@ -9,7 +18,16 @@
>  
>  # Directory in which to install the demo files:
>  DEMO_INSTALL_DIR	= $(INSTALL_ROOT)$(TK_LIBRARY)/demos
>-@@ -699,8 +708,7 @@ INSTALL_DOC_TARGETS = install-doc
>+@@ -555,6 +557,8 @@ TTK_HDRS = $(TTK_DIR)/ttkTheme.h $(TTK_DIR)/ttkDecls.h
>+ PUBLIC_HDRS = $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h \
>+ 	$(GENERIC_DIR)/tkPlatDecls.h $(@TK_WINDOWINGSYSTEM@_HDRS)
>+ 
>++INSTALL_HDRS = tk.h tkDecls.h tkInt.h tkIntXlibDecls.h tkPlatDecls.h
>++
>+ # The private headers we want installed for install-private-headers
>+ PRIVATE_HDRS = $(GENERIC_DIR)/tkInt.h $(GENERIC_DIR)/tkIntDecls.h \
>+ 	$(GENERIC_DIR)/tkIntPlatDecls.h $(GENERIC_DIR)/tkPort.h \
>+@@ -699,8 +703,7 @@ INSTALL_DOC_TARGETS = install-doc
>  INSTALL_DEV_TARGETS = install-headers
>  INSTALL_DEMO_TARGETS = install-demos
>  INSTALL_EXTRA_TARGETS = @EXTRA_INSTALL@
>@@ -19,7 +37,7 @@
>  
>  install: $(INSTALL_TARGETS)
>  
>-@@ -755,9 +766,9 @@ install-binaries: $(TK_STUB_LIB_FILE) $(
>+@@ -755,9 +758,9 @@ install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) $
>  	    @INSTALL_STUB_LIB@ ; \
>  	fi
>  	@EXTRA_INSTALL_BINARIES@
>@@ -32,3 +50,28 @@
>  
>  install-libraries: libraries
>  	@for i in "$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)/images" \
>+@@ -855,7 +858,8 @@ install-doc:
>+ install-headers:
>+ 	@if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \
>+ 	    XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \
>+-	for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}"; \
>++	for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}" \
>++		"$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)"; \
>+ 	    do \
>+ 	    if [ -n "$$i" -a ! -d "$$i" ] ; then \
>+ 		echo "Making directory $$i"; \
>+@@ -864,9 +868,12 @@ install-headers:
>+ 		fi; \
>+ 	    done;
>+ 	@echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
>+-	@for i in $(PUBLIC_HDRS); \
>++	@${BSD_INSTALL_DATA} $(GENERIC_DIR)/*.h "$(GENERIC_INCLUDE_INSTALL_DIR)"/
>++	@${BSD_INSTALL_DATA} $(UNIX_DIR)/*.h "$(UNIX_INCLUDE_INSTALL_DIR)"/
>++	@for i in $(INSTALL_HDRS); \
>+ 	    do \
>+-	    $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \
>++	    j=`basename $$i` ; \
>++	    ln -sf generic/$$j "$(INCLUDE_INSTALL_DIR)"/$$j ; \
>+ 	    done;
>+ 	@list='$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)'; for i in $$list ; \
>+ 	    do \
>Index: x11-toolkits/tk87/pkg-plist
>===================================================================
>--- x11-toolkits/tk87/pkg-plist	(revision 524751)
>+++ x11-toolkits/tk87/pkg-plist	(working copy)
>@@ -1,7 +1,42 @@
> bin/wish%%TK_VER%%
>+include/tk%%TK_VER%%/generic/default.h
>+include/tk%%TK_VER%%/generic/ks_names.h
>+include/tk%%TK_VER%%/generic/nanosvg.h
>+include/tk%%TK_VER%%/generic/nanosvgrast.h
>+include/tk%%TK_VER%%/generic/tk.h
>+include/tk%%TK_VER%%/generic/tk3d.h
>+include/tk%%TK_VER%%/generic/tkArray.h
>+include/tk%%TK_VER%%/generic/tkBusy.h
>+include/tk%%TK_VER%%/generic/tkButton.h
>+include/tk%%TK_VER%%/generic/tkCanvas.h
>+include/tk%%TK_VER%%/generic/tkColor.h
>+include/tk%%TK_VER%%/generic/tkDecls.h
>+include/tk%%TK_VER%%/generic/tkDList.h
>+include/tk%%TK_VER%%/generic/tkEntry.h
>+include/tk%%TK_VER%%/generic/tkFileFilter.h
>+include/tk%%TK_VER%%/generic/tkFont.h
>+include/tk%%TK_VER%%/generic/tkImgPhoto.h
>+include/tk%%TK_VER%%/generic/tkInt.h
>+include/tk%%TK_VER%%/generic/tkIntDecls.h
>+include/tk%%TK_VER%%/generic/tkIntPlatDecls.h
>+include/tk%%TK_VER%%/generic/tkIntXlibDecls.h
>+include/tk%%TK_VER%%/generic/tkMenu.h
>+include/tk%%TK_VER%%/generic/tkMenubutton.h
>+include/tk%%TK_VER%%/generic/tkPlatDecls.h
>+include/tk%%TK_VER%%/generic/tkPort.h
>+include/tk%%TK_VER%%/generic/tkScale.h
>+include/tk%%TK_VER%%/generic/tkScrollbar.h
>+include/tk%%TK_VER%%/generic/tkSelect.h
>+include/tk%%TK_VER%%/generic/tkText.h
>+include/tk%%TK_VER%%/generic/tkUndo.h
> include/tk%%TK_VER%%/tk.h
> include/tk%%TK_VER%%/tkDecls.h
>+include/tk%%TK_VER%%/tkInt.h
>+include/tk%%TK_VER%%/tkIntXlibDecls.h
> include/tk%%TK_VER%%/tkPlatDecls.h
>+include/tk%%TK_VER%%/unix/tkUnixDefault.h
>+include/tk%%TK_VER%%/unix/tkUnixInt.h
>+include/tk%%TK_VER%%/unix/tkUnixPort.h
> lib/libtkstub%%TK_VER%%.a
> lib/libtk%%TK_VER%%.so
> lib/libtk%%PKGNAMESUFFIX%%.so
>@@ -43,6 +78,7 @@
> %%DEMOS%%lib/tk%%TK_VER%%/demos/image1.tcl
> %%DEMOS%%lib/tk%%TK_VER%%/demos/image2.tcl
> %%DEMOS%%lib/tk%%TK_VER%%/demos/images/earth.gif
>+%%DEMOS%%lib/tk%%TK_VER%%/demos/images/earthmenu.png
> %%DEMOS%%lib/tk%%TK_VER%%/demos/images/earthris.gif
> %%DEMOS%%lib/tk%%TK_VER%%/demos/images/flagdown.xbm
> %%DEMOS%%lib/tk%%TK_VER%%/demos/images/flagup.xbm
>@@ -178,6 +214,9 @@
> lib/tk%%TK_VER%%/unsupported.tcl
> lib/tk%%TK_VER%%/xmfbox.tcl
> %%TKMAN%%man/man1/wish.tk%%PKGNAMESUFFIX%%.1.gz
>+%%TKMAN%%man/man3/FindPhoto.tk%%PKGNAMESUFFIX%%.3.gz
>+%%TKMAN%%man/man3/FontId.tk%%PKGNAMESUFFIX%%.3.gz
>+%%TKMAN%%man/man3/MeasureChar.tk%%PKGNAMESUFFIX%%.3.gz
> %%TKMAN%%man/man3/Tk_3DBorderColor.tk%%PKGNAMESUFFIX%%.3.gz
> %%TKMAN%%man/man3/Tk_3DBorderGC.tk%%PKGNAMESUFFIX%%.3.gz
> %%TKMAN%%man/man3/Tk_3DHorizontalBevel.tk%%PKGNAMESUFFIX%%.3.gz
>@@ -376,7 +415,6 @@
> %%TKMAN%%man/man3/Tk_NameOfJustify.tk%%PKGNAMESUFFIX%%.3.gz
> %%TKMAN%%man/man3/Tk_NameOfRelief.tk%%PKGNAMESUFFIX%%.3.gz
> %%TKMAN%%man/man3/Tk_NameToWindow.tk%%PKGNAMESUFFIX%%.3.gz
>-%%TKMAN%%man/man3/Tk_Offset.tk%%PKGNAMESUFFIX%%.3.gz
> %%TKMAN%%man/man3/Tk_OwnSelection.tk%%PKGNAMESUFFIX%%.3.gz
> %%TKMAN%%man/man3/Tk_Parent.tk%%PKGNAMESUFFIX%%.3.gz
> %%TKMAN%%man/man3/Tk_ParseArgv.tk%%PKGNAMESUFFIX%%.3.gz

Actions: View | Diff

Attachments on bug 243775: 211246