On Fri Apr 10, 2020 at 12:18:48AM -0600, Thomas Frohwein wrote:
> Hi,
>
> I had this locally and have been running this updated fvwm2 for a bit
> without any issues.
>
> A few modules have been removed or wrapped into others, so would
> recommend to double-check .fvwm2rc. As before, there is
> fvwm-convert-2.6 to help with converting old configs (I haven't tested
> it).
>
> A few more points about this update:
>
> - passes make port-lib-depends-check and portcheck without issues
> - upstream has moved distfiles to github
> - couldn't find a new source for fvicons; use the one from 2.6.5
> - upstream distfiles for fvicons are gone and can't find replacement.
> Therefore, MASTER_SITES0 set to
> https://ftp.openbsd.org/pub/OpenBSD/distfiles/. Or rather remove?
I would remove the icons if there are gone upstream but this is my
personal opinion.
> - looks like this is probably the last release for fvwm version 2
>
> comments, ok?
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/fvwm2/Makefile,v
> retrieving revision 1.67
> diff -u -p -r1.67 Makefile
> --- Makefile 12 Jul 2019 20:51:11 -0000 1.67
> +++ Makefile 10 Apr 2020 05:55:13 -0000
> @@ -4,18 +4,19 @@ COMMENT-main= multiple virtual desktop w
> COMMENT-fvicons=multiple virtual desktop window manager icons
> COMMENT-fvwm2= multiple virtual desktop window manager, without icons
>
> -VERSION= 2.6.5
> +VERSION= 2.6.9
> DISTNAME= fvwm-${VERSION}
> PKGNAME-main= fvwm2+fvicons-${VERSION}
> FULLPKGNAME-fvicons=fvicons-${VERSION}
> PKGNAME-fvwm2= fvwm2-${VERSION}
> -REVISION= 6
>
> CATEGORIES= x11
>
> -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} fvwm_icons-20070101.tar.gz
> +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
> + fvwm_icons-20070101.tar.gz:0
>
> HOMEPAGE= http://www.fvwm.org/
> +MAINTAINER= Thomas Frohwein <t...@openbsd.org>
>
> # GPL/BSD-like (badly worded)
> PERMIT_PACKAGE= Yes
> @@ -25,7 +26,8 @@ WANTLIB += c cairo curses fontconfig fre
> WANTLIB += gio-2.0 glib-2.0 gobject-2.0 iconv intl m png
> WANTLIB += readline rsvg-2 z
>
> -MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/
> +MASTER_SITES=
> https://github.com/fvwmorg/fvwm/releases/download/${VERSION}/
> +MASTER_SITES0 = https://ftp.openbsd.org/pub/OpenBSD/distfiles/
>
> LIB_DEPENDS+= graphics/png \
> x11/gnome/librsvg
> @@ -52,6 +54,7 @@ SEPARATE_BUILD= Yes
> CONFIGURE_STYLE= gnu
> CONFIGURE_ARGS += --disable-bidi \
> --disable-gtk \
> + --enable-mandoc \
> --without-gnome \
> --without-rplay-library \
> --without-stroke-library
> @@ -60,7 +63,8 @@ CONFIGURE_ENV += CPPFLAGS="${CPPFLAGS} -
>
> post-install:
> ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps/fvwm
> - ${INSTALL_DATA} ${WRKDIR}/fvwm_icons-20070101/*.xpm
> ${PREFIX}/share/pixmaps/fvwm/
> - ${INSTALL_DATA} ${WRKSRC}/sample.fvwmrc/system.fvwm2rc
> ${PREFIX}/share/fvwm
> + ${INSTALL_DATA} ${WRKDIR}/fvwm_icons-20070101/*.xpm \
> + ${PREFIX}/share/pixmaps/fvwm/
> + ${INSTALL_DATA} ${WRKSRC}/default-config/config ${PREFIX}/share/fvwm
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/x11/fvwm2/distinfo,v
> retrieving revision 1.14
> diff -u -p -r1.14 distinfo
> --- distinfo 18 Jan 2015 03:15:53 -0000 1.14
> +++ distinfo 10 Apr 2020 05:55:13 -0000
> @@ -1,4 +1,4 @@
> -SHA256 (fvwm-2.6.5.tar.gz) = 8B+dqAdoUvjbEU+Q8rB1jCHSZeKVj84EKJ5Be866EtE=
> +SHA256 (fvwm-2.6.9.tar.gz) = G8ZM88zQBzAIdYFoMnqCZbgFne+bI5tFHWufqyzDka4=
> SHA256 (fvwm_icons-20070101.tar.gz) =
> oL5qSSCzjVj/7+QwdYvB2QEtfHSrZWDL1udYpb3q6yw=
> -SIZE (fvwm-2.6.5.tar.gz) = 3449177
> +SIZE (fvwm-2.6.9.tar.gz) = 3942859
> SIZE (fvwm_icons-20070101.tar.gz) = 363286
> Index: patches/patch-bin_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/x11/fvwm2/patches/patch-bin_Makefile_in,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-bin_Makefile_in
> --- patches/patch-bin_Makefile_in 26 Apr 2011 18:50:46 -0000 1.1
> +++ patches/patch-bin_Makefile_in 10 Apr 2020 05:55:13 -0000
> @@ -1,11 +1,12 @@
> $OpenBSD: patch-bin_Makefile_in,v 1.1 2011/04/26 18:50:46 shadchin Exp $
> ---- bin/Makefile.in.orig Fri Mar 4 08:47:50 2011
> -+++ bin/Makefile.in Fri Mar 4 08:48:13 2011
> -@@ -710,14 +710,13 @@ info: info-am
> +Index: bin/Makefile.in
> +--- bin/Makefile.in.orig
> ++++ bin/Makefile.in
> +@@ -835,14 +835,13 @@ info: info-am
>
> info-am:
>
> --install-data-am: install-data-local install-man
> +-install-data-am: install-configDATA install-data-local install-man
> +install-data-am: install-man
>
> install-dvi: install-dvi-am
> Index: patches/patch-config_h_in
> ===================================================================
> RCS file: patches/patch-config_h_in
> diff -N patches/patch-config_h_in
> --- patches/patch-config_h_in 26 Apr 2011 18:50:46 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,13 +0,0 @@
> -$OpenBSD: patch-config_h_in,v 1.2 2011/04/26 18:50:46 shadchin Exp $
> ---- config.h.in.orig Mon Aug 9 18:30:50 2010
> -+++ config.h.in Thu Mar 3 21:36:48 2011
> -@@ -558,7 +558,9 @@
> - #pragma alloca
> - # else
> - # ifndef alloca /* predefined by HP cc +Olibcalls */
> -+# ifndef __OpenBSD__
> - char *alloca ();
> -+# endif
> - # endif
> - # endif
> - #endif
> Index: patches/patch-configure
> ===================================================================
> RCS file: /cvs/ports/x11/fvwm2/patches/patch-configure,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-configure
> --- patches/patch-configure 18 Apr 2017 15:37:27 -0000 1.3
> +++ patches/patch-configure 10 Apr 2020 05:55:13 -0000
> @@ -1,16 +1,17 @@
> $OpenBSD: patch-configure,v 1.3 2017/04/18 15:37:27 espie Exp $
> ---- configure.orig Fri Apr 20 13:03:57 2012
> -+++ configure Tue Apr 18 17:33:45 2017
> -@@ -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 0;
> - ;
> - return 0;
> - }
> -@@ -11026,7 +11026,7 @@ if test "${with_intl_library+set}" = set; then :
> +Index: configure
> +--- configure.orig
> ++++ configure
> +@@ -11337,7 +11337,7 @@ if test "${with_intl_library+set}" = set; then :
> + withval=$with_intl_library;
> + if test "$withval" = yes; then
> + with_intl=yes
> +- intl_LIBS="-l${smr_lib}"
> ++ intl_LIBS="-l${smr_lib} -liconv"
> + elif test "$withval" = no; then
> + with_intl=no
> + intl_LIBS=
> +@@ -11355,7 +11355,7 @@ if test "${with_intl_library+set}" = set; then :
> else
>
> with_intl=maybe
> Index: patches/patch-fvwm_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/x11/fvwm2/patches/patch-fvwm_Makefile_in,v
> retrieving revision 1.7
> diff -u -p -r1.7 patch-fvwm_Makefile_in
> --- patches/patch-fvwm_Makefile_in 19 May 2012 18:31:07 -0000 1.7
> +++ patches/patch-fvwm_Makefile_in 10 Apr 2020 05:55:13 -0000
> @@ -1,25 +1,26 @@
> $OpenBSD: patch-fvwm_Makefile_in,v 1.7 2012/05/19 18:31:07 shadchin Exp $
> ---- fvwm/Makefile.in.orig Fri Apr 20 17:03:55 2012
> -+++ fvwm/Makefile.in Mon Apr 30 21:20:31 2012
> -@@ -35,7 +35,7 @@ PRE_UNINSTALL = :
> +Index: fvwm/Makefile.in
> +--- fvwm/Makefile.in.orig
> ++++ fvwm/Makefile.in
> +@@ -89,7 +89,7 @@ PRE_UNINSTALL = :
> POST_UNINSTALL = :
> build_triplet = @build@
> host_triplet = @host@
> -bin_PROGRAMS = fvwm$(EXEEXT)
> +bin_PROGRAMS = fvwm2$(EXEEXT)
> subdir = fvwm
> - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
> ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
> -@@ -450,7 +450,7 @@ uninstall-binPROGRAMS:
> -
> + am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
> +@@ -576,7 +576,7 @@ uninstall-binPROGRAMS:
> clean-binPROGRAMS:
> -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
> --fvwm$(EXEEXT): $(fvwm_OBJECTS) $(fvwm_DEPENDENCIES)
> -+fvwm2$(EXEEXT): $(fvwm_OBJECTS) $(fvwm_DEPENDENCIES)
> +
> +-fvwm$(EXEEXT): $(fvwm_OBJECTS) $(fvwm_DEPENDENCIES)
> $(EXTRA_fvwm_DEPENDENCIES)
> ++fvwm2$(EXEEXT): $(fvwm_OBJECTS) $(fvwm_DEPENDENCIES)
> $(EXTRA_fvwm_DEPENDENCIES)
> @rm -f fvwm$(EXEEXT)
> - $(LINK) $(fvwm_OBJECTS) $(fvwm_LDADD) $(LIBS)
> + $(AM_V_CCLD)$(LINK) $(fvwm_OBJECTS) $(fvwm_LDADD) $(LIBS)
>
> -@@ -689,7 +689,7 @@ install-dvi: install-dvi-am
> +@@ -881,7 +881,7 @@ install-dvi: install-dvi-am
>
> install-dvi-am:
>
> Index: pkg/PLIST-fvwm2
> ===================================================================
> RCS file: /cvs/ports/x11/fvwm2/pkg/PLIST-fvwm2,v
> retrieving revision 1.10
> diff -u -p -r1.10 PLIST-fvwm2
> --- pkg/PLIST-fvwm2 26 Apr 2011 18:50:46 -0000 1.10
> +++ pkg/PLIST-fvwm2 10 Apr 2020 05:55:13 -0000
> @@ -8,7 +8,6 @@
> @bin bin/FvwmCommand
> bin/fvwm-bug
> bin/fvwm-config
> -bin/fvwm-convert-2.4
> bin/fvwm-convert-2.6
> bin/fvwm-menu-desktop
> bin/fvwm-menu-directory
> @@ -33,12 +32,8 @@ libexec/fvwm/${VERSION}/FvwmCommand.sh
> @bin libexec/fvwm/${VERSION}/FvwmConsoleC
> libexec/fvwm/${VERSION}/FvwmConsoleC.pl
> @bin libexec/fvwm/${VERSION}/FvwmCpp
> -libexec/fvwm/${VERSION}/FvwmDebug
> -@bin libexec/fvwm/${VERSION}/FvwmDragWell
> @bin libexec/fvwm/${VERSION}/FvwmEvent
> @bin libexec/fvwm/${VERSION}/FvwmForm
> -libexec/fvwm/${VERSION}/FvwmGtkDebug
> -@bin libexec/fvwm/${VERSION}/FvwmIconBox
> @bin libexec/fvwm/${VERSION}/FvwmIconMan
> @bin libexec/fvwm/${VERSION}/FvwmIdent
> @bin libexec/fvwm/${VERSION}/FvwmM4
> @@ -46,18 +41,9 @@ libexec/fvwm/${VERSION}/FvwmGtkDebug
> libexec/fvwm/${VERSION}/FvwmPerl
> @bin libexec/fvwm/${VERSION}/FvwmProxy
> @bin libexec/fvwm/${VERSION}/FvwmRearrange
> -@bin libexec/fvwm/${VERSION}/FvwmSave
> -@bin libexec/fvwm/${VERSION}/FvwmSaveDesk
> @bin libexec/fvwm/${VERSION}/FvwmScript
> -@bin libexec/fvwm/${VERSION}/FvwmScroll
> -libexec/fvwm/${VERSION}/FvwmTabs
> libexec/fvwm/${VERSION}/FvwmTalk
> -@bin libexec/fvwm/${VERSION}/FvwmTaskBar
> -@bin libexec/fvwm/${VERSION}/FvwmTheme
> libexec/fvwm/${VERSION}/FvwmTile
> -@bin libexec/fvwm/${VERSION}/FvwmWharf
> -@bin libexec/fvwm/${VERSION}/FvwmWinList
> -libexec/fvwm/${VERSION}/FvwmWindowMenu
> @man man/man1/FvwmAnimate.1
> @man man/man1/FvwmAuto.1
> @man man/man1/FvwmBacker.1
> @@ -67,12 +53,8 @@ libexec/fvwm/${VERSION}/FvwmWindowMenu
> @man man/man1/FvwmConsole.1
> @man man/man1/FvwmConsoleC.pl.1
> @man man/man1/FvwmCpp.1
> -@man man/man1/FvwmDebug.1
> -@man man/man1/FvwmDragWell.1
> @man man/man1/FvwmEvent.1
> @man man/man1/FvwmForm.1
> -@man man/man1/FvwmGtkDebug.1
> -@man man/man1/FvwmIconBox.1
> @man man/man1/FvwmIconMan.1
> @man man/man1/FvwmIdent.1
> @man man/man1/FvwmM4.1
> @@ -80,19 +62,9 @@ libexec/fvwm/${VERSION}/FvwmWindowMenu
> @man man/man1/FvwmPerl.1
> @man man/man1/FvwmProxy.1
> @man man/man1/FvwmRearrange.1
> -@man man/man1/FvwmSave.1
> -@man man/man1/FvwmSaveDesk.1
> @man man/man1/FvwmScript.1
> -@man man/man1/FvwmScroll.1
> -@man man/man1/FvwmTabs.1
> -@man man/man1/FvwmTaskBar.1
> -@man man/man1/FvwmTheme.1
> -@man man/man1/FvwmWharf.1
> -@man man/man1/FvwmWinList.1
> -@man man/man1/FvwmWindowMenu.1
> @man man/man1/fvwm-bug.1
> @man man/man1/fvwm-config.1
> -@man man/man1/fvwm-convert-2.4.1
> @man man/man1/fvwm-convert-2.6.1
> @man man/man1/fvwm-menu-desktop.1
> @man man/man1/fvwm-menu-directory.1
> @@ -100,37 +72,20 @@ libexec/fvwm/${VERSION}/FvwmWindowMenu
> @man man/man1/fvwm-menu-xlock.1
> @man man/man1/fvwm-perllib.1
> @man man/man1/fvwm-root.1
> -@man man/man1/fvwm.1
> -@man man/man1/fvwm2.1
> -share/doc/fvwm/
> -share/doc/fvwm/commands/
> -share/doc/fvwm/fvwm/
> -share/doc/fvwm/images/
> -share/doc/fvwm/images/svg_rendering/
> -share/doc/fvwm/modules/
> -share/doc/fvwm/modules/images/
> -share/doc/fvwm/modules/images/FvwmTabs/
> share/fvwm/
> share/fvwm/ConfigFvwmBacker
> share/fvwm/ConfigFvwmButtons
> share/fvwm/ConfigFvwmDefaults
> -share/fvwm/ConfigFvwmIconBox
> share/fvwm/ConfigFvwmIconMan
> share/fvwm/ConfigFvwmIdent
> share/fvwm/ConfigFvwmPager
> share/fvwm/ConfigFvwmProxyDefaults
> -share/fvwm/ConfigFvwmScroll
> -share/fvwm/ConfigFvwmSetup
> -share/fvwm/ConfigFvwmTabs
> -share/fvwm/ConfigFvwmTaskBar
> -share/fvwm/ConfigFvwmWinList
> share/fvwm/FvwmForm-Capture
> share/fvwm/FvwmForm-Desktop
> share/fvwm/FvwmForm-Form
> share/fvwm/FvwmForm-QuitVerify
> share/fvwm/FvwmForm-Rlogin
> share/fvwm/FvwmForm-RootCursor
> -share/fvwm/FvwmForm-Setup
> share/fvwm/FvwmForm-Talk
> share/fvwm/FvwmForm-TalkHelp
> share/fvwm/FvwmScript-BaseConfig
> @@ -146,11 +101,8 @@ share/fvwm/FvwmScript-PointerSetup
> share/fvwm/FvwmScript-Quit
> share/fvwm/FvwmScript-ScreenDump
> share/fvwm/FvwmScript-ScreenSetup
> -share/fvwm/FvwmScript-Setup95
> share/fvwm/FvwmScript-WidgetDemo
> -share/fvwm/FvwmTabs-DefaultSetup
> share/fvwm/fvwm-script-ComExample.pl
> -share/fvwm/fvwm-script-setup95.pl
> share/fvwm/perllib/
> share/fvwm/perllib/FVWM/
> share/fvwm/perllib/FVWM/Commands.pm
> @@ -159,8 +111,6 @@ share/fvwm/perllib/FVWM/Event.pm
> share/fvwm/perllib/FVWM/EventNames.pm
> share/fvwm/perllib/FVWM/Module/
> share/fvwm/perllib/FVWM/Module.pm
> -share/fvwm/perllib/FVWM/Module/Gtk.pm
> -share/fvwm/perllib/FVWM/Module/Gtk2.pm
> share/fvwm/perllib/FVWM/Module/Terminal.pm
> share/fvwm/perllib/FVWM/Module/Tk.pm
> share/fvwm/perllib/FVWM/Module/Toolkit.pm
> @@ -175,24 +125,15 @@ share/fvwm/perllib/FVWM/Tracker/WindowLi
> share/fvwm/perllib/General/
> share/fvwm/perllib/General/FileSystem.pm
> share/fvwm/perllib/General/Parse.pm
> -share/fvwm/system.fvwm2rc
> -share/fvwm/system.fvwm2rc-sample-95
> -share/locale/ar/
> -share/locale/ar/LC_MESSAGES/
> share/locale/ar/LC_MESSAGES/FvwmScript.mo
> -share/locale/ar/LC_MESSAGES/FvwmTaskBar.mo
> share/locale/ar/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/fr/LC_MESSAGES/FvwmScript.mo
> -share/locale/fr/LC_MESSAGES/FvwmTaskBar.mo
> share/locale/fr/LC_MESSAGES/fvwm.mo
> share/locale/sv_SE/
> share/locale/sv_SE/LC_MESSAGES/
> 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
> Index: pkg/PLIST-main
> ===================================================================
> RCS file: /cvs/ports/x11/fvwm2/pkg/PLIST-main,v
> retrieving revision 1.5
> diff -u -p -r1.5 PLIST-main
> --- pkg/PLIST-main 26 Apr 2011 18:50:46 -0000 1.5
> +++ pkg/PLIST-main 10 Apr 2020 05:55:13 -0000
> @@ -10,7 +10,6 @@
> @bin bin/FvwmCommand
> bin/fvwm-bug
> bin/fvwm-config
> -bin/fvwm-convert-2.4
> bin/fvwm-convert-2.6
> bin/fvwm-menu-desktop
> bin/fvwm-menu-directory
> @@ -35,12 +34,8 @@ libexec/fvwm/${VERSION}/FvwmCommand.sh
> @bin libexec/fvwm/${VERSION}/FvwmConsoleC
> libexec/fvwm/${VERSION}/FvwmConsoleC.pl
> @bin libexec/fvwm/${VERSION}/FvwmCpp
> -libexec/fvwm/${VERSION}/FvwmDebug
> -@bin libexec/fvwm/${VERSION}/FvwmDragWell
> @bin libexec/fvwm/${VERSION}/FvwmEvent
> @bin libexec/fvwm/${VERSION}/FvwmForm
> -libexec/fvwm/${VERSION}/FvwmGtkDebug
> -@bin libexec/fvwm/${VERSION}/FvwmIconBox
> @bin libexec/fvwm/${VERSION}/FvwmIconMan
> @bin libexec/fvwm/${VERSION}/FvwmIdent
> @bin libexec/fvwm/${VERSION}/FvwmM4
> @@ -48,18 +43,9 @@ libexec/fvwm/${VERSION}/FvwmGtkDebug
> libexec/fvwm/${VERSION}/FvwmPerl
> @bin libexec/fvwm/${VERSION}/FvwmProxy
> @bin libexec/fvwm/${VERSION}/FvwmRearrange
> -@bin libexec/fvwm/${VERSION}/FvwmSave
> -@bin libexec/fvwm/${VERSION}/FvwmSaveDesk
> @bin libexec/fvwm/${VERSION}/FvwmScript
> -@bin libexec/fvwm/${VERSION}/FvwmScroll
> -libexec/fvwm/${VERSION}/FvwmTabs
> libexec/fvwm/${VERSION}/FvwmTalk
> -@bin libexec/fvwm/${VERSION}/FvwmTaskBar
> -@bin libexec/fvwm/${VERSION}/FvwmTheme
> libexec/fvwm/${VERSION}/FvwmTile
> -@bin libexec/fvwm/${VERSION}/FvwmWharf
> -@bin libexec/fvwm/${VERSION}/FvwmWinList
> -libexec/fvwm/${VERSION}/FvwmWindowMenu
> @man man/man1/FvwmAnimate.1
> @man man/man1/FvwmAuto.1
> @man man/man1/FvwmBacker.1
> @@ -69,12 +55,8 @@ libexec/fvwm/${VERSION}/FvwmWindowMenu
> @man man/man1/FvwmConsole.1
> @man man/man1/FvwmConsoleC.pl.1
> @man man/man1/FvwmCpp.1
> -@man man/man1/FvwmDebug.1
> -@man man/man1/FvwmDragWell.1
> @man man/man1/FvwmEvent.1
> @man man/man1/FvwmForm.1
> -@man man/man1/FvwmGtkDebug.1
> -@man man/man1/FvwmIconBox.1
> @man man/man1/FvwmIconMan.1
> @man man/man1/FvwmIdent.1
> @man man/man1/FvwmM4.1
> @@ -82,19 +64,9 @@ libexec/fvwm/${VERSION}/FvwmWindowMenu
> @man man/man1/FvwmPerl.1
> @man man/man1/FvwmProxy.1
> @man man/man1/FvwmRearrange.1
> -@man man/man1/FvwmSave.1
> -@man man/man1/FvwmSaveDesk.1
> @man man/man1/FvwmScript.1
> -@man man/man1/FvwmScroll.1
> -@man man/man1/FvwmTabs.1
> -@man man/man1/FvwmTaskBar.1
> -@man man/man1/FvwmTheme.1
> -@man man/man1/FvwmWharf.1
> -@man man/man1/FvwmWinList.1
> -@man man/man1/FvwmWindowMenu.1
> @man man/man1/fvwm-bug.1
> @man man/man1/fvwm-config.1
> -@man man/man1/fvwm-convert-2.4.1
> @man man/man1/fvwm-convert-2.6.1
> @man man/man1/fvwm-menu-desktop.1
> @man man/man1/fvwm-menu-directory.1
> @@ -104,43 +76,33 @@ libexec/fvwm/${VERSION}/FvwmWindowMenu
> @man man/man1/fvwm-root.1
> @man man/man1/fvwm.1
> @man man/man1/fvwm2.1
> -share/doc/fvwm/
> -share/doc/fvwm/commands/
> -share/doc/fvwm/fvwm/
> -share/doc/fvwm/images/
> -share/doc/fvwm/images/svg_rendering/
> -share/doc/fvwm/modules/
> -share/doc/fvwm/modules/images/
> -share/doc/fvwm/modules/images/FvwmTabs/
> share/fvwm/
> share/fvwm/ConfigFvwmBacker
> share/fvwm/ConfigFvwmButtons
> share/fvwm/ConfigFvwmDefaults
> -share/fvwm/ConfigFvwmIconBox
> share/fvwm/ConfigFvwmIconMan
> share/fvwm/ConfigFvwmIdent
> share/fvwm/ConfigFvwmPager
> share/fvwm/ConfigFvwmProxyDefaults
> -share/fvwm/ConfigFvwmScroll
> -share/fvwm/ConfigFvwmSetup
> -share/fvwm/ConfigFvwmTabs
> -share/fvwm/ConfigFvwmTaskBar
> -share/fvwm/ConfigFvwmWinList
> share/fvwm/FvwmForm-Capture
> share/fvwm/FvwmForm-Desktop
> share/fvwm/FvwmForm-Form
> share/fvwm/FvwmForm-QuitVerify
> share/fvwm/FvwmForm-Rlogin
> share/fvwm/FvwmForm-RootCursor
> -share/fvwm/FvwmForm-Setup
> share/fvwm/FvwmForm-Talk
> share/fvwm/FvwmForm-TalkHelp
> +share/fvwm/FvwmForm-XDGMenuHelp
> +share/fvwm/FvwmForm-XDGOptionsHelp
> share/fvwm/FvwmScript-BaseConfig
> share/fvwm/FvwmScript-BellSetup
> share/fvwm/FvwmScript-Buttons
> share/fvwm/FvwmScript-Colorset
> share/fvwm/FvwmScript-ComExample
> +share/fvwm/FvwmScript-ConfirmCopyConfig
> +share/fvwm/FvwmScript-ConfirmQuit
> share/fvwm/FvwmScript-Date
> +share/fvwm/FvwmScript-DateTime
> share/fvwm/FvwmScript-FileBrowser
> share/fvwm/FvwmScript-Find
> share/fvwm/FvwmScript-KeyboardSetup
> @@ -148,11 +110,35 @@ share/fvwm/FvwmScript-PointerSetup
> share/fvwm/FvwmScript-Quit
> share/fvwm/FvwmScript-ScreenDump
> share/fvwm/FvwmScript-ScreenSetup
> -share/fvwm/FvwmScript-Setup95
> share/fvwm/FvwmScript-WidgetDemo
> -share/fvwm/FvwmTabs-DefaultSetup
> +share/fvwm/config
> +share/fvwm/default-config/
> +share/fvwm/default-config/.stalonetrayrc
> +share/fvwm/default-config/FvwmScript-ConfirmCopyConfig
> +share/fvwm/default-config/FvwmScript-ConfirmQuit
> +share/fvwm/default-config/FvwmScript-DateTime
> +share/fvwm/default-config/config
> +share/fvwm/default-config/images/
> +share/fvwm/default-config/images/background/
> +share/fvwm/default-config/images/background/bg1.png
> +share/fvwm/default-config/images/background/bg2.png
> +share/fvwm/default-config/images/background/bg3.png
> +share/fvwm/default-config/images/bgicons/
> +share/fvwm/default-config/images/bgicons/bg1.png
> +share/fvwm/default-config/images/bgicons/bg2.png
> +share/fvwm/default-config/images/bgicons/bg3.png
> +share/fvwm/default-config/images/fvwm-logo-small.png
> +share/fvwm/default-config/images/icons/
> +share/fvwm/default-config/images/icons/apps.png
> +share/fvwm/default-config/images/icons/conf.png
> +share/fvwm/default-config/images/icons/help.png
> +share/fvwm/default-config/images/icons/programs.png
> +share/fvwm/default-config/images/icons/quit.png
> +share/fvwm/default-config/images/icons/refresh.png
> +share/fvwm/default-config/images/icons/restart.png
> +share/fvwm/default-config/images/icons/terminal.png
> +share/fvwm/default-config/images/icons/wallpaper.png
> share/fvwm/fvwm-script-ComExample.pl
> -share/fvwm/fvwm-script-setup95.pl
> share/fvwm/perllib/
> share/fvwm/perllib/FVWM/
> share/fvwm/perllib/FVWM/Commands.pm
> @@ -161,8 +147,6 @@ share/fvwm/perllib/FVWM/Event.pm
> share/fvwm/perllib/FVWM/EventNames.pm
> share/fvwm/perllib/FVWM/Module/
> share/fvwm/perllib/FVWM/Module.pm
> -share/fvwm/perllib/FVWM/Module/Gtk.pm
> -share/fvwm/perllib/FVWM/Module/Gtk2.pm
> share/fvwm/perllib/FVWM/Module/Terminal.pm
> share/fvwm/perllib/FVWM/Module/Tk.pm
> share/fvwm/perllib/FVWM/Module/Toolkit.pm
> @@ -177,26 +161,23 @@ share/fvwm/perllib/FVWM/Tracker/WindowLi
> share/fvwm/perllib/General/
> share/fvwm/perllib/General/FileSystem.pm
> share/fvwm/perllib/General/Parse.pm
> -share/fvwm/system.fvwm2rc
> -share/fvwm/system.fvwm2rc-sample-95
> -share/locale/ar/
> -share/locale/ar/LC_MESSAGES/
> 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/
> share/locale/sv_SE/LC_MESSAGES/
> 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
> share/pixmaps/
> share/pixmaps/fvwm/
>
