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.
svn path=/head/; revision=376298
2015-01-05 13:18:58 +00:00 · 2015-01-05 13:18:58 +00:00 · bcbae34226 · 2021-03-31 03:12:20 +00:00
commit bcbae34226
parent 058ade94e8
22 changed files with 23 additions and 21 deletions
--- 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/

--- 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()
--- 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/

--- 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"
--- 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}
--- 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()
--- 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/

--- 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
--- 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/
--- 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()
--- 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/

--- 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"
--- 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}

--- 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
--- 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

--- 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"
--- 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/
--- 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"
--- 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
--- 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}"
--- 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}
--- 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}"