wm/fvwm: Update to 2.6.9

Changelog and significant items from https://github.com/fvwmorg/fvwm/releases
(for 2.6.9):
-------------------------------------------------------------------
Changes in stable release 2.6.9 (05-Sep-2019)

* Bug fixes:

  - Fix handling of configure's --enable-mandoc/--enable-htmldoc

* New fvwm features:

  - Adds a new conditional option Fullscreen which detects
    windows in that state

-------------------------------------------------------------------
Changes in stable release 2.6.8 (31-Mar-2018)

* Bug fixes:

  - Various DESTDIR fixes (especially around the default-config
    Makefile)
  - fvwm-perllib pod2man fixes.
  - FvwmIconMan no longer triggers a warning about bad size hints
    in the fvwm core.
  - VMware windows do not disapper when switching between
    fullscreen and normal state.
  - Fix (de)installation with the configure options
    --program-prefix, --program-suffix and
    --program-transform-name.
  - Remove further references to obsolete modules from man page(s).

* New fvwm features:

  - fvwm-menu-desktop(1) now requires python3 as an explicit
    dependency.
  - Add a 'fullscreen' option to the 'Maximize' command.

-------------------------------------------------------------------
Changes in stable release 2.6.7 (06-Mar-2016)

* New fvwm features:

  - A new default configuration which is available when fvwm
    doesn't detect a configuration file to load.
  - A new conitional command "Desk n" can restrict matching
    windows to a specific desk.
  - A new conditional command "Screen n" to restrict matching
    windows on a given Xinerama screen.
  - New expansion variable "w.screen" to ascertain the Xineram
    screen number a window is on.
  - New command "InfoStoreClear" to remove all items in the
    InfoStore.

* Removed features:

  - The old and unmaintained debian/and rpm/ directories have
    been remmoved; use the maintainers' copies where available.
  - VMS support has been removed.
  - GTK1.x support has been removed.
  - GNOME-specific window hints (pre-EWMH) have been removed.
  - Some fvwm modules have been removed:
      - FvwmDragWell   (no replacement)
      - FvwmGTK        (no replacement)
      - FvwmSave       (no replacement)
      - FvwmSaveDesk   (no replacement)
      - FvwmScroll     (no replacement)
      - FvwmTabs       (no replacement, never worked anyway)
      - FvwmTaskBar    (use FvwmButtons)
      - FvwmTheme      (in core of fvwm as colorsets)
      - FvwmWharf      (use FvwmButtons)
      - FvwmWinList    (use WindowList command)
      - FvwmWindowMenu (use WindowList command)
      - FvwmIconBox    (use the IconBox style instead)

* New module features:

  - FvwmButtons learned a new option "Colorset" to its
    ChangeButton command.

* fvwm-menu-desktop updated:

  - Renamed default menu to XDGMenu and changed the name
    of the FvwmForm to FvwmForm-XDGMenu-Config to not conflict
    with someone already using FvwmMenu.
  - fvwm-menu-desktop will now load defaults from the
    FvwmForm-XDGMenu-Config data file.
  - Improved dynamic menus by regenerating them on-the-fly.
  - Added new options: --regen-cmd, --dynamic, and more.

* Bug fixes:

  - A bug introduced in 2.6.6 could cause applications with
    negative coordinates to be placed at strange positions.  This
    affected for example acroread when switching to fullscreen
    mode.  This has been fixed.
  - FvwmButtons "Silent" option for dynamic ChangeButton commands
    no longer loops infinitely.

Changes in stable release 2.6.6 (15-Mar-2016)

* New fvwm features:

  - Support for Russian from Ivan Gayevskiy.
  - EnvMatch supports infostore variables.
  - The option "forget" to the Maximize command allows to
    unmaximize a window without changing its size and position.
  - Windows shaded to a corner (NW, NE, SW, SE) are reduced to a
    small square.
  - New option "!raise" to the WarpToWindow command.
  - The new extended variables $[wa.x], $[wa.y], $[wa.width],
    $[wa.height] can be used to get the geometry of the EWMH
    working area, and $[dwa.x], $[dwa.y], $[dwa.width],
    $[dwa.height] can be used to get the geometry of the EWMH
    dynamic working area.
  - The Resize commands accept "wa" or "da" as a suffix of the
    width or height value.  If present, the value is a percentage
    of the width or height of the EWMH working area or the EWMH
    dynamic working area.
  - Fvwm is much more resilient against applications that flood the
    window manager with repeated events.

* New module features:

  - FvwmForm supports separator lines.
  - New FvwmIconMan options:
      IconAndSelectButton
      IconAndSelectColorset

* Bug fixes:

  - Provide a wrapper for the deprecation of XKeycodeToKeysym and
    use XkbKeycodeToKeysym() where appropriate.
  - fvwm-menu-desktop is re-written and provides better support of
    the XDG menu specification.
  - Fix fvwm-menu-desktop keyError bug.  Use "others" if no desktop
    environment found.
  - FvwmIconMan had problems displaying the hilight colour on some
    systems (64 bit issue?).
  - Globally active windows cannot take the focus if the style
    forbids programs to take focus themselves (style
    !FPFocusByProgram).
  - Windows no longer jump from one position to the other which
    could happen in some cases with SnapAttraction.  Windows now
    snap to the closest window (or screen edge).
  - Removing bindings had several strange side effects that are
    fixed now (removing too many bindings; old bindings showing up
    again after another is removed; possibly other effects).
  - Windows sometimes did not get expose events (i.e. did not
    redraw properly) if they were uncovered by moving a window
    above them.  This has been fixed.
  - FvwmConsole now causes much less network traffic.
  - Suppress bogus events sent to the modules when a window is
    resized with the mouse.
  - Properly handle the has_ref_window_moved flag for ResizeMove and
    ResizeMoveMaximize.
  - Removed some unnecessary redraws in FvwmPager.
  - The option "NoDeskLimitY" option of the GotoPage command did
    not work.
  - Negative coordinates in the "rectangle" option to the Menu
    commend did not work correctly.  This has been fixed.
  - Removes a slight graphics problem whith the ResizeMaximize
    command being invoked from a window button menu.
  - When an attempt to reparent a client window (i.e. decorate
    it) fails, fvwm no longer throws away all events but only the
    events for that window.
  - The ChangeButton command of FvwmButtons used to strip
    whitespace from the beginning and end of button titles and
    image paths.  This is no longer done.

3 files changed, 38 insertions, 41 deletions

diff --git a/wm/fvwm/patches/patch-ab b/wm/fvwm/patches/patch-ab
index 88591d449f8..7106998d9f8 100644
--- a/wm/fvwm/patches/patch-ab
+++ b/wm/fvwm/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.4 2013/01/20 07:09:29 mef Exp $
+$NetBSD: patch-ab,v 1.5 2019/09/21 13:56:15 ng0 Exp $
 
 (1) 
 Convert install path from fvwm to fvwm2
@@ -14,23 +14,21 @@ Avoid following problem on NetBSD/amd64 6.99.16 with clang
 |   ^
 +-----------------
 
---- configure.orig	2013-01-06 10:03:11.000000000 +0900
-+++ configure	2013-01-06 10:08:01.000000000 +0900
-@@ -3179,7 +3179,7 @@ fi
+--- configure~       2019-09-01 18:13:40.757285726 +0000
++++ configure   2019-09-01 18:18:08.056139617 +0000
+@@ -578,7 +578,7 @@
+ MAKEFLAGS=
  
- 
- # Define the identity of the package.
-- PACKAGE=fvwm
-+ PACKAGE=fvwm2
-  VERSION=${version}
+ # Identity of this package.
+-PACKAGE_NAME='fvwm'
++PACKAGE_NAME='fvwm2'
+ PACKAGE_TARNAME='fvwm'
+ PACKAGE_VERSION='2.6.9'
+ PACKAGE_STRING='fvwm 2.6.9'
+@@ -3320,5 +3320,5 @@
  
  
-@@ -6492,7 +6492,7 @@ int i; static j; int *p; char *c;
-   switch (*p = p = *c) { case 0: printf("%Q", c, p); }
-   *c = &i; c = p;
-   while (1 || (unsigned int)3 >= 0 || ((int)-1) == ((unsigned int)1));
--  return;
-+  return -1;
-   ;
-   return 0;
- }
+ # Define the identity of the package.
+- PACKAGE='fvwm'
++ PACKAGE='fvwm2'
+  VERSION='2.6.9'
diff --git a/wm/fvwm/patches/patch-ad b/wm/fvwm/patches/patch-ad
deleted file mode 100644
index 6691fa8d89a..00000000000
--- a/wm/fvwm/patches/patch-ad
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2013/01/20 06:53:53 mef Exp $
-
-Avoid following problem:
- ----
-In file included from gravity.c:19:0:
-../config.h:562:9: warning: conflicting types for built-in function 'alloca'
-In file included from ../config.h:577:0,
-                 from gravity.c:19:
-/usr/include/stdlib.h:250:7: error: conflicting types for 'alloca'
-../config.h:562:9: note: previous declaration of 'alloca' was here
- ----
-
---- config.h.in.orig	2006-12-09 11:54:06.000000000 +0000
-+++ config.h.in	2006-12-12 08:52:22.000000000 +0000
-@@ -432,6 +432,8 @@
- #else
- #  ifdef _AIX
-        #pragma alloca
-+#  elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__)
-+#	include <stdlib.h>
- #  else
- #    ifndef alloca /* predefined by HP cc +Olibcalls */
-	 char *alloca ();
diff --git a/wm/fvwm/patches/patch-fvwm_fvwm-reproducible.c b/wm/fvwm/patches/patch-fvwm_fvwm-reproducible.c
new file mode 100644
index 00000000000..67fba9648bc
--- /dev/null
+++ b/wm/fvwm/patches/patch-fvwm_fvwm-reproducible.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-fvwm_fvwm-reproducible.c,v 1.1 2019/09/21 13:56:15 ng0 Exp $
+
+Remove compile time __DATE__ and __TIME__ variables from the source.
+
+It looks like upstream rejected the request for inclusion in
+https://github.com/fvwmorg/fvwm/issues/67 and focuses on fvwm3 fixes.
+This patch has been taken from a similar (but not applying as-is) patch
+by robert@openbsd for OpenBSD's Xenocara tree FVWM version.
+
+--- fvwm/fvwm.c~
++++ fvwm/fvwm.c
+@@ -1286,8 +1286,8 @@ static void setVersionInfo(void)
+ 	int support_len;
+ 
+ 	/* Set version information string */
+-	sprintf(version_str, "fvwm %s%s compiled on %s at %s",
+-		VERSION, VERSIONINFO, __DATE__, __TIME__);
++	sprintf(version_str, "fvwm %s%s\n",
++		VERSION, VERSIONINFO);
+ 	Fvwm_VersionInfo = safestrdup(version_str);
+ 
+ 	sprintf(license_str,