Hi ports@, this is an update to the latest fvwm3 release [1].
sprintf() patches are no longer needed since they are now included upstream (thanks Omar!). Also there is no longer a reason to build the -debug flavor since those debug messages are now a commandline option (-v / --verbose). Tested on amd64. [1] https://github.com/fvwmorg/fvwm3/releases/tag/1.0.5 Index: Makefile =================================================================== RCS file: /cvs/ports/x11/fvwm3/Makefile,v retrieving revision 1.3 diff -u -p -r1.3 Makefile --- Makefile 29 Jul 2022 07:45:05 -0000 1.3 +++ Makefile 30 Sep 2022 14:17:40 -0000 @@ -1,6 +1,6 @@ COMMENT= multiple virtual desktop window manager -VERSION= 1.0.4 +VERSION= 1.0.5 DISTNAME= fvwm3-${VERSION} CATEGORIES= x11 @@ -24,13 +24,6 @@ LIB_DEPENDS+= graphics/png \ x11/gnome/librsvg \ devel/libevent2 -FLAVORS= debug -FLAVOR?= - -.if ${FLAVOR:Mdebug} -CONFIGURE_ARGS+= --enable-debug-msgs -.endif - SUBST_VARS= VERSION SEPARATE_BUILD= Yes @@ -43,7 +36,8 @@ CONFIGURE_ARGS+= --enable-mandoc \ CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" -DEBUG_PACKAGES = ${BUILD_PACKAGES} + +DEBUG_PACKAGES = ${BUILD_PACKAGES} post-install: mv ${WRKINST}/${TRUEPREFIX}/bin/FvwmCommand{,3} Index: distinfo =================================================================== RCS file: /cvs/ports/x11/fvwm3/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo 26 Feb 2022 20:37:41 -0000 1.1.1.1 +++ distinfo 30 Sep 2022 14:17:40 -0000 @@ -1,2 +1,2 @@ -SHA256 (fvwm3-1.0.4.tar.gz) = IId+IK5c45Jm59DqSLAT6CLWAN2U9bJplV2wWj1Qpjs= -SIZE (fvwm3-1.0.4.tar.gz) = 4691719 +SHA256 (fvwm3-1.0.5.tar.gz) = xBp+rxy968vMf/x3O7JcwHh5+840KWM90FhOjryLEBQ= +SIZE (fvwm3-1.0.5.tar.gz) = 4538262 Index: patches/patch-libs_ColorUtils_c =================================================================== RCS file: patches/patch-libs_ColorUtils_c diff -N patches/patch-libs_ColorUtils_c --- patches/patch-libs_ColorUtils_c 11 Mar 2022 20:15:31 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,25 +0,0 @@ -Index: libs/ColorUtils.c ---- libs/ColorUtils.c.orig -+++ libs/ColorUtils.c -@@ -422,15 +422,15 @@ int pixel_to_color_string( - - if (!use_hash) - { -- sprintf( -- output, "rgb:%04x/%04x/%04x%n", (int)color.red, -- (int)color.green, (int)color.blue, &n); -+ n = sprintf( -+ output, "rgb:%04x/%04x/%04x", (int)color.red, -+ (int)color.green, (int)color.blue); - } - else - { -- sprintf( -- output, "#%02x%02x%02x%n", (int)(color.red/256), -- (int)(color.green/256), (int)(color.blue/256), &n); -+ n = sprintf( -+ output, "#%02x%02x%02x", (int)(color.red/256), -+ (int)(color.green/256), (int)(color.blue/256)); - } - - return n; Index: patches/patch-libs_Module_c =================================================================== RCS file: patches/patch-libs_Module_c diff -N patches/patch-libs_Module_c --- patches/patch-libs_Module_c 11 Mar 2022 20:15:31 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ -Index: libs/Module.c ---- libs/Module.c.orig -+++ libs/Module.c -@@ -497,7 +497,7 @@ char *module_expand_action( - return NULL; - } - /* print the number into the string */ -- sprintf(dest, "%d%n", val, &offset); -+ offset = sprintf(dest, "%d", val); - dest += offset; - } - else if (is_string) -@@ -512,7 +512,7 @@ char *module_expand_action( - /* print the colour name into the string */ - if (string) - { -- sprintf(dest, "%s%n", string, &offset); -+ offset = sprintf(dest, "%s", string); - dest += offset; - } - } Index: pkg/DESCR =================================================================== RCS file: /cvs/ports/x11/fvwm3/pkg/DESCR,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 DESCR --- pkg/DESCR 26 Feb 2022 20:37:41 -0000 1.1.1.1 +++ pkg/DESCR 30 Sep 2022 14:17:40 -0000 @@ -3,6 +3,3 @@ disjoint desktop, a 3D look for windows icons. It gives a very good emulation of mwm. A nice button-bar can be used to provide convenient access to frequently used functions or programs. - -The package can be built with "debug" FLAVOR to turn on debugging -messages.
