Upgrade fwbuilder and libfwbuilder to 2.0.6.

The main change is support for printing policies and NAT rules for
firewall objects.  Also improvments in the iptables compiler and lots
of bug fixes, to numerous to mentions.  See the release notes at:
http://www.fwbuilder.org/archives/cat_release_notes.html#000185

9 files changed, 19 insertions, 35 deletions

diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index 86690d40b25..48ce10b07d9 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/02/24 11:03:22 bad Exp $
+# $NetBSD: Makefile,v 1.2 2005/02/26 11:52:23 bad Exp $
 
-DISTNAME=	fwbuilder-2.0.5
+DISTNAME=	fwbuilder-2.0.6
 CATEGORIES=	security net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fwbuilder/}
 
diff --git a/security/fwbuilder/PLIST b/security/fwbuilder/PLIST
index 91f70c34e47..fa3bdba8173 100644
--- a/security/fwbuilder/PLIST
+++ b/security/fwbuilder/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/02/24 11:03:22 bad Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/02/26 11:52:23 bad Exp $
 bin/fwb_install
 bin/fwbedit
 bin/fwblookup
@@ -29,6 +29,8 @@ 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}/PatchAcceptancePolicy.txt
 @dirrm share/doc/fwbuilder-${PKGVERSION}
 share/fwbuilder/locale/fwbuilder_fr.qm
diff --git a/security/fwbuilder/distinfo b/security/fwbuilder/distinfo
index 6047362bdc2..6f22081cc2e 100644
--- a/security/fwbuilder/distinfo
+++ b/security/fwbuilder/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 11:34:22 bad Exp $
+$NetBSD: distinfo,v 1.3 2005/02/26 11:52:23 bad Exp $
 
-SHA1 (fwbuilder-2.0.5.tar.gz) = 4a70d38438493c23f48186813beaf025f6e1a125
-RMD160 (fwbuilder-2.0.5.tar.gz) = 3e27e22e209b1f7c104d7dc65b50ad27bab8e022
-Size (fwbuilder-2.0.5.tar.gz) = 1154966 bytes
-SHA1 (patch-aa) = 0c54b9ab9216ce05959d5776eb9f11da3dba6736
+SHA1 (fwbuilder-2.0.6.tar.gz) = 854dd963de237ef3225d93dfbd429e4c5eaf705e
+RMD160 (fwbuilder-2.0.6.tar.gz) = 8cdfcf11a118169487692010b873743ef4c261e1
+Size (fwbuilder-2.0.6.tar.gz) = 1178100 bytes
 SHA1 (patch-ab) = 368aaf5707f897d033e4513d13e4038df1cadf81
 SHA1 (patch-ac) = b498c6132574bbf68a9b9ed9a1d9a69586ade1da
 SHA1 (patch-ad) = 621e4c6dc333dd42f5e1f20bfcd18eaef9c9bd86
diff --git a/security/fwbuilder/patches/patch-aa b/security/fwbuilder/patches/patch-aa
deleted file mode 100644
index 1689b5e709c..00000000000
--- a/security/fwbuilder/patches/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/02/24 11:03:22 bad Exp $
-
---- configure.orig	Fri Jan  7 17:51:01 2005
-+++ configure	Wed Feb 23 23:48:53 2005
-@@ -7378,5 +7378,5 @@
- fi
- 
- 
--. runqmake.sh
-+$SHELL runqmake.sh
- 
diff --git a/security/libfwbuilder/Makefile b/security/libfwbuilder/Makefile
index 1f8a2ac0b12..ba9d08cb435 100644
--- a/security/libfwbuilder/Makefile
+++ b/security/libfwbuilder/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2005/02/24 10:59:56 bad Exp $
+# $NetBSD: Makefile,v 1.7 2005/02/26 11:52:04 bad Exp $
 
-DISTNAME=	libfwbuilder-2.0.5
+DISTNAME=	libfwbuilder-2.0.6
 CATEGORIES=	security net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fwbuilder/}
 
diff --git a/security/libfwbuilder/PLIST b/security/libfwbuilder/PLIST
index 1d4da33291e..6c040e4326a 100644
--- a/security/libfwbuilder/PLIST
+++ b/security/libfwbuilder/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2005/02/24 10:59:56 bad Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/02/26 11:52:04 bad Exp $
 bin/libfwbuilder-config-2
 include/fwb-2.0/fwbuilder/Address.h
 include/fwb-2.0/fwbuilder/AddressRange.h
@@ -108,5 +108,6 @@ 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
+share/libfwbuilder/migration/FWObjectDatabase_2.0.5.xslt
 @dirrm share/libfwbuilder/migration
 @dirrm share/libfwbuilder
diff --git a/security/libfwbuilder/buildlink3.mk b/security/libfwbuilder/buildlink3.mk
index c02b12dceb9..4ce63899771 100644
--- a/security/libfwbuilder/buildlink3.mk
+++ b/security/libfwbuilder/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2005/02/24 10:59:56 bad Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2005/02/26 11:52:04 bad Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBFWBUILDER_BUILDLINK3_MK:=	${LIBFWBUILDER_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibfwbuilder}
 BUILDLINK_PACKAGES+=	libfwbuilder
 
 .if !empty(LIBFWBUILDER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libfwbuilder+=	libfwbuilder-2.0.5
+BUILDLINK_DEPENDS.libfwbuilder+=	libfwbuilder>=2.0.6
 BUILDLINK_PKGSRCDIR.libfwbuilder?=	../../security/libfwbuilder
 .endif	# LIBFWBUILDER_BUILDLINK3_MK
 
diff --git a/security/libfwbuilder/distinfo b/security/libfwbuilder/distinfo
index efb865e37c2..b4cd2618a40 100644
--- a/security/libfwbuilder/distinfo
+++ b/security/libfwbuilder/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 11:34:22 bad Exp $
+$NetBSD: distinfo,v 1.5 2005/02/26 11:52:04 bad Exp $
 
-SHA1 (libfwbuilder-2.0.5.tar.gz) = 64175782b897f8211e50e10b1a2daa81a2b03d5c
-RMD160 (libfwbuilder-2.0.5.tar.gz) = 65bcb23994b47c5b19b413e5d78b5ea6ccd6d502
-Size (libfwbuilder-2.0.5.tar.gz) = 280821 bytes
-SHA1 (patch-aa) = d4a33ea81aebb695814534c9258a60df1945dcfb
+SHA1 (libfwbuilder-2.0.6.tar.gz) = 532c668d25e166b4da2f9a202ebad014f6385b3b
+RMD160 (libfwbuilder-2.0.6.tar.gz) = ea8cb352a34d495614ba41445e2062b09f0574d4
+Size (libfwbuilder-2.0.6.tar.gz) = 281256 bytes
 SHA1 (patch-ab) = dc7270976ccf09cefdca11cdba60b20b9cfe1b55
diff --git a/security/libfwbuilder/patches/patch-aa b/security/libfwbuilder/patches/patch-aa
deleted file mode 100644
index 1cf8e205bfe..00000000000
--- a/security/libfwbuilder/patches/patch-aa
+++ /dev/null
@@ -1,6 +0,0 @@
---- configure      2004/07/06 11:44:26     1.1
-+++ configure      2004/07/06 11:45:40
-10032c10032
-< . runqmake.sh
----
-> $SHELL runqmake.sh