x11-toolkits/tk86: update to 8.6.6, regenerate patches with make makepatch
Announcement: https://sourceforge.net/p/tcl/mailman/message/35246302/
This commit is contained in:
Pietro Cerutti
parent
eb44659025
commit
c5ce51480a
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=419215
5 changed files with 24 additions and 23 deletions
|
|
@ -2,7 +2,7 @@
|
|||
# $FreeBSD$
|
||||
|
||||
PORTNAME= tk
|
||||
PORTVERSION= 8.6.5
|
||||
PORTVERSION= 8.6.6
|
||||
CATEGORIES= x11-toolkits
|
||||
MASTER_SITES= SF/tcl/Tcl/${PORTVERSION} TCLTK/tcl8_6
|
||||
PKGNAMESUFFIX= ${PORTVERSION:R:S/.//}
|
||||
|
|
|
|||
|
|
@ -1,2 +1,3 @@
|
|||
SHA256 (tk8.6.5-src.tar.gz) = fbbd93541b4cd467841208643b4014c4543a54c3597586727f0ab128220d7946
|
||||
SIZE (tk8.6.5-src.tar.gz) = 4417393
|
||||
TIMESTAMP = 1469707479
|
||||
SHA256 (tk8.6.6-src.tar.gz) = d62c371a71b4744ed830e3c21d27968c31dba74dd2c45f36b9b071e6d88eb19d
|
||||
SIZE (tk8.6.6-src.tar.gz) = 4273737
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- Makefile.in.orig 2014-08-27 18:23:13.000000000 +0200
|
||||
+++ Makefile.in 2014-08-29 12:16:47.000000000 +0200
|
||||
@@ -64,6 +64,8 @@
|
||||
--- Makefile.in.orig 2016-07-26 14:07:50 UTC
|
||||
+++ Makefile.in
|
||||
@@ -64,6 +64,8 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TK
|
||||
|
||||
# Directory in which to install the include file tk.h:
|
||||
INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
# Path to the private tk header dir:
|
||||
PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@
|
||||
@@ -92,7 +94,7 @@
|
||||
@@ -92,7 +94,7 @@ HTML_DIR = @HTML_DIR@
|
||||
HTML_INSTALL_DIR = $(INSTALL_ROOT)$(HTML_DIR)
|
||||
|
||||
# Directory in which to install the configuration file tkConfig.sh:
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
# Directory in which to install the demo files:
|
||||
DEMO_INSTALL_DIR = $(INSTALL_ROOT)$(TK_LIBRARY)/demos
|
||||
@@ -555,6 +557,8 @@
|
||||
@@ -555,6 +557,8 @@ TTK_HDRS = $(TTK_DIR)/ttkTheme.h $(TTK_D
|
||||
PUBLIC_HDRS = $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h \
|
||||
$(GENERIC_DIR)/tkPlatDecls.h $(@TK_WINDOWINGSYSTEM@_HDRS)
|
||||
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
# 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 \
|
||||
@@ -584,6 +588,12 @@
|
||||
@@ -584,6 +588,12 @@ doc: $(TOP_DIR)/doc/man.macros
|
||||
${LIB_FILE}: ${STUB_LIB_FILE} @LIB_RSRC_FILE@ ${OBJS}
|
||||
rm -f $@
|
||||
@MAKE_LIB@
|
||||
|
|
@ -40,7 +40,7 @@
|
|||
|
||||
${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
|
||||
@if test "x${LIB_FILE}" = "xlibtk${MAJOR_VERSION}.${MINOR_VERSION}.dll"; then \
|
||||
@@ -699,8 +709,7 @@
|
||||
@@ -699,8 +709,7 @@ INSTALL_DOC_TARGETS = install-doc
|
||||
INSTALL_DEV_TARGETS = install-headers
|
||||
INSTALL_DEMO_TARGETS = install-demos
|
||||
INSTALL_EXTRA_TARGETS = @EXTRA_INSTALL@
|
||||
|
|
@ -50,16 +50,16 @@
|
|||
|
||||
install: $(INSTALL_TARGETS)
|
||||
|
||||
@@ -713,7 +722,7 @@
|
||||
# some ranlibs write to current directory, and this might not always be
|
||||
# possible (e.g. if installing as root).
|
||||
@@ -709,7 +718,7 @@ install-strip:
|
||||
INSTALL_PROGRAM="$(INSTALL_PROGRAM) ${INSTALL_STRIP_PROGRAM}" \
|
||||
INSTALL_LIBRARY="$(INSTALL_LIBRARY) ${INSTALL_STRIP_LIBRARY}"
|
||||
|
||||
-install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) ${WISH_EXE}
|
||||
+install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) libtk${SHORT_TK_VER}.a ${WISH_EXE}
|
||||
@for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" \
|
||||
"$(PKG_INSTALL_DIR)" "$(CONFIG_INSTALL_DIR)" ; \
|
||||
do \
|
||||
@@ -744,6 +753,10 @@
|
||||
@@ -740,6 +749,10 @@ install-binaries: $(TK_STUB_LIB_FILE) $(
|
||||
@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
|
||||
@@INSTALL_LIB@
|
||||
@chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)"
|
||||
|
|
@ -70,7 +70,7 @@
|
|||
@if test -f "tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \
|
||||
$(INSTALL_LIBRARY) "tk${MAJOR_VERSION}${MINOR_VERSION}.dll" "$(DLL_INSTALL_DIR)";\
|
||||
chmod 555 "$(DLL_INSTALL_DIR)/tk${MAJOR_VERSION}${MINOR_VERSION}.dll";\
|
||||
@@ -759,9 +772,9 @@
|
||||
@@ -755,9 +768,9 @@ install-binaries: $(TK_STUB_LIB_FILE) $(
|
||||
@INSTALL_STUB_LIB@ ; \
|
||||
fi
|
||||
@EXTRA_INSTALL_BINARIES@
|
||||
|
|
@ -83,7 +83,7 @@
|
|||
|
||||
install-libraries: libraries
|
||||
@for i in "$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)/images" \
|
||||
@@ -859,7 +872,8 @@
|
||||
@@ -855,7 +868,8 @@ install-doc:
|
||||
install-headers:
|
||||
@if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \
|
||||
XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \
|
||||
|
|
@ -93,7 +93,7 @@
|
|||
do \
|
||||
if [ -n "$$i" -a ! -d "$$i" ] ; then \
|
||||
echo "Making directory $$i"; \
|
||||
@@ -868,9 +882,12 @@
|
||||
@@ -864,9 +878,12 @@ install-headers:
|
||||
fi; \
|
||||
done;
|
||||
@echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
--- configure.orig 2014-08-27 18:23:13.000000000 +0200
|
||||
+++ configure 2014-08-29 13:46:28.000000000 +0200
|
||||
@@ -5606,15 +5606,11 @@
|
||||
--- configure.orig 2016-07-26 14:07:50 UTC
|
||||
+++ configure
|
||||
@@ -5456,15 +5456,11 @@ fi
|
||||
LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
|
||||
fi
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
--- installManPage.orig 2013-01-15 15:06:06.000000000 +0100
|
||||
+++ installManPage 2013-01-15 15:07:17.000000000 +0100
|
||||
@@ -100,7 +100,7 @@
|
||||
--- installManPage.orig 2016-07-26 14:07:50 UTC
|
||||
+++ installManPage
|
||||
@@ -100,7 +100,7 @@ SrcDir=`dirname $ManPage`
|
||||
|
||||
First=""
|
||||
for Target in $Names; do
|
||||
Loading…
Reference in a new issue