From: David Uhden Collado Subject: Re: [UPDATE] x11/fvwm3 1.1.0 -> 1.1.5 To: ports@openbsd.org, michi+openbsd@dataswamp.org Date: Tue, 28 Jul 2026 17:40:00 +0000 David Uhden Collado wrote: > Hello, > > Please find attached a patch that updates the x11/fvwm3 port from > version 1.1.0 to 1.1.5. > > The upstream release notes and full list of changes are available at: > > https://github.com/fvwmorg/fvwm3/releases > https://github.com/fvwmorg/fvwm3/compare/1.1.0...1.1.5 > > In short, the changes since 1.1.0 include improved monitor and > multi-desktop handling, new FvwmPager and FvwmRearrange features, > XFixes cursor barrier support, additional style and expansion options, > UTF-8 improvements, new translations, and numerous fixes throughout > FVWM and its modules. > > The latest release also adds the StrMatch test conditional and a > DrawIcons none option for FvwmIconMan. It fixes monitor switching, > moving windows between desktops, edge command handling, WindowList > OnlySticky behavior, and several FvwmPager issues. > > Upstream removed the Autotools build system in version 1.1.3, so the > port now uses Meson. I converted the existing configuration options to > their Meson equivalents, keeping manual page generation enabled while > leaving bidirectional text and Go support disabled. > > I also updated the build and library dependencies, including the new > XFixes requirement and gettext tools, and adjusted WANTLIB to match the > new binaries. The two patches for the former Autotools build system > were removed because they are no longer applicable. > > Finally, I adjusted the post-install handling for the new upstream file > layout and regenerated distinfo for the 1.1.5 release archive. > > Thank you for your time and consideration. > > Best regards, > David. I forgot to include the updated pkg/PLIST in the patch. I have also applied the consistent fvwm3-* naming scheme to the utilities and their manuals, keeping fvwm3 as the main executable and Fvwm* as internal modules under libexec/fvwm3 to avoid conflicts in the utilities and documentation with x11/fvwm2 and the fvwm from the base system. Index: Makefile =================================================================== RCS file: /cvs/ports/x11/fvwm3/Makefile,v diff -u -p -N -r1.15 Makefile --- Makefile +++ Makefile @@ -1,7 +1,6 @@ COMMENT= multiple virtual desktop window manager -VERSION= 1.1.0 -REVISION= 0 +VERSION= 1.1.5 DISTNAME= fvwm3-${VERSION} CATEGORIES= x11 @@ -14,14 +13,14 @@ # See COPYING and https://github.com/fvwmorg/fvwm/commit/cadd6ed0d5 PERMIT_PACKAGE= Yes -WANTLIB += ICE SM X11 Xcursor Xext Xft Xrandr Xpm Xrender -WANTLIB += c cairo curses fontconfig freetype gdk_pixbuf-2.0 -WANTLIB += gio-2.0 glib-2.0 gobject-2.0 iconv intl m png -WANTLIB += readline rsvg-2 event_core event_extra +WANTLIB += ICE SM X11 Xcursor Xext Xfixes Xft Xrandr Xpm Xrender +WANTLIB += c cairo fontconfig gobject-2.0 iconv intl m png +WANTLIB += rsvg-2 event_core SITES= https://github.com/fvwmorg/fvwm3/releases/download/${VERSION}/ -BUILD_DEPENDS+= textproc/asciidoctor +BUILD_DEPENDS+= textproc/asciidoctor \ + devel/gettext,-tools LIB_DEPENDS+= graphics/png \ x11/gnome/librsvg \ @@ -29,12 +28,13 @@ SUBST_VARS= VERSION -CONFIGURE_STYLE= gnu +CONFIGURE_STYLE= meson +MODULES += devel/meson -CONFIGURE_ARGS+= --enable-mandoc \ - --disable-bidi \ - --program-transform-name='s/^fvwm-/fvwm3-/' \ - --localedir=${TRUEPREFIX}/share/fvwm3/locale +CONFIGURE_ARGS+= -Dmandoc=true \ + -Dbidi=disabled \ + -Dgolang=disabled \ + -Dlocaledir=${TRUEPREFIX}/share/fvwm3/locale CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" @@ -46,12 +46,17 @@ post-install: cd ${WRKINST}/${TRUEPREFIX}/man/man1 && for m in Fvwm*.1; \ do mv {,fvwm3-}$$m; done + cd ${WRKINST}/${TRUEPREFIX}/man/man1 && for m in \ + fvwm-convert-2.6.1 fvwm-menu-desktop.1 fvwm-menu-directory.1 \ + fvwm-menu-xlock.1 fvwm-perllib.1 fvwm-root.1; do \ + mv $$m fvwm3-$${m#fvwm-}; done cd ${WRKINST}/${TRUEPREFIX}/man/man1/ && \ - mv fvwm3-FvwmCommand{,3}.1 && \ - ln -s fvwm3-FvwmCommand3.1 FvwmCommand3.1 + mv fvwm3-FvwmCommand{,3}.1 + cd ${WRKINST}/${TRUEPREFIX}/bin && for b in \ + fvwm-convert-2.6 fvwm-menu-desktop fvwm-menu-directory \ + fvwm-menu-xlock fvwm-perllib fvwm-root; do \ + mv $$b fvwm3-$${b#fvwm-}; done mv ${WRKINST}/${TRUEPREFIX}/bin/FvwmCommand{,3} - mv ${WRKINST}/${TRUEPREFIX}/share/FvwmScript-* \ - ${WRKINST}/${TRUEPREFIX}/share/fvwm3/ .include Index: distinfo =================================================================== RCS file: /cvs/ports/x11/fvwm3/distinfo,v diff -u -p -N -r1.7 distinfo --- distinfo +++ distinfo @@ -1,2 +1,2 @@ -SHA256 (fvwm3-1.1.0.tar.gz) = y0J9WNSeT42wE9h4+pqno2DphwbxxtCOo62AZq6GYNM= -SIZE (fvwm3-1.1.0.tar.gz) = 4527424 +SHA256 (fvwm3-1.1.5.tar.gz) = a4J4heImJh7al/7FfsA/616C4QLzCBo9yUECBAOpwZY= +SIZE (fvwm3-1.1.5.tar.gz) = 4204328 Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/x11/fvwm3/patches/patch-configure,v diff -u -p -N -r1.6 patches/patch-configure --- patches/patch-configure +++ /dev/null @@ -1,12 +0,0 @@ -Index: configure ---- configure.orig -+++ configure -@@ -12221,7 +12221,7 @@ then : - else case e in #( - e) - with_intl=maybe -- intl_LIBS="-l${smr_lib}" -+ intl_LIBS="-l${smr_lib} -liconv" - ;; - esac - fi Index: patches/patch-default-config_Makefile_in =================================================================== RCS file: /cvs/ports/x11/fvwm3/patches/patch-default-config_Makefile_in,v diff -u -p -N -r1.5 patches/patch-default-config_Makefile_in --- patches/patch-default-config_Makefile_in +++ /dev/null @@ -1,17 +0,0 @@ -Index: default-config/Makefile.in ---- default-config/Makefile.in.orig -+++ default-config/Makefile.in -@@ -575,9 +575,10 @@ uninstall-am: uninstall-configDATA - - install-data-hook: - cp -r $(srcdir)/images $(inst_location)/default-config -- 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)/default-config/FvwmScript-DateTime $(inst_location)/.. -+ mv $(inst_location)/default-config/FvwmScript-ConfirmQuit $(inst_location)/.. -+ mv $(inst_location)/default-config/FvwmScript-ConfirmCopyConfig $(inst_location)/.. -+ - - uninstall-hook: - rm -fr $(DESTDIR)/$(configdir) Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/x11/fvwm3/pkg/PLIST,v diff -u -p -N -r1.6 pkg/PLIST --- pkg/PLIST +++ pkg/PLIST @@ -12,9 +12,6 @@ @bin libexec/fvwm3/${VERSION}/FvwmAuto @bin libexec/fvwm3/${VERSION}/FvwmBacker @bin libexec/fvwm3/${VERSION}/FvwmButtons -libexec/fvwm3/${VERSION}/FvwmCommandS -@bin libexec/fvwm3/${VERSION}/FvwmConsole -@bin libexec/fvwm3/${VERSION}/FvwmConsoleC @bin libexec/fvwm3/${VERSION}/FvwmEvent @bin libexec/fvwm3/${VERSION}/FvwmForm @bin libexec/fvwm3/${VERSION}/FvwmIconMan @@ -25,13 +22,11 @@ @bin libexec/fvwm3/${VERSION}/FvwmRearrange @bin libexec/fvwm3/${VERSION}/FvwmScript libexec/fvwm3/${VERSION}/FvwmTalk -@man man/man1/FvwmCommand3.1 @man man/man1/fvwm3-FvwmAnimate.1 @man man/man1/fvwm3-FvwmAuto.1 @man man/man1/fvwm3-FvwmBacker.1 @man man/man1/fvwm3-FvwmButtons.1 @man man/man1/fvwm3-FvwmCommand3.1 -@man man/man1/fvwm3-FvwmConsole.1 @man man/man1/fvwm3-FvwmEvent.1 @man man/man1/fvwm3-FvwmForm.1 @man man/man1/fvwm3-FvwmIconMan.1 @@ -87,6 +82,9 @@ share/fvwm3/FvwmScript-ScreenSetup share/fvwm3/FvwmScript-WidgetDemo share/fvwm3/default-config/ +share/fvwm3/default-config/FvwmScript-ConfirmCopyConfig +share/fvwm3/default-config/FvwmScript-ConfirmQuit +share/fvwm3/default-config/FvwmScript-DateTime share/fvwm3/default-config/config share/fvwm3/default-config/images/ share/fvwm3/default-config/images/background/ @@ -133,36 +131,37 @@ share/fvwm3/locale/ share/fvwm3/locale/ar/ share/fvwm3/locale/ar/LC_MESSAGES/ -share/fvwm3/locale/ar/LC_MESSAGES/FvwmScript.mo -share/fvwm3/locale/ar/LC_MESSAGES/fvwm.mo +share/fvwm3/locale/ar/LC_MESSAGES/fvwm3.mo share/fvwm3/locale/da/ share/fvwm3/locale/da/LC_MESSAGES/ -share/fvwm3/locale/da/LC_MESSAGES/FvwmScript.mo -share/fvwm3/locale/da/LC_MESSAGES/fvwm.mo +share/fvwm3/locale/da/LC_MESSAGES/fvwm3.mo share/fvwm3/locale/de/ share/fvwm3/locale/de/LC_MESSAGES/ -share/fvwm3/locale/de/LC_MESSAGES/FvwmScript.mo -share/fvwm3/locale/de/LC_MESSAGES/fvwm.mo +share/fvwm3/locale/de/LC_MESSAGES/fvwm3.mo share/fvwm3/locale/es/ share/fvwm3/locale/es/LC_MESSAGES/ -share/fvwm3/locale/es/LC_MESSAGES/FvwmScript.mo -share/fvwm3/locale/es/LC_MESSAGES/fvwm.mo +share/fvwm3/locale/es/LC_MESSAGES/fvwm3.mo share/fvwm3/locale/fr/ share/fvwm3/locale/fr/LC_MESSAGES/ -share/fvwm3/locale/fr/LC_MESSAGES/FvwmScript.mo -share/fvwm3/locale/fr/LC_MESSAGES/fvwm.mo +share/fvwm3/locale/fr/LC_MESSAGES/fvwm3.mo +share/fvwm3/locale/ka/ +share/fvwm3/locale/ka/LC_MESSAGES/ +share/fvwm3/locale/ka/LC_MESSAGES/fvwm3.mo share/fvwm3/locale/ru/ share/fvwm3/locale/ru/LC_MESSAGES/ -share/fvwm3/locale/ru/LC_MESSAGES/FvwmScript.mo -share/fvwm3/locale/ru/LC_MESSAGES/fvwm.mo +share/fvwm3/locale/ru/LC_MESSAGES/fvwm3.mo share/fvwm3/locale/sv_SE/ share/fvwm3/locale/sv_SE/LC_MESSAGES/ -share/fvwm3/locale/sv_SE/LC_MESSAGES/FvwmScript.mo -share/fvwm3/locale/sv_SE/LC_MESSAGES/fvwm.mo +share/fvwm3/locale/sv_SE/LC_MESSAGES/fvwm3.mo +share/fvwm3/locale/uk/ +share/fvwm3/locale/uk/LC_MESSAGES/ +share/fvwm3/locale/uk/LC_MESSAGES/fvwm3.mo share/fvwm3/locale/zh_CN/ share/fvwm3/locale/zh_CN/LC_MESSAGES/ -share/fvwm3/locale/zh_CN/LC_MESSAGES/FvwmScript.mo -share/fvwm3/locale/zh_CN/LC_MESSAGES/fvwm.mo +share/fvwm3/locale/zh_CN/LC_MESSAGES/fvwm3.mo +share/fvwm3/locale/zh_TW/ +share/fvwm3/locale/zh_TW/LC_MESSAGES/ +share/fvwm3/locale/zh_TW/LC_MESSAGES/fvwm3.mo share/fvwm3/perllib/ share/fvwm3/perllib/FVWM/ share/fvwm3/perllib/FVWM/Commands.pm