Changes 4.1.3:

This version comes with the following usability enhancements:
* Added checkbox to the Preferences dialog, this checkbox turns off some
  tooltips that can be annoying for users who are sufficiently familiar with
  the GUI.
* Added a tab "Policy Rule" to the "Objects" page of the global preferences
  dialog; checkbox in this tab allows the user to choose whether new policy
  rules should be created with logging turned on or off.
The major bug fixes in this release include:
* Fixed installer issue for Windows users that use Putty sessions. Built-in
  policy installer can use putty session on Windows when it runs pscp.exe
  utility to copy generated script to the firewall
* Fixed bug in the generated iptables script that made it to not configure
  broadcast address when it added ip addresses to interfaces.
* Several bugs that affected cluster configurations were fixed.

10 files changed, 405 insertions, 159 deletions

diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index 2e1b20748e3..87e14599b65 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -1,31 +1,46 @@
-# $NetBSD: Makefile,v 1.21 2011/01/13 13:39:16 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2011/04/12 13:44:03 adam Exp $
 
-DISTNAME=	fwbuilder-2.0.12
-PKGREVISION=	4
+DISTNAME=	fwbuilder-4.1.3
 CATEGORIES=	security net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fwbuilder/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.fwbuilder.org/
 COMMENT=	Firewall Builder GUI
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-CONFLICTS=	fwbuilder21-[0-9]*
+CONFLICTS=	fwbuilder-[0-9]*
 
-USE_LIBTOOL=	yes
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	gmake
-USE_LANGUAGES=	c c++
-UNLIMIT_RESOURCES+=	datasize
-
-QMAKE=		${QTDIR}/bin/qmake
-CONFIGURE_ENV+=	QMAKE=${QMAKE:Q}
-MAKE_ENV+=	QMAKE=${QMAKE:Q}
+USE_LANGUAGES=		c c++
+USE_LIBTOOL=		yes
+USE_TOOLS+=		aclocal autoconf automake gmake
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--mandir=${P}
+CONFIGURE_ARGS+=	--without-distcc
+#UNLIMIT_RESOURCES+=	datasize
 
 INSTALL_MAKE_FLAGS+=	INSTALL_ROOT=${DESTDIR}
 
-.include "../../security/libfwbuilder/buildlink3.mk"
-.include "../../x11/qt3-tools/buildlink3.mk"
+.include "../../mk/compiler.mk"
+
+.if !empty(PKGSRC_COMPILER:Mclang)
+SUBST_CLASSES+=		fix-endl
+SUBST_STAGE.fix-endl=	pre-configure
+SUBST_MESSAGE.fix-endl=	Fixing QTextStream endl for Clang.
+SUBST_FILES.fix-endl=	src/iptlib/CompilerDriver_ipt_run.cpp
+SUBST_FILES.fix-endl+=	src/cisco_lib/CompilerDriver_iosacl_run.cpp
+SUBST_FILES.fix-endl+=	src/cisco_lib/CompilerDriver_pix_run.cpp
+SUBST_FILES.fix-endl+=	src/cisco_lib/CompilerDriver_procurve_acl_run.cpp
+SUBST_SED.fix-endl=	-e '/script <<.*endl/s/endl/"\n"/g'
+.endif
 
+pre-configure:
+	cd ${WRKSRC} && libtoolize -c -f -i && aclocal && autoconf
+
+.include "../../security/libfwbuilder/buildlink3.mk"
+.include "../../x11/qt4-libs/buildlink3.mk"
+.include "../../x11/qt4-tools/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/fwbuilder/PLIST b/security/fwbuilder/PLIST
index 7b6133e30d5..49c75e338a7 100644
--- a/security/fwbuilder/PLIST
+++ b/security/fwbuilder/PLIST
@@ -1,77 +1,237 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:13:28 joerg Exp $
-bin/fwb_install
-bin/fwbedit
-bin/fwblookup
-bin/fwbuilder
-bin/fwb_ipt
-bin/fwb_compile_all
-bin/fwb_pf
+@comment $NetBSD: PLIST,v 1.7 2011/04/12 13:44:03 adam Exp $
+bin/fwb_iosacl
 bin/fwb_ipf
 bin/fwb_ipfw
+bin/fwb_ipt
+bin/fwb_pf
+bin/fwb_pix
+bin/fwb_procurve_acl
+bin/fwbedit
+bin/fwbuilder
+bin/transfer_secuwall
+man/man1/fwb_iosacl.1
+man/man1/fwb_ipf.1
+man/man1/fwb_ipfw.1
+man/man1/fwb_ipt.1
+man/man1/fwb_pf.1
+man/man1/fwb_pix.1
+man/man1/fwbedit.1
+man/man1/fwbuilder.1
+share/applications/fwbuilder.desktop
 share/doc/fwbuilder-${PKGVERSION}/AUTHORS
-share/doc/fwbuilder-${PKGVERSION}/ChangeLog
 share/doc/fwbuilder-${PKGVERSION}/COPYING
+share/doc/fwbuilder-${PKGVERSION}/ChangeLog
 share/doc/fwbuilder-${PKGVERSION}/Credits
+share/doc/fwbuilder-${PKGVERSION}/FWBuilder-Routing-LICENSE.txt
+share/doc/fwbuilder-${PKGVERSION}/PatchAcceptancePolicy.txt
 share/doc/fwbuilder-${PKGVERSION}/README.floppyfw
+share/doc/fwbuilder-${PKGVERSION}/README.iosacl
 share/doc/fwbuilder-${PKGVERSION}/README.ipf
 share/doc/fwbuilder-${PKGVERSION}/README.ipfw
 share/doc/fwbuilder-${PKGVERSION}/README.ipt
 share/doc/fwbuilder-${PKGVERSION}/README.pf
-share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2_0.html
-share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2_0.txt
-share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.0.1.html
-share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.0.1.txt
-share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.0.2.html
-share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.0.2.txt
-share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.0.3.html
-share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.0.3.txt
-share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.0.4.html
-share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.0.4.txt
-share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.0.5.html
-share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.0.5.txt
-share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.0.6.html
-share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.0.6.txt
-share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.0.7.html
-share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.0.7.txt
-share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.0.8.html
-share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.0.8.txt
-share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.0.9.html
-share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.0.9.txt
-share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.0.10.html
-share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.0.10.txt
-share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.0.11.html
-share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.0.11.txt
-share/doc/fwbuilder-${PKGVERSION}/PatchAcceptancePolicy.txt
-share/fwbuilder/locale/fwbuilder_de.qm
-share/fwbuilder/locale/fwbuilder_es.qm
-share/fwbuilder/locale/fwbuilder_fr.qm
-share/fwbuilder/locale/fwbuilder_ja.qm
-share/fwbuilder/locale/fwbuilder_ru.qm
-share/fwbuilder/objects_init.xml
-share/fwbuilder/templates.xml
-share/fwbuilder/resources.xml
-share/fwbuilder/os/freebsd.xml
-share/fwbuilder/os/fwsm_os.xml
-share/fwbuilder/os/linksys.xml
-share/fwbuilder/os/linux24.xml
-share/fwbuilder/os/macosx.xml
-share/fwbuilder/os/openbsd.xml
-share/fwbuilder/os/pix_os.xml
-share/fwbuilder/os/solaris.xml
-share/fwbuilder/os/unknown_os.xml
-share/fwbuilder/platform/fwsm.xml
-share/fwbuilder/platform/ipf.xml
-share/fwbuilder/platform/ipfw.xml
-share/fwbuilder/platform/iptables.xml
-share/fwbuilder/platform/pf.xml
-share/fwbuilder/platform/pix.xml
-share/fwbuilder/platform/unknown.xml
-share/man/man1/fwb_compile_all.1
-share/man/man1/fwbedit.1
-share/man/man1/fwb_install.1
-share/man/man1/fwb_ipf.1
-share/man/man1/fwb_ipfw.1
-share/man/man1/fwb_ipt.1
-share/man/man1/fwblookup.1
-share/man/man1/fwb_pf.1
-share/man/man1/fwbuilder.1
+share/doc/fwbuilder-${PKGVERSION}/README.pix
+share/doc/fwbuilder-${PKGVERSION}/README.pix_routing
+share/doc/fwbuilder-${PKGVERSION}/README.policy_import
+share/doc/fwbuilder-${PKGVERSION}/README.routing
+share/fwbuilder-${PKGVERSION}/configlets/bsd/carp_interface
+share/fwbuilder-${PKGVERSION}/configlets/bsd/kernel_vars
+share/fwbuilder-${PKGVERSION}/configlets/bsd/pfsync_interface
+share/fwbuilder-${PKGVERSION}/configlets/bsd/shell_functions
+share/fwbuilder-${PKGVERSION}/configlets/bsd/tools
+share/fwbuilder-${PKGVERSION}/configlets/bsd/update_addresses
+share/fwbuilder-${PKGVERSION}/configlets/bsd/update_carp
+share/fwbuilder-${PKGVERSION}/configlets/bsd/update_pfsync
+share/fwbuilder-${PKGVERSION}/configlets/bsd/update_vlans
+share/fwbuilder-${PKGVERSION}/configlets/dd-wrt-jffs/check_utilities
+share/fwbuilder-${PKGVERSION}/configlets/dd-wrt-jffs/installer_commands_reg_user
+share/fwbuilder-${PKGVERSION}/configlets/dd-wrt-jffs/installer_commands_root
+share/fwbuilder-${PKGVERSION}/configlets/dd-wrt-jffs/routing_functions
+share/fwbuilder-${PKGVERSION}/configlets/dd-wrt-jffs/script_skeleton
+share/fwbuilder-${PKGVERSION}/configlets/dd-wrt-jffs/top_comment
+share/fwbuilder-${PKGVERSION}/configlets/dd-wrt-nvram/check_utilities
+share/fwbuilder-${PKGVERSION}/configlets/dd-wrt-nvram/installer_commands_reg_user
+share/fwbuilder-${PKGVERSION}/configlets/dd-wrt-nvram/installer_commands_root
+share/fwbuilder-${PKGVERSION}/configlets/dd-wrt-nvram/routing_functions
+share/fwbuilder-${PKGVERSION}/configlets/dd-wrt-nvram/script_skeleton
+share/fwbuilder-${PKGVERSION}/configlets/dd-wrt-nvram/top_comment
+share/fwbuilder-${PKGVERSION}/configlets/freebsd/installer_commands_reg_user
+share/fwbuilder-${PKGVERSION}/configlets/freebsd/installer_commands_root
+share/fwbuilder-${PKGVERSION}/configlets/freebsd/kernel_vars
+share/fwbuilder-${PKGVERSION}/configlets/freebsd/tools
+share/fwbuilder-${PKGVERSION}/configlets/ios/installer_commands_post_config
+share/fwbuilder-${PKGVERSION}/configlets/ios/installer_commands_pre_config
+share/fwbuilder-${PKGVERSION}/configlets/ios/installer_commands_reg_user
+share/fwbuilder-${PKGVERSION}/configlets/ios/safety_net_acl
+share/fwbuilder-${PKGVERSION}/configlets/ios/script_skeleton
+share/fwbuilder-${PKGVERSION}/configlets/ios/top_comment
+share/fwbuilder-${PKGVERSION}/configlets/ipcop/automatic_rules
+share/fwbuilder-${PKGVERSION}/configlets/ipcop/installer_commands_reg_user
+share/fwbuilder-${PKGVERSION}/configlets/ipcop/installer_commands_root
+share/fwbuilder-${PKGVERSION}/configlets/ipcop/kernel_vars
+share/fwbuilder-${PKGVERSION}/configlets/ipcop/script_skeleton
+share/fwbuilder-${PKGVERSION}/configlets/ipcop/shell_functions
+share/fwbuilder-${PKGVERSION}/configlets/ipcop/update_addresses
+share/fwbuilder-${PKGVERSION}/configlets/ipcop/update_bonding
+share/fwbuilder-${PKGVERSION}/configlets/ipcop/update_bridge
+share/fwbuilder-${PKGVERSION}/configlets/ipcop/update_vlans
+share/fwbuilder-${PKGVERSION}/configlets/ipf/activation
+share/fwbuilder-${PKGVERSION}/configlets/ipf/script_skeleton
+share/fwbuilder-${PKGVERSION}/configlets/ipf/top_comment
+share/fwbuilder-${PKGVERSION}/configlets/ipfw/script_skeleton
+share/fwbuilder-${PKGVERSION}/configlets/ipfw/top_comment
+share/fwbuilder-${PKGVERSION}/configlets/linux24/automatic_rules
+share/fwbuilder-${PKGVERSION}/configlets/linux24/block_action
+share/fwbuilder-${PKGVERSION}/configlets/linux24/check_utilities
+share/fwbuilder-${PKGVERSION}/configlets/linux24/conntrack
+share/fwbuilder-${PKGVERSION}/configlets/linux24/constants
+share/fwbuilder-${PKGVERSION}/configlets/linux24/installer_commands_reg_user
+share/fwbuilder-${PKGVERSION}/configlets/linux24/installer_commands_root
+share/fwbuilder-${PKGVERSION}/configlets/linux24/ip_forwarding
+share/fwbuilder-${PKGVERSION}/configlets/linux24/kernel_vars
+share/fwbuilder-${PKGVERSION}/configlets/linux24/load_modules
+share/fwbuilder-${PKGVERSION}/configlets/linux24/prolog_epilog_functions
+share/fwbuilder-${PKGVERSION}/configlets/linux24/reset_iptables
+share/fwbuilder-${PKGVERSION}/configlets/linux24/routing_functions
+share/fwbuilder-${PKGVERSION}/configlets/linux24/run_time_address_tables
+share/fwbuilder-${PKGVERSION}/configlets/linux24/run_time_wrappers
+share/fwbuilder-${PKGVERSION}/configlets/linux24/script_body_iptables_restore
+share/fwbuilder-${PKGVERSION}/configlets/linux24/script_body_single_rule
+share/fwbuilder-${PKGVERSION}/configlets/linux24/script_skeleton
+share/fwbuilder-${PKGVERSION}/configlets/linux24/shell_functions
+share/fwbuilder-${PKGVERSION}/configlets/linux24/status_action
+share/fwbuilder-${PKGVERSION}/configlets/linux24/stop_action
+share/fwbuilder-${PKGVERSION}/configlets/linux24/top_comment
+share/fwbuilder-${PKGVERSION}/configlets/linux24/update_addresses
+share/fwbuilder-${PKGVERSION}/configlets/linux24/update_bonding
+share/fwbuilder-${PKGVERSION}/configlets/linux24/update_bridge
+share/fwbuilder-${PKGVERSION}/configlets/linux24/update_vlans
+share/fwbuilder-${PKGVERSION}/configlets/linux24/verify_interfaces
+share/fwbuilder-${PKGVERSION}/configlets/macosx/installer_commands_reg_user
+share/fwbuilder-${PKGVERSION}/configlets/macosx/installer_commands_root
+share/fwbuilder-${PKGVERSION}/configlets/macosx/kernel_vars
+share/fwbuilder-${PKGVERSION}/configlets/macosx/tools
+share/fwbuilder-${PKGVERSION}/configlets/openbsd/installer_commands_reg_user
+share/fwbuilder-${PKGVERSION}/configlets/openbsd/installer_commands_root
+share/fwbuilder-${PKGVERSION}/configlets/openbsd/kernel_vars
+share/fwbuilder-${PKGVERSION}/configlets/openbsd/tools
+share/fwbuilder-${PKGVERSION}/configlets/openwrt/check_utilities
+share/fwbuilder-${PKGVERSION}/configlets/openwrt/installer_commands_reg_user
+share/fwbuilder-${PKGVERSION}/configlets/openwrt/installer_commands_root
+share/fwbuilder-${PKGVERSION}/configlets/openwrt/load_modules
+share/fwbuilder-${PKGVERSION}/configlets/openwrt/script_skeleton
+share/fwbuilder-${PKGVERSION}/configlets/openwrt/top_comment
+share/fwbuilder-${PKGVERSION}/configlets/pf/activation
+share/fwbuilder-${PKGVERSION}/configlets/pf/script_skeleton
+share/fwbuilder-${PKGVERSION}/configlets/pf/top_comment
+share/fwbuilder-${PKGVERSION}/configlets/pix_os/failover_commands_6
+share/fwbuilder-${PKGVERSION}/configlets/pix_os/failover_commands_7
+share/fwbuilder-${PKGVERSION}/configlets/pix_os/failover_interface_6
+share/fwbuilder-${PKGVERSION}/configlets/pix_os/failover_interface_7
+share/fwbuilder-${PKGVERSION}/configlets/pix_os/installer_commands_post_config
+share/fwbuilder-${PKGVERSION}/configlets/pix_os/installer_commands_pre_config
+share/fwbuilder-${PKGVERSION}/configlets/pix_os/installer_commands_reg_user
+share/fwbuilder-${PKGVERSION}/configlets/pix_os/ntp
+share/fwbuilder-${PKGVERSION}/configlets/pix_os/regular_interface_6
+share/fwbuilder-${PKGVERSION}/configlets/pix_os/regular_interface_7
+share/fwbuilder-${PKGVERSION}/configlets/pix_os/script_skeleton
+share/fwbuilder-${PKGVERSION}/configlets/pix_os/snmp
+share/fwbuilder-${PKGVERSION}/configlets/pix_os/ssh
+share/fwbuilder-${PKGVERSION}/configlets/pix_os/top_comment
+share/fwbuilder-${PKGVERSION}/configlets/pix_os/vlan_parent_interface_6
+share/fwbuilder-${PKGVERSION}/configlets/pix_os/vlan_parent_interface_7
+share/fwbuilder-${PKGVERSION}/configlets/pix_os/vlan_subinterface_6
+share/fwbuilder-${PKGVERSION}/configlets/pix_os/vlan_subinterface_7
+share/fwbuilder-${PKGVERSION}/configlets/procurve/installer_commands_post_config
+share/fwbuilder-${PKGVERSION}/configlets/procurve/installer_commands_pre_config
+share/fwbuilder-${PKGVERSION}/configlets/procurve/installer_commands_reg_user
+share/fwbuilder-${PKGVERSION}/configlets/procurve/safety_net_acl
+share/fwbuilder-${PKGVERSION}/configlets/procurve/script_skeleton
+share/fwbuilder-${PKGVERSION}/configlets/procurve/top_comment
+share/fwbuilder-${PKGVERSION}/configlets/secuwall/installer_commands_reg_user
+share/fwbuilder-${PKGVERSION}/configlets/secuwall/installer_commands_root
+share/fwbuilder-${PKGVERSION}/configlets/secuwall/management_rules
+share/fwbuilder-${PKGVERSION}/configlets/secuwall/script_skeleton
+share/fwbuilder-${PKGVERSION}/configlets/solaris/installer_commands_reg_user
+share/fwbuilder-${PKGVERSION}/configlets/solaris/installer_commands_root
+share/fwbuilder-${PKGVERSION}/configlets/solaris/kernel_vars
+share/fwbuilder-${PKGVERSION}/configlets/solaris/tools
+share/fwbuilder-${PKGVERSION}/configlets/sveasoft/installer_commands_reg_user
+share/fwbuilder-${PKGVERSION}/configlets/sveasoft/installer_commands_root
+share/fwbuilder-${PKGVERSION}/configlets/sveasoft/script_skeleton
+share/fwbuilder-${PKGVERSION}/configlets/sveasoft/shell_functions
+share/fwbuilder-${PKGVERSION}/configlets/sveasoft/top_comment
+share/fwbuilder-${PKGVERSION}/help/en_US/cluster_interfaces.png
+share/fwbuilder-${PKGVERSION}/help/en_US/create_and_add_to_group.png
+share/fwbuilder-${PKGVERSION}/help/en_US/ipcopAdvancedDialog.html
+share/fwbuilder-${PKGVERSION}/help/en_US/ipcoposAdvancedDialog.html
+share/fwbuilder-${PKGVERSION}/help/en_US/ipfw_Classify.html
+share/fwbuilder-${PKGVERSION}/help/en_US/iptAdvancedDialog.html
+share/fwbuilder-${PKGVERSION}/help/en_US/iptables_Branch.html
+share/fwbuilder-${PKGVERSION}/help/en_US/iptables_Classify.html
+share/fwbuilder-${PKGVERSION}/help/en_US/iptables_Route.html
+share/fwbuilder-${PKGVERSION}/help/en_US/iptables_Tag.html
+share/fwbuilder-${PKGVERSION}/help/en_US/iptables_rule_options.html
+share/fwbuilder-${PKGVERSION}/help/en_US/linux24AdvancedDialog.html
+share/fwbuilder-${PKGVERSION}/help/en_US/main.html
+share/fwbuilder-${PKGVERSION}/help/en_US/new_bridge_interfaces.png
+share/fwbuilder-${PKGVERSION}/help/en_US/pfAdvancedDialog.html
+share/fwbuilder-${PKGVERSION}/help/en_US/pf_Branch.html
+share/fwbuilder-${PKGVERSION}/help/en_US/pf_Classify.html
+share/fwbuilder-${PKGVERSION}/help/en_US/pf_Route.html
+share/fwbuilder-${PKGVERSION}/help/en_US/pf_Tag.html
+share/fwbuilder-${PKGVERSION}/help/en_US/pf_rule_options.html
+share/fwbuilder-${PKGVERSION}/help/en_US/pix-failover-group-1.png
+share/fwbuilder-${PKGVERSION}/help/en_US/pix-failover-groups-mapping.png
+share/fwbuilder-${PKGVERSION}/help/en_US/pix-statesync-group-1.png
+share/fwbuilder-${PKGVERSION}/help/en_US/pix-statesync-group-mapping.png
+share/fwbuilder-${PKGVERSION}/help/en_US/release_notes_4.0.0.html
+share/fwbuilder-${PKGVERSION}/help/en_US/release_notes_4.0.1.html
+share/fwbuilder-${PKGVERSION}/help/en_US/release_notes_4.1.0.html
+share/fwbuilder-${PKGVERSION}/help/en_US/release_notes_4.1.1.html
+share/fwbuilder-${PKGVERSION}/help/en_US/release_notes_4.1.2.html
+share/fwbuilder-${PKGVERSION}/help/en_US/release_notes_4.1.3.html
+share/fwbuilder-${PKGVERSION}/help/en_US/state_sync_configuration.png
+share/fwbuilder-${PKGVERSION}/help/en_US/tip01.html
+share/fwbuilder-${PKGVERSION}/help/en_US/tip02.html
+share/fwbuilder-${PKGVERSION}/help/en_US/tip03.html
+share/fwbuilder-${PKGVERSION}/help/en_US/tip04.html
+share/fwbuilder-${PKGVERSION}/help/en_US/tip05.html
+share/fwbuilder-${PKGVERSION}/help/en_US/tip06.html
+share/fwbuilder-${PKGVERSION}/help/en_US/tip07.html
+share/fwbuilder-${PKGVERSION}/help/en_US/tip08.html
+share/fwbuilder-${PKGVERSION}/help/en_US/tip09.html
+share/fwbuilder-${PKGVERSION}/help/en_US/tip10.html
+share/fwbuilder-${PKGVERSION}/help/en_US/vlan_interfaces.png
+share/fwbuilder-${PKGVERSION}/locale/fwbuilder_ja.qm
+share/fwbuilder-${PKGVERSION}/locale/fwbuilder_ru.qm
+share/fwbuilder-${PKGVERSION}/objects_init.xml
+share/fwbuilder-${PKGVERSION}/os/dd-wrt-jffs.xml
+share/fwbuilder-${PKGVERSION}/os/dd-wrt-nvram.xml
+share/fwbuilder-${PKGVERSION}/os/endian.xml
+share/fwbuilder-${PKGVERSION}/os/freebsd.xml
+share/fwbuilder-${PKGVERSION}/os/fwsm_os.xml
+share/fwbuilder-${PKGVERSION}/os/ios.xml
+share/fwbuilder-${PKGVERSION}/os/ipcop.xml
+share/fwbuilder-${PKGVERSION}/os/linux24.xml
+share/fwbuilder-${PKGVERSION}/os/macosx.xml
+share/fwbuilder-${PKGVERSION}/os/oneshield.xml
+share/fwbuilder-${PKGVERSION}/os/openbsd.xml
+share/fwbuilder-${PKGVERSION}/os/openwrt.xml
+share/fwbuilder-${PKGVERSION}/os/pix_os.xml
+share/fwbuilder-${PKGVERSION}/os/procurve.xml
+share/fwbuilder-${PKGVERSION}/os/secuwall.xml
+share/fwbuilder-${PKGVERSION}/os/solaris.xml
+share/fwbuilder-${PKGVERSION}/os/sveasoft.xml
+share/fwbuilder-${PKGVERSION}/os/unknown_os.xml
+share/fwbuilder-${PKGVERSION}/platform/fwsm.xml
+share/fwbuilder-${PKGVERSION}/platform/iosacl.xml
+share/fwbuilder-${PKGVERSION}/platform/ipf.xml
+share/fwbuilder-${PKGVERSION}/platform/ipfw.xml
+share/fwbuilder-${PKGVERSION}/platform/iptables.xml
+share/fwbuilder-${PKGVERSION}/platform/pf.xml
+share/fwbuilder-${PKGVERSION}/platform/pix.xml
+share/fwbuilder-${PKGVERSION}/platform/procurve_acl.xml
+share/fwbuilder-${PKGVERSION}/platform/unknown.xml
+share/fwbuilder-${PKGVERSION}/resources.xml
+share/fwbuilder-${PKGVERSION}/templates.xml
diff --git a/security/fwbuilder/distinfo b/security/fwbuilder/distinfo
index a1960319b50..e8ce26523eb 100644
--- a/security/fwbuilder/distinfo
+++ b/security/fwbuilder/distinfo
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.7 2006/07/13 17:37:34 bad Exp $
+$NetBSD: distinfo,v 1.8 2011/04/12 13:44:03 adam Exp $
 
-SHA1 (fwbuilder-2.0.12.tar.gz) = 5947236e365ef085ebebd4fec85935cb99b9b64c
-RMD160 (fwbuilder-2.0.12.tar.gz) = 7d3ae613ac015650333d2e9f980c8d688e320cd2
-Size (fwbuilder-2.0.12.tar.gz) = 1389953 bytes
-SHA1 (patch-aa) = dadac6310b0d27c326209867ee356610907f099c
-SHA1 (patch-ab) = 19a0c4801785536b0e95e328fe7569c155308ce6
-SHA1 (patch-ac) = 74f94531167bebc473299bbc8d636173de7a5e3a
-SHA1 (patch-ad) = 593e9459076bb2b633507c17b489a66cbcac0f55
-SHA1 (patch-ae) = c88624f1b18c55deca7d722b46103b8a09f7c98a
+SHA1 (fwbuilder-4.1.3.tar.gz) = 612dbfd7cd669c2ef8889157ae3f8f00d28537fe
+RMD160 (fwbuilder-4.1.3.tar.gz) = 9a33fd145b45b1d126a2ef4c198c797f4661b401
+Size (fwbuilder-4.1.3.tar.gz) = 5683404 bytes
+SHA1 (patch-aa) = 46ed33179244b5acf948d67dc747eacc82d41eac
+SHA1 (patch-ab) = 87555d9709d2f6c2a1de03b057078ec945377237
+SHA1 (patch-ac) = 03a01a3c60534ac313c53b5ba262235e6750f5ac
+SHA1 (patch-ad) = 84242e4064c75845b4a367af605e7a573406f113
+SHA1 (patch-ae) = e7525e9d384512071d85d8973824a2f1bdc43a13
+SHA1 (patch-configure.in) = 2486eee71f2ddf31524eaf48925aee48f72159f8
+SHA1 (patch-src_gui_main.cpp) = 0a7639f4558d3934fb6d6d6d7602333a5c4ece8b
diff --git a/security/fwbuilder/patches/patch-aa b/security/fwbuilder/patches/patch-aa
index 375a0b1c2c0..41f930bd654 100644
--- a/security/fwbuilder/patches/patch-aa
+++ b/security/fwbuilder/patches/patch-aa
@@ -1,18 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2006/03/12 06:58:42 minskim Exp $
+$NetBSD: patch-aa,v 1.4 2011/04/12 13:44:03 adam Exp $
 
---- po/po.pro.orig	2005-09-04 20:49:14.000000000 +0000
-+++ po/po.pro
-@@ -7,11 +7,13 @@ win32 {
-   QMAKE_RUN_CC  = @echo
-   QMAKE_RUN_CXX = @echo
-   QMAKE_LINK    = @echo
-+  QMAKE_LIBTOOL = @echo
- }
- !win32 {
-   QMAKE_RUN_CC  = @echo > /dev/null
-   QMAKE_RUN_CXX = @echo > /dev/null
-   QMAKE_LINK    = @echo > /dev/null
-+  QMAKE_LIBTOOL = @echo > /dev/null
- }
+--- src/common/init.cpp.orig	2011-04-11 19:03:33.000000000 +0000
++++ src/common/init.cpp
+@@ -34,7 +34,7 @@ QString user_name;
  
- TARGET        = po
+ 
+ 
+-#if defined(Q_OS_WIN32) || defined(Q_OS_MACX)
++#if defined(Q_OS_WIN32)
+ extern void init_win();
+ void init(char * const*)
+ {
diff --git a/security/fwbuilder/patches/patch-ab b/security/fwbuilder/patches/patch-ab
index ea65c72c78a..debe9c1ce69 100644
--- a/security/fwbuilder/patches/patch-ab
+++ b/security/fwbuilder/patches/patch-ab
@@ -1,23 +1,29 @@
-$NetBSD: patch-ab,v 1.2 2005/12/12 20:25:09 bad Exp $
+$NetBSD: patch-ab,v 1.3 2011/04/12 13:44:03 adam Exp $
 
---- qmake.inc.in.orig	2005-10-25 08:11:26.000000000 +0200
-+++ qmake.inc.in	2005-12-12 13:03:13.000000000 +0100
-@@ -27,7 +27,7 @@
- 	res_os.path             = $(DDIR)@RES_DIR@/os
- 	res_platform.path       = $(DDIR)@RES_DIR@/platform
+--- qmake.inc.in.orig	2010-12-06 00:29:02.000000000 +0000
++++ qmake.inc.in
+@@ -26,7 +26,6 @@ unix {
  
--	CONFIG                 += qt thread rtti stl warn_on debug
-+	CONFIG                 += qt thread rtti stl warn_on
- 	INCLUDEPATH            += @LIBFWBUILDER_INCLUDEPATH@
+     QMAKE_CXX = @CCACHE@ @DISTCC@ $$QMAKE_CXX
  
- 	LIBS                   += $$LIBS_FWBUILDER @LIBS@
-@@ -35,9 +35,7 @@
- 	PKGLOCALEDIR            = $$res.path/locale
+-    !macx {
  
- 	QMAKE_CFLAGS_DEBUG     += -Wno-unused-parameter
--	QMAKE_CFLAGS_RELEASE   += -Wno-unused-parameter
- 	QMAKE_CXXFLAGS_DEBUG   += -Wno-unused-parameter
--	QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter
- }
+         UI_DIR = .ui
+         MOC_DIR = .moc
+@@ -62,13 +61,12 @@ unix {
+ 
+         LIBS += $$LIBS_FWBUILDER @LIBS@
+ 
+-        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@@
+ 
+-    }
  }
  
+ win32 {
diff --git a/security/fwbuilder/patches/patch-ac b/security/fwbuilder/patches/patch-ac
index b104ec3159a..bed80236963 100644
--- a/security/fwbuilder/patches/patch-ac
+++ b/security/fwbuilder/patches/patch-ac
@@ -1,18 +1,28 @@
-$NetBSD: patch-ac,v 1.4 2006/03/12 06:58:42 minskim Exp $
+$NetBSD: patch-ac,v 1.5 2011/04/12 13:44:03 adam Exp $
 
---- src/res/res.pro.orig	2005-07-06 06:05:01.000000000 +0000
+--- src/res/res.pro.orig	2011-04-12 06:19:21.000000000 +0000
 +++ src/res/res.pro
-@@ -7,11 +7,13 @@ win32 {
-   QMAKE_RUN_CC  = @echo
-   QMAKE_RUN_CXX = @echo
-   QMAKE_LINK    = @echo
-+  QMAKE_LIBTOOL = @echo
- }
- !win32 {
+@@ -17,6 +17,7 @@ win32 {
    QMAKE_RUN_CC  = @echo > /dev/null
    QMAKE_RUN_CXX = @echo > /dev/null
    QMAKE_LINK    = @echo > /dev/null
 +  QMAKE_LIBTOOL = @echo > /dev/null
  }
  
+ TARGET = res
+@@ -40,7 +41,6 @@ INSTALLS += res_help_en_US
+ INSTALLS += res_configlets
+ 
+ unix {
+-!macx {
+ 	res_desktop.files = fwbuilder.desktop
+ 	INSTALLS += res_desktop
+ 
+@@ -78,7 +78,6 @@ unix {
+ 		INSTALLS += app_icon_512x512
+ 	}
+ }
+-}
+ 
+ 
  
diff --git a/security/fwbuilder/patches/patch-ad b/security/fwbuilder/patches/patch-ad
index 93628e9adc9..9741bc7d4e5 100644
--- a/security/fwbuilder/patches/patch-ad
+++ b/security/fwbuilder/patches/patch-ad
@@ -1,15 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2006/03/12 06:58:42 minskim Exp $
+$NetBSD: patch-ad,v 1.5 2011/04/12 13:44:03 adam Exp $
 
---- src/tools/tools.pro.orig	2004-07-03 06:55:35.000000000 +0000
+--- src/tools/tools.pro.orig	2010-12-06 00:29:02.000000000 +0000
 +++ src/tools/tools.pro
-@@ -7,18 +7,21 @@ win32 {
- 	QMAKE_RUN_CC  = @echo
- 	QMAKE_RUN_CXX = @echo
- 	QMAKE_LINK    = @echo
-+	QMAKE_LIBTOOL = @echo
- }
- 
- unix {
+@@ -13,6 +13,7 @@ unix {
  	QMAKE_RUN_CC  = @true
  	QMAKE_RUN_CXX = @true
  	QMAKE_LINK    = @true
@@ -17,10 +10,3 @@ $NetBSD: patch-ad,v 1.4 2006/03/12 06:58:42 minskim Exp $
  }
  
  macx {
- 	QMAKE_RUN_CC  = @true
- 	QMAKE_RUN_CXX = @true
- 	QMAKE_LINK    = @true
-+	QMAKE_LIBTOOL = @true
- }
- 
- TARGET        = tools
diff --git a/security/fwbuilder/patches/patch-ae b/security/fwbuilder/patches/patch-ae
index 380e64fc84a..a50684dc2f8 100644
--- a/security/fwbuilder/patches/patch-ae
+++ b/security/fwbuilder/patches/patch-ae
@@ -1,14 +1,8 @@
-$NetBSD: patch-ae,v 1.3 2006/03/12 06:58:42 minskim Exp $
+$NetBSD: patch-ae,v 1.4 2011/04/12 13:44:03 adam Exp $
 
---- doc/doc.pro.orig	2005-11-02 06:42:02.000000000 +0000
+--- doc/doc.pro.orig	2010-12-06 00:29:02.000000000 +0000
 +++ doc/doc.pro
-@@ -7,11 +7,13 @@ win32 {
-   QMAKE_RUN_CC  = @echo
-   QMAKE_RUN_CXX = @echo
-   QMAKE_LINK    = @echo
-+  QMAKE_LIBTOOL = @echo
- }
- !win32 {
+@@ -17,6 +17,7 @@ win32 {
    QMAKE_RUN_CC  = @echo > /dev/null
    QMAKE_RUN_CXX = @echo > /dev/null
    QMAKE_LINK    = @echo > /dev/null
diff --git a/security/fwbuilder/patches/patch-configure.in b/security/fwbuilder/patches/patch-configure.in
new file mode 100644
index 00000000000..8b9701b4aa2
--- /dev/null
+++ b/security/fwbuilder/patches/patch-configure.in
@@ -0,0 +1,52 @@
+$NetBSD: patch-configure.in,v 1.1 2011/04/12 13:44:03 adam Exp $
+
+Fix MANDIR and DEFAULT_RES_DIR.
+
+--- configure.in.orig	2011-04-12 06:15:34.000000000 +0000
++++ configure.in
+@@ -325,15 +325,15 @@ case ${host} in
+   *-*-darwin*)
+     OS=MacOSX
+     OS_MACOSX=1
+-    MANDIR="${PREFIX}/share/man/"
++    MANDIR="${PREFIX}/man/"
+     AC_MSG_RESULT(MacOSX)
+-    DEFAULT_RES_DIR="../Resources"
++    DEFAULT_RES_DIR="${PREFIX}/share/fwbuilder-${VERSION}"
+     ;;
+ 
+   *-*-solaris*)
+     OS=Solaris
+     OS_SOLARIS=1
+-    MANDIR="${PREFIX}/share/man/"
++    MANDIR="${PREFIX}/man/"
+     AC_MSG_RESULT(Solaris)
+     DEFAULT_RES_DIR="${PREFIX}/share/fwbuilder-${VERSION}"
+     ;;
+@@ -362,7 +362,7 @@ case ${host} in
+     else
+        DISTRO="Unknown"
+     fi
+-    MANDIR="${PREFIX}/share/man/"
++    MANDIR="${PREFIX}/man/"
+     AC_MSG_RESULT($DISTRO GNU/kFreeBSD)
+     DEFAULT_RES_DIR="${PREFIX}/share/fwbuilder-${VERSION}"
+     ;;
+@@ -388,7 +388,7 @@ case ${host} in
+     else
+ 	DISTRO="Unknown"
+     fi
+-    MANDIR="${PREFIX}/share/man/"
++    MANDIR="${PREFIX}/man/"
+     ICONSDIR="${DATADIR}/icons/hicolor/"
+     AC_MSG_RESULT($DISTRO Linux)
+     ;;
+@@ -397,7 +397,7 @@ case ${host} in
+     OS=Unknown
+     OS_UNKNOWN=1
+     DISTRO=Unknown
+-    MANDIR="${PREFIX}/share/man/"
++    MANDIR="${PREFIX}/man/"
+     AC_MSG_RESULT(Unknown)
+     DEFAULT_RES_DIR="${PREFIX}/share/fwbuilder-${VERSION}"
+     ;;
diff --git a/security/fwbuilder/patches/patch-src_gui_main.cpp b/security/fwbuilder/patches/patch-src_gui_main.cpp
new file mode 100644
index 00000000000..55e48cad59c
--- /dev/null
+++ b/security/fwbuilder/patches/patch-src_gui_main.cpp
@@ -0,0 +1,26 @@
+$NetBSD: patch-src_gui_main.cpp,v 1.1 2011/04/12 13:44:03 adam Exp $
+
+Fix buildling on Mac OS X.
+
+--- src/gui/main.cpp.orig	2011-04-11 20:07:30.000000000 +0000
++++ src/gui/main.cpp
+@@ -71,9 +71,6 @@
+ #include "fwbuilder/Resources.h"
+ #include "fwbuilder/FWException.h"
+ 
+-#if defined(Q_WS_MAC)
+-extern void connectOdocHandler();
+-#endif
+ 
+ #ifndef INIT2
+ #define INIT2
+@@ -257,9 +254,6 @@ int main( int argc, char *argv[] )
+     // connecting to right slot
+     app->connect(app, SIGNAL(lastWindowClosed()), app, SLOT(quit()));
+ 
+-#if defined(Q_WS_MAC)
+-    connectOdocHandler();
+-#endif
+ 
+     // setup single shot timer to call startupLoad()
+     QTimer::singleShot(500, mw, SLOT(startupLoad()));