Date: Thu, 17 Nov 2022 07:07:19 GMT From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= <fernape@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 98a1bc7f0d2f - main - net/traff: fix build with -fno-common Message-ID: <202211170707.2AH77Jg6018412@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=98a1bc7f0d2f5539100fe22e27f83cedb29ab040 commit 98a1bc7f0d2f5539100fe22e27f83cedb29ab040 Author: Robert Clausecker <fuz@fuz.su> AuthorDate: 2022-11-07 19:08:14 +0000 Commit: Fernando Apesteguía <fernape@FreeBSD.org> CommitDate: 2022-11-17 07:03:33 +0000 net/traff: fix build with -fno-common Also: * define LICENSE * fix missing LIB_DEPENDS on libargp.so PR: 267594 Reported by: fuz@fuz.su Approved by: daniel@freebsd.ro (maintainer, timeout 2 weeks) MFH: 2022Q4 (build fix) --- net/traff/Makefile | 9 +++++---- net/traff/files/patch-readconfig.c | 11 +++++++++++ net/traff/files/patch-readconfig.h | 12 ++++++++++-- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/net/traff/Makefile b/net/traff/Makefile index 70c12cc5ad79..a75fb9916df9 100644 --- a/net/traff/Makefile +++ b/net/traff/Makefile @@ -1,16 +1,17 @@ PORTNAME= traff PORTVERSION= 0.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net net-mgmt MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= daniel@freebsd.ro COMMENT= Libpcab based fast traffic accounting program +WWW= https://sourceforge.net/projects/traff -BROKEN_FreeBSD_13= ld: error: duplicate symbol: conf_file -BROKEN_FreeBSD_14= ld: error: duplicate symbol: conf_file +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${LOCALBASE}/include/argp.h:devel/argp-standalone +LIB_DEPENDS= libargp.so:devel/argp-standalone USES= gmake USE_RC_SUBR= traff diff --git a/net/traff/files/patch-readconfig.c b/net/traff/files/patch-readconfig.c new file mode 100644 index 000000000000..1d89296124ff --- /dev/null +++ b/net/traff/files/patch-readconfig.c @@ -0,0 +1,11 @@ +--- readconfig.c.orig 2022-11-06 12:02:53 UTC ++++ readconfig.c +@@ -23,6 +23,8 @@ + + #define WHITESPACE " \t\r\n" + ++char conf_file[]; ++ + typedef enum { + // oSQL, + oBadOption,oDevices,oPeriod,oCat, diff --git a/net/traff/files/patch-readconfig.h b/net/traff/files/patch-readconfig.h index 0f0af5b4f64f..15c31d3ae1c8 100644 --- a/net/traff/files/patch-readconfig.h +++ b/net/traff/files/patch-readconfig.h @@ -1,5 +1,5 @@ ---- readconfig.h.orig 2009-11-10 20:55:07.000000000 -0500 -+++ readconfig.h 2011-05-26 21:06:12.000000000 -0400 +--- readconfig.h.orig 2009-11-11 01:55:07 UTC ++++ readconfig.h @@ -13,7 +13,7 @@ #endif @@ -9,3 +9,11 @@ #endif #include <stdlib.h> +@@ -118,6 +118,6 @@ int config_read_config_file(t_config * config,char * f + void config_destroy(t_config * config); + char * get_dump_type_str(e_dumptypes dumptype); + +-char conf_file[FILELENGTH]; ++extern char conf_file[FILELENGTH]; + + #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202211170707.2AH77Jg6018412>