Updated to latest release, 5.1.0.3599. Now requires mk/resolv, net/net-snmp

devel/zlib, textproc/libxslt, textproc/libxml2, devel/cppunit, mk/pthread.
Patches were defuzzed and updated. Patch added to fix LIBDIR expansion.
List of changes since the last version and this one is 2788 lines long.
Interested parties can find the ChangeLog in the doc/ directory of the
distfile or at:
http://sourceforge.net/p/fwbuilder/code/ci/builds/tree/doc/ChangeLog

8 files changed, 69 insertions, 38 deletions

diff --git a/security/fwbuilder/patches/patch-aa b/security/fwbuilder/patches/patch-aa
index 41f930bd654..0fd639cc499 100644
--- a/security/fwbuilder/patches/patch-aa
+++ b/security/fwbuilder/patches/patch-aa
@@ -1,9 +1,11 @@
-$NetBSD: patch-aa,v 1.4 2011/04/12 13:44:03 adam Exp $
+$NetBSD: patch-aa,v 1.5 2015/03/29 15:28:43 rodent Exp $
 
---- src/common/init.cpp.orig	2011-04-11 19:03:33.000000000 +0000
+Fix build on Darwin.
+
+--- src/common/init.cpp.orig	2012-03-23 06:10:54.000000000 +0000
 +++ src/common/init.cpp
-@@ -34,7 +34,7 @@ QString user_name;
- 
+@@ -26,7 +26,7 @@ std::string ee;
+ QString user_name;
  
  
 -#if defined(Q_OS_WIN32) || defined(Q_OS_MACX)
diff --git a/security/fwbuilder/patches/patch-ab b/security/fwbuilder/patches/patch-ab
index debe9c1ce69..cc31fbf9fb6 100644
--- a/security/fwbuilder/patches/patch-ab
+++ b/security/fwbuilder/patches/patch-ab
@@ -1,28 +1,36 @@
-$NetBSD: patch-ab,v 1.3 2011/04/12 13:44:03 adam Exp $
+$NetBSD: patch-ab,v 1.4 2015/03/29 15:28:43 rodent Exp $
 
---- qmake.inc.in.orig	2010-12-06 00:29:02.000000000 +0000
+Don't build with debugging symbols by default nor hardcode compiler flags.
+
+--- qmake.inc.in.orig	2012-03-23 06:10:54.000000000 +0000
 +++ qmake.inc.in
-@@ -26,7 +26,6 @@ unix {
+@@ -17,7 +17,7 @@ CPPUNIT_LIBS = @CPPUNIT_LIBS@
  
-     QMAKE_CXX = @CCACHE@ @DISTCC@ $$QMAKE_CXX
+ # CONFIG -= nostrip
+ # CONFIG += release
+-CONFIG += debug
++#CONFIG += debug
  
--    !macx {
+ unix {
+     PREFIX = @PREFIX@
+@@ -36,11 +36,10 @@ unix {
+     OBJECTS_DIR = .obj
  
-         UI_DIR = .ui
-         MOC_DIR = .moc
-@@ -62,13 +61,12 @@ unix {
+     QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter
+-    QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
++    QMAKE_CFLAGS_RELEASE += @CXXFLAGS@
+     QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter
+-    QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter
++    QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@
  
-         LIBS += $$LIBS_FWBUILDER @LIBS@
+-    !macx {
  
--        CONFIG += warn_on debug
-+        CONFIG += warn_on
-         QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter
--        QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
-+        QMAKE_CFLAGS_RELEASE += @CXXFLAGS@
-         QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter
--        QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter
-+        QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@@
+         exec_prefix = @EXEC_PREFIX@
+         DESTDIR =
+@@ -68,7 +67,6 @@ unix {
+         CONFIG += warn_on
  
+ #		DEFINES += __STDC_FORMAT_MACROS
 -    }
  }
  
diff --git a/security/fwbuilder/patches/patch-ac b/security/fwbuilder/patches/patch-ac
index bed80236963..8aa60fd6ff9 100644
--- a/security/fwbuilder/patches/patch-ac
+++ b/security/fwbuilder/patches/patch-ac
@@ -1,6 +1,8 @@
-$NetBSD: patch-ac,v 1.5 2011/04/12 13:44:03 adam Exp $
+$NetBSD: patch-ac,v 1.6 2015/03/29 15:28:43 rodent Exp $
 
---- src/res/res.pro.orig	2011-04-12 06:19:21.000000000 +0000
+Fix build on Darwin.
+
+--- src/res/res.pro.orig	2012-03-23 06:10:54.000000000 +0000
 +++ src/res/res.pro
 @@ -17,6 +17,7 @@ win32 {
    QMAKE_RUN_CC  = @echo > /dev/null
diff --git a/security/fwbuilder/patches/patch-ad b/security/fwbuilder/patches/patch-ad
index 9741bc7d4e5..54e3ed2728d 100644
--- a/security/fwbuilder/patches/patch-ad
+++ b/security/fwbuilder/patches/patch-ad
@@ -1,6 +1,8 @@
-$NetBSD: patch-ad,v 1.5 2011/04/12 13:44:03 adam Exp $
+$NetBSD: patch-ad,v 1.6 2015/03/29 15:28:43 rodent Exp $
 
---- src/tools/tools.pro.orig	2010-12-06 00:29:02.000000000 +0000
+Use libtool.
+
+--- src/tools/tools.pro.orig	2012-03-23 06:10:54.000000000 +0000
 +++ src/tools/tools.pro
 @@ -13,6 +13,7 @@ unix {
  	QMAKE_RUN_CC  = @true
diff --git a/security/fwbuilder/patches/patch-ae b/security/fwbuilder/patches/patch-ae
index a50684dc2f8..0b0e0bf056e 100644
--- a/security/fwbuilder/patches/patch-ae
+++ b/security/fwbuilder/patches/patch-ae
@@ -1,6 +1,8 @@
-$NetBSD: patch-ae,v 1.4 2011/04/12 13:44:03 adam Exp $
+$NetBSD: patch-ae,v 1.5 2015/03/29 15:28:43 rodent Exp $
 
---- doc/doc.pro.orig	2010-12-06 00:29:02.000000000 +0000
+Use libtool.
+
+--- doc/doc.pro.orig	2012-03-23 06:10:54.000000000 +0000
 +++ doc/doc.pro
 @@ -17,6 +17,7 @@ win32 {
    QMAKE_RUN_CC  = @echo > /dev/null
diff --git a/security/fwbuilder/patches/patch-configure.in b/security/fwbuilder/patches/patch-configure.in
index 8b9701b4aa2..2a369af0f1e 100644
--- a/security/fwbuilder/patches/patch-configure.in
+++ b/security/fwbuilder/patches/patch-configure.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure.in,v 1.1 2011/04/12 13:44:03 adam Exp $
+$NetBSD: patch-configure.in,v 1.2 2015/03/29 15:28:43 rodent Exp $
 
 Fix MANDIR and DEFAULT_RES_DIR.
 
---- configure.in.orig	2011-04-12 06:15:34.000000000 +0000
+--- configure.in.orig	2012-03-23 06:10:54.000000000 +0000
 +++ configure.in
-@@ -325,15 +325,15 @@ case ${host} in
+@@ -490,15 +490,15 @@ case ${host} in
    *-*-darwin*)
      OS=MacOSX
      OS_MACOSX=1
@@ -23,7 +23,7 @@ Fix MANDIR and DEFAULT_RES_DIR.
      AC_MSG_RESULT(Solaris)
      DEFAULT_RES_DIR="${PREFIX}/share/fwbuilder-${VERSION}"
      ;;
-@@ -362,7 +362,7 @@ case ${host} in
+@@ -527,7 +527,7 @@ case ${host} in
      else
         DISTRO="Unknown"
      fi
@@ -32,7 +32,7 @@ Fix MANDIR and DEFAULT_RES_DIR.
      AC_MSG_RESULT($DISTRO GNU/kFreeBSD)
      DEFAULT_RES_DIR="${PREFIX}/share/fwbuilder-${VERSION}"
      ;;
-@@ -388,7 +388,7 @@ case ${host} in
+@@ -553,7 +553,7 @@ case ${host} in
      else
  	DISTRO="Unknown"
      fi
@@ -41,7 +41,7 @@ Fix MANDIR and DEFAULT_RES_DIR.
      ICONSDIR="${DATADIR}/icons/hicolor/"
      AC_MSG_RESULT($DISTRO Linux)
      ;;
-@@ -397,7 +397,7 @@ case ${host} in
+@@ -562,7 +562,7 @@ case ${host} in
      OS=Unknown
      OS_UNKNOWN=1
      DISTRO=Unknown
diff --git a/security/fwbuilder/patches/patch-src_gui_main.cpp b/security/fwbuilder/patches/patch-src_gui_main.cpp
index 55e48cad59c..7b1d41d43dc 100644
--- a/security/fwbuilder/patches/patch-src_gui_main.cpp
+++ b/security/fwbuilder/patches/patch-src_gui_main.cpp
@@ -1,12 +1,12 @@
-$NetBSD: patch-src_gui_main.cpp,v 1.1 2011/04/12 13:44:03 adam Exp $
+$NetBSD: patch-src_gui_main.cpp,v 1.2 2015/03/29 15:28:43 rodent Exp $
 
 Fix buildling on Mac OS X.
 
---- src/gui/main.cpp.orig	2011-04-11 20:07:30.000000000 +0000
+--- src/gui/main.cpp.orig	2012-03-23 06:10:54.000000000 +0000
 +++ src/gui/main.cpp
-@@ -71,9 +71,6 @@
- #include "fwbuilder/Resources.h"
- #include "fwbuilder/FWException.h"
+@@ -72,9 +72,6 @@
+ #include "fwbuilder/Constants.h"
+ 
  
 -#if defined(Q_WS_MAC)
 -extern void connectOdocHandler();
diff --git a/security/fwbuilder/patches/patch-src_libfwbuilder_qmake.inc.in b/security/fwbuilder/patches/patch-src_libfwbuilder_qmake.inc.in
new file mode 100644
index 00000000000..28559f557de
--- /dev/null
+++ b/security/fwbuilder/patches/patch-src_libfwbuilder_qmake.inc.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_libfwbuilder_qmake.inc.in,v 1.1 2015/03/29 15:28:43 rodent Exp $
+
+LIBDIR does not expand.
+
+--- src/libfwbuilder/qmake.inc.in.orig	2012-03-23 06:10:54.000000000 +0000
++++ src/libfwbuilder/qmake.inc.in
+@@ -43,7 +43,7 @@ unix {
+     exec_prefix = @EXEC_PREFIX@
+     DESTDIR =
+ 
+-    target.path = @LIBDIR@
++    target.path = @libdir@
+     dtd.path = @RES_DIR@/
+     migration.path = @RES_DIR@/migration
+     doc.path = @DOCDIR@