From owner-svn-ports-head@FreeBSD.ORG Wed Apr 8 11:18:21 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4782914F; Wed, 8 Apr 2015 11:18:21 +0000 (UTC) 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 19F0161B; Wed, 8 Apr 2015 11:18:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t38BIK1l055534; Wed, 8 Apr 2015 11:18:20 GMT (envelope-from matthew@FreeBSD.org) Received: (from matthew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t38BIKEq055532; Wed, 8 Apr 2015 11:18:20 GMT (envelope-from matthew@FreeBSD.org) Message-Id: <201504081118.t38BIKEq055532@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: matthew set sender to matthew@FreeBSD.org using -f From: Matthew Seaman Date: Wed, 8 Apr 2015 11:18:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r383562 - in head/net-mgmt/nagios-check_postgres: . 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-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Apr 2015 11:18:21 -0000 Author: matthew Date: Wed Apr 8 11:18:19 2015 New Revision: 383562 URL: https://svnweb.freebsd.org/changeset/ports/383562 Log: I've had reports from colleagues of check_postgres not finding psql when run via nrpe. Hardcode the directory (${LOCALBASE}/bin) expected to contain the postgres client and other binaries. Added: head/net-mgmt/nagios-check_postgres/files/ head/net-mgmt/nagios-check_postgres/files/patch-check__postgres.pl (contents, props changed) Modified: head/net-mgmt/nagios-check_postgres/Makefile Modified: head/net-mgmt/nagios-check_postgres/Makefile ============================================================================== --- head/net-mgmt/nagios-check_postgres/Makefile Wed Apr 8 10:58:05 2015 (r383561) +++ head/net-mgmt/nagios-check_postgres/Makefile Wed Apr 8 11:18:19 2015 (r383562) @@ -3,7 +3,7 @@ PORTNAME= check_postgres PORTVERSION= 2.21.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net-mgmt databases perl5 MASTER_SITES= http://bucardo.org/downloads/ PKGNAMEPREFIX= nagios- @@ -93,6 +93,9 @@ CACTI_LINKS= dbstats .include +post-patch: + ${SED} -i.bak -e s,%%LOCALBASE%%,${LOCALBASE}, ${WRKSRC}/check_postgres.pl + post-install: .if ${PORT_OPTIONS:MNAGIOS} @${MKDIR} ${STAGEDIR}${NAGIOS_PLUGINS} Added: head/net-mgmt/nagios-check_postgres/files/patch-check__postgres.pl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/nagios-check_postgres/files/patch-check__postgres.pl Wed Apr 8 11:18:19 2015 (r383562) @@ -0,0 +1,11 @@ +--- check_postgres.pl.orig 2015-04-08 10:32:58 UTC ++++ check_postgres.pl +@@ -47,7 +47,7 @@ our $DEFAULT_OUTPUT = 'nagios'; + + ## If psql binaries are not in your path, it is recommended to hardcode it here, + ## as an alternative to the --PGBINDIR option +-$PGBINDIR = ''; ++$PGBINDIR = '%%LOCALBASE%%/bin'; + + ## If this is true, $opt{PSQL} and $opt{PGBINDIR} are disabled for security reasons + our $NO_PSQL_OPTION = 1;