From owner-svn-ports-all@freebsd.org  Wed Jan 10 10:30:24 2018
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 96E3CE77B1F;
 Wed, 10 Jan 2018 10:30:24 +0000 (UTC) (envelope-from pi@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 720BB6D050;
 Wed, 10 Jan 2018 10:30:24 +0000 (UTC) (envelope-from pi@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A9C6C245C1;
 Wed, 10 Jan 2018 10:30:23 +0000 (UTC) (envelope-from pi@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0AAUN25040418;
 Wed, 10 Jan 2018 10:30:23 GMT (envelope-from pi@FreeBSD.org)
Received: (from pi@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0AAUNdW040416;
 Wed, 10 Jan 2018 10:30:23 GMT (envelope-from pi@FreeBSD.org)
Message-Id: <201801101030.w0AAUNdW040416@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org
 using -f
From: Kurt Jaeger <pi@FreeBSD.org>
Date: Wed, 10 Jan 2018 10:30:23 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r458619 - in head/net/mrouted: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: pi
X-SVN-Commit-Paths: in head/net/mrouted: . files
X-SVN-Commit-Revision: 458619
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Jan 2018 10:30:24 -0000

Author: pi
Date: Wed Jan 10 10:30:23 2018
New Revision: 458619
URL: https://svnweb.freebsd.org/changeset/ports/458619

Log:
  net/mrouted: Allow config path to be specified from rc.conf
  
  PR:		206602
  Submitted by:	Daniel Ylitalo <daniel@blodan.se>
  Approved by:	hrs (maintainer timeout)

Modified:
  head/net/mrouted/Makefile
  head/net/mrouted/files/mrouted.in

Modified: head/net/mrouted/Makefile
==============================================================================
--- head/net/mrouted/Makefile	Wed Jan 10 10:05:45 2018	(r458618)
+++ head/net/mrouted/Makefile	Wed Jan 10 10:30:23 2018	(r458619)
@@ -3,6 +3,7 @@
 
 PORTNAME=	mrouted
 PORTVERSION=	3.9.8
+PORTREVISION=	1
 CATEGORIES=	net
 
 MAINTAINER=	hrs@FreeBSD.org

Modified: head/net/mrouted/files/mrouted.in
==============================================================================
--- head/net/mrouted/files/mrouted.in	Wed Jan 10 10:05:45 2018	(r458618)
+++ head/net/mrouted/files/mrouted.in	Wed Jan 10 10:30:23 2018	(r458619)
@@ -12,9 +12,14 @@ name="mrouted"
 rcvar="${name}_enable"
 command="%%PREFIX%%/sbin/$name"
 pidfile="/var/run/${name}.pid"
-required_files="%%PREFIX%%/etc/${name}.conf"
 extra_commands="reload"
 
 load_rc_config $name
 : ${mrouted_enable="NO"}
+: ${mrouted_config="%%PREFIX%%/etc/${name}.conf"}
+
+required_files="${mrouted_config}"
+
+command_args="-c ${mrouted_config}"
+
 run_rc_command "$1"