Changes 2.1.15:

* Bug fix release

11 files changed, 151 insertions, 72 deletions

diff --git a/security/fwbuilder21/Makefile b/security/fwbuilder21/Makefile
index 16a91161217..897a2387c61 100644
--- a/security/fwbuilder21/Makefile
+++ b/security/fwbuilder21/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2007/03/24 18:37:20 bad Exp $
+# $NetBSD: Makefile,v 1.3 2007/12/12 17:59:21 adam Exp $
 
-DISTNAME=	fwbuilder-2.1.10
-PKGNAME=	fwbuilder21-2.1.10
+DISTNAME=	fwbuilder-2.1.15
+PKGNAME=	fwbuilder21-2.1.15
 CATEGORIES=	security net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fwbuilder/}
 
@@ -11,17 +11,15 @@ COMMENT=	Firewall Builder GUI
 
 CONFLICTS=	fwbuilder-[0-9]*
 
-USE_LIBTOOL=	yes
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	gmake
-USE_LANGUAGES=	c c++
+USE_TOOLS+=		gmake
+USE_LANGUAGES=		c c++
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
 UNLIMIT_RESOURCES+=	datasize
-
-QMAKE=		${QTDIR}/bin/qmake
-CONFIGURE_ENV+=	QMAKE=${QMAKE:Q}
-MAKE_ENV+=	QMAKE=${QMAKE:Q}
+CONFIGURE_ENV+=		QMAKE=${QMAKE:Q}
+MAKE_ENV+=		QMAKE=${QMAKE:Q}
+QMAKE=			${QTDIR}/bin/qmake
 
 .include "../../security/libfwbuilder21/buildlink3.mk"
 .include "../../x11/qt3-tools/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/fwbuilder21/PLIST b/security/fwbuilder21/PLIST
index 0f9f1fa9152..0deeb7abe85 100644
--- a/security/fwbuilder21/PLIST
+++ b/security/fwbuilder21/PLIST
@@ -1,45 +1,62 @@
-@comment $NetBSD: PLIST,v 1.2 2007/03/24 18:37:20 bad Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/12/12 17:59:21 adam Exp $
+bin/fwb_ipf
+bin/fwb_ipfw
+bin/fwb_ipt
+bin/fwb_pf
 bin/fwbedit
 bin/fwblookup
 bin/fwbuilder
-bin/fwb_ipt
-bin/fwb_pf
-bin/fwb_ipf
-bin/fwb_ipfw
+man/man1/fwb_ipf.1
+man/man1/fwb_ipfw.1
+man/man1/fwb_ipt.1
+man/man1/fwb_pf.1
+man/man1/fwbedit.1
+man/man1/fwblookup.1
+man/man1/fwbuilder.1
 share/doc/fwbuilder-${PKGVERSION}/AUTHORS
 share/doc/fwbuilder-${PKGVERSION}/ChangeLog
 share/doc/fwbuilder-${PKGVERSION}/COPYING
 share/doc/fwbuilder-${PKGVERSION}/Credits
 share/doc/fwbuilder-${PKGVERSION}/FWBuilder-Routing-LICENSE.txt
+share/doc/fwbuilder-${PKGVERSION}/PatchAcceptancePolicy.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.policy_import
 share/doc/fwbuilder-${PKGVERSION}/README.routing
+share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.1.10.html
+share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.1.10.txt
+share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.1.11.html
+share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.1.11.txt
+share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.1.12.html
+share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.1.12.txt
+share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.1.13.html
+share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.1.13.txt
+share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.1.14.html
+share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.1.14.txt
+share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.1.15.html
+share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.1.15.txt
 share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.1.7.txt
 share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.1.7.html
-share/doc/fwbuilder-2.1.10/ReleaseNotes_2.1.8.html
-share/doc/fwbuilder-2.1.10/ReleaseNotes_2.1.8.txt
-share/doc/fwbuilder-2.1.10/ReleaseNotes_2.1.9.html
-share/doc/fwbuilder-2.1.10/ReleaseNotes_2.1.9.txt
-share/doc/fwbuilder-2.1.10/ReleaseNotes_2.1.10.html
-share/doc/fwbuilder-2.1.10/ReleaseNotes_2.1.10.txt
-share/doc/fwbuilder-${PKGVERSION}/PatchAcceptancePolicy.txt
-share/doc/fwbuilder-${PKGVERSION}/PatchAcceptancePolicy.txt
-@dirrm share/doc/fwbuilder-${PKGVERSION}
+share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.1.8.html
+share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.1.8.txt
+share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.1.9.html
+share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.1.9.txt
 share/fwbuilder21/locale/fwbuilder_de.qm
 share/fwbuilder21/locale/fwbuilder_es.qm
 share/fwbuilder21/locale/fwbuilder_fr.qm
 share/fwbuilder21/locale/fwbuilder_ja.qm
+share/fwbuilder21/locale/fwbuilder_pt_BR.qm
 share/fwbuilder21/locale/fwbuilder_ru.qm
 share/fwbuilder21/locale/fwbuilder_sv.qm
-@dirrm share/fwbuilder21/locale
 share/fwbuilder21/objects_init.xml
-share/fwbuilder21/templates.xml
-share/fwbuilder21/resources.xml
 share/fwbuilder21/os/freebsd.xml
 share/fwbuilder21/os/fwsm_os.xml
+share/fwbuilder21/os/ios.xml
 share/fwbuilder21/os/linksys.xml
 share/fwbuilder21/os/linux24.xml
 share/fwbuilder21/os/macosx.xml
@@ -47,20 +64,18 @@ share/fwbuilder21/os/openbsd.xml
 share/fwbuilder21/os/pix_os.xml
 share/fwbuilder21/os/solaris.xml
 share/fwbuilder21/os/unknown_os.xml
-@dirrm share/fwbuilder21/os
 share/fwbuilder21/platform/fwsm.xml
+share/fwbuilder21/platform/iosacl.xml
 share/fwbuilder21/platform/ipf.xml
 share/fwbuilder21/platform/ipfw.xml
 share/fwbuilder21/platform/iptables.xml
 share/fwbuilder21/platform/pf.xml
 share/fwbuilder21/platform/pix.xml
 share/fwbuilder21/platform/unknown.xml
+share/fwbuilder21/resources.xml
+share/fwbuilder21/templates.xml
 @dirrm share/fwbuilder21/platform
+@dirrm share/fwbuilder21/os
+@dirrm share/fwbuilder21/locale
 @dirrm share/fwbuilder21
-share/man/man1/fwbedit.1
-share/man/man1/fwb_ipf.1
-share/man/man1/fwb_ipfw.1
-share/man/man1/fwb_ipt.1
-share/man/man1/fwblookup.1
-share/man/man1/fwb_pf.1
-share/man/man1/fwbuilder.1
+@dirrm share/doc/fwbuilder-${PKGVERSION}
diff --git a/security/fwbuilder21/distinfo b/security/fwbuilder21/distinfo
index 58459b08f67..92723029c44 100644
--- a/security/fwbuilder21/distinfo
+++ b/security/fwbuilder21/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.2 2007/03/24 18:37:20 bad Exp $
+$NetBSD: distinfo,v 1.3 2007/12/12 17:59:21 adam Exp $
 
-SHA1 (fwbuilder-2.1.10.tar.gz) = 811c66eac219cf2cedd6a1c2676b83e34c1a144a
-RMD160 (fwbuilder-2.1.10.tar.gz) = 9a106acf18f032a35dd06587096d2bca172db7c3
-Size (fwbuilder-2.1.10.tar.gz) = 1539007 bytes
+SHA1 (fwbuilder-2.1.15.tar.gz) = 1597c28af5b002c357c646943d2fd99fce0c35c4
+RMD160 (fwbuilder-2.1.15.tar.gz) = b7516c202bcf8675224266c10dc30f9109fe9f58
+Size (fwbuilder-2.1.15.tar.gz) = 1799660 bytes
 SHA1 (patch-aa) = dadac6310b0d27c326209867ee356610907f099c
-SHA1 (patch-ab) = 2210d7c6813e19108004d491073b0c46ef56577d
+SHA1 (patch-ab) = 7060bef9b5a4f017e076bf9274ce3f33b4cfe895
 SHA1 (patch-ac) = 74f94531167bebc473299bbc8d636173de7a5e3a
 SHA1 (patch-ad) = 593e9459076bb2b633507c17b489a66cbcac0f55
 SHA1 (patch-ae) = c88624f1b18c55deca7d722b46103b8a09f7c98a
+SHA1 (patch-af) = a97b916ac7b9b0d0590d9eb782b8333158f6d2fa
diff --git a/security/fwbuilder21/patches/patch-ab b/security/fwbuilder21/patches/patch-ab
index 66a7fefdedb..825bce17c5b 100644
--- a/security/fwbuilder21/patches/patch-ab
+++ b/security/fwbuilder21/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/11/09 19:07:56 bad Exp $
+$NetBSD: patch-ab,v 1.2 2007/12/12 17:59:21 adam Exp $
 
---- qmake.inc.in.orig	2006-06-21 09:20:37.000000000 +0200
-+++ qmake.inc.in	2006-11-08 01:26:21.000000000 +0100
-@@ -27,7 +27,7 @@
+--- qmake.inc.in.orig	2007-08-06 09:07:21.000000000 +0200
++++ qmake.inc.in
+@@ -36,7 +36,7 @@ unix {
  	res_os.path             = $(DDIR)@RES_DIR@/os
  	res_platform.path       = $(DDIR)@RES_DIR@/platform
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2006/11/09 19:07:56 bad Exp $
  	INCLUDEPATH            += @LIBFWBUILDER_INCLUDEPATH@
  
  	LIBS                   += $$LIBS_FWBUILDER @LIBS@
-@@ -35,9 +35,8 @@
+@@ -44,9 +44,8 @@ unix {
  	PKGLOCALEDIR            = $$res.path/locale
  
  	QMAKE_CFLAGS_DEBUG     += -Wno-unused-parameter
diff --git a/security/fwbuilder21/patches/patch-af b/security/fwbuilder21/patches/patch-af
new file mode 100644
index 00000000000..5555b81e69f
--- /dev/null
+++ b/security/fwbuilder21/patches/patch-af
@@ -0,0 +1,63 @@
+$NetBSD: patch-af,v 1.1 2007/12/12 17:59:21 adam Exp $
+
+--- configure.orig	2007-12-12 18:11:16.000000000 +0100
++++ configure
+@@ -5986,7 +5986,7 @@ echo "${ECHO_T}Win32 mingw" >&6
+   *-*-darwin*)
+     OS=MacOSX
+     OS_MACOSX=1
+-    MANDIR="${PREFIX}/share/man/"
++    MANDIR="${PREFIX}/man/"
+     echo "$as_me:$LINENO: result: MacOSX" >&5
+ echo "${ECHO_T}MacOSX" >&6
+     DEFAULT_RES_DIR="../Resources"
+@@ -5995,12 +5995,21 @@ echo "${ECHO_T}MacOSX" >&6
+   *-*-solaris*)
+     OS=Solaris
+     OS_SOLARIS=1
+-    MANDIR="${PREFIX}/share/man/"
++    MANDIR="${PREFIX}/man/"
+     echo "$as_me:$LINENO: result: Solaris" >&5
+ echo "${ECHO_T}Solaris" >&6
+     DEFAULT_RES_DIR="${PREFIX}/share/fwbuilder${FWB_MAJOR_VERSION}${FWB_MINOR_VERSION}"
+     ;;
+ 
++  *-*-netbsd*)
++    OS=NetBSD
++    OS_NETBSD=1
++    MANDIR="${PREFIX}/man/"
++    echo "$as_me:$LINENO: result: NetBSD" >&5
++echo "${ECHO_T}NetBSD" >&6
++    DEFAULT_RES_DIR="${PREFIX}/share/fwbuilder${FWB_MAJOR_VERSION}${FWB_MINOR_VERSION}"
++    ;;
++
+   *-*-freebsd*)
+     OS=FreeBSD
+     OS_FREEBSD=1
+@@ -6027,7 +6036,7 @@ echo "${ECHO_T}OpenBSD" >&6
+     else
+        DISTRO="Unknown"
+     fi
+-    MANDIR="${PREFIX}/share/man/"
++    MANDIR="${PREFIX}/man/"
+     echo "$as_me:$LINENO: result: $DISTRO GNU/kFreeBSD" >&5
+ echo "${ECHO_T}$DISTRO GNU/kFreeBSD" >&6
+     DEFAULT_RES_DIR="${PREFIX}/share/fwbuilder${FWB_MAJOR_VERSION}${FWB_MINOR_VERSION}"
+@@ -6054,7 +6063,7 @@ echo "${ECHO_T}$DISTRO GNU/kFreeBSD" >&6
+     else
+ 	DISTRO="Unknown"
+     fi
+-    MANDIR="${PREFIX}/share/man/"
++    MANDIR="${PREFIX}/man/"
+     echo "$as_me:$LINENO: result: $DISTRO Linux" >&5
+ echo "${ECHO_T}$DISTRO Linux" >&6
+     ;;
+@@ -6063,7 +6072,7 @@ echo "${ECHO_T}$DISTRO Linux" >&6
+     OS=Unknown
+     OS_UNKNOWN=1
+     DISTRO=Unknown
+-    MANDIR="${PREFIX}/share/man/"
++    MANDIR="${PREFIX}/man/"
+     echo "$as_me:$LINENO: result: Unknown" >&5
+ echo "${ECHO_T}Unknown" >&6
+     DEFAULT_RES_DIR="${PREFIX}/share/fwbuilder${FWB_MAJOR_VERSION}${FWB_MINOR_VERSION}"
diff --git a/security/libfwbuilder21/Makefile b/security/libfwbuilder21/Makefile
index e943765b3ca..f2a80ea25c6 100644
--- a/security/libfwbuilder21/Makefile
+++ b/security/libfwbuilder21/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2007/03/24 18:37:19 bad Exp $
+# $NetBSD: Makefile,v 1.3 2007/12/12 17:59:20 adam Exp $
 
-DISTNAME=	libfwbuilder-2.1.10
-PKGNAME=	libfwbuilder21-2.1.10
+DISTNAME=	libfwbuilder-2.1.15
+PKGNAME=	libfwbuilder21-2.1.15
 CATEGORIES=	security net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fwbuilder/}
 
diff --git a/security/libfwbuilder21/PLIST b/security/libfwbuilder21/PLIST
index 95af0f54079..7e0f595d7f6 100644
--- a/security/libfwbuilder21/PLIST
+++ b/security/libfwbuilder21/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2007/03/24 18:37:19 bad Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/12/12 17:59:20 adam Exp $
 bin/libfwbuilder-config-2.1
 include/fwb-2.1/fwbuilder/Address.h
 include/fwb-2.1/fwbuilder/AddressRange.h
@@ -50,7 +50,6 @@ include/fwb-2.1/fwbuilder/ThreadTools.h
 include/fwb-2.1/fwbuilder/Tools.h
 include/fwb-2.1/fwbuilder/UDPService.h
 include/fwb-2.1/fwbuilder/XMLTools.h
-include/fwb-2.1/fwbuilder/crypto.h
 include/fwb-2.1/fwbuilder/dns.h
 include/fwb-2.1/fwbuilder/libfwbuilder-config.h
 include/fwb-2.1/fwbuilder/libfwbuilder-version.h
@@ -101,6 +100,7 @@ share/libfwbuilder21/migration/FWObjectDatabase_2.0.0.xslt
 share/libfwbuilder21/migration/FWObjectDatabase_2.0.1.xslt
 share/libfwbuilder21/migration/FWObjectDatabase_2.0.10.xslt
 share/libfwbuilder21/migration/FWObjectDatabase_2.0.11.xslt
+share/libfwbuilder21/migration/FWObjectDatabase_2.0.12.xslt
 share/libfwbuilder21/migration/FWObjectDatabase_2.0.2.xslt
 share/libfwbuilder21/migration/FWObjectDatabase_2.0.3.xslt
 share/libfwbuilder21/migration/FWObjectDatabase_2.0.4.xslt
@@ -109,12 +109,14 @@ share/libfwbuilder21/migration/FWObjectDatabase_2.0.6.xslt
 share/libfwbuilder21/migration/FWObjectDatabase_2.0.7.xslt
 share/libfwbuilder21/migration/FWObjectDatabase_2.0.8.xslt
 share/libfwbuilder21/migration/FWObjectDatabase_2.0.9.xslt
-share/libfwbuilder21/migration/FWObjectDatabase_2.0.10.xslt
-share/libfwbuilder21/migration/FWObjectDatabase_2.0.11.xslt
-share/libfwbuilder21/migration/FWObjectDatabase_2.0.12.xslt
 share/libfwbuilder21/migration/FWObjectDatabase_2.0.99.xslt
 share/libfwbuilder21/migration/FWObjectDatabase_2.1.0.xslt
 share/libfwbuilder21/migration/FWObjectDatabase_2.1.1.xslt
+share/libfwbuilder21/migration/FWObjectDatabase_2.1.10.xslt
+share/libfwbuilder21/migration/FWObjectDatabase_2.1.11.xslt
+share/libfwbuilder21/migration/FWObjectDatabase_2.1.12.xslt
+share/libfwbuilder21/migration/FWObjectDatabase_2.1.13.xslt
+share/libfwbuilder21/migration/FWObjectDatabase_2.1.14.xslt
 share/libfwbuilder21/migration/FWObjectDatabase_2.1.2.xslt
 share/libfwbuilder21/migration/FWObjectDatabase_2.1.3.xslt
 share/libfwbuilder21/migration/FWObjectDatabase_2.1.4.xslt
diff --git a/security/libfwbuilder21/buildlink3.mk b/security/libfwbuilder21/buildlink3.mk
index 9d37b0c99d1..bea4191152c 100644
--- a/security/libfwbuilder21/buildlink3.mk
+++ b/security/libfwbuilder21/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2007/03/24 18:37:19 bad Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2007/12/12 17:59:20 adam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBFWBUILDER21_BUILDLINK3_MK:=	${LIBFWBUILDER21_BUILDLINK3_MK}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES+=	libfwbuilder21
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libfwbuilder21
 
 .if !empty(LIBFWBUILDER21_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libfwbuilder21+=	libfwbuilder21-2.1.10
-BUILDLINK_ABI_DEPENDS.libfwbuilder21+=	libfwbuilder21-2.1.10
+BUILDLINK_API_DEPENDS.libfwbuilder21+=	libfwbuilder21>=2.1.15
+BUILDLINK_ABI_DEPENDS.libfwbuilder21+=	libfwbuilder21>=2.1.15
 BUILDLINK_PKGSRCDIR.libfwbuilder21?=	../../security/libfwbuilder21
 .endif	# LIBFWBUILDER21_BUILDLINK3_MK
 
diff --git a/security/libfwbuilder21/distinfo b/security/libfwbuilder21/distinfo
index 5bc3256519a..bcc2988fb56 100644
--- a/security/libfwbuilder21/distinfo
+++ b/security/libfwbuilder21/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.2 2007/03/24 18:37:19 bad Exp $
+$NetBSD: distinfo,v 1.3 2007/12/12 17:59:21 adam Exp $
 
-SHA1 (libfwbuilder-2.1.10.tar.gz) = 019ede70f072e7a0b1c81dce0ec158b968bf2189
-RMD160 (libfwbuilder-2.1.10.tar.gz) = 596f41c9dc649c1a582490194ed910d5a2999cdc
-Size (libfwbuilder-2.1.10.tar.gz) = 320353 bytes
+SHA1 (libfwbuilder-2.1.15.tar.gz) = 8eae2486e9e83b98cfd74d007b50de77f9ebdbb0
+RMD160 (libfwbuilder-2.1.15.tar.gz) = edd1b4cafea6dcaff422cecdf10749fadde27337
+Size (libfwbuilder-2.1.15.tar.gz) = 315773 bytes
 SHA1 (patch-aa) = 21d0e029f6fcdd9c7bc1d4bea3f9126c2db8b80c
 SHA1 (patch-ab) = f8c193df3e32f6a653bef61cb7771a9bdc19cfb8
 SHA1 (patch-ac) = 396badb60ecdccd30061ee078f72944fb81a63ba
 SHA1 (patch-ad) = d921b6b2f6c4af5212878a8e444358942a1cb376
-SHA1 (patch-ae) = 9fa3afd91643a17c06989515ce11daa8714a9949
-SHA1 (patch-af) = 579f95e9d31effd9087011dafbb7a8d3d4571d5b
+SHA1 (patch-ae) = 27d30be400b96d5e7e80b48091c5262b43444d06
+SHA1 (patch-af) = bb40350518a686bd5d86f0983c9e71aa715b91f6
diff --git a/security/libfwbuilder21/patches/patch-ae b/security/libfwbuilder21/patches/patch-ae
index 758e4935704..eaf949a606d 100644
--- a/security/libfwbuilder21/patches/patch-ae
+++ b/security/libfwbuilder21/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1.1.1 2006/11/09 19:06:37 bad Exp $
+$NetBSD: patch-ae,v 1.2 2007/12/12 17:59:21 adam Exp $
 
---- configure.orig	2006-10-31 07:00:59.000000000 +0100
+--- configure.orig	2007-12-09 21:39:53.000000000 +0100
 +++ configure
-@@ -7024,7 +7024,7 @@ fi
+@@ -6750,7 +6750,7 @@ fi
  
  
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2006/11/09 19:06:37 bad Exp $
  
    LIB_RESOLV=""
    HAVE_RES_NQUERY=""
-@@ -10115,8 +10115,8 @@ fi
+@@ -9833,8 +9833,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 "
diff --git a/security/libfwbuilder21/patches/patch-af b/security/libfwbuilder21/patches/patch-af
index 3d2c50c4eed..6f8d473bea3 100644
--- a/security/libfwbuilder21/patches/patch-af
+++ b/security/libfwbuilder21/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1.1.1 2006/11/09 19:06:37 bad Exp $
+$NetBSD: patch-af,v 1.2 2007/12/12 17:59:21 adam Exp $
 
---- configure.in.orig	2006-09-06 05:53:34.000000000 +0200
+--- configure.in.orig	2007-08-26 05:06:34.000000000 +0200
 +++ configure.in
-@@ -427,7 +427,7 @@ dnl  By default we assume user wants dns
+@@ -334,7 +334,7 @@ dnl  By default we assume user wants dns
  dnl  zone transfers support, provided script can find the library
  dnl
  
@@ -11,7 +11,7 @@ $NetBSD: patch-af,v 1.1.1.1 2006/11/09 19:06:37 bad Exp $
  
    LIB_RESOLV=""
    HAVE_RES_NQUERY=""
-@@ -841,8 +841,8 @@ fi
+@@ -744,8 +744,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 "