Date: Sun, 17 Oct 2004 19:46:02 -0700 (PDT) From: Vadim Kurland <vadim@vk.crocodile.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/72808: [maintainer update] [patch] Fixed port to compile on 4.10 Message-ID: <200410180246.i9I2k2Mp088043@freebsd410.vk.crocodile.org> Resent-Message-ID: <200410180250.i9I2oDmK068205@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 72808
>Category: ports
>Synopsis: [maintainer update] [patch] Fixed port to compile on 4.10
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Oct 18 02:50:12 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Vadim Kurland
>Release: FreeBSD 4.10-RELEASE i386
>Organization:
Firewall Builder Project
>Environment:
System: FreeBSD freebsd410.vk.crocodile.org 4.10-RELEASE FreeBSD 4.10-RELEASE #1: Sat Oct 16 22:27:35 PDT 2004 root@freebsd410.vk.crocodile.org:/usr/src/sys/compile/GENERIC i386
>Description:
Port failed to compile on 4.10 because gcc 2.95 does not support command line option
-Wno-unused-parameter. Few other problems have been identified and fixed during debugging
as well. Attached patch fixes the problem and bumps port revision up.
With this patch port compiles and works on both 4.10 and 5.3b
>How-To-Repeat:
>Fix:
--- fwbuilder-port.diff begins here ---
diff -urN security/fwbuilder-old/Makefile security/fwbuilder/Makefile
--- security/fwbuilder-old/Makefile Sat Oct 16 22:54:26 2004
+++ security/fwbuilder/Makefile Sun Oct 17 18:45:01 2004
@@ -7,7 +7,7 @@
PORTNAME= fwbuilder
PORTVERSION= 2.0.2
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}/fwbuilder/
MASTER_SITE_SUBDIR= fwbuilder
diff -urN security/fwbuilder-old/files/patch-aa security/fwbuilder/files/patch-aa
--- security/fwbuilder-old/files/patch-aa Wed Dec 31 16:00:00 1969
+++ security/fwbuilder/files/patch-aa Sun Oct 17 00:33:46 2004
@@ -0,0 +1,13 @@
+--- qmake.inc.in.old Sat Oct 16 23:56:08 2004
++++ qmake.inc.in Sat Oct 16 23:56:20 2004
+@@ -37,10 +37,6 @@
+
+ PKGLOCALEDIR = $$res.path/locale
+
+- QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter
+- QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
+- QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter
+- QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter
+ }
+ }
+
diff -urN security/fwbuilder-old/files/patch-ab security/fwbuilder/files/patch-ab
--- security/fwbuilder-old/files/patch-ab Wed Dec 31 16:00:00 1969
+++ security/fwbuilder/files/patch-ab Sun Oct 17 00:33:46 2004
@@ -0,0 +1,11 @@
+--- src/gui/utils.cpp.old Sun Oct 17 00:13:41 2004
++++ src/gui/utils.cpp Sun Oct 17 00:14:26 2004
+@@ -218,7 +218,7 @@
+ int sn1 = file.findRev('/',-1);
+ int sn2 = file.findRev('\\',-1);
+ int sn = (sn1>=0)?sn1:sn2;
+- QString dir = (sn<0) ? "./" : file.left( sn );
++ QString dir = (sn<0) ? QString("./") : file.left( sn );
+
+ #ifdef _WIN32
+ /* on windows, if directory is in the root of the drive (like "c:"),
diff -urN security/fwbuilder-old/files/patch-ac security/fwbuilder/files/patch-ac
--- security/fwbuilder-old/files/patch-ac Wed Dec 31 16:00:00 1969
+++ security/fwbuilder/files/patch-ac Sun Oct 17 00:33:46 2004
@@ -0,0 +1,10 @@
+--- src/gui/FWBTree.cpp.old Sun Oct 17 00:16:10 2004
++++ src/gui/FWBTree.cpp Sun Oct 17 00:17:21 2004
+@@ -51,6 +51,7 @@
+ #include "fwbuilder/IntervalGroup.h"
+
+ #include <iostream>
++#include <algorithm>
+
+ using namespace std;
+ using namespace libfwbuilder;
diff -urN security/fwbuilder-old/files/patch-ad security/fwbuilder/files/patch-ad
--- security/fwbuilder-old/files/patch-ad Wed Dec 31 16:00:00 1969
+++ security/fwbuilder/files/patch-ad Sun Oct 17 00:33:46 2004
@@ -0,0 +1,10 @@
+--- src/gui/ObjectManipulator.cpp.old Sun Oct 17 00:19:22 2004
++++ src/gui/ObjectManipulator.cpp Sun Oct 17 00:19:41 2004
+@@ -97,6 +97,7 @@
+ #include "fwbuilder/IntervalGroup.h"
+
+ #include <iostream>
++#include <algorithm>
+
+ using namespace std;
+ using namespace libfwbuilder;
diff -urN security/fwbuilder-old/files/patch-ae security/fwbuilder/files/patch-ae
--- security/fwbuilder-old/files/patch-ae Wed Dec 31 16:00:00 1969
+++ security/fwbuilder/files/patch-ae Sun Oct 17 00:33:46 2004
@@ -0,0 +1,10 @@
+--- src/gui/listOfLibraries.cpp.old Sun Oct 17 00:23:48 2004
++++ src/gui/listOfLibraries.cpp Sun Oct 17 00:24:01 2004
+@@ -38,6 +38,7 @@
+ #include <qfile.h>
+
+ #include <iostream>
++#include <algorithm>
+
+ using namespace std;
+ using namespace libfwbuilder;
--- fwbuilder-port.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200410180246.i9I2k2Mp088043>