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, 245 insertions, 191 deletions

diff --git a/security/libfwbuilder/Makefile b/security/libfwbuilder/Makefile
index ae3411b9bba..630538a939e 100644
--- a/security/libfwbuilder/Makefile
+++ b/security/libfwbuilder/Makefile
@@ -1,31 +1,32 @@
-# $NetBSD: Makefile,v 1.29 2011/01/13 13:36:16 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2011/04/12 13:41:17 adam Exp $
 
-DISTNAME=	libfwbuilder-2.0.12
-PKGREVISION=	4
+DISTNAME=	libfwbuilder-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 API
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-CONFLICTS=	libfwbuilder21-[0-9]*
-
-USE_LIBTOOL=	yes
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	gmake
-USE_LANGUAGES=	c c++
+USE_LANGUAGES=		c c++
+USE_LIBTOOL=		yes
+USE_TOOLS+=		aclocal autoconf automake gmake
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--without-distcc
 
 INSTALL_MAKE_FLAGS+=	INSTALL_ROOT=${DESTDIR}
 
-.include "../../devel/glib2/buildlink3.mk"
+pre-configure:
+	cd ${WRKSRC} && libtoolize -c -f -i && aclocal && autoconf
+
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../net/net-snmp/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
-.include "../../x11/qt3-libs/buildlink3.mk"
-BUILDLINK_API_DEPENDS.qt3-tools+=	qt3-tools>=3.3.5nb5
-.include "../../x11/qt3-tools/buildlink3.mk"
+.include "../../x11/qt4-libs/buildlink3.mk"
+.include "../../x11/qt4-tools/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/libfwbuilder/PLIST b/security/libfwbuilder/PLIST
index 9ac285e436c..509866fa2a3 100644
--- a/security/libfwbuilder/PLIST
+++ b/security/libfwbuilder/PLIST
@@ -1,61 +1,86 @@
-@comment $NetBSD: PLIST,v 1.11 2009/06/14 18:13:31 joerg Exp $
-bin/libfwbuilder-config-2
-include/fwb-2.0/fwbuilder/Address.h
-include/fwb-2.0/fwbuilder/AddressRange.h
-include/fwb-2.0/fwbuilder/BackgroundOp.h
-include/fwb-2.0/fwbuilder/Constants.h
-include/fwb-2.0/fwbuilder/CustomService.h
-include/fwb-2.0/fwbuilder/FWException.h
-include/fwb-2.0/fwbuilder/FWIntervalReference.h
-include/fwb-2.0/fwbuilder/FWObject.h
-include/fwb-2.0/fwbuilder/FWObjectDatabase.h
-include/fwb-2.0/fwbuilder/FWObjectReference.h
-include/fwb-2.0/fwbuilder/FWOptions.h
-include/fwb-2.0/fwbuilder/FWReference.h
-include/fwb-2.0/fwbuilder/FWServiceReference.h
-include/fwb-2.0/fwbuilder/Firewall.h
-include/fwb-2.0/fwbuilder/Group.h
-include/fwb-2.0/fwbuilder/Host.h
-include/fwb-2.0/fwbuilder/HostsFile.h
-include/fwb-2.0/fwbuilder/ICMPService.h
-include/fwb-2.0/fwbuilder/IPAddress.h
-include/fwb-2.0/fwbuilder/IPService.h
-include/fwb-2.0/fwbuilder/IPv4.h
-include/fwb-2.0/fwbuilder/Interface.h
-include/fwb-2.0/fwbuilder/InterfacePolicy.h
-include/fwb-2.0/fwbuilder/Interval.h
-include/fwb-2.0/fwbuilder/IntervalGroup.h
-include/fwb-2.0/fwbuilder/Library.h
-include/fwb-2.0/fwbuilder/Logger.h
-include/fwb-2.0/fwbuilder/Management.h
-include/fwb-2.0/fwbuilder/NAT.h
-include/fwb-2.0/fwbuilder/Network.h
-include/fwb-2.0/fwbuilder/ObjectGroup.h
-include/fwb-2.0/fwbuilder/Policy.h
-include/fwb-2.0/fwbuilder/Pool.h
-include/fwb-2.0/fwbuilder/Resources.h
-include/fwb-2.0/fwbuilder/Rule.h
-include/fwb-2.0/fwbuilder/RuleElement.h
-include/fwb-2.0/fwbuilder/RuleSet.h
-include/fwb-2.0/fwbuilder/Service.h
-include/fwb-2.0/fwbuilder/ServiceGroup.h
-include/fwb-2.0/fwbuilder/SyncQueue.h
-include/fwb-2.0/fwbuilder/TCPService.h
-include/fwb-2.0/fwbuilder/ThreadTools.h
-include/fwb-2.0/fwbuilder/Tools.h
-include/fwb-2.0/fwbuilder/UDPService.h
-include/fwb-2.0/fwbuilder/XMLTools.h
-include/fwb-2.0/fwbuilder/crypto.h
-include/fwb-2.0/fwbuilder/dns.h
-include/fwb-2.0/fwbuilder/libfwbuilder-config.h
-include/fwb-2.0/fwbuilder/libfwbuilder-version.h
-include/fwb-2.0/fwbuilder/physAddress.h
-include/fwb-2.0/fwbuilder/snmp.h
-include/fwb-2.0/fwcompiler/Compiler.h
-include/fwb-2.0/fwcompiler/NATCompiler.h
-include/fwb-2.0/fwcompiler/OSConfigurator.h
-include/fwb-2.0/fwcompiler/PolicyCompiler.h
-include/fwb-2.0/fwcompiler/RuleProcessor.h
+@comment $NetBSD: PLIST,v 1.12 2011/04/12 13:41:17 adam Exp $
+bin/libfwbuilder-config-4
+include/fwb-4/fwbuilder/Address.h
+include/fwb-4/fwbuilder/AddressRange.h
+include/fwb-4/fwbuilder/AddressTable.h
+include/fwb-4/fwbuilder/BackgroundOp.h
+include/fwb-4/fwbuilder/Cluster.h
+include/fwb-4/fwbuilder/ClusterGroup.h
+include/fwb-4/fwbuilder/Constants.h
+include/fwb-4/fwbuilder/CustomService.h
+include/fwb-4/fwbuilder/DNSName.h
+include/fwb-4/fwbuilder/Dispatch.h
+include/fwb-4/fwbuilder/FWException.h
+include/fwb-4/fwbuilder/FWIntervalReference.h
+include/fwb-4/fwbuilder/FWObject.h
+include/fwb-4/fwbuilder/FWObjectDatabase.h
+include/fwb-4/fwbuilder/FWObjectReference.h
+include/fwb-4/fwbuilder/FWOptions.h
+include/fwb-4/fwbuilder/FWReference.h
+include/fwb-4/fwbuilder/FWServiceReference.h
+include/fwb-4/fwbuilder/FailoverClusterGroup.h
+include/fwb-4/fwbuilder/Firewall.h
+include/fwb-4/fwbuilder/Group.h
+include/fwb-4/fwbuilder/Host.h
+include/fwb-4/fwbuilder/HostsFile.h
+include/fwb-4/fwbuilder/ICMP6Service.h
+include/fwb-4/fwbuilder/ICMPService.h
+include/fwb-4/fwbuilder/IPRoute.h
+include/fwb-4/fwbuilder/IPService.h
+include/fwb-4/fwbuilder/IPv4.h
+include/fwb-4/fwbuilder/IPv6.h
+include/fwb-4/fwbuilder/Inet6AddrMask.h
+include/fwb-4/fwbuilder/InetAddr.h
+include/fwb-4/fwbuilder/InetAddrMask.h
+include/fwb-4/fwbuilder/Interface.h
+include/fwb-4/fwbuilder/InterfaceData.h
+include/fwb-4/fwbuilder/Interval.h
+include/fwb-4/fwbuilder/IntervalGroup.h
+include/fwb-4/fwbuilder/Library.h
+include/fwb-4/fwbuilder/Logger.h
+include/fwb-4/fwbuilder/Management.h
+include/fwb-4/fwbuilder/MultiAddress.h
+include/fwb-4/fwbuilder/NAT.h
+include/fwb-4/fwbuilder/Network.h
+include/fwb-4/fwbuilder/NetworkIPv6.h
+include/fwb-4/fwbuilder/ObjectGroup.h
+include/fwb-4/fwbuilder/ObjectMatcher.h
+include/fwb-4/fwbuilder/ObjectMirror.h
+include/fwb-4/fwbuilder/Policy.h
+include/fwb-4/fwbuilder/Pool.h
+include/fwb-4/fwbuilder/Resources.h
+include/fwb-4/fwbuilder/Routing.h
+include/fwb-4/fwbuilder/Rule.h
+include/fwb-4/fwbuilder/RuleElement.h
+include/fwb-4/fwbuilder/RuleSet.h
+include/fwb-4/fwbuilder/SecuwallMgmtFile.h
+include/fwb-4/fwbuilder/Service.h
+include/fwb-4/fwbuilder/ServiceGroup.h
+include/fwb-4/fwbuilder/StateSyncClusterGroup.h
+include/fwb-4/fwbuilder/SyncQueue.h
+include/fwb-4/fwbuilder/TCPService.h
+include/fwb-4/fwbuilder/TCPUDPService.h
+include/fwb-4/fwbuilder/TagService.h
+include/fwb-4/fwbuilder/ThreadTools.h
+include/fwb-4/fwbuilder/Tools.h
+include/fwb-4/fwbuilder/UDPService.h
+include/fwb-4/fwbuilder/UserService.h
+include/fwb-4/fwbuilder/XMLTools.h
+include/fwb-4/fwbuilder/dns.h
+include/fwb-4/fwbuilder/inet_net.h
+include/fwb-4/fwbuilder/libfwbuilder-config.h
+include/fwb-4/fwbuilder/libfwbuilder-version.h
+include/fwb-4/fwbuilder/physAddress.h
+include/fwb-4/fwbuilder/snmp.h
+include/fwb-4/fwbuilder/uint128.h
+include/fwb-4/fwcompiler/BaseCompiler.h
+include/fwb-4/fwcompiler/Compiler.h
+include/fwb-4/fwcompiler/NATCompiler.h
+include/fwb-4/fwcompiler/OSConfigurator.h
+include/fwb-4/fwcompiler/PolicyCompiler.h
+include/fwb-4/fwcompiler/Preprocessor.h
+include/fwb-4/fwcompiler/RoutingCompiler.h
+include/fwb-4/fwcompiler/RuleProcessor.h
 lib/libfwbuilder.la
 lib/libfwcompiler.la
 share/doc/libfwbuilder-${PKGVERSION}/AUTHORS
@@ -64,41 +89,78 @@ share/doc/libfwbuilder-${PKGVERSION}/ChangeLog
 share/doc/libfwbuilder-${PKGVERSION}/Credits
 share/doc/libfwbuilder-${PKGVERSION}/INSTALL
 share/doc/libfwbuilder-${PKGVERSION}/PatchAcceptancePolicy.txt
-share/libfwbuilder/fwbuilder.dtd
-share/libfwbuilder/migration/FWObjectDatabase_0.10.0.xslt
-share/libfwbuilder/migration/FWObjectDatabase_0.10.1.xslt
-share/libfwbuilder/migration/FWObjectDatabase_0.10.10.xslt
-share/libfwbuilder/migration/FWObjectDatabase_0.10.11.xslt
-share/libfwbuilder/migration/FWObjectDatabase_0.10.12.xslt
-share/libfwbuilder/migration/FWObjectDatabase_0.10.13.xslt
-share/libfwbuilder/migration/FWObjectDatabase_0.10.14.xslt
-share/libfwbuilder/migration/FWObjectDatabase_0.10.2.xslt
-share/libfwbuilder/migration/FWObjectDatabase_0.10.3.xslt
-share/libfwbuilder/migration/FWObjectDatabase_0.10.4.xslt
-share/libfwbuilder/migration/FWObjectDatabase_0.10.5.xslt
-share/libfwbuilder/migration/FWObjectDatabase_0.10.6.xslt
-share/libfwbuilder/migration/FWObjectDatabase_0.10.7.xslt
-share/libfwbuilder/migration/FWObjectDatabase_0.10.8.xslt
-share/libfwbuilder/migration/FWObjectDatabase_0.10.9.xslt
-share/libfwbuilder/migration/FWObjectDatabase_0.8.7.xslt
-share/libfwbuilder/migration/FWObjectDatabase_0.9.0.xslt
-share/libfwbuilder/migration/FWObjectDatabase_0.9.1.xslt
-share/libfwbuilder/migration/FWObjectDatabase_0.9.2.xslt
-share/libfwbuilder/migration/FWObjectDatabase_0.9.3.xslt
-share/libfwbuilder/migration/FWObjectDatabase_0.9.4.xslt
-share/libfwbuilder/migration/FWObjectDatabase_0.9.5.xslt
-share/libfwbuilder/migration/FWObjectDatabase_1.0.0.xslt
-share/libfwbuilder/migration/FWObjectDatabase_1.0.1.xslt
-share/libfwbuilder/migration/FWObjectDatabase_1.0.2.xslt
-share/libfwbuilder/migration/FWObjectDatabase_2.0.0.xslt
-share/libfwbuilder/migration/FWObjectDatabase_2.0.1.xslt
-share/libfwbuilder/migration/FWObjectDatabase_2.0.10.xslt
-share/libfwbuilder/migration/FWObjectDatabase_2.0.11.xslt
-share/libfwbuilder/migration/FWObjectDatabase_2.0.2.xslt
-share/libfwbuilder/migration/FWObjectDatabase_2.0.3.xslt
-share/libfwbuilder/migration/FWObjectDatabase_2.0.4.xslt
-share/libfwbuilder/migration/FWObjectDatabase_2.0.5.xslt
-share/libfwbuilder/migration/FWObjectDatabase_2.0.6.xslt
-share/libfwbuilder/migration/FWObjectDatabase_2.0.7.xslt
-share/libfwbuilder/migration/FWObjectDatabase_2.0.8.xslt
-share/libfwbuilder/migration/FWObjectDatabase_2.0.9.xslt
+share/libfwbuilder-${PKGVERSION}/fwbuilder.dtd
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_0.10.0.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_0.10.1.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_0.10.10.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_0.10.11.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_0.10.12.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_0.10.13.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_0.10.14.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_0.10.2.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_0.10.3.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_0.10.4.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_0.10.5.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_0.10.6.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_0.10.7.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_0.10.8.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_0.10.9.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_0.8.7.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_0.9.0.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_0.9.1.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_0.9.2.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_0.9.3.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_0.9.4.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_0.9.5.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_1.0.0.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_1.0.1.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_1.0.2.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_10.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_11.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_12.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_13.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_14.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_15.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_16.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_2.0.0.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_2.0.1.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_2.0.10.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_2.0.11.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_2.0.12.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_2.0.2.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_2.0.3.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_2.0.4.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_2.0.5.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_2.0.6.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_2.0.7.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_2.0.8.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_2.0.9.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_2.0.99.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_2.1.0.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_2.1.1.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_2.1.10.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_2.1.11.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_2.1.12.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_2.1.13.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_2.1.14.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_2.1.15.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_2.1.16.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_2.1.17.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_2.1.18.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_2.1.19.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_2.1.2.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_2.1.3.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_2.1.4.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_2.1.5.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_2.1.6.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_2.1.7.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_2.1.8.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_2.1.9.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_2.1.99.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_3.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_4.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_5.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_6.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_7.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_8.xslt
+share/libfwbuilder-${PKGVERSION}/migration/FWObjectDatabase_9.xslt
diff --git a/security/libfwbuilder/buildlink3.mk b/security/libfwbuilder/buildlink3.mk
index b95396fc91b..426e28a8bbb 100644
--- a/security/libfwbuilder/buildlink3.mk
+++ b/security/libfwbuilder/buildlink3.mk
@@ -1,19 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.22 2011/01/13 13:36:16 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2011/04/12 13:41:17 adam Exp $
 
 BUILDLINK_TREE+=	libfwbuilder
 
 .if !defined(LIBFWBUILDER_BUILDLINK3_MK)
 LIBFWBUILDER_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libfwbuilder+=	libfwbuilder>=2.0.12
-BUILDLINK_ABI_DEPENDS.libfwbuilder+=	libfwbuilder>=2.0.12nb4
+BUILDLINK_API_DEPENDS.libfwbuilder+=	libfwbuilder>=4.1.3
+BUILDLINK_ABI_DEPENDS.libfwbuilder+=	libfwbuilder>=4.1.3
 BUILDLINK_PKGSRCDIR.libfwbuilder?=	../../security/libfwbuilder
 
-.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../net/net-snmp/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
-.include "../../x11/qt3-libs/buildlink3.mk"
+.include "../../x11/qt4-libs/buildlink3.mk"
 .endif # LIBFWBUILDER_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libfwbuilder
diff --git a/security/libfwbuilder/distinfo b/security/libfwbuilder/distinfo
index 3a8fb05b57b..66fe9b56ff7 100644
--- a/security/libfwbuilder/distinfo
+++ b/security/libfwbuilder/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.10 2006/10/14 01:42:51 rillig Exp $
+$NetBSD: distinfo,v 1.11 2011/04/12 13:41:17 adam Exp $
 
-SHA1 (libfwbuilder-2.0.12.tar.gz) = a287de04e81a4ee480d34e8f209718eb63da457a
-RMD160 (libfwbuilder-2.0.12.tar.gz) = 69f996659d30863e97340c52d814469a8e5173b7
-Size (libfwbuilder-2.0.12.tar.gz) = 282065 bytes
-SHA1 (patch-aa) = 05475a05f746fa05e6df5fc9d63cd3d344717a8d
-SHA1 (patch-ab) = fc285986f8c930ef7f46dbeaf3f26eab91bf5dda
-SHA1 (patch-ac) = 044c4d42df1dea1126dfba2af960d6f8ebeffd6d
-SHA1 (patch-ad) = 92279523b583aba763cfa89e42ee387e630b65de
-SHA1 (patch-ae) = 6c6f1ec5cf6060070de4e32a470c2fe4efbd79f9
-SHA1 (patch-af) = 67707e7ac2a5c9bd4e94d20c08d416c9fa991468
+SHA1 (libfwbuilder-4.1.3.tar.gz) = 4c6b1e5baee5e4ba363de8f79c8bcc272a0689bc
+RMD160 (libfwbuilder-4.1.3.tar.gz) = ec8d2689868542d05ea584a39addcc2131555a7c
+Size (libfwbuilder-4.1.3.tar.gz) = 363194 bytes
+SHA1 (patch-aa) = 9601dfd97124f2c0c6faf820e8624bdc79463658
+SHA1 (patch-ab) = 563c0fae20bb13befafde4ca49c4b0d2f76296d7
+SHA1 (patch-ac) = 7c125aa1d1f8f7017fe8b786cf3d94abf72046e2
+SHA1 (patch-ad) = 8a648a3acbd430cee69e449a983f011c9ed7e954
+SHA1 (patch-ae) = aebf66c231466b3f970152127ea1f12c4fb8be76
diff --git a/security/libfwbuilder/patches/patch-aa b/security/libfwbuilder/patches/patch-aa
index 93706b097cb..947cc8461ab 100644
--- a/security/libfwbuilder/patches/patch-aa
+++ b/security/libfwbuilder/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.4 2006/03/12 06:56:30 minskim Exp $
+$NetBSD: patch-aa,v 1.5 2011/04/12 13:41:17 adam Exp $
 
---- etc/etc.pro.orig	2004-09-08 05:34:46.000000000 +0000
+--- etc/etc.pro.orig	2011-04-11 18:36:15.000000000 +0000
 +++ etc/etc.pro
-@@ -8,6 +8,7 @@ TEMPLATE = app
- QMAKE_RUN_CC  = @echo
+@@ -13,6 +13,7 @@ QMAKE_RUN_CC = @echo
  QMAKE_RUN_CXX = @echo
- QMAKE_LINK    = @echo
+ QMAKE_LINK = @echo
+ QMAKE_LIB = @echo
 +QMAKE_LIBTOOL = @echo
  
- TARGET        = etc
+ TARGET = etc
  
diff --git a/security/libfwbuilder/patches/patch-ab b/security/libfwbuilder/patches/patch-ab
index a00d874d33f..c442246b7dc 100644
--- a/security/libfwbuilder/patches/patch-ab
+++ b/security/libfwbuilder/patches/patch-ab
@@ -1,24 +1,34 @@
-$NetBSD: patch-ab,v 1.4 2006/03/12 06:56:30 minskim Exp $
+$NetBSD: patch-ab,v 1.5 2011/04/12 13:41:17 adam Exp $
 
---- qmake.inc.in.orig	2005-04-26 07:16:02.000000000 +0000
+--- qmake.inc.in.orig	2010-11-17 05:18:12.000000000 +0000
 +++ qmake.inc.in
-@@ -27,11 +27,9 @@ unix {
- 	migration.path          =$(DDIR)@TEMPLATE_DIR@/migration
- 	doc.path                =$(DDIR)@DOCDIR@
+@@ -22,7 +22,6 @@ unix {
+     LIBS += @PTHREAD_LIBS@ @XML_LIBS@ @XSLT_LIBS@ @LIBSNMP_LIBS@ \
+         @LIB_RESOLV@ @LIBS@
  
--	CONFIG                 += warn_on debug
-+	CONFIG                 += warn_on
- 	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 {
+          UI_DIR = .ui
+          MOC_DIR = .moc
+          OBJECTS_DIR = .obj
+@@ -35,12 +34,10 @@ unix {
+          migration.path = @TEMPLATE_DIR@/migration
+          doc.path = @DOCDIR@
+ 
+-         CONFIG += warn_on debug
++         CONFIG += warn_on
+          QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter
+-         QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
+          QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter @CXXFLAGS@
+-         QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter @CXXFLAGS@
+-    }
++         QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@
  }
  
-@@ -45,5 +43,6 @@ exists(qmake2.inc) {
+ exists(qmake2.inc) {
+@@ -48,5 +45,6 @@ exists(qmake2.inc) {
  }
  
- CONFIG     -= qt
-+CONFIG     += thread
+ CONFIG -= qt
++CONFIG += thread
  
- INSTALLS   += target
+ INSTALLS += target
diff --git a/security/libfwbuilder/patches/patch-ac b/security/libfwbuilder/patches/patch-ac
index fa47bce1719..a61f2325a83 100644
--- a/security/libfwbuilder/patches/patch-ac
+++ b/security/libfwbuilder/patches/patch-ac
@@ -1,12 +1,12 @@
-$NetBSD: patch-ac,v 1.3 2006/03/12 06:56:30 minskim Exp $
+$NetBSD: patch-ac,v 1.4 2011/04/12 13:41:17 adam Exp $
 
---- doc/doc.pro.orig	2004-09-08 05:34:46.000000000 +0000
+--- doc/doc.pro.orig	2010-11-17 05:18:12.000000000 +0000
 +++ doc/doc.pro
-@@ -8,6 +8,7 @@ TEMPLATE = app
- QMAKE_RUN_CC  = @echo
- QMAKE_RUN_CXX = @echo
- QMAKE_LINK    = @echo
-+QMAKE_LIBTOOL = @echo
+@@ -10,6 +10,7 @@ CONFIG -= embed_manifest_exe
+ QMAKE_RUN_CC  = echo
+ QMAKE_RUN_CXX = echo
+ QMAKE_LINK    = echo
++QMAKE_LIBTOOL = echo
  
- TARGET        = 
+ TARGET = 
  
diff --git a/security/libfwbuilder/patches/patch-ad b/security/libfwbuilder/patches/patch-ad
index 0d624fb6168..227c7237eea 100644
--- a/security/libfwbuilder/patches/patch-ad
+++ b/security/libfwbuilder/patches/patch-ad
@@ -1,12 +1,12 @@
-$NetBSD: patch-ad,v 1.3 2006/03/12 06:56:30 minskim Exp $
+$NetBSD: patch-ad,v 1.4 2011/04/12 13:41:17 adam Exp $
 
---- migration/migration.pro.orig	2005-10-23 06:21:55.000000000 +0000
+--- migration/migration.pro.orig	2010-11-17 05:18:12.000000000 +0000
 +++ migration/migration.pro
-@@ -8,6 +8,7 @@ TEMPLATE = app
- QMAKE_RUN_CC  = @echo
- QMAKE_RUN_CXX = @echo
- QMAKE_LINK    = @echo
-+QMAKE_LIBTOOL = @echo
+@@ -14,6 +14,7 @@ win32 {
+ QMAKE_RUN_CC  = "@echo"
+ QMAKE_RUN_CXX = "@echo"
+ QMAKE_LINK = "@echo"
++QMAKE_LIBTOOL = "@echo"
  
- TARGET        = etc
+ target.path = $${migration.path}
  
diff --git a/security/libfwbuilder/patches/patch-ae b/security/libfwbuilder/patches/patch-ae
index 6cf7d9a500c..93a5ef1d0cf 100644
--- a/security/libfwbuilder/patches/patch-ae
+++ b/security/libfwbuilder/patches/patch-ae
@@ -1,15 +1,12 @@
-$NetBSD: patch-ae,v 1.1 2006/10/14 01:42:51 rillig Exp $
+$NetBSD: patch-ae,v 1.2 2011/04/12 13:41:17 adam Exp $
 
---- configure.orig	2006-10-14 03:36:59.000000000 +0200
-+++ configure	2006-10-14 03:38:22.000000000 +0200
-@@ -10091,8 +10091,8 @@ fi
- if test "Z$ac_cv_gethostbyaddr_args" != "Z"; then
-   echo "Function gethostbyaddr_r takes $ac_cv_gethostbyaddr_args arguments"
-   echo -n "First argument for gethostbyaddr_r is "
--  if   test "Z$ac_cv_gethostbyaddr_first_arg" == "Zcharptr"; then echo "const char *"
--  elif test "Z$ac_cv_gethostbyaddr_first_arg" == "Zvoidptr"; then echo "const void *"
-+  if   test "Z$ac_cv_gethostbyaddr_first_arg" = "Zcharptr"; then echo "const char *"
-+  elif test "Z$ac_cv_gethostbyaddr_first_arg" = "Zvoidptr"; then echo "const void *"
-   else echo
-   fi
- else
+--- src/confscript/confscript.pro.orig	2011-04-11 18:34:55.000000000 +0000
++++ src/confscript/confscript.pro
+@@ -13,6 +13,7 @@ QMAKE_RUN_CC = @echo
+ QMAKE_RUN_CXX = @echo
+ QMAKE_LINK = @echo
+ QMAKE_LIB = @echo
++QMAKE_LIBTOOL = @echo
+ 
+ TARGET = confscript
+ 
diff --git a/security/libfwbuilder/patches/patch-af b/security/libfwbuilder/patches/patch-af
deleted file mode 100644
index dad926e440b..00000000000
--- a/security/libfwbuilder/patches/patch-af
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/10/14 01:42:51 rillig Exp $
-
---- configure.in.orig	2005-10-25 08:10:32.000000000 +0200
-+++ configure.in	2006-10-14 03:38:05.000000000 +0200
-@@ -822,8 +822,8 @@ fi
- if test "Z$ac_cv_gethostbyaddr_args" != "Z"; then
-   echo "Function gethostbyaddr_r takes $ac_cv_gethostbyaddr_args arguments"
-   echo -n "First argument for gethostbyaddr_r is "
--  if   test "Z$ac_cv_gethostbyaddr_first_arg" == "Zcharptr"; then echo "const char *"
--  elif test "Z$ac_cv_gethostbyaddr_first_arg" == "Zvoidptr"; then echo "const void *"
-+  if   test "Z$ac_cv_gethostbyaddr_first_arg" = "Zcharptr"; then echo "const char *"
-+  elif test "Z$ac_cv_gethostbyaddr_first_arg" = "Zvoidptr"; then echo "const void *"
-   else echo 
-   fi
- else