diff options
| -rw-r--r-- | security/fwbuilder/Makefile | 15 | ||||
| -rw-r--r-- | security/fwbuilder/PLIST | 554 | ||||
| -rw-r--r-- | security/fwbuilder/distinfo | 23 | ||||
| -rw-r--r-- | security/fwbuilder/patches/patch-aa | 10 | ||||
| -rw-r--r-- | security/fwbuilder/patches/patch-ab | 42 | ||||
| -rw-r--r-- | security/fwbuilder/patches/patch-ac | 6 | ||||
| -rw-r--r-- | security/fwbuilder/patches/patch-ad | 6 | ||||
| -rw-r--r-- | security/fwbuilder/patches/patch-ae | 6 | ||||
| -rw-r--r-- | security/fwbuilder/patches/patch-configure.in | 12 | ||||
| -rw-r--r-- | security/fwbuilder/patches/patch-src_gui_main.cpp | 10 | ||||
| -rw-r--r-- | security/fwbuilder/patches/patch-src_libfwbuilder_qmake.inc.in | 15 |
11 files changed, 426 insertions, 273 deletions
diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile index 1aecfe1f1a3..f795bd4b7f4 100644 --- a/security/fwbuilder/Makefile +++ b/security/fwbuilder/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.41 2014/02/12 23:18:31 tron Exp $ +# $NetBSD: Makefile,v 1.42 2015/03/29 15:28:43 rodent Exp $ -DISTNAME= fwbuilder-4.1.3 -PKGREVISION= 18 +DISTNAME= fwbuilder-5.1.0.3599 CATEGORIES= security net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fwbuilder/} @@ -16,8 +15,7 @@ USE_LANGUAGES= c c++ USE_LIBTOOL= yes USE_TOOLS+= aclocal autoconf automake gmake GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --mandir=${P} -CONFIGURE_ARGS+= --without-distcc +CONFIGURE_ARGS+= --mandir=${P} --without-distcc #UNLIMIT_RESOURCES+= datasize INSTALL_MAKE_FLAGS+= INSTALL_ROOT=${DESTDIR} @@ -38,6 +36,13 @@ SUBST_SED.fix-endl= -e '/script <<.*endl/s/endl/"\n"/g' pre-configure: cd ${WRKSRC} && libtoolize -c -f -i && aclocal && autoconf +.include "../../mk/resolv.buildlink3.mk" +.include "../../net/net-snmp/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" +.include "../../textproc/libxslt/buildlink3.mk" +.include "../../textproc/libxml2/buildlink3.mk" +.include "../../devel/cppunit/buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" .include "../../security/libfwbuilder/buildlink3.mk" .include "../../x11/qt4-libs/buildlink3.mk" .include "../../x11/qt4-tools/buildlink3.mk" diff --git a/security/fwbuilder/PLIST b/security/fwbuilder/PLIST index 49c75e338a7..ca72c7bebd7 100644 --- a/security/fwbuilder/PLIST +++ b/security/fwbuilder/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2011/04/12 13:44:03 adam Exp $ +@comment $NetBSD: PLIST,v 1.8 2015/03/29 15:28:43 rodent Exp $ bin/fwb_iosacl bin/fwb_ipf bin/fwb_ipfw @@ -8,7 +8,6 @@ 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 @@ -18,220 +17,337 @@ 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}/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}/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 +share/doc/${PKGNAME}/AUTHORS +share/doc/${PKGNAME}/COPYING +share/doc/${PKGNAME}/ChangeLog +share/doc/${PKGNAME}/Credits +share/doc/${PKGNAME}/FWBuilder-Routing-LICENSE.txt +share/doc/${PKGNAME}/PatchAcceptancePolicy.txt +share/doc/${PKGNAME}/README.floppyfw +share/doc/${PKGNAME}/README.iosacl +share/doc/${PKGNAME}/README.ipf +share/doc/${PKGNAME}/README.ipfw +share/doc/${PKGNAME}/README.ipt +share/doc/${PKGNAME}/README.pf +share/doc/${PKGNAME}/README.pix +share/doc/${PKGNAME}/README.pix_routing +share/doc/${PKGNAME}/README.policy_import +share/doc/${PKGNAME}/README.routing +share/${PKGNAME}/configlets/bsd/bridge_interface +share/${PKGNAME}/configlets/bsd/bridge_port +share/${PKGNAME}/configlets/bsd/carp_interface +share/${PKGNAME}/configlets/bsd/ifconfig_interface +share/${PKGNAME}/configlets/bsd/kernel_vars +share/${PKGNAME}/configlets/bsd/pfsync_interface +share/${PKGNAME}/configlets/bsd/shell_functions +share/${PKGNAME}/configlets/bsd/tools +share/${PKGNAME}/configlets/bsd/update_addresses +share/${PKGNAME}/configlets/bsd/update_bridge +share/${PKGNAME}/configlets/bsd/update_carp +share/${PKGNAME}/configlets/bsd/update_pfsync +share/${PKGNAME}/configlets/bsd/update_vlans +share/${PKGNAME}/configlets/dd-wrt-jffs/check_utilities +share/${PKGNAME}/configlets/dd-wrt-jffs/installer_commands_reg_user +share/${PKGNAME}/configlets/dd-wrt-jffs/installer_commands_root +share/${PKGNAME}/configlets/dd-wrt-jffs/routing_functions +share/${PKGNAME}/configlets/dd-wrt-jffs/script_skeleton +share/${PKGNAME}/configlets/dd-wrt-jffs/top_comment +share/${PKGNAME}/configlets/dd-wrt-nvram/check_utilities +share/${PKGNAME}/configlets/dd-wrt-nvram/installer_commands_reg_user +share/${PKGNAME}/configlets/dd-wrt-nvram/installer_commands_root +share/${PKGNAME}/configlets/dd-wrt-nvram/routing_functions +share/${PKGNAME}/configlets/dd-wrt-nvram/script_skeleton +share/${PKGNAME}/configlets/dd-wrt-nvram/top_comment +share/${PKGNAME}/configlets/freebsd/carp_interface +share/${PKGNAME}/configlets/freebsd/ifconfig_interface +share/${PKGNAME}/configlets/freebsd/installer_commands_reg_user +share/${PKGNAME}/configlets/freebsd/installer_commands_root +share/${PKGNAME}/configlets/freebsd/kernel_vars +share/${PKGNAME}/configlets/freebsd/rc_conf_bridge_port +share/${PKGNAME}/configlets/freebsd/rc_conf_carp_interface +share/${PKGNAME}/configlets/freebsd/rc_conf_ifconfig_interface +share/${PKGNAME}/configlets/freebsd/rc_conf_kernel_vars +share/${PKGNAME}/configlets/freebsd/rc_conf_pfsync_interface +share/${PKGNAME}/configlets/freebsd/routing_functions +share/${PKGNAME}/configlets/freebsd/tools +share/${PKGNAME}/configlets/fwsm_os/failover_commands_2 +share/${PKGNAME}/configlets/fwsm_os/failover_commands_3_2 +share/${PKGNAME}/configlets/fwsm_os/failover_interface_2 +share/${PKGNAME}/configlets/fwsm_os/failover_interface_3_2 +share/${PKGNAME}/configlets/fwsm_os/installer_commands_post_config +share/${PKGNAME}/configlets/fwsm_os/installer_commands_pre_config +share/${PKGNAME}/configlets/fwsm_os/installer_commands_reg_user +share/${PKGNAME}/configlets/fwsm_os/ntp +share/${PKGNAME}/configlets/fwsm_os/regular_interface_2 +share/${PKGNAME}/configlets/fwsm_os/regular_interface_3_2 +share/${PKGNAME}/configlets/fwsm_os/snmp +share/${PKGNAME}/configlets/fwsm_os/ssh +share/${PKGNAME}/configlets/fwsm_os/vlan_parent_interface_2 +share/${PKGNAME}/configlets/fwsm_os/vlan_parent_interface_3_2 +share/${PKGNAME}/configlets/fwsm_os/vlan_subinterface_2 +share/${PKGNAME}/configlets/fwsm_os/vlan_subinterface_3_2 +share/${PKGNAME}/configlets/ios/installer_commands_post_config +share/${PKGNAME}/configlets/ios/installer_commands_pre_config +share/${PKGNAME}/configlets/ios/installer_commands_reg_user +share/${PKGNAME}/configlets/ios/safety_net_acl +share/${PKGNAME}/configlets/ios/script_skeleton +share/${PKGNAME}/configlets/ios/top_comment +share/${PKGNAME}/configlets/ipcop/automatic_rules +share/${PKGNAME}/configlets/ipcop/installer_commands_reg_user +share/${PKGNAME}/configlets/ipcop/installer_commands_root +share/${PKGNAME}/configlets/ipcop/kernel_vars +share/${PKGNAME}/configlets/ipcop/script_skeleton +share/${PKGNAME}/configlets/ipcop/shell_functions +share/${PKGNAME}/configlets/ipcop/update_addresses +share/${PKGNAME}/configlets/ipcop/update_bonding +share/${PKGNAME}/configlets/ipcop/update_bridge +share/${PKGNAME}/configlets/ipcop/update_vlans +share/${PKGNAME}/configlets/ipf/activation +share/${PKGNAME}/configlets/ipf/script_skeleton +share/${PKGNAME}/configlets/ipf/top_comment +share/${PKGNAME}/configlets/ipfw/script_skeleton +share/${PKGNAME}/configlets/ipfw/top_comment +share/${PKGNAME}/configlets/linux24/automatic_rules +share/${PKGNAME}/configlets/linux24/block_action +share/${PKGNAME}/configlets/linux24/check_utilities +share/${PKGNAME}/configlets/linux24/configure_interfaces +share/${PKGNAME}/configlets/linux24/conntrack +share/${PKGNAME}/configlets/linux24/constants +share/${PKGNAME}/configlets/linux24/installer_commands_reg_user +share/${PKGNAME}/configlets/linux24/installer_commands_root +share/${PKGNAME}/configlets/linux24/ip_forwarding +share/${PKGNAME}/configlets/linux24/kernel_vars +share/${PKGNAME}/configlets/linux24/load_modules +share/${PKGNAME}/configlets/linux24/prolog_epilog_functions +share/${PKGNAME}/configlets/linux24/reset_iptables +share/${PKGNAME}/configlets/linux24/routing_functions +share/${PKGNAME}/configlets/linux24/run_time_address_tables +share/${PKGNAME}/configlets/linux24/run_time_wrappers +share/${PKGNAME}/configlets/linux24/script_body_iptables_restore +share/${PKGNAME}/configlets/linux24/script_body_iptables_shell +share/${PKGNAME}/configlets/linux24/script_body_single_rule +share/${PKGNAME}/configlets/linux24/script_skeleton +share/${PKGNAME}/configlets/linux24/shell_functions +share/${PKGNAME}/configlets/linux24/status_action +share/${PKGNAME}/configlets/linux24/stop_action +share/${PKGNAME}/configlets/linux24/top_comment +share/${PKGNAME}/configlets/linux24/update_addresses +share/${PKGNAME}/configlets/linux24/update_bonding +share/${PKGNAME}/configlets/linux24/update_bridge +share/${PKGNAME}/configlets/linux24/update_vlans +share/${PKGNAME}/configlets/linux24/verify_interfaces +share/${PKGNAME}/configlets/macosx/installer_commands_reg_user +share/${PKGNAME}/configlets/macosx/installer_commands_root +share/${PKGNAME}/configlets/macosx/kernel_vars +share/${PKGNAME}/configlets/macosx/tools +share/${PKGNAME}/configlets/openbsd/installer_commands_reg_user +share/${PKGNAME}/configlets/openbsd/installer_commands_root +share/${PKGNAME}/configlets/openbsd/kernel_vars +share/${PKGNAME}/configlets/openbsd/routing_functions +share/${PKGNAME}/configlets/openbsd/tools +share/${PKGNAME}/configlets/openwrt/check_utilities +share/${PKGNAME}/configlets/openwrt/installer_commands_reg_user +share/${PKGNAME}/configlets/openwrt/installer_commands_root +share/${PKGNAME}/configlets/openwrt/load_modules +share/${PKGNAME}/configlets/openwrt/script_skeleton +share/${PKGNAME}/configlets/openwrt/top_comment +share/${PKGNAME}/configlets/pf/activation +share/${PKGNAME}/configlets/pf/rc_conf_activation +share/${PKGNAME}/configlets/pf/rc_conf_skeleton +share/${PKGNAME}/configlets/pf/rc_conf_top_comment +share/${PKGNAME}/configlets/pf/script_skeleton +share/${PKGNAME}/configlets/pf/top_comment +share/${PKGNAME}/configlets/pix_os/failover_commands_6 +share/${PKGNAME}/configlets/pix_os/failover_commands_7 +share/${PKGNAME}/configlets/pix_os/failover_interface_6 +share/${PKGNAME}/configlets/pix_os/failover_interface_7 +share/${PKGNAME}/configlets/pix_os/installer_commands_post_config +share/${PKGNAME}/configlets/pix_os/installer_commands_pre_config +share/${PKGNAME}/configlets/pix_os/installer_commands_reg_user +share/${PKGNAME}/configlets/pix_os/ntp +share/${PKGNAME}/configlets/pix_os/regular_interface_6 +share/${PKGNAME}/configlets/pix_os/regular_interface_7 +share/${PKGNAME}/configlets/pix_os/script_skeleton +share/${PKGNAME}/configlets/pix_os/snmp +share/${PKGNAME}/configlets/pix_os/ssh +share/${PKGNAME}/configlets/pix_os/top_comment +share/${PKGNAME}/configlets/pix_os/vlan_parent_interface_6 +share/${PKGNAME}/configlets/pix_os/vlan_parent_interface_7 +share/${PKGNAME}/configlets/pix_os/vlan_subinterface_6 +share/${PKGNAME}/configlets/pix_os/vlan_subinterface_7 +share/${PKGNAME}/configlets/procurve/installer_commands_post_config +share/${PKGNAME}/configlets/procurve/installer_commands_pre_config +share/${PKGNAME}/configlets/procurve/installer_commands_reg_user +share/${PKGNAME}/configlets/procurve/safety_net_acl +share/${PKGNAME}/configlets/procurve/script_skeleton +share/${PKGNAME}/configlets/procurve/top_comment +share/${PKGNAME}/configlets/secuwall/installer_commands_reg_user +share/${PKGNAME}/configlets/secuwall/installer_commands_root +share/${PKGNAME}/configlets/secuwall/management_rules +share/${PKGNAME}/configlets/secuwall/script_skeleton +share/${PKGNAME}/configlets/solaris/installer_commands_reg_user +share/${PKGNAME}/configlets/solaris/installer_commands_root +share/${PKGNAME}/configlets/solaris/kernel_vars +share/${PKGNAME}/configlets/solaris/tools +share/${PKGNAME}/configlets/sveasoft/installer_commands_reg_user +share/${PKGNAME}/configlets/sveasoft/installer_commands_root +share/${PKGNAME}/configlets/sveasoft/script_skeleton +share/${PKGNAME}/configlets/sveasoft/shell_functions +share/${PKGNAME}/configlets/sveasoft/top_comment +share/${PKGNAME}/fwbuilder.dtd +share/${PKGNAME}/help/en_US/cluster_interfaces.png +share/${PKGNAME}/help/en_US/create_and_add_to_group.png +share/${PKGNAME}/help/en_US/ipcopAdvancedDialog.html +share/${PKGNAME}/help/en_US/ipcoposAdvancedDialog.html +share/${PKGNAME}/help/en_US/ipfw_Classify.html +share/${PKGNAME}/help/en_US/iptAdvancedDialog.html +share/${PKGNAME}/help/en_US/iptables_Branch.html +share/${PKGNAME}/help/en_US/iptables_Classify.html +share/${PKGNAME}/help/en_US/iptables_Route.html +share/${PKGNAME}/help/en_US/iptables_Tag.html +share/${PKGNAME}/help/en_US/iptables_rule_options.html +share/${PKGNAME}/help/en_US/linux24AdvancedDialog.html +share/${PKGNAME}/help/en_US/main.html +share/${PKGNAME}/help/en_US/new_bridge_interfaces.png +share/${PKGNAME}/help/en_US/pfAdvancedDialog.html +share/${PKGNAME}/help/en_US/pf_Branch.html +share/${PKGNAME}/help/en_US/pf_Classify.html +share/${PKGNAME}/help/en_US/pf_Route.html +share/${PKGNAME}/help/en_US/pf_Tag.html +share/${PKGNAME}/help/en_US/pf_rule_options.html +share/${PKGNAME}/help/en_US/pix-failover-group-1.png +share/${PKGNAME}/help/en_US/pix-failover-groups-mapping.png +share/${PKGNAME}/help/en_US/pix-statesync-group-1.png +share/${PKGNAME}/help/en_US/pix-statesync-group-mapping.png +share/${PKGNAME}/help/en_US/release_notes_4.0.0.html +share/${PKGNAME}/help/en_US/release_notes_4.0.1.html +share/${PKGNAME}/help/en_US/release_notes_4.1.0.html +share/${PKGNAME}/help/en_US/release_notes_4.1.1.html +share/${PKGNAME}/help/en_US/release_notes_4.1.2.html +share/${PKGNAME}/help/en_US/release_notes_4.1.3.html +share/${PKGNAME}/help/en_US/release_notes_4.2.0.html +share/${PKGNAME}/help/en_US/release_notes_4.2.1.html +share/${PKGNAME}/help/en_US/release_notes_4.2.2.html +share/${PKGNAME}/help/en_US/release_notes_5.0.0.html +share/${PKGNAME}/help/en_US/release_notes_5.0.1.html +share/${PKGNAME}/help/en_US/release_notes_5.1.0.html +share/${PKGNAME}/help/en_US/state_sync_configuration.png +share/${PKGNAME}/help/en_US/tip01.html +share/${PKGNAME}/help/en_US/tip02.html +share/${PKGNAME}/help/en_US/tip03.html +share/${PKGNAME}/help/en_US/tip04.html +share/${PKGNAME}/help/en_US/tip05.html +share/${PKGNAME}/help/en_US/tip06.html +share/${PKGNAME}/help/en_US/tip07.html +share/${PKGNAME}/help/en_US/tip08.html +share/${PKGNAME}/help/en_US/tip09.html +share/${PKGNAME}/help/en_US/tip10.html +share/${PKGNAME}/help/en_US/vlan_interfaces.png +share/${PKGNAME}/migration/FWObjectDatabase_0.10.0.xslt +share/${PKGNAME}/migration/FWObjectDatabase_0.10.1.xslt +share/${PKGNAME}/migration/FWObjectDatabase_0.10.10.xslt +share/${PKGNAME}/migration/FWObjectDatabase_0.10.11.xslt +share/${PKGNAME}/migration/FWObjectDatabase_0.10.12.xslt +share/${PKGNAME}/migration/FWObjectDatabase_0.10.13.xslt +share/${PKGNAME}/migration/FWObjectDatabase_0.10.14.xslt +share/${PKGNAME}/migration/FWObjectDatabase_0.10.2.xslt +share/${PKGNAME}/migration/FWObjectDatabase_0.10.3.xslt +share/${PKGNAME}/migration/FWObjectDatabase_0.10.4.xslt +share/${PKGNAME}/migration/FWObjectDatabase_0.10.5.xslt +share/${PKGNAME}/migration/FWObjectDatabase_0.10.6.xslt +share/${PKGNAME}/migration/FWObjectDatabase_0.10.7.xslt +share/${PKGNAME}/migration/FWObjectDatabase_0.10.8.xslt +share/${PKGNAME}/migration/FWObjectDatabase_0.10.9.xslt +share/${PKGNAME}/migration/FWObjectDatabase_0.9.0.xslt +share/${PKGNAME}/migration/FWObjectDatabase_0.9.1.xslt +share/${PKGNAME}/migration/FWObjectDatabase_0.9.2.xslt +share/${PKGNAME}/migration/FWObjectDatabase_0.9.3.xslt +share/${PKGNAME}/migration/FWObjectDatabase_0.9.4.xslt +share/${PKGNAME}/migration/FWObjectDatabase_0.9.5.xslt +share/${PKGNAME}/migration/FWObjectDatabase_1.0.0.xslt +share/${PKGNAME}/migration/FWObjectDatabase_1.0.1.xslt +share/${PKGNAME}/migration/FWObjectDatabase_1.0.2.xslt +share/${PKGNAME}/migration/FWObjectDatabase_10.xslt +share/${PKGNAME}/migration/FWObjectDatabase_11.xslt +share/${PKGNAME}/migration/FWObjectDatabase_12.xslt +share/${PKGNAME}/migration/FWObjectDatabase_13.xslt +share/${PKGNAME}/migration/FWObjectDatabase_14.xslt +share/${PKGNAME}/migration/FWObjectDatabase_15.xslt +share/${PKGNAME}/migration/FWObjectDatabase_16.xslt +share/${PKGNAME}/migration/FWObjectDatabase_17.xslt +share/${PKGNAME}/migration/FWObjectDatabase_18.xslt +share/${PKGNAME}/migration/FWObjectDatabase_19.xslt +share/${PKGNAME}/migration/FWObjectDatabase_2.0.0.xslt +share/${PKGNAME}/migration/FWObjectDatabase_2.0.1.xslt +share/${PKGNAME}/migration/FWObjectDatabase_2.0.10.xslt +share/${PKGNAME}/migration/FWObjectDatabase_2.0.11.xslt +share/${PKGNAME}/migration/FWObjectDatabase_2.0.12.xslt +share/${PKGNAME}/migration/FWObjectDatabase_2.0.2.xslt +share/${PKGNAME}/migration/FWObjectDatabase_2.0.3.xslt +share/${PKGNAME}/migration/FWObjectDatabase_2.0.4.xslt +share/${PKGNAME}/migration/FWObjectDatabase_2.0.5.xslt +share/${PKGNAME}/migration/FWObjectDatabase_2.0.6.xslt +share/${PKGNAME}/migration/FWObjectDatabase_2.0.7.xslt +share/${PKGNAME}/migration/FWObjectDatabase_2.0.8.xslt +share/${PKGNAME}/migration/FWObjectDatabase_2.0.9.xslt +share/${PKGNAME}/migration/FWObjectDatabase_2.0.99.xslt +share/${PKGNAME}/migration/FWObjectDatabase_2.1.0.xslt +share/${PKGNAME}/migration/FWObjectDatabase_2.1.1.xslt +share/${PKGNAME}/migration/FWObjectDatabase_2.1.10.xslt +share/${PKGNAME}/migration/FWObjectDatabase_2.1.11.xslt +share/${PKGNAME}/migration/FWObjectDatabase_2.1.12.xslt +share/${PKGNAME}/migration/FWObjectDatabase_2.1.13.xslt +share/${PKGNAME}/migration/FWObjectDatabase_2.1.14.xslt +share/${PKGNAME}/migration/FWObjectDatabase_2.1.15.xslt +share/${PKGNAME}/migration/FWObjectDatabase_2.1.16.xslt +share/${PKGNAME}/migration/FWObjectDatabase_2.1.17.xslt +share/${PKGNAME}/migration/FWObjectDatabase_2.1.18.xslt +share/${PKGNAME}/migration/FWObjectDatabase_2.1.19.xslt +share/${PKGNAME}/migration/FWObjectDatabase_2.1.2.xslt +share/${PKGNAME}/migration/FWObjectDatabase_2.1.3.xslt +share/${PKGNAME}/migration/FWObjectDatabase_2.1.4.xslt +share/${PKGNAME}/migration/FWObjectDatabase_2.1.5.xslt +share/${PKGNAME}/migration/FWObjectDatabase_2.1.6.xslt +share/${PKGNAME}/migration/FWObjectDatabase_2.1.7.xslt +share/${PKGNAME}/migration/FWObjectDatabase_2.1.8.xslt +share/${PKGNAME}/migration/FWObjectDatabase_2.1.9.xslt +share/${PKGNAME}/migration/FWObjectDatabase_2.1.99.xslt +share/${PKGNAME}/migration/FWObjectDatabase_20.xslt +share/${PKGNAME}/migration/FWObjectDatabase_21.xslt +share/${PKGNAME}/migration/FWObjectDatabase_3.xslt +share/${PKGNAME}/migration/FWObjectDatabase_4.xslt +share/${PKGNAME}/migration/FWObjectDatabase_5.xslt +share/${PKGNAME}/migration/FWObjectDatabase_6.xslt +share/${PKGNAME}/migration/FWObjectDatabase_7.xslt +share/${PKGNAME}/migration/FWObjectDatabase_8.xslt +share/${PKGNAME}/migration/FWObjectDatabase_9.xslt +share/${PKGNAME}/objects_init.xml +share/${PKGNAME}/os/dd-wrt-jffs.xml +share/${PKGNAME}/os/dd-wrt-nvram.xml +share/${PKGNAME}/os/endian.xml +share/${PKGNAME}/os/freebsd.xml +share/${PKGNAME}/os/fwsm_os.xml +share/${PKGNAME}/os/ios.xml +share/${PKGNAME}/os/ipcop.xml +share/${PKGNAME}/os/linux24.xml +share/${PKGNAME}/os/macosx.xml +share/${PKGNAME}/os/oneshield.xml +share/${PKGNAME}/os/openbsd.xml +share/${PKGNAME}/os/openwrt.xml +share/${PKGNAME}/os/pix_os.xml +share/${PKGNAME}/os/procurve.xml +share/${PKGNAME}/os/secuwall.xml +share/${PKGNAME}/os/solaris.xml +share/${PKGNAME}/os/sveasoft.xml +share/${PKGNAME}/os/unknown_os.xml +share/${PKGNAME}/platform/fwsm.xml +share/${PKGNAME}/platform/iosacl.xml +share/${PKGNAME}/platform/ipf.xml +share/${PKGNAME}/platform/ipfw.xml +share/${PKGNAME}/platform/iptables.xml +share/${PKGNAME}/platform/pf.xml +share/${PKGNAME}/platform/pix.xml +share/${PKGNAME}/platform/procurve_acl.xml +share/${PKGNAME}/platform/unknown.xml +share/${PKGNAME}/resources.xml +share/${PKGNAME}/templates.xml diff --git a/security/fwbuilder/distinfo b/security/fwbuilder/distinfo index e8ce26523eb..c79617e0306 100644 --- a/security/fwbuilder/distinfo +++ b/security/fwbuilder/distinfo @@ -1,12 +1,13 @@ -$NetBSD: distinfo,v 1.8 2011/04/12 13:44:03 adam Exp $ +$NetBSD: distinfo,v 1.9 2015/03/29 15:28:43 rodent Exp $ -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 +SHA1 (fwbuilder-5.1.0.3599.tar.gz) = 4a693eb7d5cd51b5eb16e874540cb27c5b726dc5 +RMD160 (fwbuilder-5.1.0.3599.tar.gz) = 38cb91aaa137bb5f0bc14b8d7e70da5a83467349 +Size (fwbuilder-5.1.0.3599.tar.gz) = 7182573 bytes +SHA1 (patch-aa) = 92a8962a12882507d4b8eb3e536899c3638b9cd9 +SHA1 (patch-ab) = e1d7c25ffdcd5e6b89b5b9339fb8a3ac26515b54 +SHA1 (patch-ac) = bf432946fa9e69e2ea7ef1ddce1af95baa678c43 +SHA1 (patch-ad) = 33189f54678ac147be99bf4d126afde38665b13e +SHA1 (patch-ae) = d0a20d6592c54065d26c1008e6b40e1e4d7fcdc7 +SHA1 (patch-configure.in) = 80794f50c96886d01604087e18cee875a2aa5c77 +SHA1 (patch-src_gui_main.cpp) = 36b869852d9ed25aa1124f79ff926fe060558c08 +SHA1 (patch-src_libfwbuilder_qmake.inc.in) = 43043c98224da7c3050b1a1d9b7a01a7950a5c30 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@ |