diff options
| -rw-r--r-- | net-mgmt/net-snmp-devel/Makefile | 2 | ||||
| -rw-r--r-- | net-mgmt/net-snmp-devel/files/snmpd.sh.in | 31 | ||||
| -rw-r--r-- | net-mgmt/net-snmp/Makefile | 2 | ||||
| -rw-r--r-- | net-mgmt/net-snmp/files/snmpd.sh.in | 29 | ||||
| -rw-r--r-- | net-mgmt/net-snmp53/Makefile | 2 | ||||
| -rw-r--r-- | net-mgmt/net-snmp53/files/snmpd.sh.in | 31 |
6 files changed, 86 insertions, 11 deletions
diff --git a/net-mgmt/net-snmp-devel/Makefile b/net-mgmt/net-snmp-devel/Makefile index 9c859d8bef59..49814d88b016 100644 --- a/net-mgmt/net-snmp-devel/Makefile +++ b/net-mgmt/net-snmp-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= snmp PORTVERSION= 5.2.3 -PORTREVISION= 1 +PORTREVISION= 2 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 602a0b28bb50..11648059a77d 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.2 2006-07-19 16:18:40 dougb Exp $ +# $FreeBSD: /tmp/pcvs/ports/net-mgmt/net-snmp-devel/files/Attic/snmpd.sh.in,v 1.3 2006-09-23 11:31:09 nork Exp $ # # PROVIDE: snmpd # REQUIRE: DAEMON @@ -11,7 +11,9 @@ # snmpd_enable=${snmpd_enable-"NO"} -snmpd_flags=${snmpd_flags-"-p /var/run/snmpd.pid"} +snmpd_flags=${snmpd_flags-""} +snmpd_pidfile=${snmpd_pidfile-"/var/run/snmpd.pid"} +snmpd_conffile=${snmpd_conffile-""} . %%RC_SUBR%% @@ -28,8 +30,31 @@ name=snmpd rcvar=`set_rcvar` command=%%PREFIX%%/sbin/${name} -pidfile=/var/run/${name}.pid +pidfile=${snmpd_pidfile} sig_stop=KILL load_rc_config ${name} + +case "${snmpd_flags}" in +*-p\ *) + echo "Warning: \$snmpd_flags includes -p option." \ + "Please use \$snmpd_pidfile instead." + ;; +*) + snmpd_flags="-p ${snmpd_pidfile} ${snmpd_flags}" + ;; +esac + +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}" + fi + ;; +esac + run_rc_command "$1" diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile index 9c859d8bef59..49814d88b016 100644 --- a/net-mgmt/net-snmp/Makefile +++ b/net-mgmt/net-snmp/Makefile @@ -7,7 +7,7 @@ PORTNAME= snmp PORTVERSION= 5.2.3 -PORTREVISION= 1 +PORTREVISION= 2 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 75a7e4e9a21b..73b6e27d9189 100644 --- a/net-mgmt/net-snmp/files/snmpd.sh.in +++ b/net-mgmt/net-snmp/files/snmpd.sh.in @@ -11,7 +11,9 @@ # snmpd_enable=${snmpd_enable-"NO"} -snmpd_flags=${snmpd_flags-"-p /var/run/snmpd.pid"} +snmpd_flags=${snmpd_flags-""} +snmpd_pidfile=${snmpd_pidfile-"/var/run/snmpd.pid"} +snmpd_conffile=${snmpd_conffile-""} . %%RC_SUBR%% @@ -28,8 +30,31 @@ name=snmpd rcvar=`set_rcvar` command=%%PREFIX%%/sbin/${name} -pidfile=/var/run/${name}.pid +pidfile=${snmpd_pidfile} sig_stop=KILL load_rc_config ${name} + +case "${snmpd_flags}" in +*-p\ *) + echo "Warning: \$snmpd_flags includes -p option." \ + "Please use \$snmpd_pidfile instead." + ;; +*) + snmpd_flags="-p ${snmpd_pidfile} ${snmpd_flags}" + ;; +esac + +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}" + fi + ;; +esac + run_rc_command "$1" diff --git a/net-mgmt/net-snmp53/Makefile b/net-mgmt/net-snmp53/Makefile index 9c859d8bef59..49814d88b016 100644 --- a/net-mgmt/net-snmp53/Makefile +++ b/net-mgmt/net-snmp53/Makefile @@ -7,7 +7,7 @@ PORTNAME= snmp PORTVERSION= 5.2.3 -PORTREVISION= 1 +PORTREVISION= 2 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 39eedb8fa161..661354a75bd3 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.2 2006-07-19 16:18:40 dougb Exp $ +# $FreeBSD: /tmp/pcvs/ports/net-mgmt/net-snmp53/files/Attic/snmpd.sh.in,v 1.3 2006-09-23 11:31:09 nork Exp $ # # PROVIDE: snmpd # REQUIRE: DAEMON @@ -11,7 +11,9 @@ # snmpd_enable=${snmpd_enable-"NO"} -snmpd_flags=${snmpd_flags-"-p /var/run/snmpd.pid"} +snmpd_flags=${snmpd_flags-""} +snmpd_pidfile=${snmpd_pidfile-"/var/run/snmpd.pid"} +snmpd_conffile=${snmpd_conffile-""} . %%RC_SUBR%% @@ -28,8 +30,31 @@ name=snmpd rcvar=`set_rcvar` command=%%PREFIX%%/sbin/${name} -pidfile=/var/run/${name}.pid +pidfile=${snmpd_pidfile} sig_stop=KILL load_rc_config ${name} + +case "${snmpd_flags}" in +*-p\ *) + echo "Warning: \$snmpd_flags includes -p option." \ + "Please use \$snmpd_pidfile instead." + ;; +*) + snmpd_flags="-p ${snmpd_pidfile} ${snmpd_flags}" + ;; +esac + +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}" + fi + ;; +esac + run_rc_command "$1" |