git: 02cd17e8ffbd - main - sysutils/pflogx: unbreak, fix compiler errors and warnings

The branch main has been updated by fuz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=02cd17e8ffbdf3ea10417c42821611b44d3d3866

commit 02cd17e8ffbdf3ea10417c42821611b44d3d3866
Author:     Peter Libassi <peter@libassi.se>
AuthorDate: 2023-02-06 13:36:48 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-05-11 23:23:27 +0000

    sysutils/pflogx: unbreak, fix compiler errors and warnings
    
    Submitter becomes maintainer.
    
    PR:             269371
---
 sysutils/pflogx/Makefile                           |  6 +-----
 sysutils/pflogx/files/patch-src_CmdLineParser.cpp  |  5 ++++-
 sysutils/pflogx/files/patch-src_LogEntryFormat.cpp |  8 ++++++--
 sysutils/pflogx/files/patch-src_LogParser.cpp      | 13 +++++++++++++
 sysutils/pflogx/files/patch-src_Makefile           | 11 +++++++++++
 5 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/sysutils/pflogx/Makefile b/sysutils/pflogx/Makefile
index 49b7bbbeb895..c9a71cbebae9 100644
--- a/sysutils/pflogx/Makefile
+++ b/sysutils/pflogx/Makefile
@@ -4,17 +4,13 @@ CATEGORIES=	sysutils
 MASTER_SITES=	http://akldev.free.fr/pflogx/releases/
 DISTNAME=	${PORTNAME}_${PORTVERSION:S/.//}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	peter@libassi.se
 COMMENT=	Simple tool to export pf (packet filter) logs to XML files
 WWW=		http://akldev.free.fr/pflogx/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN=		fails to build
-BROKEN_FreeBSD_13=	does not build: error: unknown type name 'LIST_ENTRY'
-BROKEN_FreeBSD_14=	does not build: error: unknown type name 'LIST_ENTRY'
-
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 OPTIONS_DEFINE=	EXPAT DOCS EXAMPLES
diff --git a/sysutils/pflogx/files/patch-src_CmdLineParser.cpp b/sysutils/pflogx/files/patch-src_CmdLineParser.cpp
index e191cc8f195e..958b33342564 100644
--- a/sysutils/pflogx/files/patch-src_CmdLineParser.cpp
+++ b/sysutils/pflogx/files/patch-src_CmdLineParser.cpp
@@ -1,9 +1,12 @@
 --- src/CmdLineParser.cpp.orig	2006-05-08 10:21:40 UTC
 +++ src/CmdLineParser.cpp
-@@ -31,6 +31,7 @@
+@@ -31,6 +31,10 @@
  #include "CmdLineParser.h"
  #include "LogEntry.h"
  #include "StrTools.h"
++#include <sys/param.h>
++#include <sys/queue.h>
++#include <sys/counter.h>
 +#include <netpfil/pf/pf.h>
  #include <unistd.h>
  #include <vector>
diff --git a/sysutils/pflogx/files/patch-src_LogEntryFormat.cpp b/sysutils/pflogx/files/patch-src_LogEntryFormat.cpp
index 521f92e0d571..7752521b5a77 100644
--- a/sysutils/pflogx/files/patch-src_LogEntryFormat.cpp
+++ b/sysutils/pflogx/files/patch-src_LogEntryFormat.cpp
@@ -1,10 +1,14 @@
 --- src/LogEntryFormat.cpp.orig	2006-05-08 10:23:07 UTC
 +++ src/LogEntryFormat.cpp
-@@ -34,6 +34,7 @@
+@@ -34,7 +34,10 @@
  #include <time.h>
  #include <netinet/in.h>
  #include <arpa/inet.h>
+-
++#include <sys/param.h>
++#include <sys/queue.h>
++#include <sys/counter.h>
 +#include <netpfil/pf/pf.h>
  
- 
  #define STATIC_BUFFER_LEN	128
+ 
diff --git a/sysutils/pflogx/files/patch-src_LogParser.cpp b/sysutils/pflogx/files/patch-src_LogParser.cpp
new file mode 100644
index 000000000000..c35445bcc3d5
--- /dev/null
+++ b/sysutils/pflogx/files/patch-src_LogParser.cpp
@@ -0,0 +1,13 @@
+--- src/LogParser.cpp.orig	2006-02-17 15:40:13 UTC
++++ src/LogParser.cpp
+@@ -240,8 +240,8 @@ bool cLogParser::FeedEntry(const struct pfloghdr* pfHe
+ 		return false;
+ 
+ 
+-	if (pfHeader->ifname)
+-		entry.SetIfName(pfHeader->ifname);
++	/* if (pfHeader->ifname) */
++	entry.SetIfName(pfHeader->ifname);
+ 
+ 	entry.SetRuleNumber(ntohl(pfHeader->rulenr));
+ 	entry.SetAction(pfHeader->action);
diff --git a/sysutils/pflogx/files/patch-src_Makefile b/sysutils/pflogx/files/patch-src_Makefile
new file mode 100644
index 000000000000..65ff43b8ed54
--- /dev/null
+++ b/sysutils/pflogx/files/patch-src_Makefile
@@ -0,0 +1,11 @@
+--- src/Makefile.orig	2006-04-25 19:27:56 UTC
++++ src/Makefile
+@@ -8,7 +8,7 @@ OS!=uname -s
+ .if defined(DEBUG_MODE)
+ CXXFLAGS += -g -DDEBUG_MODE
+ .else
+-CXXFLAGS += -s
++CXXFLAGS += -s -Qunused-arguments
+ .endif
+ 
+ # pf's include directory