aboutsummaryrefslogtreecommitdiff
path: root/net-mgmt
diff options
context:
space:
mode:
Diffstat (limited to 'net-mgmt')
-rw-r--r--net-mgmt/net-snmp-devel/Makefile2
-rw-r--r--net-mgmt/net-snmp-devel/files/snmpd.sh.in19
-rw-r--r--net-mgmt/net-snmp-devel/pkg-message3
-rw-r--r--net-mgmt/net-snmp/Makefile2
-rw-r--r--net-mgmt/net-snmp/files/snmpd.sh.in17
-rw-r--r--net-mgmt/net-snmp/pkg-message3
-rw-r--r--net-mgmt/net-snmp53/Makefile2
-rw-r--r--net-mgmt/net-snmp53/files/snmpd.sh.in19
-rw-r--r--net-mgmt/net-snmp53/pkg-message3
9 files changed, 56 insertions, 14 deletions
diff --git a/net-mgmt/net-snmp-devel/Makefile b/net-mgmt/net-snmp-devel/Makefile
index d97c59a0e2e8..f44730e35ad8 100644
--- a/net-mgmt/net-snmp-devel/Makefile
+++ b/net-mgmt/net-snmp-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= snmp
PORTVERSION= 5.3.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net-mgmt ipv6
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= net-snmp
diff --git a/net-mgmt/net-snmp-devel/files/snmpd.sh.in b/net-mgmt/net-snmp-devel/files/snmpd.sh.in
index b2c7590d8aa4..0af14f41a7b0 100644
--- a/net-mgmt/net-snmp-devel/files/snmpd.sh.in
+++ b/net-mgmt/net-snmp-devel/files/snmpd.sh.in
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: /tmp/pcvs/ports/net-mgmt/net-snmp-devel/files/Attic/snmpd.sh.in,v 1.6 2007-03-25 12:35:45 kuriyama Exp $
+# $FreeBSD: /tmp/pcvs/ports/net-mgmt/net-snmp-devel/files/Attic/snmpd.sh.in,v 1.7 2007-10-27 07:20:34 kuriyama Exp $
#
# PROVIDE: snmpd
# REQUIRE: DAEMON
@@ -52,14 +52,27 @@ case "${snmpd_flags}" in
;;
esac
+for conffile in ${snmpd_conffile}; do
+ if [ ! -z ${conffile} -a -f ${conffile} ]; then
+ if [ -z ${snmpd_conffile_set} ]; then
+ snmpd_conffile_set="${conffile}"
+ else
+ snmpd_conffile_set="${snmpd_conffile_set},${conffile}"
+ fi
+ else
+ echo "snmpd configuration file $conffile not set or not found."
+ exit 1
+ fi
+done
+
case "${snmpd_flags}" in
*-c\ *)
echo "Warning: \$snmpd_flags includes -c option." \
"Please use \$snmpd_conffile instead."
;;
*)
- if [ ! -z "${snmpd_conffile}" -a -f ${snmpd_conffile} ]; then
- snmpd_flags="-c ${snmpd_conffile} ${snmpd_flags}"
+ if [ ! -z "${snmpd_conffile_set}" ]; then
+ snmpd_flags="-c ${snmpd_conffile_set} ${snmpd_flags}"
fi
;;
esac
diff --git a/net-mgmt/net-snmp-devel/pkg-message b/net-mgmt/net-snmp-devel/pkg-message
index 4a213e367a42..203b8a6b6ed6 100644
--- a/net-mgmt/net-snmp-devel/pkg-message
+++ b/net-mgmt/net-snmp-devel/pkg-message
@@ -4,7 +4,8 @@
lines into /etc/rc.conf.
snmpd_enable="YES"
- snmpd_flags="-a -p /var/run/snmpd.pid"
+ snmpd_flags="-a"
+ snmpd_conffile="/usr/local/share/snmpd.conf /etc/snmpd.conf"
snmptrapd_enable="YES"
snmptrapd_flags="-a -p /var/run/snmptrapd.pid"
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index d97c59a0e2e8..f44730e35ad8 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= snmp
PORTVERSION= 5.3.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net-mgmt ipv6
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= net-snmp
diff --git a/net-mgmt/net-snmp/files/snmpd.sh.in b/net-mgmt/net-snmp/files/snmpd.sh.in
index 7452947d1375..9b7403fff268 100644
--- a/net-mgmt/net-snmp/files/snmpd.sh.in
+++ b/net-mgmt/net-snmp/files/snmpd.sh.in
@@ -52,14 +52,27 @@ case "${snmpd_flags}" in
;;
esac
+for conffile in ${snmpd_conffile}; do
+ if [ ! -z ${conffile} -a -f ${conffile} ]; then
+ if [ -z ${snmpd_conffile_set} ]; then
+ snmpd_conffile_set="${conffile}"
+ else
+ snmpd_conffile_set="${snmpd_conffile_set},${conffile}"
+ fi
+ else
+ echo "snmpd configuration file $conffile not set or not found."
+ exit 1
+ fi
+done
+
case "${snmpd_flags}" in
*-c\ *)
echo "Warning: \$snmpd_flags includes -c option." \
"Please use \$snmpd_conffile instead."
;;
*)
- if [ ! -z "${snmpd_conffile}" -a -f ${snmpd_conffile} ]; then
- snmpd_flags="-c ${snmpd_conffile} ${snmpd_flags}"
+ if [ ! -z "${snmpd_conffile_set}" ]; then
+ snmpd_flags="-c ${snmpd_conffile_set} ${snmpd_flags}"
fi
;;
esac
diff --git a/net-mgmt/net-snmp/pkg-message b/net-mgmt/net-snmp/pkg-message
index 4a213e367a42..203b8a6b6ed6 100644
--- a/net-mgmt/net-snmp/pkg-message
+++ b/net-mgmt/net-snmp/pkg-message
@@ -4,7 +4,8 @@
lines into /etc/rc.conf.
snmpd_enable="YES"
- snmpd_flags="-a -p /var/run/snmpd.pid"
+ snmpd_flags="-a"
+ snmpd_conffile="/usr/local/share/snmpd.conf /etc/snmpd.conf"
snmptrapd_enable="YES"
snmptrapd_flags="-a -p /var/run/snmptrapd.pid"
diff --git a/net-mgmt/net-snmp53/Makefile b/net-mgmt/net-snmp53/Makefile
index d97c59a0e2e8..f44730e35ad8 100644
--- a/net-mgmt/net-snmp53/Makefile
+++ b/net-mgmt/net-snmp53/Makefile
@@ -7,7 +7,7 @@
PORTNAME= snmp
PORTVERSION= 5.3.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net-mgmt ipv6
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= net-snmp
diff --git a/net-mgmt/net-snmp53/files/snmpd.sh.in b/net-mgmt/net-snmp53/files/snmpd.sh.in
index 08b42edbf3c7..09db428eb9b2 100644
--- a/net-mgmt/net-snmp53/files/snmpd.sh.in
+++ b/net-mgmt/net-snmp53/files/snmpd.sh.in
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: /tmp/pcvs/ports/net-mgmt/net-snmp53/files/Attic/snmpd.sh.in,v 1.6 2007-03-25 12:35:45 kuriyama Exp $
+# $FreeBSD: /tmp/pcvs/ports/net-mgmt/net-snmp53/files/Attic/snmpd.sh.in,v 1.7 2007-10-27 07:20:34 kuriyama Exp $
#
# PROVIDE: snmpd
# REQUIRE: DAEMON
@@ -52,14 +52,27 @@ case "${snmpd_flags}" in
;;
esac
+for conffile in ${snmpd_conffile}; do
+ if [ ! -z ${conffile} -a -f ${conffile} ]; then
+ if [ -z ${snmpd_conffile_set} ]; then
+ snmpd_conffile_set="${conffile}"
+ else
+ snmpd_conffile_set="${snmpd_conffile_set},${conffile}"
+ fi
+ else
+ echo "snmpd configuration file $conffile not set or not found."
+ exit 1
+ fi
+done
+
case "${snmpd_flags}" in
*-c\ *)
echo "Warning: \$snmpd_flags includes -c option." \
"Please use \$snmpd_conffile instead."
;;
*)
- if [ ! -z "${snmpd_conffile}" -a -f ${snmpd_conffile} ]; then
- snmpd_flags="-c ${snmpd_conffile} ${snmpd_flags}"
+ if [ ! -z "${snmpd_conffile_set}" ]; then
+ snmpd_flags="-c ${snmpd_conffile_set} ${snmpd_flags}"
fi
;;
esac
diff --git a/net-mgmt/net-snmp53/pkg-message b/net-mgmt/net-snmp53/pkg-message
index 4a213e367a42..203b8a6b6ed6 100644
--- a/net-mgmt/net-snmp53/pkg-message
+++ b/net-mgmt/net-snmp53/pkg-message
@@ -4,7 +4,8 @@
lines into /etc/rc.conf.
snmpd_enable="YES"
- snmpd_flags="-a -p /var/run/snmpd.pid"
+ snmpd_flags="-a"
+ snmpd_conffile="/usr/local/share/snmpd.conf /etc/snmpd.conf"
snmptrapd_enable="YES"
snmptrapd_flags="-a -p /var/run/snmptrapd.pid"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 05:33:36 +0000