Fixed "test ==".

3 files changed, 49 insertions, 15 deletions

diff --git a/net/net-snmp/distinfo b/net/net-snmp/distinfo
index 5ac9cc8bb92..8a3098b6e67 100644
--- a/net/net-snmp/distinfo
+++ b/net/net-snmp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32 2006/10/02 00:09:55 seb Exp $
+$NetBSD: distinfo,v 1.33 2006/10/11 19:15:19 rillig Exp $
 
 SHA1 (net-snmp-5.3.1.tar.gz) = 8ddb5122769814f04a7d3d352dcc640df7c89d41
 RMD160 (net-snmp-5.3.1.tar.gz) = 7bcdd213fb2517d0927b030deab5146522b58b3d
@@ -6,7 +6,7 @@ Size (net-snmp-5.3.1.tar.gz) = 4210843 bytes
 SHA1 (patch-aa) = 30a4d1546fe7022a0578d01004fc3f284e45c392
 SHA1 (patch-ab) = 3227eeb8b54b37813d8b6949f8c6ddc446038bf2
 SHA1 (patch-ae) = 750412088b9ccd5fb50bd6e7fc049903f6113a39
-SHA1 (patch-af) = d2a38e024bd5da572fc898674907eef8f84d4f43
+SHA1 (patch-af) = a04f38cb26153947e9f3daa5c58cbec0ba5715e5
 SHA1 (patch-ag) = c6c355a48c28ae43ee96bff5d5b4b0f1fa9d69b8
 SHA1 (patch-aj) = eb17148368c9d02c0e589052b99003e7e21f2917
 SHA1 (patch-al) = 2609e273d557e1ce06c1295d86965fe26ac7ff08
@@ -51,4 +51,4 @@ SHA1 (patch-ep) = 952e24044ad8a5fe370166d61c76c4760196365c
 SHA1 (patch-eq) = 52f831c88fd7d1f2153686bb5288f4f093a0f41f
 SHA1 (patch-er) = 1ca5658a6c97210174c83f63cc5791d02037541b
 SHA1 (patch-es) = c26c048ccbda7e4d28cb0a2263cdaa71befb4f96
-SHA1 (patch-mib2cupdate) = d6773633c8737fe45a58e378967995e21012d21d
+SHA1 (patch-et) = 246eb76fd17020ea654c59580c46e18008000e2e
diff --git a/net/net-snmp/patches/patch-af b/net/net-snmp/patches/patch-af
index fcde0d912a2..526e8cd1c8a 100644
--- a/net/net-snmp/patches/patch-af
+++ b/net/net-snmp/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.7 2006/07/29 16:48:27 adam Exp $
+$NetBSD: patch-af,v 1.8 2006/10/11 19:15:19 rillig Exp $
 
---- configure.orig	2006-07-29 17:35:31.000000000 +0200
-+++ configure
+--- configure.orig	2006-07-13 23:58:38.000000000 +0200
++++ configure	2006-10-11 21:13:18.000000000 +0200
 @@ -13548,7 +13548,7 @@ else
     default_mibs=IP-MIB:IF-MIB:TCP-MIB:UDP-MIB:HOST-RESOURCES-MIB:SNMPv2-MIB:RFC1213-MIB:NOTIFICATION-LOG-MIB:DISMAN-EVENT-MIB:DISMAN-SCHEDULE-MIB
  
@@ -171,12 +171,3 @@ $NetBSD: patch-af,v 1.7 2006/07/29 16:48:27 adam Exp $
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -35133,6 +35202,8 @@ do
- _ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF
-   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+    # Avoid regenerating for rechecks on pkgsrc
-+    exit 0
-     ac_cs_recheck=: ;;
-   --version | --vers* | -V )
-     echo "$ac_cs_version"; exit 0 ;;
diff --git a/net/net-snmp/patches/patch-et b/net/net-snmp/patches/patch-et
new file mode 100644
index 00000000000..c3798630171
--- /dev/null
+++ b/net/net-snmp/patches/patch-et
@@ -0,0 +1,43 @@
+$NetBSD: patch-et,v 1.1 2006/10/11 19:15:19 rillig Exp $
+
+Removed bashisms.
+
+--- local/mib2c-update.orig	2005-09-27 18:01:36.000000000 +0200
++++ local/mib2c-update	2006-10-11 21:13:41.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # $Id: patch-et,v 1.1 2006/10/11 19:15:19 rillig Exp $
+ #
+@@ -96,7 +96,7 @@ check_setup()
+ #        rc=0
+ #    fi
+ 
+-    if [[ $rc -eq 0 && $UPDATE_NOPROBE -ne 1 ]]; then
++    if [ $rc -eq 0 ] && [ $UPDATE_NOPROBE -ne 1 ]; then
+         mib2c -c unknown  > /dev/null 2>&1
+         if [ $? -eq 0 ]; then
+             error "WARNING: mib2c returns 0 on error conditions!"
+@@ -131,7 +131,7 @@ do_diff()
+             diff -U $FUZZ -p -b -w --show-c-function \
+                 -I "$""Id:" $f $DD_CURR/$f >> $DD_OUTPUT
+             rc=$?
+-            (( rcs = $rcs + $rc ))
++            rcs=`expr $rcs + $rc`
+             if [ $rc -eq 1 ]; then
+                 echo "   $f is different"
+             fi
+@@ -330,10 +330,10 @@ if [ -f .M2C-UPDATE-MERGE-FAILED ]; then
+         echo "[q)uit]"
+         echo "(c|r|q) ?"
+         read ans
+-        if [ "x$ans" == "xr" ]; then
++        if [ "x$ans" = "xr" ]; then
+             rm .M2C-UPDATE-MERGE-FAILED
+             break
+-        elif [ "x$ans" == "xc" ]; then
++        elif [ "x$ans" = "xc" ]; then
+             echo "Have you have manually merged all the"
+             echo "changes into the merged directory?"
+             echo "(y|n)"