Index: head/net-mgmt/check_mk_agent/files/patch-agents_check__mk__agent.freebsd =================================================================== --- head/net-mgmt/check_mk_agent/files/patch-agents_check__mk__agent.freebsd (revision 525466) +++ head/net-mgmt/check_mk_agent/files/patch-agents_check__mk__agent.freebsd (nonexistent) @@ -1,31 +0,0 @@ ---- agents/check_mk_agent.freebsd.orig 2019-09-06 10:22:12 UTC -+++ agents/check_mk_agent.freebsd -@@ -41,15 +41,15 @@ - export LC_ALL=C - unset LANG - --export MK_LIBDIR="/usr/local/lib/check_mk_agent" --export MK_CONFDIR="/etc/check_mk" --export MK_TMPDIR="/var/run/check_mk" -+export MK_LIBDIR="%%CHECKMK_LIBDIR%%" -+export MK_CONFDIR="%%CHECKMK_CONFDIR%%" -+export MK_TMPDIR="%%CHECKMK_TMPDIR%%" - - # Optionally set a tempdir for all subsequent calls - #export TMPDIR= - - # Make sure, locally installed binaries are found --PATH=$PATH:/usr/local/bin:/usr/local/sbin -+PATH=$PATH:%%LOCALBASE%%/bin:%%LOCALBASE%%/sbin - - # All executables in PLUGINSDIR will simply be executed and their - # ouput appended to the output of the agent. Plugins define their own -@@ -102,7 +102,7 @@ function run_cached() { - - # Cache file outdated and new job not yet running? Start it - if [ -z "$USE_CACHEFILE" -a ! -e "$CACHEFILE.new" ] ; then -- echo "$CMDLINE" | daemon /usr/local/bin/bash -o noclobber > $CACHEFILE.new && mv $CACHEFILE.new $CACHEFILE || rm -f $CACHEFILE $CACHEFILE.new & -+ echo "$CMDLINE" | daemon %%BASH%% -o noclobber > $CACHEFILE.new && mv $CACHEFILE.new $CACHEFILE || rm -f $CACHEFILE $CACHEFILE.new & - fi - } - Property changes on: head/net-mgmt/check_mk_agent/files/patch-agents_check__mk__agent.freebsd ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/check_mk_agent/files/patch-check__mk__agent.freebsd =================================================================== --- head/net-mgmt/check_mk_agent/files/patch-check__mk__agent.freebsd (nonexistent) +++ head/net-mgmt/check_mk_agent/files/patch-check__mk__agent.freebsd (revision 525467) @@ -0,0 +1,31 @@ +--- check_mk_agent.freebsd.orig 2020-02-05 09:13:20 UTC ++++ check_mk_agent.freebsd +@@ -41,15 +41,15 @@ + export LC_ALL=C + unset LANG + +-export MK_LIBDIR="/usr/local/lib/check_mk_agent" +-export MK_CONFDIR="/etc/check_mk" +-export MK_TMPDIR="/var/run/check_mk" ++export MK_LIBDIR="%%CHECKMK_LIBDIR%%" ++export MK_CONFDIR="%%CHECKMK_CONFDIR%%" ++export MK_TMPDIR="%%CHECKMK_TMPDIR%%" + + # Optionally set a tempdir for all subsequent calls + #export TMPDIR= + + # Make sure, locally installed binaries are found +-PATH=$PATH:/usr/local/bin:/usr/local/sbin ++PATH=$PATH:%%LOCALBASE%%/bin:%%LOCALBASE%%/sbin + + # All executables in PLUGINSDIR will simply be executed and their + # ouput appended to the output of the agent. Plugins define their own +@@ -109,7 +109,7 @@ function run_cached() { + + # Cache file outdated and new job not yet running? Start it + if [ -z "$USE_CACHEFILE" -a ! -e "$CACHEFILE.new" ] ; then +- echo "$CMDLINE" | daemon /usr/local/bin/bash -o noclobber > $CACHEFILE.new && mv $CACHEFILE.new $CACHEFILE || rm -f $CACHEFILE $CACHEFILE.new & ++ echo "$CMDLINE" | daemon %%BASH%% -o noclobber > $CACHEFILE.new && mv $CACHEFILE.new $CACHEFILE || rm -f $CACHEFILE $CACHEFILE.new & + fi + } + Property changes on: head/net-mgmt/check_mk_agent/files/patch-check__mk__agent.freebsd ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property