On Sat, Feb 13, 2021 at 09:02:44PM -0500, David Goerger wrote: > I've copied this patch from FreeBSD ports[1], and submitted it to what > appears[2] to be the new upstream on gitlab.com[3]. > > This fixes the build for me on -current amd64. Thanks a lot for you work, I'll commit a brushed up diff now.
> Apologies if this isn't formatted correctly---I'm unsure how to > represent "mkdir mail/mlmmj/patches" using cvs diff, but otherwise > this applies cleanly for me on a fresh checkout. It applies but `make update-patches' would complain about the format still; since the sources contain ".orig" files which we use for patches as well I had to set PATCHORIG=.pat.orig in our Makefile first to avoid this clash and have `update-patches' only account for your newly added patch, i.e. ignore shipped files somewhere under contrib/. Once `update-patches' your patch is formatted as it should be; I've also added a comment while here. > [1] > https://svnweb.freebsd.org/ports/head/mail/mlmmj/files/patch-gcc10?view=markup&pathrev=562279 > > [2] https://marc.info/?l=mlmmj&m=161122707912991&w=2 > > [3] https://gitlab.com/mlmmj/mlmmj > > > diff -u -p -r1.21 Makefile > --- Makefile 12 Jul 2019 20:47:30 -0000 1.21 > +++ Makefile 14 Feb 2021 01:31:22 -0000 > @@ -3,6 +3,7 @@ > COMMENT= mailing list manager > > DISTNAME= mlmmj-1.3.0 > +REVISION= 1 REVISION usually starts at zero (I adjusted it), but anything is fine really as long as the overall version (`make show=FULLPKGNAME') goes up. > CATEGORIES= mail > > HOMEPAGE= http://mlmmj.org/ > > diff -u -p -N /dev/null patches/patch-include_mlmmj_h > --- /dev/null Sat Feb 13 20:32:13 2021 > +++ patches/patch-include_mlmmj_h Sat Feb 13 20:25:12 2021 > @@ -0,0 +1,22 @@ > +diff --git include/mlmmj.h include/mlmmj.h > +index include/mlmmj.h 100644 > +--- include/mlmmj.h > ++++ include/mlmmj.h > +@@ -81,7 +81,7 @@ enum subtype { > + SUB_NONE /* For when an address is not subscribed at all */ > + }; > + > +-char *subtype_strs[7]; /* count matches enum above; defined in > subscriberfuncs.c */ > ++extern char *subtype_strs[7]; /* count matches enum above; defined in > subscriberfuncs.c */ > + > + enum subreason { > + SUB_REQUEST, > +@@ -92,7 +92,7 @@ enum subreason { > + SUB_SWITCH > + }; > + > +-char * subreason_strs[6]; /* count matches enum above; defined in > subscriberfuncs.c */ > ++extern char * subreason_strs[6]; /* count matches enum above; defined in > subscriberfuncs.c */ > + > + void print_version(const char *prg); > + >
