Hi ports, x11/fvwm2 had a new release: 2.7.0. This is just a bug-fix release [1]. Patch below.
Tested on amd64. [1] https://github.com/fvwmorg/fvwm/releases/tag/2.7.0 Index: Makefile =================================================================== RCS file: /cvs/ports/x11/fvwm2/Makefile,v retrieving revision 1.73 diff -u -p -r1.73 Makefile --- Makefile 29 Jul 2022 07:45:04 -0000 1.73 +++ Makefile 14 Nov 2022 14:51:53 -0000 @@ -1,7 +1,6 @@ COMMENT= multiple virtual desktop window manager -VERSION= 2.6.9 -REVISION= 1 +VERSION= 2.7.0 DISTNAME= fvwm-${VERSION} PKGNAME= fvwm2-${VERSION} @@ -18,7 +17,7 @@ PERMIT_PACKAGE= Yes WANTLIB += ICE SM X11 Xcursor Xext Xft Xinerama 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 z +WANTLIB += readline rsvg-2 MASTER_SITES= https://github.com/fvwmorg/fvwm/releases/download/${VERSION}/ Index: distinfo =================================================================== RCS file: /cvs/ports/x11/fvwm2/distinfo,v retrieving revision 1.16 diff -u -p -r1.16 distinfo --- distinfo 8 Jan 2021 15:01:14 -0000 1.16 +++ distinfo 14 Nov 2022 14:51:53 -0000 @@ -1,2 +1,2 @@ -SHA256 (fvwm-2.6.9.tar.gz) = G8ZM88zQBzAIdYFoMnqCZbgFne+bI5tFHWufqyzDka4= -SIZE (fvwm-2.6.9.tar.gz) = 3942859 +SHA256 (fvwm-2.7.0.tar.gz) = ZoJt1gt3REcXADfZB4/UPnX3IwpJrPuEqYjuvOfjQYs= +SIZE (fvwm-2.7.0.tar.gz) = 3933529 Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/x11/fvwm2/patches/patch-configure,v retrieving revision 1.6 diff -u -p -r1.6 patch-configure --- patches/patch-configure 11 Mar 2022 20:15:31 -0000 1.6 +++ patches/patch-configure 14 Nov 2022 14:51:53 -0000 @@ -1,8 +1,8 @@ Index: configure --- configure.orig +++ configure -@@ -11355,7 +11355,7 @@ if test "${with_intl_library+set}" = set; then : - else +@@ -12109,7 +12109,7 @@ then : + else $as_nop with_intl=maybe - intl_LIBS="-l${smr_lib}" Index: patches/patch-default-config_Makefile_in =================================================================== RCS file: /cvs/ports/x11/fvwm2/patches/patch-default-config_Makefile_in,v retrieving revision 1.3 diff -u -p -r1.3 patch-default-config_Makefile_in --- patches/patch-default-config_Makefile_in 11 Mar 2022 20:15:31 -0000 1.3 +++ patches/patch-default-config_Makefile_in 14 Nov 2022 14:51:53 -0000 @@ -1,16 +1,16 @@ Index: default-config/Makefile.in --- default-config/Makefile.in.orig +++ default-config/Makefile.in -@@ -602,9 +602,9 @@ uninstall-am: uninstall-configDATA +@@ -604,9 +604,9 @@ uninstall-am: uninstall-configDATA install-data-hook: - cp -r $(srcdir)/images $(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)/.. + 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: patches/patch-fvwm_Makefile_in =================================================================== RCS file: /cvs/ports/x11/fvwm2/patches/patch-fvwm_Makefile_in,v retrieving revision 1.10 diff -u -p -r1.10 patch-fvwm_Makefile_in --- patches/patch-fvwm_Makefile_in 11 Mar 2022 20:15:31 -0000 1.10 +++ patches/patch-fvwm_Makefile_in 14 Nov 2022 14:51:53 -0000 @@ -10,7 +10,7 @@ Index: fvwm/Makefile.in subdir = fvwm ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -@@ -576,7 +576,7 @@ uninstall-binPROGRAMS: +@@ -577,7 +577,7 @@ uninstall-binPROGRAMS: clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/x11/fvwm2/pkg/PLIST,v retrieving revision 1.19 diff -u -p -r1.19 PLIST --- pkg/PLIST 11 Mar 2022 20:15:31 -0000 1.19 +++ pkg/PLIST 14 Nov 2022 14:51:53 -0000 @@ -1,8 +1,8 @@ +@conflict fvwm2+fvicons-* +@conflict fvicons-* @pkgpath x11/fvwm2,-main @pkgpath x11/fvwm2,-fvicons @pkgpath x11/fvwm2,-fvwm2 -@conflict fvwm2+fvicons-* -@conflict fvicons-* @bin bin/FvwmCommand bin/fvwm-bug bin/fvwm-config @@ -23,8 +23,6 @@ libexec/fvwm/${VERSION}/FvwmAudio @bin libexec/fvwm/${VERSION}/FvwmBanner @bin libexec/fvwm/${VERSION}/FvwmButtons libexec/fvwm/${VERSION}/FvwmCascade -libexec/fvwm/${VERSION}/FvwmCommand.pm -libexec/fvwm/${VERSION}/FvwmCommand.sh @bin libexec/fvwm/${VERSION}/FvwmCommandS @bin libexec/fvwm/${VERSION}/FvwmConsole @bin libexec/fvwm/${VERSION}/FvwmConsoleC @@ -132,6 +130,39 @@ share/fvwm/default-config/images/icons/t share/fvwm/default-config/images/icons/wallpaper.png share/fvwm/fvwm-menu-desktop-config.fpl share/fvwm/fvwm-script-ComExample.pl +share/fvwm/locale/ +share/fvwm/locale/ar/ +share/fvwm/locale/ar/LC_MESSAGES/ +share/fvwm/locale/ar/LC_MESSAGES/FvwmScript.mo +share/fvwm/locale/ar/LC_MESSAGES/fvwm.mo +share/fvwm/locale/da/ +share/fvwm/locale/da/LC_MESSAGES/ +share/fvwm/locale/da/LC_MESSAGES/FvwmScript.mo +share/fvwm/locale/da/LC_MESSAGES/fvwm.mo +share/fvwm/locale/de/ +share/fvwm/locale/de/LC_MESSAGES/ +share/fvwm/locale/de/LC_MESSAGES/FvwmScript.mo +share/fvwm/locale/de/LC_MESSAGES/fvwm.mo +share/fvwm/locale/es/ +share/fvwm/locale/es/LC_MESSAGES/ +share/fvwm/locale/es/LC_MESSAGES/FvwmScript.mo +share/fvwm/locale/es/LC_MESSAGES/fvwm.mo +share/fvwm/locale/fr/ +share/fvwm/locale/fr/LC_MESSAGES/ +share/fvwm/locale/fr/LC_MESSAGES/FvwmScript.mo +share/fvwm/locale/fr/LC_MESSAGES/fvwm.mo +share/fvwm/locale/ru/ +share/fvwm/locale/ru/LC_MESSAGES/ +share/fvwm/locale/ru/LC_MESSAGES/FvwmScript.mo +share/fvwm/locale/ru/LC_MESSAGES/fvwm.mo +share/fvwm/locale/sv_SE/ +share/fvwm/locale/sv_SE/LC_MESSAGES/ +share/fvwm/locale/sv_SE/LC_MESSAGES/FvwmScript.mo +share/fvwm/locale/sv_SE/LC_MESSAGES/fvwm.mo +share/fvwm/locale/zh_CN/ +share/fvwm/locale/zh_CN/LC_MESSAGES/ +share/fvwm/locale/zh_CN/LC_MESSAGES/FvwmScript.mo +share/fvwm/locale/zh_CN/LC_MESSAGES/fvwm.mo share/fvwm/perllib/ share/fvwm/perllib/FVWM/ share/fvwm/perllib/FVWM/Commands.pm @@ -154,21 +185,3 @@ share/fvwm/perllib/FVWM/Tracker/WindowLi share/fvwm/perllib/General/ 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 -share/locale/es/LC_MESSAGES/fvwm.mo -share/locale/fr/LC_MESSAGES/FvwmScript.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/fvwm.mo -share/locale/zh_CN/LC_MESSAGES/FvwmScript.mo -share/locale/zh_CN/LC_MESSAGES/fvwm.mo
