Update 4.2.2 --> 5.0.0

Feature safe:	yes

4 files changed, 8 insertions, 23 deletions

diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index b5d041bca5fd..866faf5df767 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	fwbuilder
-DISTVERSION=	4.2.2
+DISTVERSION=	5.0.0
 PORTVERSION=	${DISTVERSION}
-PORTREVISION=	1
 CATEGORIES=	security
-BUILD=		3541
+BUILD=		3568
 .if defined(DEVEL)
 MASTER_SITES=	http://www.fwbuilder.org/nightly_builds/fwbuilder-4.0/build-${BUILD}/
 PKGNAMESUFFIX=	-devel
diff --git a/security/fwbuilder/distinfo b/security/fwbuilder/distinfo
index 9d1eb0ffd4fd..deef47290799 100644
--- a/security/fwbuilder/distinfo
+++ b/security/fwbuilder/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fwbuilder-4.2.2.3541.tar.gz) = 90111e0d7fcad31a9eccdbbc4d9ca7ce5182c0d93e8f9dbd8c683c3c80980482
-SIZE (fwbuilder-4.2.2.3541.tar.gz) = 6830864
+SHA256 (fwbuilder-5.0.0.3568.tar.gz) = dc42956bfa5a0c4f703353ace2a36ddfec985f4431ab00c00ae0ac9ca6f672c0
+SIZE (fwbuilder-5.0.0.3568.tar.gz) = 6703816
diff --git a/security/fwbuilder/files/patch-src-pflib-PolicyCompiler_pf.cpp b/security/fwbuilder/files/patch-src-pflib-PolicyCompiler_pf.cpp
deleted file mode 100644
index cdd29413541a..000000000000
--- a/security/fwbuilder/files/patch-src-pflib-PolicyCompiler_pf.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urPN --exclude=CVS --exclude=.svn --exclude=00_TRANS.TBL export/home/cy/freebsd/fwbuilder/work/fwbuilder-3.0.7/src/pflib/PolicyCompiler_pf.cpp usr/ports/security/fwbuilder.old/work/fwbuilder-3.0.6/src/pflib/PolicyCompiler_pf.cpp
---- src/pflib/PolicyCompiler_pf.cpp	2009-09-18 12:28:39.000000000 -0700
-+++ src/pflib/PolicyCompiler_pf.cpp	2009-08-18 08:27:52.000000000 -0700
-@@ -521,8 +521,7 @@
- {
-     PolicyRule *rule=getNext(); if (rule==NULL) return false;
- 
--    if (rule->getDirection()==PolicyRule::Both &&
--        rule->getAction()==PolicyRule::Route)
-+    if (rule->getDirection()==PolicyRule::Both)
-     {
- 	PolicyRule *r= compiler->dbcopy->createPolicyRule();
- 	compiler->temp_ruleset->add(r);
diff --git a/security/fwbuilder/pkg-plist b/security/fwbuilder/pkg-plist
index fd55e7074ff7..2ed79df6f373 100644
--- a/security/fwbuilder/pkg-plist
+++ b/security/fwbuilder/pkg-plist
@@ -7,7 +7,6 @@ bin/fwb_pix
 bin/fwbedit
 bin/fwbuilder
 bin/fwb_procurve_acl
-bin/transfer_secuwall
 share/applications/fwbuilder.desktop
 share/fwbuilder-%%BUILD_VERSION%%/configlets/bsd/bridge_interface
 share/fwbuilder-%%BUILD_VERSION%%/configlets/bsd/bridge_port
@@ -99,6 +98,7 @@ share/fwbuilder-%%BUILD_VERSION%%/configlets/linux24/routing_functions
 share/fwbuilder-%%BUILD_VERSION%%/configlets/linux24/run_time_address_tables
 share/fwbuilder-%%BUILD_VERSION%%/configlets/linux24/run_time_wrappers
 share/fwbuilder-%%BUILD_VERSION%%/configlets/linux24/script_body_iptables_restore
+share/fwbuilder-%%BUILD_VERSION%%/configlets/linux24/script_body_iptables_shell
 share/fwbuilder-%%BUILD_VERSION%%/configlets/linux24/script_body_single_rule
 share/fwbuilder-%%BUILD_VERSION%%/configlets/linux24/script_skeleton
 share/fwbuilder-%%BUILD_VERSION%%/configlets/linux24/shell_functions
@@ -201,6 +201,7 @@ share/fwbuilder-%%BUILD_VERSION%%/help/en_US/release_notes_4.1.3.html
 share/fwbuilder-%%BUILD_VERSION%%/help/en_US/release_notes_4.2.0.html
 share/fwbuilder-%%BUILD_VERSION%%/help/en_US/release_notes_4.2.1.html
 share/fwbuilder-%%BUILD_VERSION%%/help/en_US/release_notes_4.2.2.html
+share/fwbuilder-%%BUILD_VERSION%%/help/en_US/release_notes_5.0.0.html
 share/fwbuilder-%%BUILD_VERSION%%/help/en_US/state_sync_configuration.png
 share/fwbuilder-%%BUILD_VERSION%%/help/en_US/tip01.html
 share/fwbuilder-%%BUILD_VERSION%%/help/en_US/tip02.html
@@ -213,8 +214,6 @@ share/fwbuilder-%%BUILD_VERSION%%/help/en_US/tip08.html
 share/fwbuilder-%%BUILD_VERSION%%/help/en_US/tip09.html
 share/fwbuilder-%%BUILD_VERSION%%/help/en_US/tip10.html
 share/fwbuilder-%%BUILD_VERSION%%/help/en_US/vlan_interfaces.png
-share/fwbuilder-%%BUILD_VERSION%%/locale/fwbuilder_ja.qm
-share/fwbuilder-%%BUILD_VERSION%%/locale/fwbuilder_ru.qm
 share/fwbuilder-%%BUILD_VERSION%%/objects_init.xml
 share/fwbuilder-%%BUILD_VERSION%%/os/dd-wrt-jffs.xml
 share/fwbuilder-%%BUILD_VERSION%%/os/dd-wrt-nvram.xml
@@ -251,7 +250,6 @@ share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_0.9.3.xslt
 share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_0.9.2.xslt
 share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_0.9.1.xslt
 share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_0.9.0.xslt
-share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_0.8.7.xslt
 share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.14.xslt
 share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.13.xslt
 share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.12.xslt
@@ -322,11 +320,12 @@ share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_16.xslt
 share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_17.xslt
 share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_18.xslt
 share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_19.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_20.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_21.xslt
 share/fwbuilder-%%BUILD_VERSION%%/fwbuilder.dtd
 @dirrm share/fwbuilder-%%BUILD_VERSION%%/platform
 @dirrm share/fwbuilder-%%BUILD_VERSION%%/os
 @dirrm share/fwbuilder-%%BUILD_VERSION%%/migration
-@dirrm share/fwbuilder-%%BUILD_VERSION%%/locale
 @dirrm share/fwbuilder-%%BUILD_VERSION%%/help/en_US
 @dirrm share/fwbuilder-%%BUILD_VERSION%%/help
 @dirrm share/fwbuilder-%%BUILD_VERSION%%/configlets/sveasoft