5 files changed, 137 insertions, 33 deletions

diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index 8e901e357f50..54e2f6d2c6a6 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -6,29 +6,33 @@
 #
 
 PORTNAME=	fwbuilder
-DISTVERSION=	4.1.3
+DISTVERSION=	4.2.0
 PORTVERSION=	${DISTVERSION}
 CATEGORIES=	security
-.if defined(BUILD)
+BUILD=		3530
+.if defined(DEVEL)
 MASTER_SITES=	http://www.fwbuilder.org/nightly_builds/fwbuilder-4.0/build-${BUILD}/
 PKGNAMESUFFIX=	-devel
 PORTVERSION=	${DISTVERSION}.b${BUILD}
 .else
 MASTER_SITES=	SF/${PORTNAME}/Current_Packages/${PORTVERSION}
+DISTVERSIONSUFFIX=	.${BUILD}
 .endif
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Firewall Builder GUI and policy compilers
 
-.if defined(BUILD)
-CONFLICTS=	fwbuilder-[23].* fwbuilder-devel-[23].*
-LIB_DEPENDS=	fwbuilder.9:${PORTSDIR}/security/libfwbuilder-devel
+.if defined(DEVEL)
+CONFLICTS=	fwbuilder-[23].* fwbuilder-devel-[23].* \
+		libfwbuilder-[23].* libfwbuilder-devel-[23].*
 .else
-CONFLICTS=	fwbuilder-[23].* fwbuilder-devel-*
-LIB_DEPENDS=	fwbuilder.9:${PORTSDIR}/security/libfwbuilder
+CONFLICTS=	fwbuilder-[23].* fwbuilder-devel-* \
+		libfwbuilder-[23].* libfwbuilder-devel-*
 .endif
+LIB_DEPENDS=	xslt.2:${PORTSDIR}/textproc/libxslt \
+		netsnmp.20:${PORTSDIR}/net-mgmt/net-snmp
 
-PLIST_SUB=	BUILD_VERSION=${DISTVERSION}
+PLIST_SUB=	BUILD_VERSION=${DISTVERSION}.${BUILD}
 USE_QT_VER=	4
 QT_COMPONENTS=	corelib \
 		gui \
diff --git a/security/fwbuilder/distinfo b/security/fwbuilder/distinfo
index 564254efcd5a..7987f1f09707 100644
--- a/security/fwbuilder/distinfo
+++ b/security/fwbuilder/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fwbuilder-4.1.3.tar.gz) = f8af490bc3a09124eb5ac6ce1157366530cb516cf856a398b6ece819b6e6643e
-SIZE (fwbuilder-4.1.3.tar.gz) = 5683404
+SHA256 (fwbuilder-4.2.0.3530.tar.gz) = 79f962fb992be94afbaab6e191e501775fa100b0a85d5cc930a3a15ad4701e1f
+SIZE (fwbuilder-4.2.0.3530.tar.gz) = 6778279
diff --git a/security/fwbuilder/files/patch-aa b/security/fwbuilder/files/patch-aa
index 08ae9b5ede34..c3bc9b16dac8 100644
--- a/security/fwbuilder/files/patch-aa
+++ b/security/fwbuilder/files/patch-aa
@@ -1,14 +1,14 @@
---- qmake.inc.in.orig	2010-01-26 15:58:20.000000000 -0800
-+++ qmake.inc.in	2010-05-02 23:23:06.953322354 -0700
-@@ -68,11 +68,7 @@
-         LIBS += $$LIBS_FWBUILDER @LIBS@
+--- qmake.inc.in.orig	2011-04-20 10:48:53.000000000 -0700
++++ qmake.inc.in	2011-04-21 12:36:58.901647669 -0700
+@@ -35,11 +35,6 @@
+     MOC_DIR = .moc
+     OBJECTS_DIR = .obj
  
-         CONFIG += warn_on debug
--        QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter
--        QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
--        QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter
--        QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter
-
-     }
- }
+-    QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter
+-    QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
+-    QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter
+-    QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter
+-
+     !macx {
  
+         exec_prefix = @EXEC_PREFIX@
diff --git a/security/fwbuilder/files/patch-src-pflib-PolicyCompiler_pf.cpp b/security/fwbuilder/files/patch-src-pflib-PolicyCompiler_pf.cpp
index 9cf6bf34c322..cdd29413541a 100644
--- a/security/fwbuilder/files/patch-src-pflib-PolicyCompiler_pf.cpp
+++ b/security/fwbuilder/files/patch-src-pflib-PolicyCompiler_pf.cpp
@@ -11,14 +11,3 @@ diff -urPN --exclude=CVS --exclude=.svn --exclude=00_TRANS.TBL export/home/cy/fr
      {
  	PolicyRule *r= compiler->dbcopy->createPolicyRule();
  	compiler->temp_ruleset->add(r);
-@@ -1080,9 +1079,7 @@
- 	add( new fillDirection("determine directions"               ));
- 
- // commented out for bug #2828602
--// ... and put back per #2844561
--// both bug reports/patches are by Tom Judge (tomjudge on sourceforge)
--	add( new SplitDirection("split rules with direction 'both'"  ));
-+//	add( new SplitDirection("split rules with direction 'both'"  ));
- 
-         add( new addLoopbackForRedirect(
-                  "add loopback to rules that permit redirected services" ) );
diff --git a/security/fwbuilder/pkg-plist b/security/fwbuilder/pkg-plist
index cc100440be77..b4539727d19b 100644
--- a/security/fwbuilder/pkg-plist
+++ b/security/fwbuilder/pkg-plist
@@ -9,12 +9,16 @@ 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
 share/fwbuilder-%%BUILD_VERSION%%/configlets/bsd/carp_interface
+share/fwbuilder-%%BUILD_VERSION%%/configlets/bsd/ifconfig_interface
 share/fwbuilder-%%BUILD_VERSION%%/configlets/bsd/kernel_vars
 share/fwbuilder-%%BUILD_VERSION%%/configlets/bsd/pfsync_interface
 share/fwbuilder-%%BUILD_VERSION%%/configlets/bsd/shell_functions
 share/fwbuilder-%%BUILD_VERSION%%/configlets/bsd/tools
 share/fwbuilder-%%BUILD_VERSION%%/configlets/bsd/update_addresses
+share/fwbuilder-%%BUILD_VERSION%%/configlets/bsd/update_bridge
 share/fwbuilder-%%BUILD_VERSION%%/configlets/bsd/update_carp
 share/fwbuilder-%%BUILD_VERSION%%/configlets/bsd/update_pfsync
 share/fwbuilder-%%BUILD_VERSION%%/configlets/bsd/update_vlans
@@ -30,10 +34,34 @@ share/fwbuilder-%%BUILD_VERSION%%/configlets/dd-wrt-nvram/installer_commands_roo
 share/fwbuilder-%%BUILD_VERSION%%/configlets/dd-wrt-nvram/routing_functions
 share/fwbuilder-%%BUILD_VERSION%%/configlets/dd-wrt-nvram/script_skeleton
 share/fwbuilder-%%BUILD_VERSION%%/configlets/dd-wrt-nvram/top_comment
+share/fwbuilder-%%BUILD_VERSION%%/configlets/freebsd/carp_interface
+share/fwbuilder-%%BUILD_VERSION%%/configlets/freebsd/ifconfig_interface
 share/fwbuilder-%%BUILD_VERSION%%/configlets/freebsd/installer_commands_reg_user
 share/fwbuilder-%%BUILD_VERSION%%/configlets/freebsd/installer_commands_root
 share/fwbuilder-%%BUILD_VERSION%%/configlets/freebsd/kernel_vars
+share/fwbuilder-%%BUILD_VERSION%%/configlets/freebsd/rc_conf_bridge_port
+share/fwbuilder-%%BUILD_VERSION%%/configlets/freebsd/rc_conf_carp_interface
+share/fwbuilder-%%BUILD_VERSION%%/configlets/freebsd/rc_conf_ifconfig_interface
+share/fwbuilder-%%BUILD_VERSION%%/configlets/freebsd/rc_conf_kernel_vars
+share/fwbuilder-%%BUILD_VERSION%%/configlets/freebsd/rc_conf_pfsync_interface
+share/fwbuilder-%%BUILD_VERSION%%/configlets/freebsd/routing_functions
 share/fwbuilder-%%BUILD_VERSION%%/configlets/freebsd/tools
+share/fwbuilder-%%BUILD_VERSION%%/configlets/fwsm_os/failover_commands_2
+share/fwbuilder-%%BUILD_VERSION%%/configlets/fwsm_os/failover_commands_3_2
+share/fwbuilder-%%BUILD_VERSION%%/configlets/fwsm_os/failover_interface_2
+share/fwbuilder-%%BUILD_VERSION%%/configlets/fwsm_os/failover_interface_3_2
+share/fwbuilder-%%BUILD_VERSION%%/configlets/fwsm_os/installer_commands_post_config
+share/fwbuilder-%%BUILD_VERSION%%/configlets/fwsm_os/installer_commands_pre_config
+share/fwbuilder-%%BUILD_VERSION%%/configlets/fwsm_os/installer_commands_reg_user
+share/fwbuilder-%%BUILD_VERSION%%/configlets/fwsm_os/ntp
+share/fwbuilder-%%BUILD_VERSION%%/configlets/fwsm_os/regular_interface_2
+share/fwbuilder-%%BUILD_VERSION%%/configlets/fwsm_os/regular_interface_3_2
+share/fwbuilder-%%BUILD_VERSION%%/configlets/fwsm_os/snmp
+share/fwbuilder-%%BUILD_VERSION%%/configlets/fwsm_os/ssh
+share/fwbuilder-%%BUILD_VERSION%%/configlets/fwsm_os/vlan_parent_interface_2
+share/fwbuilder-%%BUILD_VERSION%%/configlets/fwsm_os/vlan_parent_interface_3_2
+share/fwbuilder-%%BUILD_VERSION%%/configlets/fwsm_os/vlan_subinterface_2
+share/fwbuilder-%%BUILD_VERSION%%/configlets/fwsm_os/vlan_subinterface_3_2
 share/fwbuilder-%%BUILD_VERSION%%/configlets/ios/installer_commands_post_config
 share/fwbuilder-%%BUILD_VERSION%%/configlets/ios/installer_commands_pre_config
 share/fwbuilder-%%BUILD_VERSION%%/configlets/ios/installer_commands_reg_user
@@ -89,6 +117,7 @@ share/fwbuilder-%%BUILD_VERSION%%/configlets/macosx/tools
 share/fwbuilder-%%BUILD_VERSION%%/configlets/openbsd/installer_commands_reg_user
 share/fwbuilder-%%BUILD_VERSION%%/configlets/openbsd/installer_commands_root
 share/fwbuilder-%%BUILD_VERSION%%/configlets/openbsd/kernel_vars
+share/fwbuilder-%%BUILD_VERSION%%/configlets/openbsd/routing_functions
 share/fwbuilder-%%BUILD_VERSION%%/configlets/openbsd/tools
 share/fwbuilder-%%BUILD_VERSION%%/configlets/openwrt/check_utilities
 share/fwbuilder-%%BUILD_VERSION%%/configlets/openwrt/installer_commands_reg_user
@@ -97,6 +126,9 @@ share/fwbuilder-%%BUILD_VERSION%%/configlets/openwrt/load_modules
 share/fwbuilder-%%BUILD_VERSION%%/configlets/openwrt/script_skeleton
 share/fwbuilder-%%BUILD_VERSION%%/configlets/openwrt/top_comment
 share/fwbuilder-%%BUILD_VERSION%%/configlets/pf/activation
+share/fwbuilder-%%BUILD_VERSION%%/configlets/pf/rc_conf_activation
+share/fwbuilder-%%BUILD_VERSION%%/configlets/pf/rc_conf_skeleton
+share/fwbuilder-%%BUILD_VERSION%%/configlets/pf/rc_conf_top_comment
 share/fwbuilder-%%BUILD_VERSION%%/configlets/pf/script_skeleton
 share/fwbuilder-%%BUILD_VERSION%%/configlets/pf/top_comment
 share/fwbuilder-%%BUILD_VERSION%%/configlets/pix_os/failover_commands_6
@@ -166,6 +198,7 @@ share/fwbuilder-%%BUILD_VERSION%%/help/en_US/release_notes_4.1.0.html
 share/fwbuilder-%%BUILD_VERSION%%/help/en_US/release_notes_4.1.1.html
 share/fwbuilder-%%BUILD_VERSION%%/help/en_US/release_notes_4.1.2.html
 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/state_sync_configuration.png
 share/fwbuilder-%%BUILD_VERSION%%/help/en_US/tip01.html
 share/fwbuilder-%%BUILD_VERSION%%/help/en_US/tip02.html
@@ -210,8 +243,85 @@ share/fwbuilder-%%BUILD_VERSION%%/platform/procurve_acl.xml
 share/fwbuilder-%%BUILD_VERSION%%/platform/unknown.xml
 share/fwbuilder-%%BUILD_VERSION%%/resources.xml
 share/fwbuilder-%%BUILD_VERSION%%/templates.xml
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_0.9.5.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_0.9.4.xslt
+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
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.11.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.10.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.9.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.8.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.7.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.6.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.5.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.4.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.3.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.2.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.1.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.0.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_1.0.0.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_1.0.1.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_1.0.2.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.0.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.1.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.2.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.3.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.4.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.5.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.6.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.7.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.8.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.9.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.10.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.11.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.12.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.99.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.0.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.1.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.2.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.3.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.4.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.5.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.6.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.7.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.8.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.9.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.10.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.11.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.12.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.13.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.14.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.15.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.16.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.17.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.18.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.19.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.99.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_3.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_4.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_5.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_6.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_7.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_8.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_9.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_10.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_11.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_12.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_13.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_14.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_15.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_16.xslt
+share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_17.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
@@ -229,6 +339,7 @@ share/fwbuilder-%%BUILD_VERSION%%/templates.xml
 @dirrm share/fwbuilder-%%BUILD_VERSION%%/configlets/ipf
 @dirrm share/fwbuilder-%%BUILD_VERSION%%/configlets/ipcop
 @dirrm share/fwbuilder-%%BUILD_VERSION%%/configlets/ios
+@dirrm share/fwbuilder-%%BUILD_VERSION%%/configlets/fwsm_os
 @dirrm share/fwbuilder-%%BUILD_VERSION%%/configlets/freebsd
 @dirrm share/fwbuilder-%%BUILD_VERSION%%/configlets/dd-wrt-nvram
 @dirrm share/fwbuilder-%%BUILD_VERSION%%/configlets/dd-wrt-jffs