UPDATE: x11/fvwm2 to 2.6.9

Hello ports,

after talking to upstream why fvwm 2.6.7 is still marked as the stable
version [0] for the 2.x branch instead of 2.6.9 I was told to always use
the latest 2.x release now. Therefore here is an update to 2.6.9.

No notable changes, tested on amd64.


[0] https://github.com/fvwmorg/fvwm#releases


Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/fvwm2/Makefile,v
retrieving revision 1.68
diff -u -p -u -p -r1.68 Makefile
--- Makefile 13 Dec 2020 21:17:02 -0000 1.68
+++ Makefile 1 Jan 2021 20:52:33 -0000
@@ -2,7 +2,7 @@

COMMENT= multiple virtual desktop window manager

-VERSION= 2.6.7
+VERSION= 2.6.9
DISTNAME= fvwm-${VERSION}
PKGNAME= fvwm2-${VERSION}

@@ -39,7 +39,8 @@ SUBST_VARS= VERSION

SEPARATE_BUILD= Yes
CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= --disable-bidi \
+CONFIGURE_ARGS+= --enable-mandoc \
+ --disable-bidi \
--disable-gtk \
--without-gnome \
--without-rplay-library \
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/fvwm2/distinfo,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 distinfo
--- distinfo 13 Dec 2020 21:17:02 -0000 1.15
+++ distinfo 1 Jan 2021 20:52:33 -0000
@@ -1,2 +1,2 @@
-SHA256 (fvwm-2.6.7.tar.gz) = AWVNWr3N5trBMcrpvv5c9vAfn3Uk0JfDsPMW45+E73M=
-SIZE (fvwm-2.6.7.tar.gz) = 3934327
+SHA256 (fvwm-2.6.9.tar.gz) = G8ZM88zQBzAIdYFoMnqCZbgFne+bI5tFHWufqyzDka4=
+SIZE (fvwm-2.6.9.tar.gz) = 3942859
Index: patches/patch-default-config_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/fvwm2/patches/patch-default-config_Makefile_in,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-default-config_Makefile_in
--- patches/patch-default-config_Makefile_in 13 Dec 2020 21:17:02 -0000 1.1
+++ patches/patch-default-config_Makefile_in 1 Jan 2021 20:52:33 -0000
@@ -1,19 +1,18 @@
-$OpenBSD: patch-default-config_Makefile_in,v 1.1 2020/12/13 21:17:02 sthen Exp $
+$OpenBSD$

Index: default-config/Makefile.in
--- default-config/Makefile.in.orig
+++ default-config/Makefile.in
-@@ -597,9 +597,10 @@ uninstall-am: uninstall-configDATA
+@@ -602,9 +602,9 @@ uninstall-am: uninstall-configDATA

install-data-hook:
cp -r $(srcdir)/images $(inst_location)
-- ln -sf $(inst_location)/FvwmScript-DateTime $(inst_location)/..
-- ln -sf $(inst_location)/FvwmScript-ConfirmQuit $(inst_location)/..
-- ln -sf $(inst_location)/FvwmScript-ConfirmCopyConfig $(inst_location)/..
+- ln -sf default-config/FvwmScript-DateTime $(inst_location)/..
+- ln -sf default-config/FvwmScript-ConfirmQuit $(inst_location)/..
+- ln -sf default-config/FvwmScript-ConfirmCopyConfig $(inst_location)/..
+ mv $(inst_location)/FvwmScript-DateTime $(inst_location)/..
+ mv $(inst_location)/FvwmScript-ConfirmQuit $(inst_location)/..
+ mv $(inst_location)/FvwmScript-ConfirmCopyConfig $(inst_location)/..
-+

uninstall-hook:
rm -fr $(DESTDIR)/$(configdir)
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/fvwm2/pkg/PLIST,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 PLIST
--- pkg/PLIST 13 Dec 2020 21:17:02 -0000 1.16
+++ pkg/PLIST 1 Jan 2021 20:52:33 -0000
@@ -152,6 +152,8 @@ share/fvwm/perllib/General/FileSystem.pm
share/fvwm/perllib/General/Parse.pm
share/locale/ar/LC_MESSAGES/FvwmScript.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/fvwm.mo
share/locale/es/LC_MESSAGES/FvwmScript.mo