On Sat, Sep 11, 2021 at 11:00:33AM +0200, Rafael Sadowski wrote:
> On Sat Sep 11, 2021 at 10:55:58AM +0200, Michael wrote:
> > Hello ports@,
> >
> > this removes the "%n" format usage and fixes some other minor issues.
>
> Thanks!
>
> >
> > Tested on amd64.
> >
> >
> >
> > Index: Makefile
> > ===================================================================
> > RCS file: /cvs/ports/x11/fvwm2/Makefile,v
> > retrieving revision 1.70
> > diff -u -p -u -p -r1.70 Makefile
> > --- Makefile 8 Jan 2021 15:53:33 -0000 1.70
> > +++ Makefile 11 Sep 2021 08:48:23 -0000
> > @@ -3,7 +3,7 @@
> > COMMENT= multiple virtual desktop window manager
> >
> > VERSION= 2.6.9
> > -REVISION= 0
> > +REVISION= 1
> > DISTNAME= fvwm-${VERSION}
> > PKGNAME= fvwm2-${VERSION}
> >
> > @@ -42,8 +42,6 @@ SEPARATE_BUILD= Yes
> > CONFIGURE_STYLE= gnu
> > CONFIGURE_ARGS+= --enable-mandoc \
> > --disable-bidi \
> > - --disable-gtk \
> > - --without-gnome \
>
> Please do this in an additional diff/commit. Thanks
>
Are you sure this is necessary? Those CONFIGURE_ARGS got ignored anyway
and just caused a warning, i.e. those are not heavy changes.
Should this still be relevant here would be an updated diff:
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/fvwm2/Makefile,v
retrieving revision 1.70
diff -u -p -u -p -r1.70 Makefile
--- Makefile 8 Jan 2021 15:53:33 -0000 1.70
+++ Makefile 11 Sep 2021 09:06:39 -0000
@@ -3,7 +3,7 @@
COMMENT= multiple virtual desktop window manager
VERSION= 2.6.9
-REVISION= 0
+REVISION= 1
DISTNAME= fvwm-${VERSION}
PKGNAME= fvwm2-${VERSION}
Index: patches/patch-bin_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/fvwm2/patches/patch-bin_Makefile_in,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-bin_Makefile_in
--- patches/patch-bin_Makefile_in 13 Dec 2020 21:17:02 -0000 1.2
+++ patches/patch-bin_Makefile_in 11 Sep 2021 09:06:39 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-bin_Makefile_in,v 1.2 20
Index: bin/Makefile.in
--- bin/Makefile.in.orig
+++ bin/Makefile.in
-@@ -824,14 +824,13 @@ info: info-am
+@@ -835,14 +835,13 @@ info: info-am
info-am:
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/x11/fvwm2/patches/patch-configure,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-configure
--- patches/patch-configure 13 Dec 2020 21:17:02 -0000 1.4
+++ patches/patch-configure 11 Sep 2021 09:06:39 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-configure,v 1.4 2020/12/
Index: configure
--- configure.orig
+++ configure
-@@ -11756,7 +11756,7 @@ if test "${with_intl_library+set}" = set; then :
+@@ -11355,7 +11355,7 @@ if test "${with_intl_library+set}" = set; then :
else
with_intl=maybe
Index: patches/patch-fvwm_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/fvwm2/patches/patch-fvwm_Makefile_in,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 patch-fvwm_Makefile_in
--- patches/patch-fvwm_Makefile_in 13 Dec 2020 21:17:02 -0000 1.8
+++ patches/patch-fvwm_Makefile_in 11 Sep 2021 09:06:39 -0000
@@ -3,16 +3,16 @@ $OpenBSD: patch-fvwm_Makefile_in,v 1.8 2
Index: fvwm/Makefile.in
--- fvwm/Makefile.in.orig
+++ fvwm/Makefile.in
-@@ -79,7 +79,7 @@ PRE_UNINSTALL = :
+@@ -89,7 +89,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-bin_PROGRAMS = fvwm$(EXEEXT)
+bin_PROGRAMS = fvwm2$(EXEEXT)
subdir = fvwm
- DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/etc/depcomp
-@@ -549,7 +549,7 @@ uninstall-binPROGRAMS:
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+@@ -576,7 +576,7 @@ uninstall-binPROGRAMS:
clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
@@ -21,7 +21,7 @@ Index: fvwm/Makefile.in
@rm -f fvwm$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(fvwm_OBJECTS) $(fvwm_LDADD) $(LIBS)
-@@ -795,7 +795,7 @@ install-dvi: install-dvi-am
+@@ -881,7 +881,7 @@ install-dvi: install-dvi-am
install-dvi-am:
Index: patches/patch-libs_ColorUtils_c
===================================================================
RCS file: patches/patch-libs_ColorUtils_c
diff -N patches/patch-libs_ColorUtils_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libs_ColorUtils_c 11 Sep 2021 09:06:39 -0000
@@ -0,0 +1,27 @@
+$OpenBSD$
+
+Index: libs/ColorUtils.c
+--- libs/ColorUtils.c.orig
++++ libs/ColorUtils.c
+@@ -405,15 +405,15 @@ int pixel_to_color_string(
+ XQueryColor(dpy, cmap, &color);
+ 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, "#%04x%04x%04x%n", (int)color.red,
+- (int)color.green, (int)color.blue, &n);
++ n = sprintf(
++ output, "#%04x%04x%04x", (int)color.red,
++ (int)color.green, (int)color.blue);
+ }
+
+ return n;
Index: patches/patch-libs_Module_c
===================================================================
RCS file: patches/patch-libs_Module_c
diff -N patches/patch-libs_Module_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libs_Module_c 11 Sep 2021 09:06:39 -0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+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: patches/patch-modules_FvwmScript_Instructions_c
===================================================================
RCS file: patches/patch-modules_FvwmScript_Instructions_c
diff -N patches/patch-modules_FvwmScript_Instructions_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-modules_FvwmScript_Instructions_c 11 Sep 2021 09:06:39
-0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: modules/FvwmScript/Instructions.c
+--- modules/FvwmScript/Instructions.c.orig
++++ modules/FvwmScript/Instructions.c
+@@ -665,7 +665,7 @@ static char *GetTime (int *NbArg,long *TabArg)
+
+ str = (char*)safecalloc(20,sizeof(char));
+ t = time(NULL);
+- sprintf(str,"%ld",(long)t-x11base->BeginTime);
++ sprintf(str,"%lld",(long)t-x11base->BeginTime);
+ return str;
+ }
+
