change command_interpreter from /usr/bin/perl to ${PREFIX}/bin/perl

Several ports had rc.d scripts with hardcoded command_interpreter string
as /usr/bin/perl.  This symlink is not guaranteed to be in place, and it
isn't even an option for perl 5.20.  For affected ports, the interpreter
was changed to localbase.

In one case, the interpreter was correct, but it wasn't surround by
quotes.  Since the rc.d script would break if a space was contained in
${PREFIX}, quotes were added in that case.

22 files changed, 23 insertions, 21 deletions

diff --git a/dns/bindgraph/Makefile b/dns/bindgraph/Makefile
index 856330e7dd73..34e39668bc5a 100644
--- a/dns/bindgraph/Makefile
+++ b/dns/bindgraph/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	bindgraph
 PORTVERSION=	0.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	dns
 MASTER_SITES=	http://www.linux.it/~md/software/
 
diff --git a/dns/bindgraph/files/bindgraph.in b/dns/bindgraph/files/bindgraph.in
index 42f4f4315bf2..a84640a8c1ab 100644
--- a/dns/bindgraph/files/bindgraph.in
+++ b/dns/bindgraph/files/bindgraph.in
@@ -17,7 +17,7 @@ rcvar=bindgraph_enable
 
 command=%%PREFIX%%/sbin/${name}.pl
 command_args='> /dev/null 2>&1'
-command_interpreter=/usr/bin/perl
+command_interpreter="%%PREFIX%%/bin/perl"
 stop_postcmd=stop_postcmd
 
 stop_postcmd()
diff --git a/japanese/tiarra/Makefile b/japanese/tiarra/Makefile
index 50d3ff8f69fb..e8e46b3b5e75 100644
--- a/japanese/tiarra/Makefile
+++ b/japanese/tiarra/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tiarra
 PORTVERSION=	20100212
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese irc ipv6
 MASTER_SITES=	http://www.clovery.jp/tiarra/archive/2010/02/
 
diff --git a/japanese/tiarra/files/tiarra.in b/japanese/tiarra/files/tiarra.in
index 2346e2fba107..2a46ceef38d7 100644
--- a/japanese/tiarra/files/tiarra.in
+++ b/japanese/tiarra/files/tiarra.in
@@ -21,7 +21,7 @@ tiarra_user=${tiarra_user:-"%%TIARRA_USER%%"}
 tiarra_chdir=${tiarra_chdir:-"%%PREFIX%%/${name}"}
 
 command="${tiarra_chdir}/${name}"
-command_interpreter="/usr/bin/perl"
+command_interpreter="%%PREFIX%%/bin/perl"
 required_dirs="${tiarra_chdir}"
 required_files="${tiarra_chdir}/${name}.conf"
 extra_commands="reload"
diff --git a/mail/couriergraph/Makefile b/mail/couriergraph/Makefile
index 82328554b1a0..81199f3d0fb3 100644
--- a/mail/couriergraph/Makefile
+++ b/mail/couriergraph/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	couriergraph
 PORTVERSION=	20060202
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	mail
 MASTER_SITES=	http://www.arschkrebs.de/postfix/${PORTNAME}/
 DISTNAME=	${PORTNAME}
diff --git a/mail/couriergraph/files/couriergraph.in b/mail/couriergraph/files/couriergraph.in
index 82297160f005..430a64c3078b 100644
--- a/mail/couriergraph/files/couriergraph.in
+++ b/mail/couriergraph/files/couriergraph.in
@@ -18,7 +18,7 @@ rcvar=couriergraph_enable
 
 command=%%PREFIX%%/sbin/couriergraph.pl
 command_args='> /dev/null 2>&1'
-command_interpreter=/usr/bin/perl
+command_interpreter="%%PREFIX%%/bin/perl"
 stop_postcmd=stop_postcmd
 
 stop_postcmd()
diff --git a/mail/exilog/Makefile b/mail/exilog/Makefile
index dc2e5fba4cfe..f0eaf9f3fbe0 100644
--- a/mail/exilog/Makefile
+++ b/mail/exilog/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	exilog
 PORTVERSION=	0.5
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	mail
 MASTER_SITES=	http://duncanthrax.net/exilog/
 
diff --git a/mail/exilog/files/exilog.in b/mail/exilog/files/exilog.in
index 887be6cbdce8..072572b7abbe 100644
--- a/mail/exilog/files/exilog.in
+++ b/mail/exilog/files/exilog.in
@@ -20,7 +20,7 @@ rcvar=exilog_enable
 command=%%PREFIX%%/sbin/exilog_agent.pl
 pidfile=/var/run/exilog.pid
 required_files=%%PREFIX%%/etc/exilog.conf
-command_interpreter=/usr/bin/perl
+command_interpreter="%%PREFIX%%/bin/perl"
 
 # read settings, set default values
 load_rc_config $name
diff --git a/mail/ovs/Makefile b/mail/ovs/Makefile
index 28562e795226..7380a12eb2f8 100644
--- a/mail/ovs/Makefile
+++ b/mail/ovs/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ovs
 PORTVERSION=	1.05
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.oav.net/openvisp/stats/ \
 		http://mirror.amdmi3.ru/distfiles/
diff --git a/mail/ovs/files/ovs.in b/mail/ovs/files/ovs.in
index 8dabbc632342..573aee39c48a 100644
--- a/mail/ovs/files/ovs.in
+++ b/mail/ovs/files/ovs.in
@@ -17,7 +17,7 @@ rcvar=ovs_enable
 
 command=%%PREFIX%%/sbin/${name}.pl
 command_args='> /dev/null 2>&1'
-command_interpreter=/usr/bin/perl
+command_interpreter="%%PREFIX/bin/perl"
 stop_postcmd=stop_postcmd
 
 stop_postcmd()
diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
index ffda3798903e..97ae5974d69d 100644
--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	rspamd
 PORTVERSION=	0.8.0
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://rspamd.com/downloads/
 
diff --git a/mail/rspamd/files/rspamd_redirector.in b/mail/rspamd/files/rspamd_redirector.in
index d3842b71ccd8..d719ee240af0 100644
--- a/mail/rspamd/files/rspamd_redirector.in
+++ b/mail/rspamd/files/rspamd_redirector.in
@@ -23,7 +23,7 @@ load_rc_config $name
 pidfile=${rspamd_redirector_pidfile:-"/var/run/rspamd/redirector.pid"}
 
 command="%%PREFIX%%/bin/rspamd-redirector"
-command_interpreter="/usr/bin/perl"
+command_interpreter="%%PREFIX%%/bin/perl"
 extra_commands="reload"
 sig_reload="USR1"
 stop_postcmd="rm -f $pidfile"
diff --git a/net-mgmt/devmon/Makefile b/net-mgmt/devmon/Makefile
index 708feb8a525e..25ce6b2b604c 100644
--- a/net-mgmt/devmon/Makefile
+++ b/net-mgmt/devmon/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	devmon
 DISTVERSION=	0.3.1-beta1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}
 
diff --git a/net-mgmt/devmon/files/devmon.in b/net-mgmt/devmon/files/devmon.in
index 78e3dce487ab..7761cdbba623 100644
--- a/net-mgmt/devmon/files/devmon.in
+++ b/net-mgmt/devmon/files/devmon.in
@@ -19,7 +19,7 @@ load_rc_config ${name}
 
 command="%%PREFIX%%/devmon/devmon"
 command_args="-c ${devmon_config} -d ${devmon_db}"
-command_interpreter=/usr/local/bin/perl
+command_interpreter="%%PREFIX%%/bin/perl"
 pidfile=${devmon_pid}
 
 start_precmd=devmon_startprecmd
diff --git a/net-mgmt/netdisco/Makefile b/net-mgmt/netdisco/Makefile
index af401c6aa6fe..553c170a704e 100644
--- a/net-mgmt/netdisco/Makefile
+++ b/net-mgmt/netdisco/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	netdisco
 PORTVERSION=	1.3.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	SF
 
diff --git a/net-mgmt/netdisco/files/netdisco.in b/net-mgmt/netdisco/files/netdisco.in
index f2adf9fa4dd4..8dccea10f7a9 100644
--- a/net-mgmt/netdisco/files/netdisco.in
+++ b/net-mgmt/netdisco/files/netdisco.in
@@ -24,7 +24,7 @@ restart_cmd=${name}_restart
 status_cmd=${name}_status
 
 command="%%PREFIX%%/bin/netdisco"
-command_interpreter="/usr/bin/perl"
+command_interpreter="%%PREFIX%%/bin/perl"
 netdisco_config="%%ETCDIR%%/netdisco.conf"
 pidfile=$(grep ^daemon_pid $netdisco_config | cut -d= -f2 | tail -1)
 flags="-p start"
diff --git a/net-mgmt/smokeping/Makefile b/net-mgmt/smokeping/Makefile
index f5febdb7999a..1dd973ff3b2e 100644
--- a/net-mgmt/smokeping/Makefile
+++ b/net-mgmt/smokeping/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	smokeping
 PORTVERSION=	2.6.9
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	http://oss.oetiker.ch/smokeping/pub/ \
 		http://smokeping.cs.pu.edu.tw/pub/
diff --git a/net-mgmt/smokeping/files/smokeping.in b/net-mgmt/smokeping/files/smokeping.in
index c31b8b1cdb81..9bc303fbe42c 100644
--- a/net-mgmt/smokeping/files/smokeping.in
+++ b/net-mgmt/smokeping/files/smokeping.in
@@ -31,10 +31,10 @@ load_rc_config $name
 : ${smokeping_user="%%USERS%%"}
 : ${smokeping_group="%%GROUPS%%"}
 
-command=%%PREFIX%%/bin/smokeping
+command="%%PREFIX%%/bin/smokeping"
 command_args="--logfile=${smokeping_logfile}"
 pidfile="${smokeping_pidfile}"
-command_interpreter=%%PREFIX%%/bin/perl
+command_interpreter="%%PREFIX%%/bin/perl"
 
 extra_commands=reload
 reload_cmd="${command} --reload"
diff --git a/sysutils/backuppc-devel/Makefile b/sysutils/backuppc-devel/Makefile
index 6d8104487c10..42f728a782fb 100644
--- a/sysutils/backuppc-devel/Makefile
+++ b/sysutils/backuppc-devel/Makefile
@@ -4,6 +4,7 @@
 PORTNAME=	backuppc
 DISTVERSION=	4.0.0alpha3
 CATEGORIES=	sysutils
+PORTREVISION=	1
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}-beta/${DISTVERSION}
 PKGNAMESUFFIX=	-devel
diff --git a/sysutils/backuppc-devel/files/backuppc.in b/sysutils/backuppc-devel/files/backuppc.in
index 500d3a4335c7..9b73df7c2522 100644
--- a/sysutils/backuppc-devel/files/backuppc.in
+++ b/sysutils/backuppc-devel/files/backuppc.in
@@ -20,7 +20,7 @@ load_rc_config $name
 : ${backuppc_group:="backuppc"}
 : ${backuppc_config:="%%ETCDIR%%/config.pl"}
 
-command_interpreter="/usr/bin/perl"
+command_interpreter="%%PREFIX%%/bin/perl"
 command="%%PREFIX%%/bin/BackupPC"
 
 required_files="${backuppc_config}"
diff --git a/sysutils/backuppc/Makefile b/sysutils/backuppc/Makefile
index bb3b916d447d..43cb75377eb9 100644
--- a/sysutils/backuppc/Makefile
+++ b/sysutils/backuppc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	backuppc
 PORTVERSION=	3.3.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}/${PORTVERSION}
diff --git a/sysutils/backuppc/files/backuppc.in b/sysutils/backuppc/files/backuppc.in
index 1d9640345d1a..02568d9ad7b4 100644
--- a/sysutils/backuppc/files/backuppc.in
+++ b/sysutils/backuppc/files/backuppc.in
@@ -20,7 +20,7 @@ load_rc_config $name
 : ${backuppc_group:="backuppc"}
 : ${backuppc_config:="%%ETCDIR%%/config.pl"}
 
-command_interpreter="/usr/bin/perl"
+command_interpreter="%%PREFIX%%/bin/perl"
 command="%%PREFIX%%/bin/BackupPC"
 
 required_files="${backuppc_config}"