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.

7 files changed, 121 insertions, 460 deletions

diff --git a/wm/fvwm/Makefile b/wm/fvwm/Makefile
index 162a0d544e3..2728743c161 100644
--- a/wm/fvwm/Makefile
+++ b/wm/fvwm/Makefile
@@ -1,25 +1,20 @@
-# $NetBSD: Makefile,v 1.40 2019/08/11 13:24:14 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2019/09/21 13:56:15 ng0 Exp $
 
 DISTNAME=	fvwm-${FVWM_VER}
-PKGREVISION=	11
 CATEGORIES=	x11 wm
-MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/
-MASTER_SITES+=	http://www.fvwm.org/generated/icon_download/
-DISTFILES+=	fvwm-${FVWM_VER}.tar.gz fvwm_icons.tgz
+MASTER_SITES=	${MASTER_SITE_GITHUB:=fvwmorg/}
+GITHUB_RELEASE=	${FVWM_VER}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.fvwm.org/
 COMMENT=	Newer version of X11 Virtual window manager
 LICENSE=	gnu-gpl-v2
 
-#DEPENDS+=	xpmroot-2.*:../../x11/xpmroot
-
 CONFLICTS=	fvwm1-[0-9]* fvwm2-[0-9]* metisse-[0-9]* xpmroot-[0-9]*
-EXTRACT_ONLY=	${DISTNAME}.tar.gz
-FVWM_VER=	2.6.5
+FVWM_VER=	2.6.9
 
 GNU_CONFIGURE=		YES
-USE_TOOLS+=		perl:run tar
+USE_TOOLS+=		perl:run tar pkg-config
 
 PLIST_SUBST+=		FVWM_VER=${FVWM_VER:Q}
 
@@ -27,44 +22,37 @@ INSTALLATION_DIRS+=	lib/X11/fvwm2
 INSTALLATION_DIRS+=	lib/X11/fvwm2/pixmaps
 INSTALLATION_DIRS+=	${PKGMANDIR}/man1
 
-CONFIGURE_ARGS+=	--without-gnome
 CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/lib/X11/fvwm2
 CONFIGURE_ARGS+=	--libexecdir=${PREFIX}/lib/X11
-CONFIGURE_ARGS+=	--with-xpm-includes=${BUILDLINK_PREFIX.libXpm:Q}/include
+CONFIGURE_ARGS+=	--with-xpm-includes=${BUILDLINK_PREFIX.libXpm}/include
 CONFIGURE_ARGS+=	--with-imagepath=${PREFIX}/lib/X11/fvwm2/pixmaps:${X11BASE}/include/X11/bitmaps:${X11BASE}/include/X11/pixmaps
 
 # We don't want to have CPP from the buildlink directory
 CONFIGURE_ENV+=		ac_cv_path_FVWM_CPP=${CPP:Q}
 # To avoid ${WRKDIR} is included in perl script
-CONFIGURE_ENV+=         ac_cv_path_PERL=${PERL5:Q}
+CONFIGURE_ENV+=		ac_cv_path_PERL=${PERL5:Q}
 
-post-extract:
-	mkdir ${WRKDIR}/icons
-	cd ${WRKDIR}/icons && tar -xzf ${DISTDIR}/fvwm_icons.tgz
+.include "../../lang/python/application.mk"
+# fvwm-menu-desktop requires python3 and requires python-xdg at runtime.
+PYTHON_VERSIONS_INCOMPATIBLE=	27
+DEPENDS+=			${PYPKGPREFIX}-xdg-[0-9]*:../../devel/py-xdg
+CONFIGURE_ENV+=			PYTHON=${PYTHONBIN}
+CONFIGURE_ENV+=			ac_cv_path_PYTHON=${PYTHONBIN:Q}
 
-post-install:
-	${INSTALL_DATA} \
-		${WRKDIR}/icons/fvwm_icons/*.xpm \
-		${DESTDIR}${PREFIX}/lib/X11/fvwm2/pixmaps
-	${INSTALL_DATA} \
-		${WRKSRC}/sample.fvwmrc/decor_examples \
-		${WRKSRC}/sample.fvwmrc/system.fvwm2rc-sample-* \
-		${DESTDIR}${PREFIX}/lib/X11/fvwm2
-	${INSTALL_DATA} \
-		${WRKSRC}/sample.fvwmrc/system.fvwm2rc \
-		${DESTDIR}${PREFIX}/lib/X11/fvwm2/system.fvwm2rc.example
-	if [ ! -f ${DESTDIR}${PREFIX}/lib/X11/fvwm2/system.fvwm2rc ]; then \
-		${INSTALL_DATA} \
-			${DESTDIR}${PREFIX}/lib/X11/fvwm2/system.fvwm2rc.example \
-			${DESTDIR}${PREFIX}/lib/X11/fvwm2/system.fvwm2rc ; \
-	fi
+# 2 manpages want xsltproc.
+CONFIGURE_ARGS+=	--enable-mandoc
+BUILD_DEPENDS+=		docbook-xsl-[0-9]*:../../textproc/docbook-xsl
+BUILD_DEPENDS+=		libxslt-[0-9]*:../../textproc/libxslt
 
 .include "options.mk"
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
+.include "../../devel/libstroke/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../graphics/librsvg/available.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
diff --git a/wm/fvwm/PLIST b/wm/fvwm/PLIST
index 3f2a10bf55e..8a7edcc8545 100644
--- a/wm/fvwm/PLIST
+++ b/wm/fvwm/PLIST
@@ -1,9 +1,12 @@
-@comment $NetBSD: PLIST,v 1.4 2013/01/20 06:53:53 mef Exp $
+@comment $NetBSD: PLIST,v 1.5 2019/09/21 13:56:15 ng0 Exp $
+@pkgdir share/doc/fvwm2/commands
+@pkgdir share/doc/fvwm2/fvwm
+@pkgdir share/doc/fvwm2/images/svg_rendering
+@pkgdir share/doc/fvwm2/modules/images/FvwmTabs
 bin/FvwmCommand
 bin/fvwm
 bin/fvwm-bug
 bin/fvwm-config
-bin/fvwm-convert-2.4
 bin/fvwm-convert-2.6
 bin/fvwm-menu-desktop
 bin/fvwm-menu-directory
@@ -27,13 +30,9 @@ lib/X11/fvwm2/${FVWM_VER}/FvwmConsole
 lib/X11/fvwm2/${FVWM_VER}/FvwmConsoleC
 lib/X11/fvwm2/${FVWM_VER}/FvwmConsoleC.pl
 lib/X11/fvwm2/${FVWM_VER}/FvwmCpp
-lib/X11/fvwm2/${FVWM_VER}/FvwmDebug
-lib/X11/fvwm2/${FVWM_VER}/FvwmDragWell
 lib/X11/fvwm2/${FVWM_VER}/FvwmEvent
 lib/X11/fvwm2/${FVWM_VER}/FvwmForm
 ${PLIST.gtk}lib/X11/fvwm2/${FVWM_VER}/FvwmGtk
-lib/X11/fvwm2/${FVWM_VER}/FvwmGtkDebug
-lib/X11/fvwm2/${FVWM_VER}/FvwmIconBox
 lib/X11/fvwm2/${FVWM_VER}/FvwmIconMan
 lib/X11/fvwm2/${FVWM_VER}/FvwmIdent
 lib/X11/fvwm2/${FVWM_VER}/FvwmM4
@@ -41,340 +40,9 @@ lib/X11/fvwm2/${FVWM_VER}/FvwmPager
 lib/X11/fvwm2/${FVWM_VER}/FvwmPerl
 lib/X11/fvwm2/${FVWM_VER}/FvwmProxy
 lib/X11/fvwm2/${FVWM_VER}/FvwmRearrange
-lib/X11/fvwm2/${FVWM_VER}/FvwmSave
-lib/X11/fvwm2/${FVWM_VER}/FvwmSaveDesk
 lib/X11/fvwm2/${FVWM_VER}/FvwmScript
-lib/X11/fvwm2/${FVWM_VER}/FvwmScroll
-lib/X11/fvwm2/${FVWM_VER}/FvwmTabs
 lib/X11/fvwm2/${FVWM_VER}/FvwmTalk
-lib/X11/fvwm2/${FVWM_VER}/FvwmTaskBar
-lib/X11/fvwm2/${FVWM_VER}/FvwmTheme
 lib/X11/fvwm2/${FVWM_VER}/FvwmTile
-lib/X11/fvwm2/${FVWM_VER}/FvwmWharf
-lib/X11/fvwm2/${FVWM_VER}/FvwmWinList
-lib/X11/fvwm2/${FVWM_VER}/FvwmWindowMenu
-lib/X11/fvwm2/decor_examples
-lib/X11/fvwm2/pixmaps/Jlock.xpm
-lib/X11/fvwm2/pixmaps/Jnews.xpm
-lib/X11/fvwm2/pixmaps/Jrecycle.xpm
-lib/X11/fvwm2/pixmaps/Jxlock.xpm
-lib/X11/fvwm2/pixmaps/Monitor.xpm
-lib/X11/fvwm2/pixmaps/Mosaic.xpm
-lib/X11/fvwm2/pixmaps/Xfm.xpm
-lib/X11/fvwm2/pixmaps/arrdown2.xpm
-lib/X11/fvwm2/pixmaps/arrows2.xpm
-lib/X11/fvwm2/pixmaps/arrup2.xpm
-lib/X11/fvwm2/pixmaps/banner.fvwm_blue_cursive.xpm
-lib/X11/fvwm2/pixmaps/banner.fvwm_bracket.xpm
-lib/X11/fvwm2/pixmaps/banner.fvwm_cat_thing.xpm
-lib/X11/fvwm2/pixmaps/banner.fvwm_red_3D.xpm
-lib/X11/fvwm2/pixmaps/banner.fvwm_red_cursive.xpm
-lib/X11/fvwm2/pixmaps/banner.fvwm_tiger.xpm
-lib/X11/fvwm2/pixmaps/banner.fvwm_tiger_tail.xpm
-lib/X11/fvwm2/pixmaps/bckgnd1.xpm
-lib/X11/fvwm2/pixmaps/bckgnd3.xpm
-lib/X11/fvwm2/pixmaps/bell.xpm
-lib/X11/fvwm2/pixmaps/bomb.xpm
-lib/X11/fvwm2/pixmaps/button-close.xpm
-lib/X11/fvwm2/pixmaps/button-horiz.xpm
-lib/X11/fvwm2/pixmaps/button-max.xpm
-lib/X11/fvwm2/pixmaps/button-vert.xpm
-lib/X11/fvwm2/pixmaps/button.xpm
-lib/X11/fvwm2/pixmaps/clamp.xpm
-lib/X11/fvwm2/pixmaps/date.xpm
-lib/X11/fvwm2/pixmaps/datebook.xpm
-lib/X11/fvwm2/pixmaps/default.xpm
-lib/X11/fvwm2/pixmaps/desk.xpm
-lib/X11/fvwm2/pixmaps/desktop.xpm
-lib/X11/fvwm2/pixmaps/dialog_box.xpm
-lib/X11/fvwm2/pixmaps/display.xpm
-lib/X11/fvwm2/pixmaps/documents.xpm
-lib/X11/fvwm2/pixmaps/doomface.xpm
-lib/X11/fvwm2/pixmaps/editres.xpm
-lib/X11/fvwm2/pixmaps/eps.xpm
-lib/X11/fvwm2/pixmaps/exit.xpm
-lib/X11/fvwm2/pixmaps/find1.xpm
-lib/X11/fvwm2/pixmaps/flow_chart.xpm
-lib/X11/fvwm2/pixmaps/folder.xpm
-lib/X11/fvwm2/pixmaps/folder2.xpm
-lib/X11/fvwm2/pixmaps/folders.xpm
-lib/X11/fvwm2/pixmaps/fvwm.xpm
-lib/X11/fvwm2/pixmaps/fvwm2.xpm
-lib/X11/fvwm2/pixmaps/fvwm2_big.xpm
-lib/X11/fvwm2/pixmaps/fvwm3.xpm
-lib/X11/fvwm2/pixmaps/gimp.xpm
-lib/X11/fvwm2/pixmaps/gnu-animal.xpm
-lib/X11/fvwm2/pixmaps/graphs.xpm
-lib/X11/fvwm2/pixmaps/gv.xpm
-lib/X11/fvwm2/pixmaps/help.xpm
-lib/X11/fvwm2/pixmaps/jx.xpm
-lib/X11/fvwm2/pixmaps/keyboard.xpm
-lib/X11/fvwm2/pixmaps/lemacs.xpm
-lib/X11/fvwm2/pixmaps/mag_glass.xpm
-lib/X11/fvwm2/pixmaps/mail1.xpm
-lib/X11/fvwm2/pixmaps/mail2.xpm
-lib/X11/fvwm2/pixmaps/map.xpm
-lib/X11/fvwm2/pixmaps/math4.xpm
-lib/X11/fvwm2/pixmaps/menu.xpm
-lib/X11/fvwm2/pixmaps/mini.arch.xpm
-lib/X11/fvwm2/pixmaps/mini.audiovol.xpm
-lib/X11/fvwm2/pixmaps/mini.audiovol2.xpm
-lib/X11/fvwm2/pixmaps/mini.ball.xpm
-lib/X11/fvwm2/pixmaps/mini.ball2.xpm
-lib/X11/fvwm2/pixmaps/mini.bball.xpm
-lib/X11/fvwm2/pixmaps/mini.blah.xpm
-lib/X11/fvwm2/pixmaps/mini.bomb.xpm
-lib/X11/fvwm2/pixmaps/mini.bomb2.xpm
-lib/X11/fvwm2/pixmaps/mini.book1.xpm
-lib/X11/fvwm2/pixmaps/mini.book2.xpm
-lib/X11/fvwm2/pixmaps/mini.book3.xpm
-lib/X11/fvwm2/pixmaps/mini.book4.xpm
-lib/X11/fvwm2/pixmaps/mini.books.xpm
-lib/X11/fvwm2/pixmaps/mini.briefcase.xpm
-lib/X11/fvwm2/pixmaps/mini.bug1.xpm
-lib/X11/fvwm2/pixmaps/mini.bug2.xpm
-lib/X11/fvwm2/pixmaps/mini.bx2.xpm
-lib/X11/fvwm2/pixmaps/mini.calc.xpm
-lib/X11/fvwm2/pixmaps/mini.calc2.xpm
-lib/X11/fvwm2/pixmaps/mini.calendar.xpm
-lib/X11/fvwm2/pixmaps/mini.camera.xpm
-lib/X11/fvwm2/pixmaps/mini.cat.xpm
-lib/X11/fvwm2/pixmaps/mini.cave.xpm
-lib/X11/fvwm2/pixmaps/mini.cd.xpm
-lib/X11/fvwm2/pixmaps/mini.cdlabel.xpm
-lib/X11/fvwm2/pixmaps/mini.chart.xpm
-lib/X11/fvwm2/pixmaps/mini.checkmark.xpm
-lib/X11/fvwm2/pixmaps/mini.chinese.xpm
-lib/X11/fvwm2/pixmaps/mini.clipboard.xpm
-lib/X11/fvwm2/pixmaps/mini.clock.xpm
-lib/X11/fvwm2/pixmaps/mini.clock2.xpm
-lib/X11/fvwm2/pixmaps/mini.colors.xpm
-lib/X11/fvwm2/pixmaps/mini.connect.xpm
-lib/X11/fvwm2/pixmaps/mini.crosbone.xpm
-lib/X11/fvwm2/pixmaps/mini.cross.xpm
-lib/X11/fvwm2/pixmaps/mini.cut.xpm
-lib/X11/fvwm2/pixmaps/mini.delete.xpm
-lib/X11/fvwm2/pixmaps/mini.desktop.xpm
-lib/X11/fvwm2/pixmaps/mini.destroy.xpm
-lib/X11/fvwm2/pixmaps/mini.diff.xpm
-lib/X11/fvwm2/pixmaps/mini.directory.xpm
-lib/X11/fvwm2/pixmaps/mini.dirlink.xpm
-lib/X11/fvwm2/pixmaps/mini.diskette.xpm
-lib/X11/fvwm2/pixmaps/mini.display.xpm
-lib/X11/fvwm2/pixmaps/mini.doc.xpm
-lib/X11/fvwm2/pixmaps/mini.doc1.xpm
-lib/X11/fvwm2/pixmaps/mini.dog.xpm
-lib/X11/fvwm2/pixmaps/mini.ear.xpm
-lib/X11/fvwm2/pixmaps/mini.edit.xpm
-lib/X11/fvwm2/pixmaps/mini.espada.xpm
-lib/X11/fvwm2/pixmaps/mini.excl.xpm
-lib/X11/fvwm2/pixmaps/mini.exclam.xpm
-lib/X11/fvwm2/pixmaps/mini.exit.xpm
-lib/X11/fvwm2/pixmaps/mini.exp.xpm
-lib/X11/fvwm2/pixmaps/mini.eye.xpm
-lib/X11/fvwm2/pixmaps/mini.eye2.xpm
-lib/X11/fvwm2/pixmaps/mini.eyes.xpm
-lib/X11/fvwm2/pixmaps/mini.f1.xpm
-lib/X11/fvwm2/pixmaps/mini.fax.xpm
-lib/X11/fvwm2/pixmaps/mini.fdisk.xpm
-lib/X11/fvwm2/pixmaps/mini.file.xpm
-lib/X11/fvwm2/pixmaps/mini.filelink.xpm
-lib/X11/fvwm2/pixmaps/mini.filemgr.xpm
-lib/X11/fvwm2/pixmaps/mini.floppy.xpm
-lib/X11/fvwm2/pixmaps/mini.folder.xpm
-lib/X11/fvwm2/pixmaps/mini.font.xpm
-lib/X11/fvwm2/pixmaps/mini.fractal.xpm
-lib/X11/fvwm2/pixmaps/mini.frame.xpm
-lib/X11/fvwm2/pixmaps/mini.ftp.xpm
-lib/X11/fvwm2/pixmaps/mini.fvwm.xpm
-lib/X11/fvwm2/pixmaps/mini.gball.xpm
-lib/X11/fvwm2/pixmaps/mini.gimp.xpm
-lib/X11/fvwm2/pixmaps/mini.gnome.xpm
-lib/X11/fvwm2/pixmaps/mini.gnu.xpm
-lib/X11/fvwm2/pixmaps/mini.go.xpm
-lib/X11/fvwm2/pixmaps/mini.gopher.xpm
-lib/X11/fvwm2/pixmaps/mini.graph.xpm
-lib/X11/fvwm2/pixmaps/mini.graph2.xpm
-lib/X11/fvwm2/pixmaps/mini.gv.xpm
-lib/X11/fvwm2/pixmaps/mini.hammer.xpm
-lib/X11/fvwm2/pixmaps/mini.happy.xpm
-lib/X11/fvwm2/pixmaps/mini.hdisk.xpm
-lib/X11/fvwm2/pixmaps/mini.heart.xpm
-lib/X11/fvwm2/pixmaps/mini.hex.xpm
-lib/X11/fvwm2/pixmaps/mini.hextris.xpm
-lib/X11/fvwm2/pixmaps/mini.ibm.xpm
-lib/X11/fvwm2/pixmaps/mini.iconify.xpm
-lib/X11/fvwm2/pixmaps/mini.iconify1.xpm
-lib/X11/fvwm2/pixmaps/mini.icons.xpm
-lib/X11/fvwm2/pixmaps/mini.kde.xpm
-lib/X11/fvwm2/pixmaps/mini.keyboard.xpm
-lib/X11/fvwm2/pixmaps/mini.keys.xpm
-lib/X11/fvwm2/pixmaps/mini.letter.xpm
-lib/X11/fvwm2/pixmaps/mini.line.xpm
-lib/X11/fvwm2/pixmaps/mini.lock.xpm
-lib/X11/fvwm2/pixmaps/mini.lower.xpm
-lib/X11/fvwm2/pixmaps/mini.lower2.xpm
-lib/X11/fvwm2/pixmaps/mini.lower3.xpm
-lib/X11/fvwm2/pixmaps/mini.mag.xpm
-lib/X11/fvwm2/pixmaps/mini.mail.xpm
-lib/X11/fvwm2/pixmaps/mini.mail2.xpm
-lib/X11/fvwm2/pixmaps/mini.manual.xpm
-lib/X11/fvwm2/pixmaps/mini.max1.xpm
-lib/X11/fvwm2/pixmaps/mini.maximize-horiz.xpm
-lib/X11/fvwm2/pixmaps/mini.maximize-horiz1.xpm
-lib/X11/fvwm2/pixmaps/mini.maximize-vert.xpm
-lib/X11/fvwm2/pixmaps/mini.maximize-vert1.xpm
-lib/X11/fvwm2/pixmaps/mini.maximize.xpm
-lib/X11/fvwm2/pixmaps/mini.maximize1.xpm
-lib/X11/fvwm2/pixmaps/mini.maximize2.xpm
-lib/X11/fvwm2/pixmaps/mini.maze.xpm
-lib/X11/fvwm2/pixmaps/mini.modules.xpm
-lib/X11/fvwm2/pixmaps/mini.monitor.xpm
-lib/X11/fvwm2/pixmaps/mini.mouse.xpm
-lib/X11/fvwm2/pixmaps/mini.move.xpm
-lib/X11/fvwm2/pixmaps/mini.move1.xpm
-lib/X11/fvwm2/pixmaps/mini.move2.xpm
-lib/X11/fvwm2/pixmaps/mini.move3.xpm
-lib/X11/fvwm2/pixmaps/mini.mwm.xpm
-lib/X11/fvwm2/pixmaps/mini.netscape.xpm
-lib/X11/fvwm2/pixmaps/mini.news.xpm
-lib/X11/fvwm2/pixmaps/mini.nscape.xpm
-lib/X11/fvwm2/pixmaps/mini.ofolder.xpm
-lib/X11/fvwm2/pixmaps/mini.olwm.xpm
-lib/X11/fvwm2/pixmaps/mini.pager.xpm
-lib/X11/fvwm2/pixmaps/mini.paint.xpm
-lib/X11/fvwm2/pixmaps/mini.paint2.xpm
-lib/X11/fvwm2/pixmaps/mini.palette.xpm
-lib/X11/fvwm2/pixmaps/mini.paper.xpm
-lib/X11/fvwm2/pixmaps/mini.pdf.xpm
-lib/X11/fvwm2/pixmaps/mini.pencil.xpm
-lib/X11/fvwm2/pixmaps/mini.penguin.xpm
-lib/X11/fvwm2/pixmaps/mini.perf.xpm
-lib/X11/fvwm2/pixmaps/mini.picture.xpm
-lib/X11/fvwm2/pixmaps/mini.question.xpm
-lib/X11/fvwm2/pixmaps/mini.rainbow.xpm
-lib/X11/fvwm2/pixmaps/mini.raise.xpm
-lib/X11/fvwm2/pixmaps/mini.raise2.xpm
-lib/X11/fvwm2/pixmaps/mini.raise3.xpm
-lib/X11/fvwm2/pixmaps/mini.ray.xpm
-lib/X11/fvwm2/pixmaps/mini.rball.xpm
-lib/X11/fvwm2/pixmaps/mini.refresh.xpm
-lib/X11/fvwm2/pixmaps/mini.resize.xpm
-lib/X11/fvwm2/pixmaps/mini.resize2.xpm
-lib/X11/fvwm2/pixmaps/mini.resize3.xpm
-lib/X11/fvwm2/pixmaps/mini.resize4.xpm
-lib/X11/fvwm2/pixmaps/mini.roach.xpm
-lib/X11/fvwm2/pixmaps/mini.run.xpm
-lib/X11/fvwm2/pixmaps/mini.sh.xpm
-lib/X11/fvwm2/pixmaps/mini.sh1.xpm
-lib/X11/fvwm2/pixmaps/mini.shade1.xpm
-lib/X11/fvwm2/pixmaps/mini.slon.xpm
-lib/X11/fvwm2/pixmaps/mini.sound.xpm
-lib/X11/fvwm2/pixmaps/mini.start.xpm
-lib/X11/fvwm2/pixmaps/mini.stick.xpm
-lib/X11/fvwm2/pixmaps/mini.stick1.xpm
-lib/X11/fvwm2/pixmaps/mini.stick2.xpm
-lib/X11/fvwm2/pixmaps/mini.stickpressed.xpm
-lib/X11/fvwm2/pixmaps/mini.stop.xpm
-lib/X11/fvwm2/pixmaps/mini.telnet.xpm
-lib/X11/fvwm2/pixmaps/mini.term.xpm
-lib/X11/fvwm2/pixmaps/mini.term2.xpm
-lib/X11/fvwm2/pixmaps/mini.tetris.xpm
-lib/X11/fvwm2/pixmaps/mini.trebol.xpm
-lib/X11/fvwm2/pixmaps/mini.turn.xpm
-lib/X11/fvwm2/pixmaps/mini.twm.xpm
-lib/X11/fvwm2/pixmaps/mini.winXX-close.xpm
-lib/X11/fvwm2/pixmaps/mini.winXX-maximize.xpm
-lib/X11/fvwm2/pixmaps/mini.winXX-minimize.xpm
-lib/X11/fvwm2/pixmaps/mini.winXX-normalize.xpm
-lib/X11/fvwm2/pixmaps/mini.winXX-sysmenu.xpm
-lib/X11/fvwm2/pixmaps/mini.window.xpm
-lib/X11/fvwm2/pixmaps/mini.window2.xpm
-lib/X11/fvwm2/pixmaps/mini.windows.xpm
-lib/X11/fvwm2/pixmaps/mini.windowshade.xpm
-lib/X11/fvwm2/pixmaps/mini.x.xpm
-lib/X11/fvwm2/pixmaps/mini.x2.xpm
-lib/X11/fvwm2/pixmaps/mini.xaniroc.xpm
-lib/X11/fvwm2/pixmaps/mini.xarchie.xpm
-lib/X11/fvwm2/pixmaps/mini.xbiff.xpm
-lib/X11/fvwm2/pixmaps/mini.xboing.xpm
-lib/X11/fvwm2/pixmaps/mini.xfig.xpm
-lib/X11/fvwm2/pixmaps/mini.xjewel.xpm
-lib/X11/fvwm2/pixmaps/mini.xkeycaps.xpm
-lib/X11/fvwm2/pixmaps/mini.xlander.xpm
-lib/X11/fvwm2/pixmaps/mini.xlock.xpm
-lib/X11/fvwm2/pixmaps/mini.xmag.xpm
-lib/X11/fvwm2/pixmaps/mini.xmahjongg.xpm
-lib/X11/fvwm2/pixmaps/mini.xman.xpm
-lib/X11/fvwm2/pixmaps/mini.xpaint.xpm
-lib/X11/fvwm2/pixmaps/mini.xsnow.xpm
-lib/X11/fvwm2/pixmaps/mini.xterm.xpm
-lib/X11/fvwm2/pixmaps/mini.xv.xpm
-lib/X11/fvwm2/pixmaps/mini.zircon.xpm
-lib/X11/fvwm2/pixmaps/mini.zoom.xpm
-lib/X11/fvwm2/pixmaps/modules.xpm
-lib/X11/fvwm2/pixmaps/nscape.xpm
-lib/X11/fvwm2/pixmaps/page.xpm
-lib/X11/fvwm2/pixmaps/page2.xpm
-lib/X11/fvwm2/pixmaps/pointer.xpm
-lib/X11/fvwm2/pixmaps/programs.xpm
-lib/X11/fvwm2/pixmaps/ps.xpm
-lib/X11/fvwm2/pixmaps/question.xpm
-lib/X11/fvwm2/pixmaps/rbomb.xpm
-lib/X11/fvwm2/pixmaps/rbomb2.xpm
-lib/X11/fvwm2/pixmaps/rcalc.xpm
-lib/X11/fvwm2/pixmaps/rcalc2.xpm
-lib/X11/fvwm2/pixmaps/resize.rainbow.xpm
-lib/X11/fvwm2/pixmaps/rterm.xpm
-lib/X11/fvwm2/pixmaps/rterm2.xpm
-lib/X11/fvwm2/pixmaps/run.xpm
-lib/X11/fvwm2/pixmaps/screen.xpm
-lib/X11/fvwm2/pixmaps/settings.xpm
-lib/X11/fvwm2/pixmaps/shells.xpm
-lib/X11/fvwm2/pixmaps/shutdown.xpm
-lib/X11/fvwm2/pixmaps/shutdown2.xpm
-lib/X11/fvwm2/pixmaps/side.fvwm2.xpm
-lib/X11/fvwm2/pixmaps/side.fvwm2_1.xpm
-lib/X11/fvwm2/pixmaps/side.fvwm2_2.xpm
-lib/X11/fvwm2/pixmaps/side.utilities.xpm
-lib/X11/fvwm2/pixmaps/small.Paint2.xpm
-lib/X11/fvwm2/pixmaps/small.Shell2.xpm
-lib/X11/fvwm2/pixmaps/small.exit.xpm
-lib/X11/fvwm2/pixmaps/small.lock.xpm
-lib/X11/fvwm2/pixmaps/small.man.next.xpm
-lib/X11/fvwm2/pixmaps/small.note.next.xpm
-lib/X11/fvwm2/pixmaps/small.tools2_3d.xpm
-lib/X11/fvwm2/pixmaps/term.xpm
-lib/X11/fvwm2/pixmaps/textedit.xpm
-lib/X11/fvwm2/pixmaps/tiff2.xpm
-lib/X11/fvwm2/pixmaps/toolbox.xpm
-lib/X11/fvwm2/pixmaps/unknown1.xpm
-lib/X11/fvwm2/pixmaps/wierd_page3.xpm
-lib/X11/fvwm2/pixmaps/window.xpm
-lib/X11/fvwm2/pixmaps/word_processor.xpm
-lib/X11/fvwm2/pixmaps/wterm.xpm
-lib/X11/fvwm2/pixmaps/xcalc.xpm
-lib/X11/fvwm2/pixmaps/xemacs.xpm
-lib/X11/fvwm2/pixmaps/xlock.xpm
-lib/X11/fvwm2/pixmaps/xman.xpm
-lib/X11/fvwm2/pixmaps/xpaint.xpm
-lib/X11/fvwm2/pixmaps/xterm-axp.xpm
-lib/X11/fvwm2/pixmaps/xterm-blank.xpm
-lib/X11/fvwm2/pixmaps/xterm-bsd.xpm
-lib/X11/fvwm2/pixmaps/xterm-dec.xpm
-lib/X11/fvwm2/pixmaps/xterm-linux.xpm
-lib/X11/fvwm2/pixmaps/xterm-sgi.xpm
-lib/X11/fvwm2/pixmaps/xterm-sol.xpm
-lib/X11/fvwm2/pixmaps/xterm-sun.xpm
-lib/X11/fvwm2/pixmaps/xterm.xpm
-lib/X11/fvwm2/pixmaps/xv.xpm
-lib/X11/fvwm2/pixmaps/xv2.xpm
-lib/X11/fvwm2/pixmaps/xview.xpm
-lib/X11/fvwm2/system.fvwm2rc
-lib/X11/fvwm2/system.fvwm2rc-sample-1
-lib/X11/fvwm2/system.fvwm2rc-sample-2
-lib/X11/fvwm2/system.fvwm2rc-sample-95
-lib/X11/fvwm2/system.fvwm2rc.example
 man/man1/FvwmAnimate.1
 man/man1/FvwmAuto.1
 man/man1/FvwmBacker.1
@@ -384,13 +52,9 @@ man/man1/FvwmCommand.1
 man/man1/FvwmConsole.1
 man/man1/FvwmConsoleC.pl.1
 man/man1/FvwmCpp.1
-man/man1/FvwmDebug.1
-man/man1/FvwmDragWell.1
 man/man1/FvwmEvent.1
 man/man1/FvwmForm.1
 ${PLIST.gtk}man/man1/FvwmGtk.1
-man/man1/FvwmGtkDebug.1
-man/man1/FvwmIconBox.1
 man/man1/FvwmIconMan.1
 man/man1/FvwmIdent.1
 man/man1/FvwmM4.1
@@ -398,19 +62,9 @@ man/man1/FvwmPager.1
 man/man1/FvwmPerl.1
 man/man1/FvwmProxy.1
 man/man1/FvwmRearrange.1
-man/man1/FvwmSave.1
-man/man1/FvwmSaveDesk.1
 man/man1/FvwmScript.1
-man/man1/FvwmScroll.1
-man/man1/FvwmTabs.1
-man/man1/FvwmTaskBar.1
-man/man1/FvwmTheme.1
-man/man1/FvwmWharf.1
-man/man1/FvwmWinList.1
-man/man1/FvwmWindowMenu.1
 man/man1/fvwm-bug.1
 man/man1/fvwm-config.1
-man/man1/fvwm-convert-2.4.1
 man/man1/fvwm-convert-2.6.1
 man/man1/fvwm-menu-desktop.1
 man/man1/fvwm-menu-directory.1
@@ -424,31 +78,29 @@ man/man1/xpmroot.1
 share/fvwm2/ConfigFvwmBacker
 share/fvwm2/ConfigFvwmButtons
 share/fvwm2/ConfigFvwmDefaults
-share/fvwm2/ConfigFvwmIconBox
 share/fvwm2/ConfigFvwmIconMan
 share/fvwm2/ConfigFvwmIdent
 share/fvwm2/ConfigFvwmPager
 share/fvwm2/ConfigFvwmProxyDefaults
-share/fvwm2/ConfigFvwmScroll
-share/fvwm2/ConfigFvwmSetup
-share/fvwm2/ConfigFvwmTabs
-share/fvwm2/ConfigFvwmTaskBar
-share/fvwm2/ConfigFvwmWinList
 share/fvwm2/FvwmForm-Capture
 share/fvwm2/FvwmForm-Desktop
 share/fvwm2/FvwmForm-Form
 share/fvwm2/FvwmForm-QuitVerify
 share/fvwm2/FvwmForm-Rlogin
 share/fvwm2/FvwmForm-RootCursor
-share/fvwm2/FvwmForm-Setup
 share/fvwm2/FvwmForm-Talk
 share/fvwm2/FvwmForm-TalkHelp
+share/fvwm2/FvwmForm-XDGMenuHelp
+share/fvwm2/FvwmForm-XDGOptionsHelp
 share/fvwm2/FvwmScript-BaseConfig
 share/fvwm2/FvwmScript-BellSetup
 share/fvwm2/FvwmScript-Buttons
 share/fvwm2/FvwmScript-Colorset
 share/fvwm2/FvwmScript-ComExample
+share/fvwm2/FvwmScript-ConfirmCopyConfig
+share/fvwm2/FvwmScript-ConfirmQuit
 share/fvwm2/FvwmScript-Date
+share/fvwm2/FvwmScript-DateTime
 share/fvwm2/FvwmScript-FileBrowser
 share/fvwm2/FvwmScript-Find
 share/fvwm2/FvwmScript-KeyboardSetup
@@ -456,18 +108,35 @@ share/fvwm2/FvwmScript-PointerSetup
 share/fvwm2/FvwmScript-Quit
 share/fvwm2/FvwmScript-ScreenDump
 share/fvwm2/FvwmScript-ScreenSetup
-share/fvwm2/FvwmScript-Setup95
 share/fvwm2/FvwmScript-WidgetDemo
-share/fvwm2/FvwmTabs-DefaultSetup
+share/fvwm2/default-config/.stalonetrayrc
+share/fvwm2/default-config/FvwmScript-ConfirmCopyConfig
+share/fvwm2/default-config/FvwmScript-ConfirmQuit
+share/fvwm2/default-config/FvwmScript-DateTime
+share/fvwm2/default-config/config
+share/fvwm2/default-config/images/background/bg1.png
+share/fvwm2/default-config/images/background/bg2.png
+share/fvwm2/default-config/images/background/bg3.png
+share/fvwm2/default-config/images/bgicons/bg1.png
+share/fvwm2/default-config/images/bgicons/bg2.png
+share/fvwm2/default-config/images/bgicons/bg3.png
+share/fvwm2/default-config/images/fvwm-logo-small.png
+share/fvwm2/default-config/images/icons/apps.png
+share/fvwm2/default-config/images/icons/conf.png
+share/fvwm2/default-config/images/icons/help.png
+share/fvwm2/default-config/images/icons/programs.png
+share/fvwm2/default-config/images/icons/quit.png
+share/fvwm2/default-config/images/icons/refresh.png
+share/fvwm2/default-config/images/icons/restart.png
+share/fvwm2/default-config/images/icons/terminal.png
+share/fvwm2/default-config/images/icons/wallpaper.png
+share/fvwm2/fvwm-menu-desktop-config.fpl
 share/fvwm2/fvwm-script-ComExample.pl
-share/fvwm2/fvwm-script-setup95.pl
 share/fvwm2/perllib/FVWM/Commands.pm
 share/fvwm2/perllib/FVWM/Constants.pm
 share/fvwm2/perllib/FVWM/Event.pm
 share/fvwm2/perllib/FVWM/EventNames.pm
 share/fvwm2/perllib/FVWM/Module.pm
-share/fvwm2/perllib/FVWM/Module/Gtk.pm
-share/fvwm2/perllib/FVWM/Module/Gtk2.pm
 share/fvwm2/perllib/FVWM/Module/Terminal.pm
 share/fvwm2/perllib/FVWM/Module/Tk.pm
 share/fvwm2/perllib/FVWM/Module/Toolkit.pm
@@ -480,23 +149,19 @@ share/fvwm2/perllib/FVWM/Tracker/Scheduler.pm
 share/fvwm2/perllib/FVWM/Tracker/WindowList.pm
 share/fvwm2/perllib/General/FileSystem.pm
 share/fvwm2/perllib/General/Parse.pm
-share/fvwm2/system.fvwm2rc-sample-95
 share/locale/ar/LC_MESSAGES/FvwmScript.mo
-share/locale/ar/LC_MESSAGES/FvwmTaskBar.mo
 share/locale/ar/LC_MESSAGES/fvwm.mo
+share/locale/da/LC_MESSAGES/FvwmScript.mo
+share/locale/da/LC_MESSAGES/fvwm.mo
 share/locale/de/LC_MESSAGES/FvwmScript.mo
-share/locale/de/LC_MESSAGES/FvwmTaskBar.mo
 share/locale/de/LC_MESSAGES/fvwm.mo
+share/locale/es/LC_MESSAGES/FvwmScript.mo
+share/locale/es/LC_MESSAGES/fvwm.mo
 share/locale/fr/LC_MESSAGES/FvwmScript.mo
-share/locale/fr/LC_MESSAGES/FvwmTaskBar.mo
 share/locale/fr/LC_MESSAGES/fvwm.mo
+share/locale/ru/LC_MESSAGES/FvwmScript.mo
+share/locale/ru/LC_MESSAGES/fvwm.mo
 share/locale/sv_SE/LC_MESSAGES/FvwmScript.mo
-share/locale/sv_SE/LC_MESSAGES/FvwmTaskBar.mo
 share/locale/sv_SE/LC_MESSAGES/fvwm.mo
 share/locale/zh_CN/LC_MESSAGES/FvwmScript.mo
-share/locale/zh_CN/LC_MESSAGES/FvwmTaskBar.mo
 share/locale/zh_CN/LC_MESSAGES/fvwm.mo
-@pkgdir share/doc/fvwm2/modules/images/FvwmTabs
-@pkgdir share/doc/fvwm2/images/svg_rendering
-@pkgdir share/doc/fvwm2/fvwm
-@pkgdir share/doc/fvwm2/commands
diff --git a/wm/fvwm/distinfo b/wm/fvwm/distinfo
index 5442a4e9c70..42719a46754 100644
--- a/wm/fvwm/distinfo
+++ b/wm/fvwm/distinfo
@@ -1,12 +1,8 @@
-$NetBSD: distinfo,v 1.6 2015/11/02 23:42:52 agc Exp $
+$NetBSD: distinfo,v 1.7 2019/09/21 13:56:15 ng0 Exp $
 
-SHA1 (fvwm-2.6.5.tar.gz) = c200e9647d11d1a8b4938c419a987fea4aec6606
-RMD160 (fvwm-2.6.5.tar.gz) = 39f3154b4ae71d935bfbb8715eb2b5dc76cccb23
-SHA512 (fvwm-2.6.5.tar.gz) = 02af6738f75061a2c86ebb6e0ebd411cf59d1741784e85323c15f8faac694fb53c9e9581b612b0bf92ed2feb3a350588e1ab016edb5ace3e2145403e9a19711b
-Size (fvwm-2.6.5.tar.gz) = 3449177 bytes
-SHA1 (fvwm_icons.tgz) = d6ee1e52f1a84c4edd722ccee0f7e9cc79cc2a4b
-RMD160 (fvwm_icons.tgz) = a5aa60994e64aab939f94b4620d79ea4fcb156f3
-SHA512 (fvwm_icons.tgz) = c0ca8bb2a6cdce8030dbf93797dc9c10c11f69bfa482f748ae09d44bc40abb58a7a5ad35d05a87f2c4d64188bf78c28b80d841e4e74f5ace62138f25420ff7fc
-Size (fvwm_icons.tgz) = 363406 bytes
-SHA1 (patch-ab) = b38e1b58a2001b844321d204229ab0d9b07c7542
-SHA1 (patch-ad) = 4a36153af9cab68746d097e83599d5f39764f46f
+SHA1 (fvwm-2.6.9.tar.gz) = c767e95eaacaa38da620086db363ea7dd5c4b5a9
+RMD160 (fvwm-2.6.9.tar.gz) = 6a3a554f94773c559ebc5284d00b4297491f3131
+SHA512 (fvwm-2.6.9.tar.gz) = a9c2214ad19edd17da81446a6d4250284cc50b59b53c233212f2a9354c01143dbb870521392752f272f00af50bee2dd8f0b6bf6176b0d4b3075694d2a61a623e
+Size (fvwm-2.6.9.tar.gz) = 3942859 bytes
+SHA1 (patch-ab) = d9e960ed7be624a36af5a8a3ad4422f4ed4ce64e
+SHA1 (patch-fvwm_fvwm-reproducible.c) = 96515959482750a25bfe59e9a370d0ef0295bc89
diff --git a/wm/fvwm/options.mk b/wm/fvwm/options.mk
index f33c7afea99..1feeb570403 100644
--- a/wm/fvwm/options.mk
+++ b/wm/fvwm/options.mk
@@ -1,13 +1,13 @@
-# $NetBSD: options.mk,v 1.2 2013/01/20 06:53:53 mef Exp $
+# $NetBSD: options.mk,v 1.3 2019/09/21 13:56:15 ng0 Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.fvwm
-PKG_SUPPORTED_OPTIONS=		gtk rplay xrender xcursor xft2
+PKG_SUPPORTED_OPTIONS=		gtk rplay xrender xcursor xft2 fribidi debug
 PKG_OPTIONS_LEGACY_VARS+=	FVWM2_USE_GTK:gtk
 PKG_OPTIONS_LEGACY_VARS+=	FVWM2_USE_RPLAY:rplay
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		gtk
+PLIST_VARS+=		gtk fribidi
 
 .if !empty(PKG_OPTIONS:Mgtk)
 .  include "../../x11/gtk/buildlink3.mk"
@@ -18,6 +18,8 @@ CONFIGURE_ARGS+=	--without-gtk-prefix
 
 .if !empty(PKG_OPTIONS:Mrplay)
 .  include "../../audio/rplay/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-rplay-library
 .endif
 
 .if !empty(PKG_OPTIONS:Mxcursor)
@@ -40,3 +42,16 @@ CONFIGURE_ARGS+=        --enable-xrender
 .else
 CONFIGURE_ARGS+=        --disable-xrender
 .endif
+
+.if !empty(PKG_OPTIONS:Mfribidi)
+CONFIGURE_ARGS+=	--enable-bidi
+.include "../../converters/fribidi/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-bidi
+.endif
+
+.if !empty(PKG_OPTIONS:Mdebug)
+CONFIGURE_ARGS+=	--enable-debug-msgs
+.else
+CONFIGURE_ARGS+=	--disable-debug-msgs
+.endif
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,