Fixed "test ==" and pkglint warnings.

5 files changed, 69 insertions, 37 deletions

diff --git a/security/libfwbuilder/PLIST b/security/libfwbuilder/PLIST
index 129e760830a..4418eb41b3f 100644
--- a/security/libfwbuilder/PLIST
+++ b/security/libfwbuilder/PLIST
@@ -1,64 +1,61 @@
-@comment $NetBSD: PLIST,v 1.9 2006/07/13 17:37:34 bad Exp $
+@comment $NetBSD: PLIST,v 1.10 2006/10/14 01:42:51 rillig 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/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/Interface.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/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/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/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/RuleElement.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/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
-@dirrm include/fwb-2.0/fwbuilder
+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
-@dirrm include/fwb-2.0/fwcompiler
-@dirrm include/fwb-2.0
 lib/libfwbuilder.la
 lib/libfwcompiler.la
 share/doc/libfwbuilder-${PKGVERSION}/AUTHORS
@@ -67,35 +64,36 @@ 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/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.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_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_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
@@ -104,7 +102,9 @@ 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/migration/FWObjectDatabase_2.0.10.xslt
-share/libfwbuilder/migration/FWObjectDatabase_2.0.11.xslt
 @dirrm share/libfwbuilder/migration
 @dirrm share/libfwbuilder
+@dirrm share/doc/libfwbuilder-${PKGVERSION}
+@dirrm include/fwb-2.0/fwcompiler
+@dirrm include/fwb-2.0/fwbuilder
+@dirrm include/fwb-2.0
diff --git a/security/libfwbuilder/buildlink3.mk b/security/libfwbuilder/buildlink3.mk
index 25049355cf6..c19aa2ba82a 100644
--- a/security/libfwbuilder/buildlink3.mk
+++ b/security/libfwbuilder/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/07/13 17:37:34 bad Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2006/10/14 01:42:51 rillig Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBFWBUILDER_BUILDLINK3_MK:=	${LIBFWBUILDER_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libfwbuilder
 
 .if !empty(LIBFWBUILDER_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libfwbuilder+=	libfwbuilder>=2.0.12
-BUILDLINK_ABI_DEPENDS.libfwbuilder?=	libfwbuilder>=2.0.12
+BUILDLINK_ABI_DEPENDS.libfwbuilder+=	libfwbuilder>=2.0.12
 BUILDLINK_PKGSRCDIR.libfwbuilder?=	../../security/libfwbuilder
 .endif	# LIBFWBUILDER_BUILDLINK3_MK
 
diff --git a/security/libfwbuilder/distinfo b/security/libfwbuilder/distinfo
index 877a60f111d..3a8fb05b57b 100644
--- a/security/libfwbuilder/distinfo
+++ b/security/libfwbuilder/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2006/07/13 17:37:34 bad Exp $
+$NetBSD: distinfo,v 1.10 2006/10/14 01:42:51 rillig Exp $
 
 SHA1 (libfwbuilder-2.0.12.tar.gz) = a287de04e81a4ee480d34e8f209718eb63da457a
 RMD160 (libfwbuilder-2.0.12.tar.gz) = 69f996659d30863e97340c52d814469a8e5173b7
@@ -7,3 +7,5 @@ SHA1 (patch-aa) = 05475a05f746fa05e6df5fc9d63cd3d344717a8d
 SHA1 (patch-ab) = fc285986f8c930ef7f46dbeaf3f26eab91bf5dda
 SHA1 (patch-ac) = 044c4d42df1dea1126dfba2af960d6f8ebeffd6d
 SHA1 (patch-ad) = 92279523b583aba763cfa89e42ee387e630b65de
+SHA1 (patch-ae) = 6c6f1ec5cf6060070de4e32a470c2fe4efbd79f9
+SHA1 (patch-af) = 67707e7ac2a5c9bd4e94d20c08d416c9fa991468
diff --git a/security/libfwbuilder/patches/patch-ae b/security/libfwbuilder/patches/patch-ae
new file mode 100644
index 00000000000..6cf7d9a500c
--- /dev/null
+++ b/security/libfwbuilder/patches/patch-ae
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.1 2006/10/14 01:42:51 rillig 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
diff --git a/security/libfwbuilder/patches/patch-af b/security/libfwbuilder/patches/patch-af
new file mode 100644
index 00000000000..dad926e440b
--- /dev/null
+++ b/security/libfwbuilder/patches/patch-af
@@ -0,0 +1,15 @@
+$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