diff --git a/net/traff/Makefile b/net/traff/Makefile index 70c12cc5ad79..a75fb9916df9 100644 --- a/net/traff/Makefile +++ b/net/traff/Makefile @@ -1,48 +1,49 @@ 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 GNU_CONFIGURE= yes LIBS+= -L${LOCALBASE}/lib -largp OPTIONS_DEFINE= MYSQL PGSQL OPTIONS_DEFAULT= MYSQL .include .if ${PORT_OPTIONS:MMYSQL} USES+= mysql CPPFLAGS+= -DwithMYSQL -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib/mysql -lmysqlclient_r CONFIGURE_ARGS+=--enable-mysql .endif .if ${PORT_OPTIONS:MPGSQL} USES+= pgsql CPPFLAGS+= -DwithPGSQL -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib -lpq CONFIGURE_ARGS+=--enable-postgresql .endif post-configure: @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \ ${WRKSRC}/Makefile ${WRKSRC}/traff.c do-install: ${INSTALL_PROGRAM} ${WRKSRC}/traff ${STAGEDIR}${PREFIX}/sbin ${INSTALL_DATA} ${WRKSRC}/traff.conf ${STAGEDIR}${PREFIX}/etc/traff.conf.sample .include 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,11 +1,19 @@ ---- 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 #if withPGSQL -#include +#include #endif #include +@@ -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