From 025ed98a5de7b2dc0282cf4456ecc1c2a6091430 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Sun, 20 Mar 2011 06:43:47 +0000 Subject: [PATCH] Re-add the rc script after previous commit: don't trust update-plist, it's still broken and remove @rcscript from the PLIST. While here, fix pexp. --- net/mrtg/Makefile | 4 ++-- net/mrtg/pkg/PLIST | 3 ++- net/mrtg/pkg/mrtg.rc | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile index 3a975709275..b1ed9d843be 100644 --- a/net/mrtg/Makefile +++ b/net/mrtg/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.76 2011/03/05 19:41:14 sthen Exp $ +# $OpenBSD: Makefile,v 1.77 2011/03/20 06:43:47 ajacoutot Exp $ COMMENT= multi-router traffic grapher DISTNAME= mrtg-2.17.1 -REVISION= 0 +REVISION= 1 CATEGORIES= net HOMEPAGE= http://oss.oetiker.ch/mrtg/ diff --git a/net/mrtg/pkg/PLIST b/net/mrtg/pkg/PLIST index 815196bbf9f..e814c7120f0 100644 --- a/net/mrtg/pkg/PLIST +++ b/net/mrtg/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.26 2011/03/05 19:41:14 sthen Exp $ +@comment $OpenBSD: PLIST,v 1.27 2011/03/20 06:43:47 ajacoutot Exp $ @newgroup _mrtg:578 @newuser _mrtg:578:578:daemon:MRTG account:/var/empty:/sbin/nologin bin/cfgmaker @@ -46,3 +46,4 @@ share/mrtg/mrtg-r.gif share/mrtg/mrtg-r.png share/mrtg/mrtg-ti.gif share/mrtg/mrtg-ti.png +@rcscript ${RCDIR}/mrtg diff --git a/net/mrtg/pkg/mrtg.rc b/net/mrtg/pkg/mrtg.rc index 4650d5a3691..5812654260d 100644 --- a/net/mrtg/pkg/mrtg.rc +++ b/net/mrtg/pkg/mrtg.rc @@ -1,12 +1,12 @@ #!/bin/sh # -# $OpenBSD: mrtg.rc,v 1.3 2010/12/27 14:50:23 ajacoutot Exp $ +# $OpenBSD: mrtg.rc,v 1.4 2011/03/20 06:43:47 ajacoutot Exp $ daemon="${TRUEPREFIX}/bin/mrtg" daemon_flags="--daemon --user _mrtg --group _mrtg --confcache-file /tmp/mrtg.ok --lock-file /tmp/mrtg_lock --pid-file /var/run/mrtg.pid" . /etc/rc.d/rc.subr -pexp="/usr/bin/perl -w ${daemon} ${daemon_flags}" +pexp="/usr/bin/perl -w ${daemon}${daemon_flags:+ ${daemon_flags}}" rc_cmd $1