Remove $Id$ tags, update URL's, and more

- remove obsolete svn '$Id$' tags from all source files
- update .fl files and generated files accordingly
- replace 'http://www.fltk.org' URL's with 'https://...'
- replace bug report URL 'str.php' with 'bugs.php'
- remove trailing whitespace
- fix other whitespace errors flagged by Git
- add and/or fix missing or wrong standard headers
- convert tabs to spaces in all source files

The only relevant code changes are in the fluid/ folder where
some .fl files and other source files were used to generate
the '$Id' headers and footers.

12 files changed, 141 insertions, 175 deletions

diff --git a/CMake/Android/abi-version.cmake.in b/CMake/Android/abi-version.cmake.in
index d9fe5a341..5200197a9 100644
--- a/CMake/Android/abi-version.cmake.in
+++ b/CMake/Android/abi-version.cmake.in
@@ -1,6 +1,4 @@
 /*
- * "$Id$"
- *
  * Configuration file for the Fast Light Tool Kit (FLTK).
  *
  * Copyright 1998-2020 by Bill Spitzak and others.
@@ -11,9 +9,9 @@
  *
  *     https://www.fltk.org/COPYING.php
  *
- * Please report all bugs and problems on the following page:
+ * Please see the following page on how to report bugs and issues:
  *
- *     https://www.fltk.org/str.php
+ *     https://www.fltk.org/bugs.php
  */
 
 /*
@@ -25,7 +23,3 @@
 /* define FL_ABI_VERSION as 10x0y for FLTK ABI version 1.x.y */
 
 /* #undef FL_ABI_VERSION */
-
-/*
- * End of "$Id$".
- */
diff --git a/CMake/FLTKConfig.cmake.in b/CMake/FLTKConfig.cmake.in
index 2fafb4b7a..c93f5f004 100644
--- a/CMake/FLTKConfig.cmake.in
+++ b/CMake/FLTKConfig.cmake.in
@@ -36,7 +36,3 @@ if (CMAKE_CROSSCOMPILING)
 else ()
   set (FLTK_FLUID_EXECUTABLE fluid)
 endif (CMAKE_CROSSCOMPILING)
-
-#
-# End of file
-#
diff --git a/CMake/FindSDL2.cmake b/CMake/FindSDL2.cmake
index 026dc34e7..28cb8c603 100644
--- a/CMake/FindSDL2.cmake
+++ b/CMake/FindSDL2.cmake
@@ -68,46 +68,46 @@
 message("<FindSDL2.cmake>")
 
 SET(SDL2_SEARCH_PATHS
-	~/Library/Frameworks
-	/Library/Frameworks
-	/usr/local
-	/usr
-	/sw # Fink
-	/opt/local # DarwinPorts
-	/opt/csw # Blastwave
-	/opt
-	${SDL2_PATH}
+        ~/Library/Frameworks
+        /Library/Frameworks
+        /usr/local
+        /usr
+        /sw # Fink
+        /opt/local # DarwinPorts
+        /opt/csw # Blastwave
+        /opt
+        ${SDL2_PATH}
 )
 
 FIND_PATH(SDL2_INCLUDE_DIR SDL.h
-	HINTS
-	$ENV{SDL2DIR}
-	PATH_SUFFIXES include/SDL2 include
-	PATHS ${SDL2_SEARCH_PATHS}
+        HINTS
+        $ENV{SDL2DIR}
+        PATH_SUFFIXES include/SDL2 include
+        PATHS ${SDL2_SEARCH_PATHS}
 )
 
 FIND_LIBRARY(SDL2_LIBRARY_TEMP
-	NAMES SDL2
-	HINTS
-	$ENV{SDL2DIR}
-	PATH_SUFFIXES lib64 lib
-	PATHS ${SDL2_SEARCH_PATHS}
+        NAMES SDL2
+        HINTS
+        $ENV{SDL2DIR}
+        PATH_SUFFIXES lib64 lib
+        PATHS ${SDL2_SEARCH_PATHS}
 )
 
 IF(NOT SDL2_BUILDING_LIBRARY)
-	IF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework")
-		# Non-OS X framework versions expect you to also dynamically link to
-		# SDL2main. This is mainly for Windows and OS X. Other (Unix) platforms
-		# seem to provide SDL2main for compatibility even though they don't
-		# necessarily need it.
-		FIND_LIBRARY(SDL2MAIN_LIBRARY
-			NAMES SDL2main
-			HINTS
-			$ENV{SDL2DIR}
-			PATH_SUFFIXES lib64 lib
-			PATHS ${SDL2_SEARCH_PATHS}
-		)
-	ENDIF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework")
+        IF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework")
+                # Non-OS X framework versions expect you to also dynamically link to
+                # SDL2main. This is mainly for Windows and OS X. Other (Unix) platforms
+                # seem to provide SDL2main for compatibility even though they don't
+                # necessarily need it.
+                FIND_LIBRARY(SDL2MAIN_LIBRARY
+                        NAMES SDL2main
+                        HINTS
+                        $ENV{SDL2DIR}
+                        PATH_SUFFIXES lib64 lib
+                        PATHS ${SDL2_SEARCH_PATHS}
+                )
+        ENDIF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework")
 ENDIF(NOT SDL2_BUILDING_LIBRARY)
 
 # SDL2 may require threads on your system.
@@ -115,50 +115,50 @@ ENDIF(NOT SDL2_BUILDING_LIBRARY)
 # frameworks may already provide it.
 # But for non-OSX systems, I will use the CMake Threads package.
 IF(NOT APPLE)
-	FIND_PACKAGE(Threads)
+        FIND_PACKAGE(Threads)
 ENDIF(NOT APPLE)
 
 # MinGW needs an additional library, mwindows
 # It's total link flags should look like -lmingw32 -lSDL2main -lSDL2 -lmwindows
 # (Actually on second look, I think it only needs one of the m* libraries.)
 IF(MINGW)
-	SET(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW")
+        SET(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW")
 ENDIF(MINGW)
 
 IF(SDL2_LIBRARY_TEMP)
-	# For SDL2main
-	IF(NOT SDL2_BUILDING_LIBRARY)
-		IF(SDL2MAIN_LIBRARY)
-			SET(SDL2_LIBRARY_TEMP ${SDL2MAIN_LIBRARY} ${SDL2_LIBRARY_TEMP})
-		ENDIF(SDL2MAIN_LIBRARY)
-	ENDIF(NOT SDL2_BUILDING_LIBRARY)
-
-	# For OS X, SDL2 uses Cocoa as a backend so it must link to Cocoa.
-	# CMake doesn't display the -framework Cocoa string in the UI even
-	# though it actually is there if I modify a pre-used variable.
-	# I think it has something to do with the CACHE STRING.
-	# So I use a temporary variable until the end so I can set the
-	# "real" variable in one-shot.
-	IF(APPLE)
-		SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} "-framework Cocoa")
-	ENDIF(APPLE)
-
-	# For threads, as mentioned Apple doesn't need this.
-	# In fact, there seems to be a problem if I used the Threads package
-	# and try using this line, so I'm just skipping it entirely for OS X.
-	IF(NOT APPLE)
-		SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT})
-	ENDIF(NOT APPLE)
-
-	# For MinGW library
-	IF(MINGW)
-		SET(SDL2_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL2_LIBRARY_TEMP})
-	ENDIF(MINGW)
-
-	# Set the final string here so the GUI reflects the final state.
-	SET(SDL2_LIBRARY ${SDL2_LIBRARY_TEMP} CACHE STRING "Where the SDL2 Library can be found")
-	# Set the temp variable to INTERNAL so it is not seen in the CMake GUI
-	SET(SDL2_LIBRARY_TEMP "${SDL2_LIBRARY_TEMP}" CACHE INTERNAL "")
+        # For SDL2main
+        IF(NOT SDL2_BUILDING_LIBRARY)
+                IF(SDL2MAIN_LIBRARY)
+                        SET(SDL2_LIBRARY_TEMP ${SDL2MAIN_LIBRARY} ${SDL2_LIBRARY_TEMP})
+                ENDIF(SDL2MAIN_LIBRARY)
+        ENDIF(NOT SDL2_BUILDING_LIBRARY)
+
+        # For OS X, SDL2 uses Cocoa as a backend so it must link to Cocoa.
+        # CMake doesn't display the -framework Cocoa string in the UI even
+        # though it actually is there if I modify a pre-used variable.
+        # I think it has something to do with the CACHE STRING.
+        # So I use a temporary variable until the end so I can set the
+        # "real" variable in one-shot.
+        IF(APPLE)
+                SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} "-framework Cocoa")
+        ENDIF(APPLE)
+
+        # For threads, as mentioned Apple doesn't need this.
+        # In fact, there seems to be a problem if I used the Threads package
+        # and try using this line, so I'm just skipping it entirely for OS X.
+        IF(NOT APPLE)
+                SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT})
+        ENDIF(NOT APPLE)
+
+        # For MinGW library
+        IF(MINGW)
+                SET(SDL2_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL2_LIBRARY_TEMP})
+        ENDIF(MINGW)
+
+        # Set the final string here so the GUI reflects the final state.
+        SET(SDL2_LIBRARY ${SDL2_LIBRARY_TEMP} CACHE STRING "Where the SDL2 Library can be found")
+        # Set the temp variable to INTERNAL so it is not seen in the CMake GUI
+        SET(SDL2_LIBRARY_TEMP "${SDL2_LIBRARY_TEMP}" CACHE INTERNAL "")
 ENDIF(SDL2_LIBRARY_TEMP)
 
 message("</FindSDL2.cmake>")
diff --git a/CMake/UseFLTK.cmake.in b/CMake/UseFLTK.cmake.in
index 20ecb85d6..f9e9e0b6e 100644
--- a/CMake/UseFLTK.cmake.in
+++ b/CMake/UseFLTK.cmake.in
@@ -13,7 +13,3 @@ message(AUTHOR_WARNING
  * or later. Please use 'include_directories(\${FLTK_INCLUDE_DIRS})' or
  * 'target_include_directories(<target> PUBLIC|PRIVATE \${FLTK_INCLUDE_DIRS})'
  * instead of 'include(\${FLTK_USE_FILE})'.")
-
-#
-# End of file
-#
diff --git a/CMake/android.cmake b/CMake/android.cmake
index 7255af3fe..b5db954cf 100644
--- a/CMake/android.cmake
+++ b/CMake/android.cmake
@@ -1,6 +1,4 @@
 #
-# "$Id$"
-#
 # android.cmake to build the FLTK AndroidStudio project using CMake
 # Written by Matthias Melcher
 #
@@ -10,11 +8,11 @@
 # the file "COPYING" which should have been included with this file.  If this
 # file is missing or damaged, see the license at:
 #
-#     http://www.fltk.org/COPYING.php
+#     https://www.fltk.org/COPYING.php
 #
-# Please report all bugs and problems on the following page:
+# Please see the following page on how to report bugs and issues:
 #
-#     http://www.fltk.org/str.php
+#     https://www.fltk.org/bugs.php
 #
 
 # all target modules will be added here later
diff --git a/CMake/export.cmake b/CMake/export.cmake
index fecd1bd22..d6c07564a 100644
--- a/CMake/export.cmake
+++ b/CMake/export.cmake
@@ -1,6 +1,4 @@
 #
-# "$Id$"
-#
 # Main CMakeLists.txt to build the FLTK project using CMake (www.cmake.org)
 # Written by Michael Surette
 #
@@ -10,11 +8,11 @@
 # the file "COPYING" which should have been included with this file.  If this
 # file is missing or damaged, see the license at:
 #
-#     http://www.fltk.org/COPYING.php
+#     https://www.fltk.org/COPYING.php
 #
-# Please report all bugs and problems on the following page:
+# Please see the following page on how to report bugs and issues:
 #
-#     http://www.fltk.org/str.php
+#     https://www.fltk.org/bugs.php
 #
 
 #######################################################################
@@ -79,7 +77,7 @@ configure_file(
 
 if (UNIX)
   execute_process(COMMAND chmod 755 fltk-config
-		  WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+                  WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
   )
 endif (UNIX)
 
diff --git a/CMake/install.cmake b/CMake/install.cmake
index cb4f8fe71..0ab8e6073 100644
--- a/CMake/install.cmake
+++ b/CMake/install.cmake
@@ -1,6 +1,4 @@
 #
-# "$Id$"
-#
 # Main CMakeLists.txt to build the FLTK project using CMake (www.cmake.org)
 # Written by Michael Surette
 #
@@ -10,11 +8,11 @@
 # the file "COPYING" which should have been included with this file.  If this
 # file is missing or damaged, see the license at:
 #
-#     http://www.fltk.org/COPYING.php
+#     https://www.fltk.org/COPYING.php
 #
-# Please report all bugs and problems on the following page:
+# Please see the following page on how to report bugs and issues:
 #
-#     http://www.fltk.org/str.php
+#     https://www.fltk.org/bugs.php
 #
 
 #######################################################################
diff --git a/CMake/macros.cmake b/CMake/macros.cmake
index 4d5d4581d..b91b80b89 100644
--- a/CMake/macros.cmake
+++ b/CMake/macros.cmake
@@ -1,6 +1,4 @@
 #
-# "$Id$"
-#
 # Macros used by the CMake build system for the Fast Light Tool Kit (FLTK).
 # Written by Michael Surette
 #
@@ -10,11 +8,11 @@
 # the file "COPYING" which should have been included with this file.  If this
 # file is missing or damaged, see the license at:
 #
-#     http://www.fltk.org/COPYING.php
+#     https://www.fltk.org/COPYING.php
 #
-# Please report all bugs and problems on the following page:
+# Please see the following page on how to report bugs and issues:
 #
-#     http://www.fltk.org/str.php
+#     https://www.fltk.org/bugs.php
 #
 
 #######################################################################
@@ -59,9 +57,9 @@ macro(FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES)
     endif (${LIBTYPE} STREQUAL "SHARED")
 
     if (MSVC)
-	set (DEBUG_OUTPUT_NAME "${LIBNAME}d")
+        set (DEBUG_OUTPUT_NAME "${LIBNAME}d")
     else ()
-	set (DEBUG_OUTPUT_NAME "${LIBNAME}")
+        set (DEBUG_OUTPUT_NAME "${LIBNAME}")
     endif (MSVC)
 
     add_library(${TARGET_NAME} ${LIBTYPE} ${LIBFILES})
@@ -72,33 +70,33 @@ macro(FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES)
         DEBUG_OUTPUT_NAME ${DEBUG_OUTPUT_NAME}
         CLEAN_DIRECT_OUTPUT TRUE
         COMPILE_DEFINITIONS "FL_LIBRARY"
-	)
+        )
 
     if (${LIBTYPE} STREQUAL "SHARED")
-	set_target_properties(${TARGET_NAME}
-	    PROPERTIES
-	    OUTPUT_NAME ${LIBNAME}
-	    DEBUG_OUTPUT_NAME ${DEBUG_OUTPUT_NAME}
-	    VERSION ${FLTK_VERSION_FULL}
-	    SOVERSION ${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR}
-	    PREFIX "lib"    # for MSVC static/shared coexistence
-	    )
+        set_target_properties(${TARGET_NAME}
+            PROPERTIES
+            OUTPUT_NAME ${LIBNAME}
+            DEBUG_OUTPUT_NAME ${DEBUG_OUTPUT_NAME}
+            VERSION ${FLTK_VERSION_FULL}
+            SOVERSION ${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR}
+            PREFIX "lib"    # for MSVC static/shared coexistence
+            )
     endif (${LIBTYPE} STREQUAL "SHARED")
 
     if (MSVC)
-	if (OPTION_LARGE_FILE)
-	    set_target_properties(${TARGET_NAME}
-		PROPERTIES
-		LINK_FLAGS /LARGEADDRESSAWARE
-		)
-	endif (OPTION_LARGE_FILE)
-
-	if (${LIBTYPE} STREQUAL "SHARED")
-	    set_target_properties(${TARGET_NAME}
-		PROPERTIES
-		COMPILE_DEFINITIONS "FL_DLL"
-		)
-	endif (${LIBTYPE} STREQUAL "SHARED")
+        if (OPTION_LARGE_FILE)
+            set_target_properties(${TARGET_NAME}
+                PROPERTIES
+                LINK_FLAGS /LARGEADDRESSAWARE
+                )
+        endif (OPTION_LARGE_FILE)
+
+        if (${LIBTYPE} STREQUAL "SHARED")
+            set_target_properties(${TARGET_NAME}
+                PROPERTIES
+                COMPILE_DEFINITIONS "FL_DLL"
+                )
+        endif (${LIBTYPE} STREQUAL "SHARED")
     endif (MSVC)
 
     install(TARGETS ${TARGET_NAME}
@@ -106,7 +104,7 @@ macro(FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES)
         RUNTIME DESTINATION ${FLTK_BINDIR}
         LIBRARY DESTINATION ${FLTK_LIBDIR}
         ARCHIVE DESTINATION ${FLTK_LIBDIR}
-	)
+        )
 
     list(APPEND FLTK_LIBRARIES "${TARGET_NAME}")
     set (FLTK_LIBRARIES ${FLTK_LIBRARIES} PARENT_SCOPE)
@@ -119,14 +117,14 @@ function(FLTK_RUN_FLUID TARGET SOURCES)
     set (CXX_FILES)
     foreach(src ${SOURCES})
         if ("${src}" MATCHES "\\.fl$")
-	    string(REGEX REPLACE "(.*).fl" \\1 basename ${src})
-	    add_custom_command(
-		OUTPUT "${basename}.cxx" "${basename}.h"
-		COMMAND fluid -c ${CMAKE_CURRENT_SOURCE_DIR}/${src}
-		DEPENDS ${src}
-		MAIN_DEPENDENCY ${src}
-		)
-	    list(APPEND CXX_FILES "${basename}.cxx")
+            string(REGEX REPLACE "(.*).fl" \\1 basename ${src})
+            add_custom_command(
+                OUTPUT "${basename}.cxx" "${basename}.h"
+                COMMAND fluid -c ${CMAKE_CURRENT_SOURCE_DIR}/${src}
+                DEPENDS ${src}
+                MAIN_DEPENDENCY ${src}
+                )
+            list(APPEND CXX_FILES "${basename}.cxx")
         endif ("${src}" MATCHES "\\.fl$")
         set (${TARGET} ${CXX_FILES} PARENT_SCOPE)
     endforeach(src)
@@ -135,11 +133,11 @@ endfunction(FLTK_RUN_FLUID TARGET SOURCES)
 #######################################################################
 macro(CREATE_EXAMPLE NAME SOURCES LIBRARIES)
 
-    set (srcs)			# source files
-    set (flsrcs)		# fluid source files
+    set (srcs)                  # source files
+    set (flsrcs)                # fluid source files
 
-    set (tname ${NAME})		# target name
-    set (oname ${NAME})		# output (executable) name
+    set (tname ${NAME})         # target name
+    set (oname ${NAME})         # output (executable) name
 
     foreach(src ${SOURCES})
         if ("${src}" MATCHES "\\.fl$")
@@ -151,7 +149,7 @@ macro(CREATE_EXAMPLE NAME SOURCES LIBRARIES)
 
     set (FLUID_SOURCES)
     if (flsrcs)
-	FLTK_RUN_FLUID(FLUID_SOURCES "${flsrcs}")
+        FLTK_RUN_FLUID(FLUID_SOURCES "${flsrcs}")
     endif (flsrcs)
 
     if (APPLE AND (NOT OPTION_APPLE_X11) AND (NOT OPTION_APPLE_SDL))
diff --git a/CMake/options.cmake b/CMake/options.cmake
index 701280806..63412ebc3 100644
--- a/CMake/options.cmake
+++ b/CMake/options.cmake
@@ -1,6 +1,4 @@
 #
-# "$Id$"
-#
 # Main CMakeLists.txt to build the FLTK project using CMake (www.cmake.org)
 # Written by Michael Surette
 #
@@ -12,9 +10,9 @@
 #
 #     https://www.fltk.org/COPYING.php
 #
-# Please report all bugs and problems on the following page:
+# Please see the following page on how to report bugs and issues:
 #
-#     https://www.fltk.org/str.php
+#     https://www.fltk.org/bugs.php
 #
 
 set (DEBUG_OPTIONS_CMAKE 0)
@@ -471,7 +469,7 @@ if(X11_Xft_FOUND AND OPTION_USE_PANGO)
     set(USE_PANGO TRUE)
     list(APPEND FLTK_LDLIBS -lpango-1.0 -lpangoxft-1.0 -lgobject-2.0)
   else(PANGOXFT_FOUND)
-  
+
 #this covers Debian, Ubuntu, FreeBSD, NetBSD, Darwin
   if(APPLE AND OPTION_APPLE_X11)
      find_file(FINK_PREFIX NAMES /opt/sw /sw)
diff --git a/CMake/resources.cmake b/CMake/resources.cmake
index 3676d3bc0..4539f6f87 100644
--- a/CMake/resources.cmake
+++ b/CMake/resources.cmake
@@ -1,6 +1,4 @@
 #
-# "$Id$"
-#
 # Main CMakeLists.txt to build the FLTK project using CMake (www.cmake.org)
 # Written by Michael Surette
 #
@@ -10,11 +8,11 @@
 # the file "COPYING" which should have been included with this file.  If this
 # file is missing or damaged, see the license at:
 #
-#     http://www.fltk.org/COPYING.php
+#     https://www.fltk.org/COPYING.php
 #
-# Please report all bugs and problems on the following page:
+# Please see the following page on how to report bugs and issues:
 #
-#     http://www.fltk.org/str.php
+#     https://www.fltk.org/bugs.php
 #
 
 #######################################################################
@@ -208,31 +206,31 @@ if(HAVE_DLFCN_H)
 endif(HAVE_DLFCN_H)
 
 set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_DL_LIBS})
-CHECK_FUNCTION_EXISTS(dlsym			HAVE_DLSYM)
+CHECK_FUNCTION_EXISTS(dlsym                     HAVE_DLSYM)
 set(CMAKE_REQUIRED_LIBRARIES)
 
-CHECK_FUNCTION_EXISTS(localeconv		HAVE_LOCALECONV)
+CHECK_FUNCTION_EXISTS(localeconv                HAVE_LOCALECONV)
 
 if(LIB_png)
   set(CMAKE_REQUIRED_LIBRARIES ${LIB_png})
-  CHECK_FUNCTION_EXISTS(png_get_valid		HAVE_PNG_GET_VALID)
-  CHECK_FUNCTION_EXISTS(png_set_tRNS_to_alpha	HAVE_PNG_SET_TRNS_TO_ALPHA)
+  CHECK_FUNCTION_EXISTS(png_get_valid           HAVE_PNG_GET_VALID)
+  CHECK_FUNCTION_EXISTS(png_set_tRNS_to_alpha   HAVE_PNG_SET_TRNS_TO_ALPHA)
   set(CMAKE_REQUIRED_LIBRARIES)
 endif(LIB_png)
 
-CHECK_FUNCTION_EXISTS(scandir			HAVE_SCANDIR)
-CHECK_FUNCTION_EXISTS(snprintf			HAVE_SNPRINTF)
+CHECK_FUNCTION_EXISTS(scandir                   HAVE_SCANDIR)
+CHECK_FUNCTION_EXISTS(snprintf                  HAVE_SNPRINTF)
 
 # not really true but we convert strcasecmp calls to _stricmp calls in flstring.h
 if(MSVC)
    set(HAVE_STRCASECMP 1)
 endif(MSVC)
 
-CHECK_FUNCTION_EXISTS(strcasecmp		HAVE_STRCASECMP)
+CHECK_FUNCTION_EXISTS(strcasecmp                HAVE_STRCASECMP)
 
-CHECK_FUNCTION_EXISTS(strlcat			HAVE_STRLCAT)
-CHECK_FUNCTION_EXISTS(strlcpy			HAVE_STRLCPY)
-CHECK_FUNCTION_EXISTS(vsnprintf			HAVE_VSNPRINTF)
+CHECK_FUNCTION_EXISTS(strlcat                   HAVE_STRLCAT)
+CHECK_FUNCTION_EXISTS(strlcpy                   HAVE_STRLCPY)
+CHECK_FUNCTION_EXISTS(vsnprintf                 HAVE_VSNPRINTF)
 
 if(HAVE_SCANDIR AND NOT HAVE_SCANDIR_POSIX)
    set(MSG "POSIX compatible scandir")
@@ -285,7 +283,3 @@ endif (DOXYGEN_FOUND)
 # Cleanup: unset local variables
 
 unset (CMAKE_REQUIRED_QUIET)
-
-#
-# End of "$Id$".
-#
diff --git a/CMake/setup.cmake b/CMake/setup.cmake
index 8a261bc97..8935ed2bf 100644
--- a/CMake/setup.cmake
+++ b/CMake/setup.cmake
@@ -1,6 +1,4 @@
 #
-# "$Id$"
-#
 # CMakeLists.txt to build the FLTK project using CMake (www.cmake.org)
 # Written by Michael Surette
 #
@@ -10,11 +8,11 @@
 # the file "COPYING" which should have been included with this file.  If this
 # file is missing or damaged, see the license at:
 #
-#     http://www.fltk.org/COPYING.php
+#     https://www.fltk.org/COPYING.php
 #
-# Please report all bugs and problems on the following page:
+# Please see the following page on how to report bugs and issues:
 #
-#     http://www.fltk.org/str.php
+#     https://www.fltk.org/bugs.php
 #
 
 #######################################################################
diff --git a/CMake/variables.cmake b/CMake/variables.cmake
index 4edf8b749..ebafe7b10 100644
--- a/CMake/variables.cmake
+++ b/CMake/variables.cmake
@@ -1,6 +1,4 @@
 #
-# "$Id$"
-#
 # This file sets variables for common use in export.cmake and install.cmake
 # Written by Michael Surette
 #
@@ -10,11 +8,11 @@
 # the file "COPYING" which should have been included with this file.  If this
 # file is missing or damaged, see the license at:
 #
-#     http://www.fltk.org/COPYING.php
+#     https://www.fltk.org/COPYING.php
 #
-# Please report all bugs and problems on the following page:
+# Please see the following page on how to report bugs and issues:
 #
-#     http://www.fltk.org/str.php
+#     https://www.fltk.org/bugs.php
 #
 
 #######################################################################