Date: Mon, 5 Jan 2015 13:18:59 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r376298 - in head: dns/bindgraph dns/bindgraph/files japanese/tiarra japanese/tiarra/files mail/couriergraph mail/couriergraph/files mail/exilog mail/exilog/files mail/ovs mail/ovs/file... Message-ID: <201501051318.t05DIxZo013056@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Mon Jan 5 13:18:58 2015 New Revision: 376298 URL: https://svnweb.freebsd.org/changeset/ports/376298 QAT: https://qat.redports.org/buildarchive/r376298/ Log: 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. Modified: head/dns/bindgraph/Makefile head/dns/bindgraph/files/bindgraph.in head/japanese/tiarra/Makefile head/japanese/tiarra/files/tiarra.in head/mail/couriergraph/Makefile head/mail/couriergraph/files/couriergraph.in head/mail/exilog/Makefile head/mail/exilog/files/exilog.in head/mail/ovs/Makefile head/mail/ovs/files/ovs.in head/mail/rspamd/Makefile head/mail/rspamd/files/rspamd_redirector.in head/net-mgmt/devmon/Makefile head/net-mgmt/devmon/files/devmon.in head/net-mgmt/netdisco/Makefile head/net-mgmt/netdisco/files/netdisco.in head/net-mgmt/smokeping/Makefile head/net-mgmt/smokeping/files/smokeping.in head/sysutils/backuppc-devel/Makefile head/sysutils/backuppc-devel/files/backuppc.in head/sysutils/backuppc/Makefile head/sysutils/backuppc/files/backuppc.in Modified: head/dns/bindgraph/Makefile ============================================================================== --- head/dns/bindgraph/Makefile Mon Jan 5 13:18:10 2015 (r376297) +++ head/dns/bindgraph/Makefile Mon Jan 5 13:18:58 2015 (r376298) @@ -3,7 +3,7 @@ PORTNAME= bindgraph PORTVERSION= 0.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= dns MASTER_SITES= http://www.linux.it/~md/software/ Modified: head/dns/bindgraph/files/bindgraph.in ============================================================================== --- head/dns/bindgraph/files/bindgraph.in Mon Jan 5 13:18:10 2015 (r376297) +++ head/dns/bindgraph/files/bindgraph.in Mon Jan 5 13:18:58 2015 (r376298) @@ -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() Modified: head/japanese/tiarra/Makefile ============================================================================== --- head/japanese/tiarra/Makefile Mon Jan 5 13:18:10 2015 (r376297) +++ head/japanese/tiarra/Makefile Mon Jan 5 13:18:58 2015 (r376298) @@ -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/ Modified: head/japanese/tiarra/files/tiarra.in ============================================================================== --- head/japanese/tiarra/files/tiarra.in Mon Jan 5 13:18:10 2015 (r376297) +++ head/japanese/tiarra/files/tiarra.in Mon Jan 5 13:18:58 2015 (r376298) @@ -21,7 +21,7 @@ tiarra_user=${tiarra_user:-"%%TIARRA_USE 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" Modified: head/mail/couriergraph/Makefile ============================================================================== --- head/mail/couriergraph/Makefile Mon Jan 5 13:18:10 2015 (r376297) +++ head/mail/couriergraph/Makefile Mon Jan 5 13:18:58 2015 (r376298) @@ -3,7 +3,7 @@ PORTNAME= couriergraph PORTVERSION= 20060202 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= mail MASTER_SITES= http://www.arschkrebs.de/postfix/${PORTNAME}/ DISTNAME= ${PORTNAME} Modified: head/mail/couriergraph/files/couriergraph.in ============================================================================== --- head/mail/couriergraph/files/couriergraph.in Mon Jan 5 13:18:10 2015 (r376297) +++ head/mail/couriergraph/files/couriergraph.in Mon Jan 5 13:18:58 2015 (r376298) @@ -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() Modified: head/mail/exilog/Makefile ============================================================================== --- head/mail/exilog/Makefile Mon Jan 5 13:18:10 2015 (r376297) +++ head/mail/exilog/Makefile Mon Jan 5 13:18:58 2015 (r376298) @@ -3,7 +3,7 @@ PORTNAME= exilog PORTVERSION= 0.5 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= mail MASTER_SITES= http://duncanthrax.net/exilog/ Modified: head/mail/exilog/files/exilog.in ============================================================================== --- head/mail/exilog/files/exilog.in Mon Jan 5 13:18:10 2015 (r376297) +++ head/mail/exilog/files/exilog.in Mon Jan 5 13:18:58 2015 (r376298) @@ -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 Modified: head/mail/ovs/Makefile ============================================================================== --- head/mail/ovs/Makefile Mon Jan 5 13:18:10 2015 (r376297) +++ head/mail/ovs/Makefile Mon Jan 5 13:18:58 2015 (r376298) @@ -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/ Modified: head/mail/ovs/files/ovs.in ============================================================================== --- head/mail/ovs/files/ovs.in Mon Jan 5 13:18:10 2015 (r376297) +++ head/mail/ovs/files/ovs.in Mon Jan 5 13:18:58 2015 (r376298) @@ -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() Modified: head/mail/rspamd/Makefile ============================================================================== --- head/mail/rspamd/Makefile Mon Jan 5 13:18:10 2015 (r376297) +++ head/mail/rspamd/Makefile Mon Jan 5 13:18:58 2015 (r376298) @@ -2,6 +2,7 @@ PORTNAME= rspamd PORTVERSION= 0.8.0 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= http://rspamd.com/downloads/ Modified: head/mail/rspamd/files/rspamd_redirector.in ============================================================================== --- head/mail/rspamd/files/rspamd_redirector.in Mon Jan 5 13:18:10 2015 (r376297) +++ head/mail/rspamd/files/rspamd_redirector.in Mon Jan 5 13:18:58 2015 (r376298) @@ -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" Modified: head/net-mgmt/devmon/Makefile ============================================================================== --- head/net-mgmt/devmon/Makefile Mon Jan 5 13:18:10 2015 (r376297) +++ head/net-mgmt/devmon/Makefile Mon Jan 5 13:18:58 2015 (r376298) @@ -3,7 +3,7 @@ PORTNAME= devmon DISTVERSION= 0.3.1-beta1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-mgmt MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION} Modified: head/net-mgmt/devmon/files/devmon.in ============================================================================== --- head/net-mgmt/devmon/files/devmon.in Mon Jan 5 13:18:10 2015 (r376297) +++ head/net-mgmt/devmon/files/devmon.in Mon Jan 5 13:18:58 2015 (r376298) @@ -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 Modified: head/net-mgmt/netdisco/Makefile ============================================================================== --- head/net-mgmt/netdisco/Makefile Mon Jan 5 13:18:10 2015 (r376297) +++ head/net-mgmt/netdisco/Makefile Mon Jan 5 13:18:58 2015 (r376298) @@ -3,7 +3,7 @@ PORTNAME= netdisco PORTVERSION= 1.3.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-mgmt www MASTER_SITES= SF Modified: head/net-mgmt/netdisco/files/netdisco.in ============================================================================== --- head/net-mgmt/netdisco/files/netdisco.in Mon Jan 5 13:18:10 2015 (r376297) +++ head/net-mgmt/netdisco/files/netdisco.in Mon Jan 5 13:18:58 2015 (r376298) @@ -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" Modified: head/net-mgmt/smokeping/Makefile ============================================================================== --- head/net-mgmt/smokeping/Makefile Mon Jan 5 13:18:10 2015 (r376297) +++ head/net-mgmt/smokeping/Makefile Mon Jan 5 13:18:58 2015 (r376298) @@ -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/ Modified: head/net-mgmt/smokeping/files/smokeping.in ============================================================================== --- head/net-mgmt/smokeping/files/smokeping.in Mon Jan 5 13:18:10 2015 (r376297) +++ head/net-mgmt/smokeping/files/smokeping.in Mon Jan 5 13:18:58 2015 (r376298) @@ -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" Modified: head/sysutils/backuppc-devel/Makefile ============================================================================== --- head/sysutils/backuppc-devel/Makefile Mon Jan 5 13:18:10 2015 (r376297) +++ head/sysutils/backuppc-devel/Makefile Mon Jan 5 13:18:58 2015 (r376298) @@ -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 Modified: head/sysutils/backuppc-devel/files/backuppc.in ============================================================================== --- head/sysutils/backuppc-devel/files/backuppc.in Mon Jan 5 13:18:10 2015 (r376297) +++ head/sysutils/backuppc-devel/files/backuppc.in Mon Jan 5 13:18:58 2015 (r376298) @@ -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}" Modified: head/sysutils/backuppc/Makefile ============================================================================== --- head/sysutils/backuppc/Makefile Mon Jan 5 13:18:10 2015 (r376297) +++ head/sysutils/backuppc/Makefile Mon Jan 5 13:18:58 2015 (r376298) @@ -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} Modified: head/sysutils/backuppc/files/backuppc.in ============================================================================== --- head/sysutils/backuppc/files/backuppc.in Mon Jan 5 13:18:10 2015 (r376297) +++ head/sysutils/backuppc/files/backuppc.in Mon Jan 5 13:18:58 2015 (r376298) @@ -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}"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501051318.t05DIxZo013056>