From owner-svn-ports-head@freebsd.org Wed Dec 27 10:39:59 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DDE20E84222; Wed, 27 Dec 2017 10:39:59 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B563680D08; Wed, 27 Dec 2017 10:39:59 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBRAdwI6038438; Wed, 27 Dec 2017 10:39:58 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBRAdwmA038431; Wed, 27 Dec 2017 10:39:58 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201712271039.vBRAdwmA038431@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Wed, 27 Dec 2017 10:39:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r457359 - in head/sysutils/pflogx: . files X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head/sysutils/pflogx: . files X-SVN-Commit-Revision: 457359 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Dec 2017 10:40:00 -0000 Author: danfe Date: Wed Dec 27 10:39:58 2017 New Revision: 457359 URL: https://svnweb.freebsd.org/changeset/ports/457359 Log: Unbreak the build on sparc64: it was caused by #include that was conflicting with C++ headers, leading to the following errors: In file included from /usr/include/c++/4.2/iostream:45, from ../include/XmlFileWriter.h:36, from pflogx.cpp:36: /usr/include/c++/4.2/ostream:566:47: error: macro "flush" passed 2 arguments, but takes just 1 This header was required before PF_* enums were moved to , which applies to all supported versions of FreeBSD. Thus, do not #include offending and nowadays useless header file, only #include (which is #included by ) when its definitions are needed. Tested on: i386, amd64, powerpc, sparc64 Added: head/sysutils/pflogx/files/patch-include_LogEntry.h (contents, props changed) head/sysutils/pflogx/files/patch-include_LogParser.h (contents, props changed) head/sysutils/pflogx/files/patch-include_Options.h - copied unchanged from r457358, head/sysutils/pflogx/files/patch-include__Options.h head/sysutils/pflogx/files/patch-src_CmdLineParser.cpp (contents, props changed) head/sysutils/pflogx/files/patch-src_LogEntryFormat.cpp (contents, props changed) head/sysutils/pflogx/files/patch-src_LogEntryParser.cpp (contents, props changed) Deleted: head/sysutils/pflogx/files/patch-include__Options.h Modified: head/sysutils/pflogx/Makefile Modified: head/sysutils/pflogx/Makefile ============================================================================== --- head/sysutils/pflogx/Makefile Wed Dec 27 09:30:47 2017 (r457358) +++ head/sysutils/pflogx/Makefile Wed Dec 27 10:39:58 2017 (r457359) @@ -13,8 +13,6 @@ COMMENT= Simple tool to export pf (packet filter) logs LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_sparc64= cannot compile: error in C++ code - WRKSRC= ${WRKDIR}/${PORTNAME} OPTIONS_DEFINE= EXPAT DOCS EXAMPLES Added: head/sysutils/pflogx/files/patch-include_LogEntry.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/pflogx/files/patch-include_LogEntry.h Wed Dec 27 10:39:58 2017 (r457359) @@ -0,0 +1,10 @@ +--- include/LogEntry.h.orig 2006-04-16 13:43:43 UTC ++++ include/LogEntry.h +@@ -36,7 +36,6 @@ + #include + #include + #include +-#include + #include + + using namespace std; Added: head/sysutils/pflogx/files/patch-include_LogParser.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/pflogx/files/patch-include_LogParser.h Wed Dec 27 10:39:58 2017 (r457359) @@ -0,0 +1,10 @@ +--- include/LogParser.h.orig 2006-04-16 13:45:17 UTC ++++ include/LogParser.h +@@ -35,7 +35,6 @@ + #include + #include + #include +-#include + #include + #include + #include Copied: head/sysutils/pflogx/files/patch-include_Options.h (from r457358, head/sysutils/pflogx/files/patch-include__Options.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/pflogx/files/patch-include_Options.h Wed Dec 27 10:39:58 2017 (r457359, copy of r457358, head/sysutils/pflogx/files/patch-include__Options.h) @@ -0,0 +1,10 @@ +--- include/Options.h.orig 2006-04-25 19:13:29 UTC ++++ include/Options.h +@@ -33,6 +33,7 @@ + + #include + #include ++#include + + using namespace std; + Added: head/sysutils/pflogx/files/patch-src_CmdLineParser.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/pflogx/files/patch-src_CmdLineParser.cpp Wed Dec 27 10:39:58 2017 (r457359) @@ -0,0 +1,10 @@ +--- src/CmdLineParser.cpp.orig 2006-05-08 10:21:40 UTC ++++ src/CmdLineParser.cpp +@@ -31,6 +31,7 @@ + #include "CmdLineParser.h" + #include "LogEntry.h" + #include "StrTools.h" ++#include + #include + #include + Added: head/sysutils/pflogx/files/patch-src_LogEntryFormat.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/pflogx/files/patch-src_LogEntryFormat.cpp Wed Dec 27 10:39:58 2017 (r457359) @@ -0,0 +1,10 @@ +--- src/LogEntryFormat.cpp.orig 2006-05-08 10:23:07 UTC ++++ src/LogEntryFormat.cpp +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + + + #define STATIC_BUFFER_LEN 128 Added: head/sysutils/pflogx/files/patch-src_LogEntryParser.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/pflogx/files/patch-src_LogEntryParser.cpp Wed Dec 27 10:39:58 2017 (r457359) @@ -0,0 +1,10 @@ +--- src/LogEntryParser.cpp.orig 2006-04-25 19:22:42 UTC ++++ src/LogEntryParser.cpp +@@ -35,6 +35,7 @@ + #include + #include + #include ++#include + + +