From owner-svn-ports-all@FreeBSD.ORG Wed May 27 15:54:38 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 12189641; Wed, 27 May 2015 15:54:38 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DB5BFD95; Wed, 27 May 2015 15:54:37 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4RFsb0a068431; Wed, 27 May 2015 15:54:37 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4RFsbZr068428; Wed, 27 May 2015 15:54:37 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201505271554.t4RFsbZr068428@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Wed, 27 May 2015 15:54:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r387623 - in head/net-mgmt/observium: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 May 2015 15:54:38 -0000 Author: feld Date: Wed May 27 15:54:36 2015 New Revision: 387623 URL: https://svnweb.freebsd.org/changeset/ports/387623 Log: Fix PATH issues for poller scripts used as cron entries We don't have /usr/local/{bin,sbin} in cron PATH by default Submitted by: mat Added: head/net-mgmt/observium/files/patch-poller-wrapper.py (contents, props changed) head/net-mgmt/observium/files/patch-poller.php (contents, props changed) Modified: head/net-mgmt/observium/Makefile Modified: head/net-mgmt/observium/Makefile ============================================================================== --- head/net-mgmt/observium/Makefile Wed May 27 15:42:51 2015 (r387622) +++ head/net-mgmt/observium/Makefile Wed May 27 15:54:36 2015 (r387623) @@ -80,6 +80,9 @@ USE_MYSQL= server USE_MYSQL= client .endif +post-patch: + ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/poller-wrapper.py ${WRKSRC}/poller.php + do-install: @${MKDIR} ${STAGEDIR}/${WWWDIR} .for dir in ${ROOT_DIRS} Added: head/net-mgmt/observium/files/patch-poller-wrapper.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/observium/files/patch-poller-wrapper.py Wed May 27 15:54:36 2015 (r387623) @@ -0,0 +1,17 @@ +--- poller-wrapper.py.orig 2014-11-04 16:14:27 UTC ++++ poller-wrapper.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! %%LOCALBASE%%/bin/python + """ + poller-wrapper A small tool which wraps around the Observium poller + and tries to guide the polling process with a more modern +@@ -38,6 +38,8 @@ except: + print "threading, Queue, sys, subprocess, time, os, json" + sys.exit(2) + ++os.environ['PATH'] += ':%%LOCALBASE%%/sbin:%%LOCALBASE%%/bin' ++ + try: + import MySQLdb + except: Added: head/net-mgmt/observium/files/patch-poller.php ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/observium/files/patch-poller.php Wed May 27 15:54:36 2015 (r387623) @@ -0,0 +1,8 @@ +--- poller.php.orig 2015-05-27 15:48:33 UTC ++++ poller.php +@@ -1,4 +1,4 @@ +-#!/usr/bin/env php ++#!%%LOCALBASE%%/bin/php +