update x11/fvwm3 to 1.0.5; diff from maintainer Michael, thanks!

changelog: https://github.com/fvwmorg/fvwm3/releases/tag/1.0.5

Some patches were upstreamed and not needed anymore, regen the other
patches.  There is no longer a -debug flavor since those debug messages
are now available via a command line option (-v / --verbose).

x11/fvwm3/Makefile

@@ -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}

x11/fvwm3/distinfo

@@ -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

x11/fvwm3/patches/patch-configure

@@ -1,8 +1,8 @@
 Index: configure
 --- configure.orig
 +++ configure
-@@ -11077,7 +11077,7 @@ if test "${with_intl_library+set}" = set; then :
- else
+@@ -11779,7 +11779,7 @@ then :
+ else $as_nop
  
      with_intl=maybe
 -    intl_LIBS="-l${smr_lib}"

x11/fvwm3/patches/patch-default-config_Makefile_in

@@ -1,7 +1,7 @@
 Index: default-config/Makefile.in
 --- default-config/Makefile.in.orig
 +++ default-config/Makefile.in
-@@ -590,9 +590,10 @@ uninstall-am: uninstall-configDATA
+@@ -593,9 +593,10 @@ uninstall-am: uninstall-configDATA
  
  install-data-hook:
  	cp -r $(srcdir)/images $(inst_location)/default-config

x11/fvwm3/patches/patch-libs_ColorUtils_c

@@ -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;

x11/fvwm3/patches/patch-libs_Module_c

@@ -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;
- 			}
- 		}

x11/fvwm3/pkg/DESCR

@@ -3,6 +3,3 @@ disjoint desktop, a 3D look for windows decorations, shaped/color
 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.