3 files changed, 34 insertions, 30 deletions

diff --git a/net-mgmt/percona-monitoring-plugins/Makefile b/net-mgmt/percona-monitoring-plugins/Makefile
index 9d0d63f669c0..daf813e1c574 100644
--- a/net-mgmt/percona-monitoring-plugins/Makefile
+++ b/net-mgmt/percona-monitoring-plugins/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	percona-monitoring-plugins
-PORTVERSION=	1.0.2
+PORTVERSION=	1.1.3
 CATEGORIES=	net-mgmt
-MASTER_SITES=	http://www.percona.com/downloads/percona-monitoring-plugins/ \
+MASTER_SITES=	http://www.percona.com/downloads/percona-monitoring-plugins/${PORTVERSION}/ \
 		ftp://ftp.renatasystems.org/pub/FreeBSD/ports/distfiles/
 
 MAINTAINER=	alexey@renatasystems.org
@@ -28,34 +28,32 @@ PORTDOCS=	Changelog
 
 CACTIDIR?=	share/cacti
 
-NO_STAGE=	yes
-
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 do-install:
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}/${doc}
+	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}/${doc}
 .endfor
 .endif
 
-	${MKDIR} ${PREFIX}/share/cacti/scripts
-	${MKDIR} ${PREFIX}/share/percona-monitoring-plugins
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/cacti/scripts
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/percona-monitoring-plugins
 
 .for dir in definitions misc templates
 	cd ${WRKSRC} && ${PAX} -r -w cacti/${dir} \
-		${PREFIX}/share/percona-monitoring-plugins
+		${STAGEDIR}${PREFIX}/share/percona-monitoring-plugins
 .endfor
 
 .for script in ss_get_by_ssh.php ss_get_mysql_stats.php
 	${INSTALL_DATA} ${WRKSRC}/cacti/scripts/${script} \
-		${PREFIX}/share/cacti/scripts/${script}
+		${STAGEDIR}${PREFIX}/share/cacti/scripts/${script}
 .endfor
 
-	${INSTALL_SCRIPT} ${WRKSRC}/cacti/bin/* ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/nagios/bin/* ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/cacti/bin/* ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/nagios/bin/* ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/percona-monitoring-plugins/distinfo b/net-mgmt/percona-monitoring-plugins/distinfo
index d1ffc2f42198..8a9a1e6ef8fd 100644
--- a/net-mgmt/percona-monitoring-plugins/distinfo
+++ b/net-mgmt/percona-monitoring-plugins/distinfo
@@ -1,2 +1,2 @@
-SHA256 (percona-monitoring-plugins-1.0.2.tar.gz) = da84cfe89637292da15ddb1e66f67ad9703fa21392d8d49e664ad08f7aa45585
-SIZE (percona-monitoring-plugins-1.0.2.tar.gz) = 317455
+SHA256 (percona-monitoring-plugins-1.1.3.tar.gz) = 593213da354ca889f94626de7a103d34f590bfae6ec9e5755f1cd7a715da94c6
+SIZE (percona-monitoring-plugins-1.1.3.tar.gz) = 403525
diff --git a/net-mgmt/percona-monitoring-plugins/pkg-plist b/net-mgmt/percona-monitoring-plugins/pkg-plist
index d90b50b70930..976c897c2b00 100644
--- a/net-mgmt/percona-monitoring-plugins/pkg-plist
+++ b/net-mgmt/percona-monitoring-plugins/pkg-plist
@@ -2,6 +2,7 @@ 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
@@ -12,11 +13,14 @@ 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
 share/cacti/scripts/ss_get_by_ssh.php
 share/cacti/scripts/ss_get_mysql_stats.php
+%%PORTDOCS%%%%DOCSDIR%%/Changelog
 %%DATADIR%%/cacti/definitions/apache.def
+%%DATADIR%%/cacti/definitions/galera.def
 %%DATADIR%%/cacti/definitions/gnu_linux.def
 %%DATADIR%%/cacti/definitions/jmx.def
 %%DATADIR%%/cacti/definitions/memcached.def
@@ -24,21 +28,23 @@ share/cacti/scripts/ss_get_mysql_stats.php
 %%DATADIR%%/cacti/definitions/mysql.def
 %%DATADIR%%/cacti/definitions/nginx.def
 %%DATADIR%%/cacti/definitions/openvz.def
+%%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.0.2.xml
-%%DATADIR%%/cacti/templates/cacti_host_template_percona_gnu_linux_server_ht_0.8.6i-sver1.0.2.xml
-%%DATADIR%%/cacti/templates/cacti_host_template_percona_jmx_server_ht_0.8.6i-sver1.0.2.xml
-%%DATADIR%%/cacti/templates/cacti_host_template_percona_memcached_server_ht_0.8.6i-sver1.0.2.xml
-%%DATADIR%%/cacti/templates/cacti_host_template_percona_mongodb_server_ht_0.8.6i-sver1.0.2.xml
-%%DATADIR%%/cacti/templates/cacti_host_template_percona_mysql_server_ht_0.8.6i-sver1.0.2.xml
-%%DATADIR%%/cacti/templates/cacti_host_template_percona_nginx_server_ht_0.8.6i-sver1.0.2.xml
-%%DATADIR%%/cacti/templates/cacti_host_template_percona_openvz_server_ht_0.8.6i-sver1.0.2.xml
-%%DATADIR%%/cacti/templates/cacti_host_template_percona_redis_server_ht_0.8.6i-sver1.0.2.xml
-@dirrm %%DATADIR%%/cacti/templates
-@dirrm %%DATADIR%%/cacti/misc
-@dirrm %%DATADIR%%/cacti/definitions
-@dirrm %%DATADIR%%/cacti
-@dirrm %%DATADIR%%
-@dirrmtry share/cacti/scripts
-@dirrmtry share/cacti
+%%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
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
+@dirrmtry %%DATADIR%%/cacti/definitions
+@dirrmtry %%DATADIR%%/cacti/misc
+@dirrmtry %%DATADIR%%/cacti/templates
+@dirrmtry %%DATADIR%%/cacti
+@dirrmtry %%DATADIR%%