[pkgsrc/trunk]: pkgsrc/net/net-snmp Removed the unconditional dependency to b...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e90a32ab2675
branches:  trunk
changeset: 509568:e90a32ab2675
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Mar 11 16:59:54 2006 +0000

description:
Removed the unconditional dependency to bash. Also removed the bashisms
from the mib2c-update program. Bumped PKGREVISION.

diffstat:

 net/net-snmp/Makefile                  |   9 ++++-----
 net/net-snmp/distinfo                  |   3 ++-
 net/net-snmp/patches/patch-mib2cupdate |  24 ++++++++++++++++++++++++
 3 files changed, 30 insertions(+), 6 deletions(-)

diffs (69 lines):

diff -r ae7e16a6bb4f -r e90a32ab2675 net/net-snmp/Makefile
--- a/net/net-snmp/Makefile     Sat Mar 11 16:44:44 2006 +0000
+++ b/net/net-snmp/Makefile     Sat Mar 11 16:59:54 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2006/03/10 14:28:33 rillig Exp $
+# $NetBSD: Makefile,v 1.46 2006/03/11 16:59:54 rillig Exp $
 
 DISTNAME=      net-snmp-5.3.0.1
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=net-snmp/} \
                ftp://ftp.net-smnp.org/pub/sourceforge/net-snmp/
@@ -89,11 +89,10 @@
 REQD_DIRS=     ${PREFIX}/share/snmp
 RCD_SCRIPTS=   snmpd snmptrapd
 
-DEPENDS+=              bash-[0-9]*:../../shells/bash
-
+USE_TOOLS+=            sh:run
 REPLACE_INTERPRETER+=  bash
 REPLACE.bash.old=      /bin/bash
-REPLACE.bash.new=      ${LOCALBASE}/bin/bash
+REPLACE.bash.new=      ${SH}
 REPLACE_FILES.bash=    local/mib2c-update
 
 post-wrapper:
diff -r ae7e16a6bb4f -r e90a32ab2675 net/net-snmp/distinfo
--- a/net/net-snmp/distinfo     Sat Mar 11 16:44:44 2006 +0000
+++ b/net/net-snmp/distinfo     Sat Mar 11 16:59:54 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2006/03/08 02:47:13 minskim Exp $
+$NetBSD: distinfo,v 1.21 2006/03/11 16:59:54 rillig Exp $
 
 SHA1 (net-snmp-5.3.0.1.tar.gz) = c58ddabe4281c3681a268bd48de6865e812f2ec5
 RMD160 (net-snmp-5.3.0.1.tar.gz) = 86b7e56b512faf73d2a08ac3df2def4560b62945
@@ -10,3 +10,4 @@
 SHA1 (patch-al) = 2609e273d557e1ce06c1295d86965fe26ac7ff08
 SHA1 (patch-am) = 9a9ed6feb2f249b294d939a00e92d3ef9dbde21b
 SHA1 (patch-an) = 167f23c62c085efc96a25bc2be5dca3c746dde6f
+SHA1 (patch-mib2cupdate) = d6773633c8737fe45a58e378967995e21012d21d
diff -r ae7e16a6bb4f -r e90a32ab2675 net/net-snmp/patches/patch-mib2cupdate
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/net-snmp/patches/patch-mib2cupdate    Sat Mar 11 16:59:54 2006 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-mib2cupdate,v 1.1 2006/03/11 16:59:54 rillig Exp $
+
+Removed bashisms.
+
+--- local/mib2c-update.orig    2006-03-11 17:23:13.000000000 +0100
++++ local/mib2c-update 2006-03-11 17:55:55.000000000 +0100
+@@ -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