3 files changed, 30 insertions, 36 deletions
diff --git a/net-mgmt/percona-monitoring-plugins/Makefile b/net-mgmt/percona-monitoring-plugins/Makefile
index 794d023df70d..4ac5cec8876f 100644
--- a/net-mgmt/percona-monitoring-plugins/Makefile
+++ b/net-mgmt/percona-monitoring-plugins/Makefile
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	percona-monitoring-plugins
-PORTVERSION=	1.1.3
-PORTREVISION=	4
+PORTVERSION=	1.1.8
+PORTREVISION=	0
 CATEGORIES=	net-mgmt
-MASTER_SITES=	http://www.percona.com/downloads/percona-monitoring-plugins/${PORTVERSION}/ \
+MASTER_SITES=	https://www.percona.com/downloads/percona-monitoring-plugins/${PORTNAME}-${PORTVERSION}/source/tarball/ \
 		ftp://ftp.renatasystems.org/pub/FreeBSD/ports/distfiles/
 
 MAINTAINER=	alexey@renatasystems.org
@@ -33,17 +33,20 @@ CACTIDIR?=	share/cacti
 
 OPTIONS_DEFINE=	DOCS
 
+REINPLACE_ARGS=	-i ''
+
 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
+	@${REINPLACE_CMD} 's|/etc/cacti/|${PREFIX}/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|${PREFIX}/etc/nagios/mysql.cnf|g' ${WRKSRC}/nagios/bin/pmp-check-mysql-*
+	@${REINPLACE_CMD} 's|/usr/bin/php|${PREFIX}/bin/php|g' ${WRKSRC}/zabbix/scripts/get_mysql_stats_wrapper.sh
+	@${REINPLACE_CMD} 's|wget|${PREFIX}/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
+	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nagios
 
-.for dir in definitions misc templates
+.for dir in definitions misc
 	cd ${WRKSRC} && ${PAX} -r -w cacti/${dir} \
 		${STAGEDIR}${PREFIX}/share/percona-monitoring-plugins
 .endfor
@@ -54,7 +57,7 @@ do-install:
 .endfor
 
 	${INSTALL_SCRIPT} ${WRKSRC}/cacti/bin/* ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/nagios/bin/* ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/nagios/bin/* ${STAGEDIR}${PREFIX}/libexec/nagios
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/net-mgmt/percona-monitoring-plugins/distinfo b/net-mgmt/percona-monitoring-plugins/distinfo
index 8a9a1e6ef8fd..1c108c0a7ba2 100644
--- a/net-mgmt/percona-monitoring-plugins/distinfo
+++ b/net-mgmt/percona-monitoring-plugins/distinfo
@@ -1,2 +1,3 @@
-SHA256 (percona-monitoring-plugins-1.1.3.tar.gz) = 593213da354ca889f94626de7a103d34f590bfae6ec9e5755f1cd7a715da94c6
-SIZE (percona-monitoring-plugins-1.1.3.tar.gz) = 403525
+TIMESTAMP = 1526482898
+SHA256 (percona-monitoring-plugins-1.1.8.tar.gz) = c7a7ce92788bcc7df9e58d922365562f151854f1b4b5215e279fc7c4484b91dc
+SIZE (percona-monitoring-plugins-1.1.8.tar.gz) = 12494139
diff --git a/net-mgmt/percona-monitoring-plugins/pkg-plist b/net-mgmt/percona-monitoring-plugins/pkg-plist
index e591bf578d1d..0745a6e6d27f 100644
--- a/net-mgmt/percona-monitoring-plugins/pkg-plist
+++ b/net-mgmt/percona-monitoring-plugins/pkg-plist
@@ -2,20 +2,21 @@ bin/pmp-cacti-extract-template
 bin/pmp-cacti-graph-defs
 bin/pmp-cacti-make-hashes
 bin/pmp-cacti-template
-bin/pmp-check-aws-rds.py
-bin/pmp-check-lvm-snapshots
-bin/pmp-check-mysql-deadlocks
-bin/pmp-check-mysql-deleted-files
-bin/pmp-check-mysql-file-privs
-bin/pmp-check-mysql-innodb
-bin/pmp-check-mysql-pidfile
-bin/pmp-check-mysql-processlist
-bin/pmp-check-mysql-replication-delay
-bin/pmp-check-mysql-replication-running
-bin/pmp-check-mysql-status
-bin/pmp-check-mysql-ts-count
-bin/pmp-check-pt-table-checksum
-bin/pmp-check-unix-memory
+libexec/nagios/pmp-check-mongo.py
+libexec/nagios/pmp-check-aws-rds.py
+libexec/nagios/pmp-check-lvm-snapshots
+libexec/nagios/pmp-check-mysql-deadlocks
+libexec/nagios/pmp-check-mysql-deleted-files
+libexec/nagios/pmp-check-mysql-file-privs
+libexec/nagios/pmp-check-mysql-innodb
+libexec/nagios/pmp-check-mysql-pidfile
+libexec/nagios/pmp-check-mysql-processlist
+libexec/nagios/pmp-check-mysql-replication-delay
+libexec/nagios/pmp-check-mysql-replication-running
+libexec/nagios/pmp-check-mysql-status
+libexec/nagios/pmp-check-mysql-ts-count
+libexec/nagios/pmp-check-pt-table-checksum
+libexec/nagios/pmp-check-unix-memory
 share/cacti/scripts/ss_get_by_ssh.php
 share/cacti/scripts/ss_get_mysql_stats.php
 %%DATADIR%%/cacti/definitions/apache.def
@@ -30,14 +31,3 @@ share/cacti/scripts/ss_get_mysql_stats.php
 %%DATADIR%%/cacti/definitions/rds.def
 %%DATADIR%%/cacti/definitions/redis.def
 %%DATADIR%%/cacti/misc/jmx-monitor.xml
-%%DATADIR%%/cacti/templates/cacti_host_template_percona_apache_server_ht_0.8.6i-sver1.1.3.xml
-%%DATADIR%%/cacti/templates/cacti_host_template_percona_galera_server_ht_0.8.6i-sver1.1.3.xml
-%%DATADIR%%/cacti/templates/cacti_host_template_percona_gnu_linux_server_ht_0.8.6i-sver1.1.3.xml
-%%DATADIR%%/cacti/templates/cacti_host_template_percona_jmx_server_ht_0.8.6i-sver1.1.3.xml
-%%DATADIR%%/cacti/templates/cacti_host_template_percona_memcached_server_ht_0.8.6i-sver1.1.3.xml
-%%DATADIR%%/cacti/templates/cacti_host_template_percona_mongodb_server_ht_0.8.6i-sver1.1.3.xml
-%%DATADIR%%/cacti/templates/cacti_host_template_percona_mysql_server_ht_0.8.6i-sver1.1.3.xml
-%%DATADIR%%/cacti/templates/cacti_host_template_percona_nginx_server_ht_0.8.6i-sver1.1.3.xml
-%%DATADIR%%/cacti/templates/cacti_host_template_percona_openvz_server_ht_0.8.6i-sver1.1.3.xml
-%%DATADIR%%/cacti/templates/cacti_host_template_percona_rds_server_ht_0.8.6i-sver1.1.3.xml
-%%DATADIR%%/cacti/templates/cacti_host_template_percona_redis_server_ht_0.8.6i-sver1.1.3.xml