Upgrade to 5.0.9.

Convert to use rc.subr script.

Heads up!
  Variable name in /etc/rc.conf is changed to $snmpd_enable and
  $snmpd_flags.  Old variables are imported for transition.

9 files changed, 120 insertions, 96 deletions

diff --git a/net-mgmt/net-snmp-devel/Makefile b/net-mgmt/net-snmp-devel/Makefile
index 312cb98db434..45767c531a76 100644
--- a/net-mgmt/net-snmp-devel/Makefile
+++ b/net-mgmt/net-snmp-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	net-snmp
-PORTVERSION=	5.0.8
-PORTREVISION=	3
+PORTVERSION=	5.0.9
 CATEGORIES=	net ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR= net-snmp
@@ -15,6 +14,13 @@ MASTER_SITE_SUBDIR= net-snmp
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	An extendable SNMP implementation
 
+.if !exists(/etc/rc.subr)
+RUN_DEPENDS=	${LOCALBASE}/etc/rc.subr:${PORTSDIR}/sysutils/rc_subr
+RC_SUBR=	${LOCALBASE}/etc/rc.subr
+.else
+RC_SUBR=	/etc/rc.subr
+.endif
+
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 USE_AUTOCONF_VER=213
@@ -99,6 +105,7 @@ CONFIGURE_ARGS+= --enable-ipv6 \
 
 SHLIB_VERSION=	5
 PLIST_SUB+=	shlib=${SHLIB_VERSION}
+RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 
 post-patch:
 	@${REINPLACE_CMD} \
@@ -119,7 +126,9 @@ post-install:
 	@( cd ${PREFIX}/sbin && ${STRIP_CMD} ${SBIN} )
 	@${FIND} ${PREFIX}/include/net-snmp ${PREFIX}/share/snmp/mibs -type f \
 		| ${XARGS} ${CHMOD} 644
-	@${INSTALL_SCRIPT} -m 751 ${FILESDIR}/snmpd.sh.sample ${STARTUP_FILE}
+	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+		${FILESDIR}/snmpd.sh.sample > ${STARTUP_FILE}
+	@${CHMOD} 755 ${STARTUP_FILE}
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/net-mgmt/net-snmp-devel/distinfo b/net-mgmt/net-snmp-devel/distinfo
index 28a49985a98c..9b43d7320ee1 100644
--- a/net-mgmt/net-snmp-devel/distinfo
+++ b/net-mgmt/net-snmp-devel/distinfo
@@ -1 +1 @@
-MD5 (net-snmp-5.0.8.tar.gz) = 9fa8555c1a9d68008b3b0df52721ee82
+MD5 (net-snmp-5.0.9.tar.gz) = cecd5ec74f5c546c1ea7ed7987b5932b
diff --git a/net-mgmt/net-snmp-devel/files/snmpd.sh.sample b/net-mgmt/net-snmp-devel/files/snmpd.sh.sample
index a626c9b9e26e..f07a6fac2376 100644
--- a/net-mgmt/net-snmp-devel/files/snmpd.sh.sample
+++ b/net-mgmt/net-snmp-devel/files/snmpd.sh.sample
@@ -1,36 +1,35 @@
 #!/bin/sh
 #
 # $FreeBSD$
+#
+# PROVIDE: snmpd
+# REQUIRE: DAEMON
+# KEYWORD: FreeBSD
+#
+# Add the following line to /etc/rc.conf to enable snmpd:
+#
+# snmpd_enable="YES"
+#
 
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
-    echo "$0: Cannot determine the PREFIX" >&2
-    exit 1
-fi
+snmpd_enable="NO"
+snmpd_flags="-P /var/run/snmpd.pid"
+
+. %%RC_SUBR%%
 
-if [ -z "${source_rc_confs_defined}" ]; then
-	if [ -r /etc/defaults/rc.conf ]; then
-		. /etc/defaults/rc.conf
-		source_rc_confs
-	elif [ -r /etc/rc.conf ]; then
-		. /etc/rc.conf
-	fi
+load_rc_config net_snmpd
+
+if [ ! -z "$net_snmpd_enable" ]; then
+    echo "Warning: \$net_snmpd_enable is obsoleted."
+    echo "         Use \$snmpd_enable instead."
+    snmpd_enable="$net_snmpd_enable"
+    [ ! -z "$net_snmpd_flags" ] && snmpd_flags="$net_snmpd_flags"
 fi
 
-case "$1" in
-start)
-	case "${net_snmpd_enable}" in
-	    [Yy][Ee][Ss])
-	    echo -n ' snmpd'
-	    ${net_snmpd_program:-${PREFIX}/sbin/snmpd} ${net_snmpd_flags}
-	    ;;
-	esac
-	;;
-stop)
-	killall snmpd && echo -n ' snmpd'
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	;;
-esac
+name=snmpd
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/sbin/snmpd
+pidfile='/var/run/snmpd.pid'
 
-exit 0
+load_rc_config $name
+run_rc_command "$1"
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index 312cb98db434..45767c531a76 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	net-snmp
-PORTVERSION=	5.0.8
-PORTREVISION=	3
+PORTVERSION=	5.0.9
 CATEGORIES=	net ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR= net-snmp
@@ -15,6 +14,13 @@ MASTER_SITE_SUBDIR= net-snmp
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	An extendable SNMP implementation
 
+.if !exists(/etc/rc.subr)
+RUN_DEPENDS=	${LOCALBASE}/etc/rc.subr:${PORTSDIR}/sysutils/rc_subr
+RC_SUBR=	${LOCALBASE}/etc/rc.subr
+.else
+RC_SUBR=	/etc/rc.subr
+.endif
+
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 USE_AUTOCONF_VER=213
@@ -99,6 +105,7 @@ CONFIGURE_ARGS+= --enable-ipv6 \
 
 SHLIB_VERSION=	5
 PLIST_SUB+=	shlib=${SHLIB_VERSION}
+RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 
 post-patch:
 	@${REINPLACE_CMD} \
@@ -119,7 +126,9 @@ post-install:
 	@( cd ${PREFIX}/sbin && ${STRIP_CMD} ${SBIN} )
 	@${FIND} ${PREFIX}/include/net-snmp ${PREFIX}/share/snmp/mibs -type f \
 		| ${XARGS} ${CHMOD} 644
-	@${INSTALL_SCRIPT} -m 751 ${FILESDIR}/snmpd.sh.sample ${STARTUP_FILE}
+	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+		${FILESDIR}/snmpd.sh.sample > ${STARTUP_FILE}
+	@${CHMOD} 755 ${STARTUP_FILE}
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/net-mgmt/net-snmp/distinfo b/net-mgmt/net-snmp/distinfo
index 28a49985a98c..9b43d7320ee1 100644
--- a/net-mgmt/net-snmp/distinfo
+++ b/net-mgmt/net-snmp/distinfo
@@ -1 +1 @@
-MD5 (net-snmp-5.0.8.tar.gz) = 9fa8555c1a9d68008b3b0df52721ee82
+MD5 (net-snmp-5.0.9.tar.gz) = cecd5ec74f5c546c1ea7ed7987b5932b
diff --git a/net-mgmt/net-snmp/files/snmpd.sh.sample b/net-mgmt/net-snmp/files/snmpd.sh.sample
index a626c9b9e26e..f07a6fac2376 100644
--- a/net-mgmt/net-snmp/files/snmpd.sh.sample
+++ b/net-mgmt/net-snmp/files/snmpd.sh.sample
@@ -1,36 +1,35 @@
 #!/bin/sh
 #
 # $FreeBSD$
+#
+# PROVIDE: snmpd
+# REQUIRE: DAEMON
+# KEYWORD: FreeBSD
+#
+# Add the following line to /etc/rc.conf to enable snmpd:
+#
+# snmpd_enable="YES"
+#
 
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
-    echo "$0: Cannot determine the PREFIX" >&2
-    exit 1
-fi
+snmpd_enable="NO"
+snmpd_flags="-P /var/run/snmpd.pid"
+
+. %%RC_SUBR%%
 
-if [ -z "${source_rc_confs_defined}" ]; then
-	if [ -r /etc/defaults/rc.conf ]; then
-		. /etc/defaults/rc.conf
-		source_rc_confs
-	elif [ -r /etc/rc.conf ]; then
-		. /etc/rc.conf
-	fi
+load_rc_config net_snmpd
+
+if [ ! -z "$net_snmpd_enable" ]; then
+    echo "Warning: \$net_snmpd_enable is obsoleted."
+    echo "         Use \$snmpd_enable instead."
+    snmpd_enable="$net_snmpd_enable"
+    [ ! -z "$net_snmpd_flags" ] && snmpd_flags="$net_snmpd_flags"
 fi
 
-case "$1" in
-start)
-	case "${net_snmpd_enable}" in
-	    [Yy][Ee][Ss])
-	    echo -n ' snmpd'
-	    ${net_snmpd_program:-${PREFIX}/sbin/snmpd} ${net_snmpd_flags}
-	    ;;
-	esac
-	;;
-stop)
-	killall snmpd && echo -n ' snmpd'
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	;;
-esac
+name=snmpd
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/sbin/snmpd
+pidfile='/var/run/snmpd.pid'
 
-exit 0
+load_rc_config $name
+run_rc_command "$1"
diff --git a/net-mgmt/net-snmp53/Makefile b/net-mgmt/net-snmp53/Makefile
index 312cb98db434..45767c531a76 100644
--- a/net-mgmt/net-snmp53/Makefile
+++ b/net-mgmt/net-snmp53/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	net-snmp
-PORTVERSION=	5.0.8
-PORTREVISION=	3
+PORTVERSION=	5.0.9
 CATEGORIES=	net ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR= net-snmp
@@ -15,6 +14,13 @@ MASTER_SITE_SUBDIR= net-snmp
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	An extendable SNMP implementation
 
+.if !exists(/etc/rc.subr)
+RUN_DEPENDS=	${LOCALBASE}/etc/rc.subr:${PORTSDIR}/sysutils/rc_subr
+RC_SUBR=	${LOCALBASE}/etc/rc.subr
+.else
+RC_SUBR=	/etc/rc.subr
+.endif
+
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 USE_AUTOCONF_VER=213
@@ -99,6 +105,7 @@ CONFIGURE_ARGS+= --enable-ipv6 \
 
 SHLIB_VERSION=	5
 PLIST_SUB+=	shlib=${SHLIB_VERSION}
+RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 
 post-patch:
 	@${REINPLACE_CMD} \
@@ -119,7 +126,9 @@ post-install:
 	@( cd ${PREFIX}/sbin && ${STRIP_CMD} ${SBIN} )
 	@${FIND} ${PREFIX}/include/net-snmp ${PREFIX}/share/snmp/mibs -type f \
 		| ${XARGS} ${CHMOD} 644
-	@${INSTALL_SCRIPT} -m 751 ${FILESDIR}/snmpd.sh.sample ${STARTUP_FILE}
+	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+		${FILESDIR}/snmpd.sh.sample > ${STARTUP_FILE}
+	@${CHMOD} 755 ${STARTUP_FILE}
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/net-mgmt/net-snmp53/distinfo b/net-mgmt/net-snmp53/distinfo
index 28a49985a98c..9b43d7320ee1 100644
--- a/net-mgmt/net-snmp53/distinfo
+++ b/net-mgmt/net-snmp53/distinfo
@@ -1 +1 @@
-MD5 (net-snmp-5.0.8.tar.gz) = 9fa8555c1a9d68008b3b0df52721ee82
+MD5 (net-snmp-5.0.9.tar.gz) = cecd5ec74f5c546c1ea7ed7987b5932b
diff --git a/net-mgmt/net-snmp53/files/snmpd.sh.sample b/net-mgmt/net-snmp53/files/snmpd.sh.sample
index a626c9b9e26e..f07a6fac2376 100644
--- a/net-mgmt/net-snmp53/files/snmpd.sh.sample
+++ b/net-mgmt/net-snmp53/files/snmpd.sh.sample
@@ -1,36 +1,35 @@
 #!/bin/sh
 #
 # $FreeBSD$
+#
+# PROVIDE: snmpd
+# REQUIRE: DAEMON
+# KEYWORD: FreeBSD
+#
+# Add the following line to /etc/rc.conf to enable snmpd:
+#
+# snmpd_enable="YES"
+#
 
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
-    echo "$0: Cannot determine the PREFIX" >&2
-    exit 1
-fi
+snmpd_enable="NO"
+snmpd_flags="-P /var/run/snmpd.pid"
+
+. %%RC_SUBR%%
 
-if [ -z "${source_rc_confs_defined}" ]; then
-	if [ -r /etc/defaults/rc.conf ]; then
-		. /etc/defaults/rc.conf
-		source_rc_confs
-	elif [ -r /etc/rc.conf ]; then
-		. /etc/rc.conf
-	fi
+load_rc_config net_snmpd
+
+if [ ! -z "$net_snmpd_enable" ]; then
+    echo "Warning: \$net_snmpd_enable is obsoleted."
+    echo "         Use \$snmpd_enable instead."
+    snmpd_enable="$net_snmpd_enable"
+    [ ! -z "$net_snmpd_flags" ] && snmpd_flags="$net_snmpd_flags"
 fi
 
-case "$1" in
-start)
-	case "${net_snmpd_enable}" in
-	    [Yy][Ee][Ss])
-	    echo -n ' snmpd'
-	    ${net_snmpd_program:-${PREFIX}/sbin/snmpd} ${net_snmpd_flags}
-	    ;;
-	esac
-	;;
-stop)
-	killall snmpd && echo -n ' snmpd'
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	;;
-esac
+name=snmpd
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/sbin/snmpd
+pidfile='/var/run/snmpd.pid'
 
-exit 0
+load_rc_config $name
+run_rc_command "$1"