From owner-svn-ports-head@freebsd.org Tue Apr 25 16:07:33 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B5255D50DAD; Tue, 25 Apr 2017 16:07:33 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 6D2C732A; Tue, 25 Apr 2017 16:07:33 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3PG7Wug057754; Tue, 25 Apr 2017 16:07:32 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3PG7WXJ057753; Tue, 25 Apr 2017 16:07:32 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201704251607.v3PG7WXJ057753@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Tue, 25 Apr 2017 16:07:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r439404 - head/net-mgmt/percona-monitoring-plugins 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.23 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: Tue, 25 Apr 2017 16:07:33 -0000 Author: feld Date: Tue Apr 25 16:07:32 2017 New Revision: 439404 URL: https://svnweb.freebsd.org/changeset/ports/439404 Log: net-mgmt/percona-monitoring-plugins: Improve FreeBSD compatibility - Properly declare wget as a dependency - Give full path to wget binary - Scripts that can take config files should source from LOCALBASE/etc, not /etc PR: 218611 Approved by: maintainer timeout Modified: head/net-mgmt/percona-monitoring-plugins/Makefile Modified: head/net-mgmt/percona-monitoring-plugins/Makefile ============================================================================== --- head/net-mgmt/percona-monitoring-plugins/Makefile Tue Apr 25 15:58:50 2017 (r439403) +++ head/net-mgmt/percona-monitoring-plugins/Makefile Tue Apr 25 16:07:32 2017 (r439404) @@ -3,7 +3,7 @@ PORTNAME= percona-monitoring-plugins PORTVERSION= 1.1.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt MASTER_SITES= http://www.percona.com/downloads/percona-monitoring-plugins/${PORTVERSION}/ \ ftp://ftp.renatasystems.org/pub/FreeBSD/ports/distfiles/ @@ -20,7 +20,8 @@ RUN_DEPENDS= cacti>=0:net-mgmt/cacti \ p5-Digest-MD5>=0:security/p5-Digest-MD5 \ p5-Getopt-Long>=0:devel/p5-Getopt-Long \ p5-Time-HiRes>=0:devel/p5-Time-HiRes \ - bash:shells/bash + bash:shells/bash \ + wget:ftp/wget USES= shebangfix perl5 php:cli USE_PERL5= run @@ -36,6 +37,12 @@ CACTIDIR?= share/cacti OPTIONS_DEFINE= DOCS +post-patch: + @${REINPLACE_CMD} 's|/etc/cacti/|${LOCALBASE}/etc/cacti/|g' ${WRKSRC}/cacti/scripts/ss_get_mysql_stats.php ${WRKSRC}/cacti/scripts/ss_get_by_ssh.php + @${REINPLACE_CMD} 's|/etc/nagios/mysql.cnf|${LOCALBASE}/etc/nagios/mysql.cnf|g' ${WRKSRC}/nagios/bin/pmp-check-mysql-* + @${REINPLACE_CMD} 's|/etc/cacti/|${LOCALBASE}/etc/cacti/|g' ${WRKSRC}/zabbix/scripts/ss_get_mysql_stats.php + @${REINPLACE_CMD} 's|wget|${LOCALBASE}/bin/wget|g' ${WRKSRC}/cacti/scripts/ss_get_by_ssh.php + do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share/cacti/scripts ${MKDIR} ${STAGEDIR}${PREFIX}/share/percona-monitoring-plugins