diff options
| author | rillig <rillig> | 2006-03-11 16:59:54 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2006-03-11 16:59:54 +0000 |
| commit | ef694bdaa66e398bbd7cc123e3972b34fa5d50a8 (patch) | |
| tree | e05f61c423d2ab4f5b04bc8a537b3d345dd723b4 /net | |
| parent | a0b9499b401c0f1fe692161e9c270bdbdee622ca (diff) | |
| download | pkgsrc-ef694bdaa66e398bbd7cc123e3972b34fa5d50a8.tar.gz | |
Removed the unconditional dependency to bash. Also removed the bashisms
from the mib2c-update program. Bumped PKGREVISION.
Diffstat (limited to 'net')
| -rw-r--r-- | net/net-snmp/Makefile | 9 | ||||
| -rw-r--r-- | net/net-snmp/distinfo | 3 | ||||
| -rw-r--r-- | net/net-snmp/patches/patch-mib2cupdate | 24 |
3 files changed, 30 insertions, 6 deletions
diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile index 02a81c0a726..22b1591dd9c 100644 --- a/net/net-snmp/Makefile +++ b/net/net-snmp/Makefile @@ -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 @@ CONFIGURE_ENV+= PERLPROG=${PERL5:Q} 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 --git a/net/net-snmp/distinfo b/net/net-snmp/distinfo index e3278e3acc0..9f8bfb40df9 100644 --- a/net/net-snmp/distinfo +++ b/net/net-snmp/distinfo @@ -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-aj) = eb17148368c9d02c0e589052b99003e7e21f2917 SHA1 (patch-al) = 2609e273d557e1ce06c1295d86965fe26ac7ff08 SHA1 (patch-am) = 9a9ed6feb2f249b294d939a00e92d3ef9dbde21b SHA1 (patch-an) = 167f23c62c085efc96a25bc2be5dca3c746dde6f +SHA1 (patch-mib2cupdate) = d6773633c8737fe45a58e378967995e21012d21d diff --git a/net/net-snmp/patches/patch-mib2cupdate b/net/net-snmp/patches/patch-mib2cupdate new file mode 100644 index 00000000000..abaebf92a4a --- /dev/null +++ b/net/net-snmp/patches/patch-mib2cupdate @@ -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 |