security update to 0.8.7i (with Plugin Architecture version 3.1)

     bug#0001963: Bandwidth summation "total in" and "total out"
		 are always 0
     bug#0002040: ICMP ping errors for Windows 7 with PHP 5.3
     bug#0002062: Multiple security vulnerabilities
     bug#0002063: Multiple value poller output incorrectly interpreted
		 as hexadecimal value
     bug#0002064: Removing "~" (tilde) by sanitize_uri() conflicts with
		 Apache UserDir translation
     bug#0002066: Graph without host id "Notice: Undefined variable:
		 host_id"
     bug#0002067: Custom time range filter not working
     bug#0002068: Missing header include in analyze_database.php
     bug#0002071: MySQL table poller_item is dropped always when "Data
		 Input Method" is changed or added.
     bug#0002079: Using input field of a script in graph title does not
		 work
     bug#0002080: Database password containing "@" does not connect
     bug#0002083: Adding a new users generates errors in apache logs
     bug#0002084: Incorrect normalization of hrStorageTable values
		 over 2^31
     bug#0002086: Incorrect usage of mysql custom tcp port
     bug#0002087: PHP recache problems due to missing slashes in reindex
		 table
     bug#0002093: Unit exponent value of 0 not imported with graph
		 template
     bug#0002094: CDEF: "another cdef" references not included in
		 template export
     bug#0002106: Command line add device does not accept "None" for
		 host template
     bug: Update host template cli script help to fix incorrect options
     bug: Refresh of Cacti log viewer not working
     bug: Problems saving User Graph Permissions in IE9
     bug: Bandwidth summation fails if NAN values are present
     bug: Special Type Code "host_id" available in Data Queries by Not
	 Data Input Methods
     bug: Do not generate error messages when creating non host based
	 graphs
     bug: Wrong index used for Data Queries using VALUE/REGEXP
     bug: Fix issue with title variable replacement failing when no host
	 is associated with graph
     bug: Cacti generating MySQL 1100 Errors when modifying the tree
     bug: Resolved "Fatal error: Cannot use string offset as an array"
	 in lib/data_query.php
     feature: Properly support ifHighSpeed replacement variable
     feature: Increase granularity of availability options to correct
	     spine bug
     feature: Replace "event count" with last changed date for host
	     availability

2 files changed, 7 insertions, 15 deletions

diff --git a/net/cacti/Makefile b/net/cacti/Makefile
index 8f1c49693be..a81d8ae3397 100644
--- a/net/cacti/Makefile
+++ b/net/cacti/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/11/22 22:23:13 tez Exp $
+# $NetBSD: Makefile,v 1.2 2011/12/20 23:57:33 tez Exp $
 #
 
-DISTNAME=		cacti-0.8.7h
+PKGNAME=		cacti-0.8.7i
+DISTNAME=		cacti-0.8.7i-PIA-3.1
 CATEGORIES=		net
-DISTFILES=		cacti-0.8.7h.tar.gz
-DISTFILES+=		cacti-plugin-0.8.7h-PA-v3.0.tar.gz
 MASTER_SITES=		http://www.cacti.net/downloads/
-MASTER_SITES+=		http://www.cacti.net/downloads/pia/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.cacti.net/
@@ -75,9 +73,6 @@ SPECIAL_PERMS+=		share/cacti/log/cacti.log ${CACTI_USER} ${CACTI_GROUP} 755
 INSTALLATION_DIRS=      share/examples/cacti
 INSTALLATION_DIRS+=	share/cacti
 
-pre-patch:
-	${CP} -R ${WRKDIR}/cacti-plugin-arch/files/* ${WRKDIR}
-
 post-extract:
 	${CP} ${FILESDIR}/httpd-cacti.conf ${WRKDIR}/
 	${CP} ${FILESDIR}/freebsd_memory.pl ${WRKSRC}/scripts/
diff --git a/net/cacti/distinfo b/net/cacti/distinfo
index 7c943c4dde6..2112d80ba99 100644
--- a/net/cacti/distinfo
+++ b/net/cacti/distinfo
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2011/11/22 22:23:13 tez Exp $
+$NetBSD: distinfo,v 1.2 2011/12/20 23:57:33 tez Exp $
 
-SHA1 (cacti-0.8.7h.tar.gz) = 4311cff2ec8883c013efd0225c73d145bcc1cf00
-RMD160 (cacti-0.8.7h.tar.gz) = 923492a3f36e5d320570ebfad9b4136acf7b9eb7
-Size (cacti-0.8.7h.tar.gz) = 2249323 bytes
-SHA1 (cacti-plugin-0.8.7h-PA-v3.0.tar.gz) = a144fcf32d31a268a338d84adf8db3b63f3fe5a9
-RMD160 (cacti-plugin-0.8.7h-PA-v3.0.tar.gz) = 87e22690f74e8fd6d367063684aabbd582691a24
-Size (cacti-plugin-0.8.7h-PA-v3.0.tar.gz) = 252949 bytes
+SHA1 (cacti-0.8.7i-PIA-3.1.tar.gz) = 84cb6326645a2d08059dcc6767f777147a0a4607
+RMD160 (cacti-0.8.7i-PIA-3.1.tar.gz) = 691d2fad7d7071475076556ab643a480ef2ee84c
+Size (cacti-0.8.7i-PIA-3.1.tar.gz) = 2270714 bytes
 SHA1 (patch-cacti.sql) = 37e18026c4136630d939ab5a7a4d6336bf166282
 SHA1 (patch-include_global.php) = fb0d2f15596b051c60ed6032ecb9038315b7c663
 SHA1 (patch-include_global__settings.php) = 54ffd0c3fc9d927595b1568a874c45a4a6033f7b