From owner-svn-ports-all@FreeBSD.ORG  Thu Mar 27 23:31:53 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BFD4A388;
 Thu, 27 Mar 2014 23:31:53 +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 ACD578E4;
 Thu, 27 Mar 2014 23:31:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2RNVrF9042316;
 Thu, 27 Mar 2014 23:31:53 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2RNVrxS042314;
 Thu, 27 Mar 2014 23:31:53 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201403272331.s2RNVrxS042314@svn.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Thu, 27 Mar 2014 23:31:53 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r349374 - in head/ftp/proftpd: . 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.17
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: Thu, 27 Mar 2014 23:31:53 -0000

Author: mm
Date: Thu Mar 27 23:31:52 2014
New Revision: 349374
URL: http://svnweb.freebsd.org/changeset/ports/349374
QAT: https://qat.redports.org/buildarchive/r349374/

Log:
  Allow specification of custom ProFTPD configuration file
  
  PR:		ports/187678
  Submitted by: 	Daniel Ylitalo <daniel@blodan.se>

Modified:
  head/ftp/proftpd/Makefile
  head/ftp/proftpd/files/proftpd.in

Modified: head/ftp/proftpd/Makefile
==============================================================================
--- head/ftp/proftpd/Makefile	Thu Mar 27 23:26:04 2014	(r349373)
+++ head/ftp/proftpd/Makefile	Thu Mar 27 23:31:52 2014	(r349374)
@@ -5,7 +5,7 @@ PORTNAME?=	proftpd
 .if !defined(DISTVERSION)
 PORTVERSION?=	${PROFTPD_VERSION}
 .endif
-PORTREVISION?=	4
+PORTREVISION?=	5
 CATEGORIES?=	ftp
 MASTER_SITES=	ftp://ftp.proftpd.org/distrib/source/ \
 		https://github.com/downloads/proftpd/proftpd.github.com/ \

Modified: head/ftp/proftpd/files/proftpd.in
==============================================================================
--- head/ftp/proftpd/files/proftpd.in	Thu Mar 27 23:26:04 2014	(r349373)
+++ head/ftp/proftpd/files/proftpd.in	Thu Mar 27 23:31:52 2014	(r349374)
@@ -22,22 +22,20 @@
 name=proftpd
 rcvar=proftpd_enable
 
+proftpd_enable=${proftpd_enable:="NO"}
+proftpd_config=${proftpd_config:="%%PREFIX%%/etc/proftpd.conf"}
+
 command=%%PREFIX%%/sbin/proftpd
-pidfile=$(grep PidFile /usr/local/etc/proftpd.conf | awk '{print($2)}')
-required_files=%%PREFIX%%/etc/proftpd.conf
+command_args="-c ${proftpd_config}"
+pidfile=$(grep PidFile ${proftpd_config} | awk '{print($2)}')
+required_files=${proftpd_config}
 
+extra_commands="reload"
 stop_postcmd=stop_postcmd
-
 stop_postcmd()
 {
   rm -f $pidfile
 }
 
-# set defaults
-
-proftpd_enable=${proftpd_enable:-"NO"}
-
-extra_commands="reload"
-
 load_rc_config $name
 run_rc_command "$1"