Replace libfwbuilder with version 2.0.5 as the previous version wasn't

useful.

Firewall Builder is a multi-platform firewall configuration and
management tool.  It consists of a GUI and a set of policy compilers for
various firewall platforms.  Firewall Builder uses an object-oriented
approach, it helps administrators maintain a database of network
objects and allows policy editing using simple drag-and-drop
operations.  Firewall Builder currently supports

	iptables,
	IP Filter,
	ipfw,
	OpenBSD PF, and
	Cisco PIX

libfwbuilder provides the back-end functionality in a library.

9 files changed, 159 insertions, 212 deletions

diff --git a/security/libfwbuilder/DESCR b/security/libfwbuilder/DESCR
index a6c6f005362..89cb9f5b265 100644
--- a/security/libfwbuilder/DESCR
+++ b/security/libfwbuilder/DESCR
@@ -1,12 +1,13 @@
-Firewall Builder is multi-platform firewall configuration and
-management tool.  It consists of a GUI and set of policy compilers for
-various firewall platforms.  Firewall Builder uses object-oriented
-approach, it helps administrator maintain a database of network
+Firewall Builder is a multi-platform firewall configuration and
+management tool.  It consists of a GUI and a set of policy compilers for
+various firewall platforms.  Firewall Builder uses an object-oriented
+approach, it helps administrators maintain a database of network
 objects and allows policy editing using simple drag-and-drop
 operations.  Firewall Builder currently supports
 
 	iptables,
-	ipfilter,
+	IP Filter,
+	ipfw,
 	OpenBSD PF, and
 	Cisco PIX
 
diff --git a/security/libfwbuilder/Makefile b/security/libfwbuilder/Makefile
index 7510c364bbc..1f8a2ac0b12 100644
--- a/security/libfwbuilder/Makefile
+++ b/security/libfwbuilder/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2004/11/20 22:10:23 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2005/02/24 10:59:56 bad Exp $
 
-DISTNAME=	libfwbuilder-1.0.2
-PKGREVISION=	4
+DISTNAME=	libfwbuilder-2.0.5
 CATEGORIES=	security net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fwbuilder/}
 
@@ -15,13 +14,20 @@ GNU_CONFIGURE=	yes
 USE_GNU_TOOLS+=	make
 USE_LANGUAGES=	c++
 
-pre-configure:
-	cd ${WRKSRC}; ${AUTOCONF}
+QMAKE=		${QTDIR}/bin/qmake
+CONFIGURE_ENV+=	QMAKE="${QMAKE}"
+MAKE_ENV+=	QMAKE="${QMAKE}"
 
-.include "../../devel/glib/buildlink3.mk"
+post-install:
+	${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/src/fwbuilder/libfwbuilder.la ${PREFIX}/lib
+	${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/src/fwcompiler/libfwcompiler.la ${PREFIX}/lib
+	${LIBTOOL} --mode=finish ${PREFIX}/lib
+
+.include "../../devel/glib2/buildlink3.mk"
 .include "../../net/net-snmp/buildlink3.mk"
 .include "../../textproc/libxml/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
+.include "../../x11/qt3-libs/buildlink3.mk"
+.include "../../x11/qt3-tools/buildlink3.mk"
 
-.include "../../mk/autoconf.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/libfwbuilder/PLIST b/security/libfwbuilder/PLIST
index a8e91f34e15..1d4da33291e 100644
--- a/security/libfwbuilder/PLIST
+++ b/security/libfwbuilder/PLIST
@@ -1,119 +1,112 @@
-@comment $NetBSD: PLIST,v 1.2 2004/10/07 16:27:13 tv Exp $
-bin/libfwbuilder-config
-include/fwbuilder/Address.hh
-include/fwbuilder/AddressRange.hh
-include/fwbuilder/BackgroundOp.hh
-include/fwbuilder/Constants.hh
-include/fwbuilder/CustomService.hh
-include/fwbuilder/FWException.hh
-include/fwbuilder/FWIntervalReference.hh
-include/fwbuilder/FWObject.hh
-include/fwbuilder/FWObjectDatabase.hh
-include/fwbuilder/FWObjectReference.hh
-include/fwbuilder/FWOptions.hh
-include/fwbuilder/FWReference.hh
-include/fwbuilder/FWServiceReference.hh
-include/fwbuilder/Firewall.hh
-include/fwbuilder/Group.hh
-include/fwbuilder/Host.hh
-include/fwbuilder/HostsFile.hh
-include/fwbuilder/ICMPService.hh
-include/fwbuilder/IPAddress.hh
-include/fwbuilder/IPService.hh
-include/fwbuilder/IPv4.hh
-include/fwbuilder/Interface.hh
-include/fwbuilder/InterfacePolicy.hh
-include/fwbuilder/Interval.hh
-include/fwbuilder/IntervalGroup.hh
-include/fwbuilder/Logger.hh
-include/fwbuilder/Management.hh
-include/fwbuilder/NAT.hh
-include/fwbuilder/Network.hh
-include/fwbuilder/ObjectGroup.hh
-include/fwbuilder/Policy.hh
-include/fwbuilder/Pool.hh
-include/fwbuilder/Resources.hh
-include/fwbuilder/Rule.hh
-include/fwbuilder/RuleElement.hh
-include/fwbuilder/RuleSet.hh
-include/fwbuilder/Service.hh
-include/fwbuilder/ServiceGroup.hh
-include/fwbuilder/SyncQueue.hh
-include/fwbuilder/TCPService.hh
-include/fwbuilder/ThreadTools.hh
-include/fwbuilder/Tools.hh
-include/fwbuilder/UDPService.hh
-include/fwbuilder/XMLTools.hh
-include/fwbuilder/crypto.hh
-include/fwbuilder/dns.hh
-include/fwbuilder/libfwbuilder-config.h
-include/fwbuilder/physAddress.hh
-include/fwbuilder/snmp.hh
-include/fwcompiler/Compiler.hh
-include/fwcompiler/NATCompiler.hh
-include/fwcompiler/OSConfigurator.hh
-include/fwcompiler/PolicyCompiler.hh
-include/fwcompiler/RuleProcessor.hh
-include/fwcompiler/manifest.hh
+@comment $NetBSD: PLIST,v 1.3 2005/02/24 10:59:56 bad 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/crypto.h
+include/fwb-2.0/fwbuilder/CustomService.h
+include/fwb-2.0/fwbuilder/dns.h
+include/fwb-2.0/fwbuilder/Firewall.h
+include/fwb-2.0/fwbuilder/FWException.h
+include/fwb-2.0/fwbuilder/FWIntervalReference.h
+include/fwb-2.0/fwbuilder/FWObjectDatabase.h
+include/fwb-2.0/fwbuilder/FWObject.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/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/Interface.h
+include/fwb-2.0/fwbuilder/IPv4.h
+include/fwb-2.0/fwbuilder/InterfacePolicy.h
+include/fwb-2.0/fwbuilder/IntervalGroup.h
+include/fwb-2.0/fwbuilder/Interval.h
+include/fwb-2.0/fwbuilder/IPAddress.h
+include/fwb-2.0/fwbuilder/IPService.h
+include/fwb-2.0/fwbuilder/libfwbuilder-config.h
+include/fwb-2.0/fwbuilder/libfwbuilder-version.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/physAddress.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/RuleElement.h
+include/fwb-2.0/fwbuilder/Rule.h
+include/fwb-2.0/fwbuilder/RuleSet.h
+include/fwb-2.0/fwbuilder/ServiceGroup.h
+include/fwb-2.0/fwbuilder/Service.h
+include/fwb-2.0/fwbuilder/snmp.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
+@dirrm include/fwb-2.0/fwbuilder
+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
+@dirrm include/fwb-2.0/fwcompiler
+@dirrm include/fwb-2.0
 lib/libfwbuilder.la
+lib/libfwbuilder.a
+lib/libfwbuilder.so
+lib/libfwbuilder.so.6
+lib/libfwbuilder.so.6.2
+lib/libfwbuilder.so.6.0.2
 lib/libfwcompiler.la
-share/doc/${PKGNAME}/AUTHORS
-share/doc/${PKGNAME}/COPYING
-share/doc/${PKGNAME}/ChangeLog
-share/doc/${PKGNAME}/Credits
-share/doc/${PKGNAME}/INSTALL
-share/doc/${PKGNAME}/README
+lib/libfwcompiler.a
+lib/libfwcompiler.so.6
+lib/libfwcompiler.so.6.2
+lib/libfwcompiler.so.6.0.2
+share/doc/libfwbuilder-${PKGVERSION}/AUTHORS
+share/doc/libfwbuilder-${PKGVERSION}/COPYING
+share/doc/libfwbuilder-${PKGVERSION}/ChangeLog
+share/doc/libfwbuilder-${PKGVERSION}/Credits
+share/doc/libfwbuilder-${PKGVERSION}/INSTALL
+share/doc/libfwbuilder-${PKGVERSION}/PatchAcceptancePolicy.txt
+@dirrm share/doc/libfwbuilder-${PKGVERSION}
 share/libfwbuilder/fwbuilder.dtd
-share/libfwbuilder/migration/0.10.0/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.1/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.10/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.11/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.12/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.13/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.14/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.2/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.3/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.4/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.5/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.6/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.7/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.8/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.9/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.8.7/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.9.0/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.9.1/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.9.2/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.9.3/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.9.4/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.9.5/FWObjectDatabase.xslt
-share/libfwbuilder/migration/1.0.0/FWObjectDatabase.xslt
-share/libfwbuilder/migration/1.0.1/FWObjectDatabase.xslt
-@dirrm share/libfwbuilder/migration/1.0.1
-@dirrm share/libfwbuilder/migration/1.0.0
-@dirrm share/libfwbuilder/migration/0.9.5
-@dirrm share/libfwbuilder/migration/0.9.4
-@dirrm share/libfwbuilder/migration/0.9.3
-@dirrm share/libfwbuilder/migration/0.9.2
-@dirrm share/libfwbuilder/migration/0.9.1
-@dirrm share/libfwbuilder/migration/0.9.0
-@dirrm share/libfwbuilder/migration/0.8.7
-@dirrm share/libfwbuilder/migration/0.10.9
-@dirrm share/libfwbuilder/migration/0.10.8
-@dirrm share/libfwbuilder/migration/0.10.7
-@dirrm share/libfwbuilder/migration/0.10.6
-@dirrm share/libfwbuilder/migration/0.10.5
-@dirrm share/libfwbuilder/migration/0.10.4
-@dirrm share/libfwbuilder/migration/0.10.3
-@dirrm share/libfwbuilder/migration/0.10.2
-@dirrm share/libfwbuilder/migration/0.10.14
-@dirrm share/libfwbuilder/migration/0.10.13
-@dirrm share/libfwbuilder/migration/0.10.12
-@dirrm share/libfwbuilder/migration/0.10.11
-@dirrm share/libfwbuilder/migration/0.10.10
-@dirrm share/libfwbuilder/migration/0.10.1
-@dirrm share/libfwbuilder/migration/0.10.0
+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_0.10.0.xslt
+share/libfwbuilder/migration/FWObjectDatabase_0.10.1.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_1.0.0.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.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_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.2.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.0.3.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.0.4.xslt
 @dirrm share/libfwbuilder/migration
 @dirrm share/libfwbuilder
-@dirrm share/doc/${PKGNAME}
-@dirrm include/fwcompiler
-@dirrm include/fwbuilder
diff --git a/security/libfwbuilder/buildlink3.mk b/security/libfwbuilder/buildlink3.mk
index dac22d89d01..c02b12dceb9 100644
--- a/security/libfwbuilder/buildlink3.mk
+++ b/security/libfwbuilder/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/07 16:27:13 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2005/02/24 10:59:56 bad Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBFWBUILDER_BUILDLINK3_MK:=	${LIBFWBUILDER_BUILDLINK3_MK}+
@@ -11,14 +11,15 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibfwbuilder}
 BUILDLINK_PACKAGES+=	libfwbuilder
 
 .if !empty(LIBFWBUILDER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libfwbuilder+=	libfwbuilder>=1.0.2
-BUILDLINK_RECOMMENDED.libfwbuilder+=	libfwbuilder>=1.0.2nb2
+BUILDLINK_DEPENDS.libfwbuilder+=	libfwbuilder-2.0.5
 BUILDLINK_PKGSRCDIR.libfwbuilder?=	../../security/libfwbuilder
 .endif	# LIBFWBUILDER_BUILDLINK3_MK
 
-.include "../../devel/glib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
 .include "../../net/net-snmp/buildlink3.mk"
 .include "../../textproc/libxml/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
+.include "../../x11/qt3-libs/buildlink3.mk"
+.include "../../x11/qt3-tools/buildlink3.mk"
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/libfwbuilder/distinfo b/security/libfwbuilder/distinfo
index d334d0ab590..b1f9164006b 100644
--- a/security/libfwbuilder/distinfo
+++ b/security/libfwbuilder/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.2 2004/10/14 15:21:25 tv Exp $
+$NetBSD: distinfo,v 1.3 2005/02/24 10:59:56 bad Exp $
 
-SHA1 (libfwbuilder-1.0.2.tar.gz) = 3564a255850d4880d69a7d8c1aa4a35bc4e0b4c5
-Size (libfwbuilder-1.0.2.tar.gz) = 403462 bytes
-SHA1 (patch-aa) = f307aaaa7059f5eb82314bb9a3430d915056082a
-SHA1 (patch-ab) = 6d2875e2b5ce2872d3463b1e88b30859860fde4c
-SHA1 (patch-ac) = 56837990a7ec3302437cd016aad8495e2af43b1e
-SHA1 (patch-ad) = 7da478913712773d8663ef65928f88a1dcbb1515
+SHA1 (libfwbuilder-2.0.5.tar.gz) = 64175782b897f8211e50e10b1a2daa81a2b03d5c
+Size (libfwbuilder-2.0.5.tar.gz) = 280821 bytes
+SHA1 (patch-aa) = d4a33ea81aebb695814534c9258a60df1945dcfb
+SHA1 (patch-ab) = dc7270976ccf09cefdca11cdba60b20b9cfe1b55
diff --git a/security/libfwbuilder/patches/patch-aa b/security/libfwbuilder/patches/patch-aa
index b9fd1cf72e5..1cf8e205bfe 100644
--- a/security/libfwbuilder/patches/patch-aa
+++ b/security/libfwbuilder/patches/patch-aa
@@ -1,37 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/07/06 18:04:40 agc Exp $
-
---- acinclude.m4.old	Sun Jun  1 05:25:09 2003
-+++ acinclude.m4	Sun Jun  1 05:25:31 2003
-@@ -81,19 +81,19 @@
-     ],[
- 	echo
- 
--dnl      if test "${ac_cv_lib_snmp_init_snmp+set}" = "set"; then
--dnl        unset ac_cv_lib_snmp_init_snmp
--dnl      fi
--dnl
--dnl      save_LIBS="$LIBS"
--dnl      LIBS="$LIBS -ldes"
--dnl      AC_CHECK_LIB($ac_snmplib_name, init_snmp,
--dnl      [
--dnl          LIBS="$save_LIBS"
--dnl          LIBSNMP_LIBS="-ldes -l$ac_snmplib_name"
--dnl	  HAVE_LIBSNMP="1"
--dnl          AC_DEFINE(HAVE_LIBSNMP)
--dnl      ])
-+      if test "${ac_cv_lib_snmp_init_snmp+set}" = "set"; then
-+        unset ac_cv_lib_snmp_init_snmp
-+      fi
-+
-+      save_LIBS="$LIBS"
-+      LIBS="$LIBS -ldes"
-+      AC_CHECK_LIB($ac_snmplib_name, init_snmp,
-+      [
-+          LIBS="$save_LIBS"
-+          LIBSNMP_LIBS="-ldes -l$ac_snmplib_name"
-+	  HAVE_LIBSNMP="1"
-+          AC_DEFINE(HAVE_LIBSNMP)
-+      ])
-     ])
-   ])
- 
+--- configure      2004/07/06 11:44:26     1.1
++++ configure      2004/07/06 11:45:40
+10032c10032
+< . runqmake.sh
+---
+> $SHELL runqmake.sh
diff --git a/security/libfwbuilder/patches/patch-ab b/security/libfwbuilder/patches/patch-ab
index 01c751476b1..10aa71523ed 100644
--- a/security/libfwbuilder/patches/patch-ab
+++ b/security/libfwbuilder/patches/patch-ab
@@ -1,15 +1,18 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/07/06 18:04:40 agc Exp $
+$NetBSD: patch-ab,v 1.2 2005/02/24 10:59:56 bad Exp $
 
---- libfwbuilder-config.in	2004/07/06 11:44:26	1.1
-+++ libfwbuilder-config.in	2004/07/06 11:45:40
-@@ -167,8 +167,8 @@
- stat_lib=
- for i in $all_flags; do
-     case "$i" in
--    -L/usr/lib) ;;
--    -I/usr/include) ;;
-+    -L*) ;;
-+    -I*) ;;
-     *.a) stat_libs="$stat_libs $i" ;;
-     -l*) rev_libs="$i $rev_libs" ;;
-     *)
+--- qmake.inc.in.orig	Wed Sep  8 07:34:44 2004
++++ qmake.inc.in	Wed Dec 15 17:36:00 2004
+@@ -43,12 +43,10 @@
+ 	migration.path          =$(DDIR)@TEMPLATE_DIR@/migration
+ 	doc.path                =$(DDIR)@DOCDIR@
+ 
+-	CONFIG                 += warn_on debug
++	CONFIG                 += warn_on
+ 	INCLUDEPATH            += /usr/include @XML_CFLAGS_Q@ @XSLT_CFLAGS_Q@ @PTHREAD_CFLAGS_Q@ @OPENSSL_CFLAGS_Q@ @LWRES_CFLAGS_Q@
+ 	QMAKE_CFLAGS_DEBUG     += -Wno-unused-parameter
+-	QMAKE_CFLAGS_RELEASE   += -Wno-unused-parameter
+ 	QMAKE_CXXFLAGS_DEBUG   += -Wno-unused-parameter
+-	QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter
+ 	LIBS                   += @PTHREAD_LIBS@ @XML_LIBS@ @XSLT_LIBS@ @OPENSSL_LIBS@ @LIBSNMP_LIBS@ @LWRES_LIBS@ @LIBS@
+ }
+ 
diff --git a/security/libfwbuilder/patches/patch-ac b/security/libfwbuilder/patches/patch-ac
deleted file mode 100644
index b2967db480f..00000000000
--- a/security/libfwbuilder/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2004/10/14 15:21:25 tv Exp $
-
---- src/fwbuilder/Makefile.in.orig	2004-10-14 11:18:44.000000000 -0400
-+++ src/fwbuilder/Makefile.in
-@@ -293,7 +293,6 @@ depend:
- install_lib: libfwbuilder.la
- 	$(mkinstalldirs) $(DESTDIR)$(libdir)
- 	$(LTINSTALL) -c $(INSTALL_STRIP) libfwbuilder.la $(DESTDIR)$(libdir)
--	rm -f $(DESTDIR)$(libdir)/libfwbuilder.la
- 
- install_headers: $(HEADERS)
- 	$(mkinstalldirs) $(DESTDIR)$(includedir)
diff --git a/security/libfwbuilder/patches/patch-ad b/security/libfwbuilder/patches/patch-ad
deleted file mode 100644
index 8320bf81f11..00000000000
--- a/security/libfwbuilder/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2004/10/14 15:21:25 tv Exp $
-
---- src/fwcompiler/Makefile.in.orig	2004-10-14 11:19:07.000000000 -0400
-+++ src/fwcompiler/Makefile.in
-@@ -152,7 +152,6 @@ depend:
- install_lib: libfwcompiler.la
- 	$(mkinstalldirs) $(DESTDIR)$(libdir)
- 	$(LTINSTALL) -c $(INSTALL_STRIP) libfwcompiler.la $(DESTDIR)$(libdir)
--	rm -f $(DESTDIR)$(libdir)/libfwcompiler.la
- 
- install_headers: $(HEADERS)
- 	$(mkinstalldirs) $(DESTDIR)$(includedir)