Update 3.0.4 --> 3.0.5

PR:		135924

8 files changed, 74 insertions, 34 deletions

diff --git a/security/fwbuilder-devel/Makefile b/security/fwbuilder-devel/Makefile
index c68e792d76e8..ba5327ac0c49 100644
--- a/security/fwbuilder-devel/Makefile
+++ b/security/fwbuilder-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	fwbuilder
-PORTVERSION=	3.0.4
-PORTREVISION=	2
+PORTVERSION=	3.0.5
 CATEGORIES=	security
 .if defined(BUILD)
 MASTER_SITES=	http://www.fwbuilder.org/nightly_builds/fwbuilder-3.0/build-${BUILD}/
diff --git a/security/fwbuilder-devel/distinfo b/security/fwbuilder-devel/distinfo
index 0aa2dcc6650c..9d22367b32ff 100644
--- a/security/fwbuilder-devel/distinfo
+++ b/security/fwbuilder-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (fwbuilder-3.0.4.tar.gz) = a53ad035511e6a8a6b4b89e6eacf4485
-SHA256 (fwbuilder-3.0.4.tar.gz) = 4cbfc786e2c69b36aa788fb55e19050b1b7e7119ae8178d6528475e1cc9b058c
-SIZE (fwbuilder-3.0.4.tar.gz) = 2383070
+MD5 (fwbuilder-3.0.5.tar.gz) = 826cd7eb84dbd3faa9e4f99f3595999c
+SHA256 (fwbuilder-3.0.5.tar.gz) = b8efbec32786f3e213f68fe3d79d4bc51924a83a98149789f552c67ad5b33dcc
+SIZE (fwbuilder-3.0.5.tar.gz) = 2466047
diff --git a/security/fwbuilder-devel/files/patch-aa b/security/fwbuilder-devel/files/patch-aa
index 7b02dcef3a4f..0b01982becb8 100644
--- a/security/fwbuilder-devel/files/patch-aa
+++ b/security/fwbuilder-devel/files/patch-aa
@@ -1,15 +1,15 @@
---- qmake.inc.in.orig	2008-08-27 22:44:07.000000000 -0700
-+++ qmake.inc.in	2008-08-29 16:04:11.000000000 -0700
-@@ -66,10 +66,8 @@
- 	PKGLOCALEDIR			= $$res.path/locale
+--- qmake.inc.in.orig	2009-06-15 15:07:27.000000000 -0700
++++ qmake.inc.in	2009-06-22 13:50:12.000000000 -0700
+@@ -59,10 +59,8 @@
+         PKGLOCALEDIR = $$res.path/locale
  
- 	CONFIG                 += warn_on debug
--	QMAKE_CFLAGS_DEBUG     += -Wno-unused-parameter
--	QMAKE_CFLAGS_RELEASE   += -Wno-unused-parameter
--	QMAKE_CXXFLAGS_DEBUG   += -Wno-unused-parameter @CXXFLAGS@
--	QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter @CXXFLAGS@
-+	QMAKE_CXXFLAGS_DEBUG   += @CXXFLAGS@
-+	QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@
- }
+         CONFIG += warn_on debug
+-        QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter
+-        QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
+-        QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter @CXXFLAGS@
+-        QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter @CXXFLAGS@
++        QMAKE_CXXFLAGS_DEBUG += @CXXFLAGS@
++        QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@
+     }
  }
  
diff --git a/security/fwbuilder-devel/pkg-plist b/security/fwbuilder-devel/pkg-plist
index 182bcda3c4df..f2989bffc292 100644
--- a/security/fwbuilder-devel/pkg-plist
+++ b/security/fwbuilder-devel/pkg-plist
@@ -10,10 +10,31 @@ share/applications/fwbuilder.desktop
 share/fwbuilder-%%BUILD_VERSION%%/objects_init.xml
 share/fwbuilder-%%BUILD_VERSION%%/templates.xml
 share/fwbuilder-%%BUILD_VERSION%%/resources.xml
+share/fwbuilder-%%BUILD_VERSION%%/help/ipfw_Classify_en_US.html
 share/fwbuilder-%%BUILD_VERSION%%/help/iptAdvancedDialog_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/iptables_Branch_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/iptables_Classify_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/iptables_Route_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/iptables_Tag_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/iptables_rule_options_en_US.html
 share/fwbuilder-%%BUILD_VERSION%%/help/linux24AdvancedDialog_en_US.html
 share/fwbuilder-%%BUILD_VERSION%%/help/main_en_US.html
 share/fwbuilder-%%BUILD_VERSION%%/help/pfAdvancedDialog_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/pf_Branch_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/pf_Classify_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/pf_Route_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/pf_Tag_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/pf_rule_options_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/tip01_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/tip02_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/tip03_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/tip04_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/tip05_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/tip06_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/tip07_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/tip08_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/tip09_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/tip10_en_US.html
 share/fwbuilder-%%BUILD_VERSION%%/locale/fwbuilder_ja.qm
 share/fwbuilder-%%BUILD_VERSION%%/locale/fwbuilder_ru.qm
 share/fwbuilder-%%BUILD_VERSION%%/platform/iosacl.xml
diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index c68e792d76e8..ba5327ac0c49 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	fwbuilder
-PORTVERSION=	3.0.4
-PORTREVISION=	2
+PORTVERSION=	3.0.5
 CATEGORIES=	security
 .if defined(BUILD)
 MASTER_SITES=	http://www.fwbuilder.org/nightly_builds/fwbuilder-3.0/build-${BUILD}/
diff --git a/security/fwbuilder/distinfo b/security/fwbuilder/distinfo
index 0aa2dcc6650c..9d22367b32ff 100644
--- a/security/fwbuilder/distinfo
+++ b/security/fwbuilder/distinfo
@@ -1,3 +1,3 @@
-MD5 (fwbuilder-3.0.4.tar.gz) = a53ad035511e6a8a6b4b89e6eacf4485
-SHA256 (fwbuilder-3.0.4.tar.gz) = 4cbfc786e2c69b36aa788fb55e19050b1b7e7119ae8178d6528475e1cc9b058c
-SIZE (fwbuilder-3.0.4.tar.gz) = 2383070
+MD5 (fwbuilder-3.0.5.tar.gz) = 826cd7eb84dbd3faa9e4f99f3595999c
+SHA256 (fwbuilder-3.0.5.tar.gz) = b8efbec32786f3e213f68fe3d79d4bc51924a83a98149789f552c67ad5b33dcc
+SIZE (fwbuilder-3.0.5.tar.gz) = 2466047
diff --git a/security/fwbuilder/files/patch-aa b/security/fwbuilder/files/patch-aa
index 7b02dcef3a4f..0b01982becb8 100644
--- a/security/fwbuilder/files/patch-aa
+++ b/security/fwbuilder/files/patch-aa
@@ -1,15 +1,15 @@
---- qmake.inc.in.orig	2008-08-27 22:44:07.000000000 -0700
-+++ qmake.inc.in	2008-08-29 16:04:11.000000000 -0700
-@@ -66,10 +66,8 @@
- 	PKGLOCALEDIR			= $$res.path/locale
+--- qmake.inc.in.orig	2009-06-15 15:07:27.000000000 -0700
++++ qmake.inc.in	2009-06-22 13:50:12.000000000 -0700
+@@ -59,10 +59,8 @@
+         PKGLOCALEDIR = $$res.path/locale
  
- 	CONFIG                 += warn_on debug
--	QMAKE_CFLAGS_DEBUG     += -Wno-unused-parameter
--	QMAKE_CFLAGS_RELEASE   += -Wno-unused-parameter
--	QMAKE_CXXFLAGS_DEBUG   += -Wno-unused-parameter @CXXFLAGS@
--	QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter @CXXFLAGS@
-+	QMAKE_CXXFLAGS_DEBUG   += @CXXFLAGS@
-+	QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@
- }
+         CONFIG += warn_on debug
+-        QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter
+-        QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
+-        QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter @CXXFLAGS@
+-        QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter @CXXFLAGS@
++        QMAKE_CXXFLAGS_DEBUG += @CXXFLAGS@
++        QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@
+     }
  }
  
diff --git a/security/fwbuilder/pkg-plist b/security/fwbuilder/pkg-plist
index 182bcda3c4df..f2989bffc292 100644
--- a/security/fwbuilder/pkg-plist
+++ b/security/fwbuilder/pkg-plist
@@ -10,10 +10,31 @@ share/applications/fwbuilder.desktop
 share/fwbuilder-%%BUILD_VERSION%%/objects_init.xml
 share/fwbuilder-%%BUILD_VERSION%%/templates.xml
 share/fwbuilder-%%BUILD_VERSION%%/resources.xml
+share/fwbuilder-%%BUILD_VERSION%%/help/ipfw_Classify_en_US.html
 share/fwbuilder-%%BUILD_VERSION%%/help/iptAdvancedDialog_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/iptables_Branch_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/iptables_Classify_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/iptables_Route_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/iptables_Tag_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/iptables_rule_options_en_US.html
 share/fwbuilder-%%BUILD_VERSION%%/help/linux24AdvancedDialog_en_US.html
 share/fwbuilder-%%BUILD_VERSION%%/help/main_en_US.html
 share/fwbuilder-%%BUILD_VERSION%%/help/pfAdvancedDialog_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/pf_Branch_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/pf_Classify_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/pf_Route_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/pf_Tag_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/pf_rule_options_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/tip01_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/tip02_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/tip03_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/tip04_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/tip05_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/tip06_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/tip07_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/tip08_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/tip09_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/tip10_en_US.html
 share/fwbuilder-%%BUILD_VERSION%%/locale/fwbuilder_ja.qm
 share/fwbuilder-%%BUILD_VERSION%%/locale/fwbuilder_ru.qm
 share/fwbuilder-%%BUILD_VERSION%%/platform/iosacl.xml