Christian Weisgerber <[email protected]> writes: > net/argus-clients: fix for -fno-common > > This removes an unused variable from the static library argus_common.a. > It clashes with one in the raconvert tool. You could argue the latter > one should be renamed instead, but then again, the library variable > isn't referenced anywhere. > > OK?
OK gnezdo > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/net/argus-clients/Makefile,v > retrieving revision 1.18 > diff -u -p -r1.18 Makefile > --- Makefile 20 Mar 2020 16:44:25 -0000 1.18 > +++ Makefile 23 Feb 2021 21:40:01 -0000 > @@ -3,7 +3,7 @@ > COMMENT = utilities to read and parse Argus data > > DISTNAME = argus-clients-3.0.8.2 > -REVISION = 2 > +REVISION = 3 > CATEGORIES = net > > HOMEPAGE = http://qosient.com/argus/ > Index: patches/patch-common_argus_util_c > =================================================================== > RCS file: /cvs/ports/net/argus-clients/patches/patch-common_argus_util_c,v > retrieving revision 1.5 > diff -u -p -r1.5 patch-common_argus_util_c > --- patches/patch-common_argus_util_c 12 Aug 2016 21:39:14 -0000 1.5 > +++ patches/patch-common_argus_util_c 23 Feb 2021 21:40:01 -0000 > @@ -1,7 +1,19 @@ > $OpenBSD: patch-common_argus_util_c,v 1.5 2016/08/12 21:39:14 steven Exp $ > ---- common/argus_util.c.orig Wed Jun 1 21:17:28 2016 > -+++ common/argus_util.c Fri Jun 3 19:23:33 2016 > -@@ -22679,8 +22679,8 @@ ArgusLog (int priority, char *fmt, ...) > + > +First hunk: remove unused variable that clashes with one in raconvert > + > +Index: common/argus_util.c > +--- common/argus_util.c.orig > ++++ common/argus_util.c > +@@ -6634,7 +6634,6 @@ ArgusGetIndicatorString (struct ArgusParserStruct *par > + > + > + char argus_strbuf[MAXSTRLEN]; > +-u_short ArgusThisProto; > + > + void > + ArgusPrintSourceID (struct ArgusParserStruct *parser, char *buf, struct > ArgusRecordStruct *argus, int len) > +@@ -22679,8 +22678,8 @@ ArgusLog (int priority, char *fmt, ...) > *tptr++ = buf[i]; > }
