merge core-8-branch

5 files changed, 11 insertions, 8 deletions

diff --git a/unix/Makefile.in b/unix/Makefile.in
index 8c96906..99b38a0 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -2388,9 +2388,9 @@ html-tk: ${NATIVE_TCLSH}
 
 BUILD_HTML = \
 	@${NATIVE_TCLSH} $(TOOL_DIR)/tcltk-man2html.tcl \
-		--useversion=$(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) \
+		--useversion=$(MAJOR_VERSION).$(MINOR_VERSION) \
 		--htmldir="$(HTML_INSTALL_DIR)" \
-		--srcdir=$(TOP_DIR)/.. $(BUILD_HTML_FLAGS)
+		--srcdir=$(TOP_DIR) $(BUILD_HTML_FLAGS)
 
 #--------------------------------------------------------------------------
 # The list of all the targets that do not correspond to real files. This stops
diff --git a/unix/README b/unix/README
index 3c1a207..b8adc71 100644
--- a/unix/README
+++ b/unix/README
@@ -8,11 +8,11 @@ MacOSX platform too, but they all depend on UNIX (POSIX/ANSI C) interfaces and
 some of them only make sense under UNIX.
 
 Updated forms of the information found in this file is available at:
-	http://www.tcl.tk/doc/howto/compile.html#unix
+	https://www.tcl-tk.org/doc/howto/compile.html#unix
 
 For information on platforms where Tcl is known to compile, along with any
 porting notes for getting it to work on those platforms, see:
-	http://www.tcl.tk/software/tcltk/platforms.html
+	https://www.tcl-tk.org/software/tcltk/platforms.html
 
 The rest of this file contains instructions on how to do this. The release
 should compile and run either "out of the box" or with trivial changes on any
@@ -89,7 +89,7 @@ How To Compile And Install Tcl:
 	--enable-dtrace		Enable tcl DTrace provider (if DTrace is
 				available on the platform), c.f. tclDTrace.d
 				for descriptions of the probes made available,
-				see http://wiki.tcl.tk/DTrace for more details
+				see https://wiki.tcl-lang.org/page/DTrace for more details
 	--with-encoding=ENCODING Specifies the encoding for compile-time
 				configuration values. Defaults to utf-8,
 				which is also sufficient for ASCII.
diff --git a/unix/tcl.pc.in b/unix/tcl.pc.in
index 2693cd8..21ea0ce 100644
--- a/unix/tcl.pc.in
+++ b/unix/tcl.pc.in
@@ -8,7 +8,7 @@ libfile=@TCL_LIB_FILE@
 
 Name: Tool Command Language
 Description: Tcl is a powerful, easy-to-learn dynamic programming language, suitable for a wide range of uses.
-URL: http://www.tcl.tk/
+URL: https://www.tcl-tk.org/
 Version: @TCL_VERSION@@TCL_PATCH_LEVEL@
 Requires.private: zlib >= 1.2.3, libtommath >= 1.2.0
 Libs: -L${libdir} @TCL_LIB_FLAG@ @TCL_STUB_LIB_FLAG@
diff --git a/unix/tcl.spec b/unix/tcl.spec
index e719a48..3956126 100644
--- a/unix/tcl.spec
+++ b/unix/tcl.spec
@@ -9,7 +9,7 @@ Release:       2
 License:       BSD
 Group:         Development/Languages
 Source:        http://prdownloads.sourceforge.net/tcl/tcl%{version}-src.tar.gz
-URL:           http://www.tcl.tk/
+URL:           https://www.tcl-lang.org/
 Buildroot:     /var/tmp/%{name}%{version}
 
 %description
diff --git a/unix/tclKqueueNotfy.c b/unix/tclKqueueNotfy.c
index ab3732d..6606c8c 100644
--- a/unix/tclKqueueNotfy.c
+++ b/unix/tclKqueueNotfy.c
@@ -182,7 +182,10 @@ PlatformEventsControl(
 
     if (fstat(filePtr->fd, &fdStat) == -1) {
 	Tcl_Panic("fstat: %s", strerror(errno));
-    } else if ((fdStat.st_mode & S_IFMT) == S_IFREG) {
+    } else if ((fdStat.st_mode & S_IFMT) == S_IFREG
+	    || (fdStat.st_mode & S_IFMT) == S_IFDIR
+	    || (fdStat.st_mode & S_IFMT) == S_IFLNK
+	    ) {
 	switch (op) {
 	case EV_ADD:
 	    if (isNew) {