Date: Thu, 27 Mar 2014 23:31:53 +0000 (UTC) From: Martin Matuska <mm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349374 - in head/ftp/proftpd: . files Message-ID: <201403272331.s2RNVrxS042314@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403272331.s2RNVrxS042314>