aboutsummaryrefslogtreecommitdiff
path: root/ftp
diff options
context:
space:
mode:
authorPhilip M. Gollucci <pgollucci@FreeBSD.org>2010-01-04 04:34:07 +0000
committerPhilip M. Gollucci <pgollucci@FreeBSD.org>2010-01-04 04:34:07 +0000
commit21ebf5c57f07761cc4802167c54b8b839b265f51 (patch)
tree49f97f64b9daca7bf41d6f7735d03de046324977 /ftp
parentae534863c026842fa80bc39be3dd5a5f2dbb9fe4 (diff)
downloadports-21ebf5c57f07761cc4802167c54b8b839b265f51.tar.gz
ports-21ebf5c57f07761cc4802167c54b8b839b265f51.zip
- Pull the pidfile path from a central location (the config file)
instead of hard coding it again in the rc.d script PR: ports/141945 Submitted by: Danil <desruptorrogue@gmail.com>
Notes
Notes: svn path=/head/; revision=247097
Diffstat (limited to 'ftp')
-rw-r--r--ftp/proftpd/Makefile3
-rw-r--r--ftp/proftpd/files/proftpd.in (renamed from ftp/proftpd/files/proftpd.sh.in)2
2 files changed, 3 insertions, 2 deletions
diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile
index 6d10cbe0b38a..b7ae43adb5a2 100644
--- a/ftp/proftpd/Makefile
+++ b/ftp/proftpd/Makefile
@@ -7,6 +7,7 @@
PORTNAME= proftpd
PORTVERSION= 1.3.2b
+PORTREVISION= 1
CATEGORIES?= ftp
MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \
ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \
@@ -56,7 +57,7 @@ GNU_CONFIGURE= yes
CONFLICTS= proftpd-devel-1.[0-9].*
-USE_RC_SUBR= proftpd.sh
+USE_RC_SUBR= proftpd
CONFIGURE_ARGS= --localstatedir=/var/run \
--with-pkgconfig=libdata/pkgconfig \
diff --git a/ftp/proftpd/files/proftpd.sh.in b/ftp/proftpd/files/proftpd.in
index 362a2d37f6a0..44b5e0e8a0df 100644
--- a/ftp/proftpd/files/proftpd.sh.in
+++ b/ftp/proftpd/files/proftpd.in
@@ -23,7 +23,7 @@ name=proftpd
rcvar=`set_rcvar`
command=%%PREFIX%%/sbin/proftpd
-pidfile=/var/run/proftpd.pid
+pidfile=$(grep PidFile /usr/local/etc/proftpd.conf | awk '{print($2)}')
required_files=%%PREFIX%%/etc/proftpd.conf
stop_postcmd=stop_postcmd