Attachment #237894 for bug #267594

View | Details | Raw Unified | Return to bug 267594
Collapse All | Expand All




PORTNAME=	traff
PORTVERSION=	0.7
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

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/COPYING

LIB_DEPENDS=	libargp.so:devel/argp-standalone

USES=		gmake
USE_RC_SUBR=	traff

Added Link Here

(-)b/net/traff/files/patch-readconfig.c (+11 lines)
1	--- readconfig.c.orig 2022-11-06 12:02:53 UTC
2	+++ readconfig.c
3	@@ -23,6 +23,8 @@
4
5	#define WHITESPACE " \t\r\n"
6
7	+char conf_file[];
8	+
9	typedef enum {
10	// oSQL,
11	oBadOption,oDevices,oPeriod,oCat,




--- readconfig.h.orig	2009-11-11 01:55:07 UTC
+++ readconfig.h
@@ -13,7 +13,7 @@
 #endif
 

 #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

Return to bug 267594

Lines 1-16 Link Here

(-)b/net/traff/Makefile (-4 / +5 lines)
1	PORTNAME= traff	1	PORTNAME= traff
2	PORTVERSION= 0.7	2	PORTVERSION= 0.7
3	PORTREVISION= 1	3	PORTREVISION= 2
4	CATEGORIES= net net-mgmt	4	CATEGORIES= net net-mgmt
5	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}	5	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
6		6
7	MAINTAINER= daniel@freebsd.ro	7	MAINTAINER= daniel@freebsd.ro
8	COMMENT= Libpcab based fast traffic accounting program	8	COMMENT= Libpcab based fast traffic accounting program
		9	WWW= https://sourceforge.net/projects/traff
9		10
10	BROKEN_FreeBSD_13= ld: error: duplicate symbol: conf_file	11	LICENSE= GPLv2
11	BROKEN_FreeBSD_14= ld: error: duplicate symbol: conf_file	12	LICENSE_FILE= ${WRKSRC}/COPYING
12		13
13	BUILD_DEPENDS= ${LOCALBASE}/include/argp.h:devel/argp-standalone	14	LIB_DEPENDS= libargp.so:devel/argp-standalone
14		15
15	USES= gmake	16	USES= gmake
16	USE_RC_SUBR= traff	17	USE_RC_SUBR= traff

Lines 1-5 Link Here

(-)b/net/traff/files/patch-readconfig.h (-3 / +10 lines)
1	--- readconfig.h.orig 2009-11-10 20:55:07.000000000 -0500	1	--- readconfig.h.orig 2009-11-11 01:55:07 UTC
2	+++ readconfig.h 2011-05-26 21:06:12.000000000 -0400	2	+++ readconfig.h
3	@@ -13,7 +13,7 @@	3	@@ -13,7 +13,7 @@
4	#endif	4	#endif
5		5
Lines 9-11 Link Here
9	#endif	9	#endif
10		10
11	#include <stdlib.h>	11	#include <stdlib.h>
12	-	12	@@ -118,6 +118,6 @@ int config_read_config_file(t_config * config,char * f
		13	void config_destroy(t_config * config);
		14	char * get_dump_type_str(e_dumptypes dumptype);
		15
		16	-char conf_file[FILELENGTH];
		17	+extern char conf_file[FILELENGTH];
		18
		19	#endif