From owner-svn-ports-all@FreeBSD.ORG  Wed Sep 10 09:36:25 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 63DCF3A3;
 Wed, 10 Sep 2014 09:36:25 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4F58A1453;
 Wed, 10 Sep 2014 09:36:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8A9aP1K043950;
 Wed, 10 Sep 2014 09:36:25 GMT (envelope-from ehaupt@FreeBSD.org)
Received: (from ehaupt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8A9aO0U043945;
 Wed, 10 Sep 2014 09:36:24 GMT (envelope-from ehaupt@FreeBSD.org)
Message-Id: <201409100936.s8A9aO0U043945@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ehaupt set sender to
 ehaupt@FreeBSD.org using -f
From: Emanuel Haupt <ehaupt@FreeBSD.org>
Date: Wed, 10 Sep 2014 09:36:24 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r367807 - in head/net/rsync: . files
X-SVN-Group: ports-head
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.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Sep 2014 09:36:25 -0000

Author: ehaupt
Date: Wed Sep 10 09:36:24 2014
New Revision: 367807
URL: http://svnweb.freebsd.org/changeset/ports/367807
QAT: https://qat.redports.org/buildarchive/r367807/

Log:
  Allow specifying config path in rc.conf
  
  PR:		191601
  Submitted by:	daniel@blodan.se

Modified:
  head/net/rsync/Makefile
  head/net/rsync/files/rsyncd.in

Modified: head/net/rsync/Makefile
==============================================================================
--- head/net/rsync/Makefile	Wed Sep 10 09:19:27 2014	(r367806)
+++ head/net/rsync/Makefile	Wed Sep 10 09:36:24 2014	(r367807)
@@ -3,7 +3,7 @@
 
 PORTNAME=	rsync
 PORTVERSION=	3.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://rsync.samba.org/ftp/%SUBDIR%/ \
 		ftp://ftp.samba.org/pub/%SUBDIR%/ \

Modified: head/net/rsync/files/rsyncd.in
==============================================================================
--- head/net/rsync/files/rsyncd.in	Wed Sep 10 09:19:27 2014	(r367806)
+++ head/net/rsync/files/rsyncd.in	Wed Sep 10 09:36:24 2014	(r367807)
@@ -22,14 +22,17 @@ name="%%NAME%%"
 rcvar=%%NAME%%_enable
 
 command="%%PREFIX%%/bin/rsync"
-command_args="--daemon"
 start_precmd="%%NAME%%_precmd"
 pidfile="/var/run/$name.pid"
-required_files="%%ETCDIR%%/$name.conf"
 
 # read configuration and set defaults
 load_rc_config "$name"
 : ${%%NAME%%_enable="NO"}
+: ${%%NAME%%_configfile:=%%ETCDIR%%/$name.conf}
+
+required_files="${%%NAME%%_configfile}"
+
+command_args="--daemon --config ${%%NAME%%_configfile}"
 
 %%NAME%%_precmd()
 {