From d784a8f2ee5ae2bad00fca7964d760dcf7933235 Mon Sep 17 00:00:00 2001 From: sem Date: Sun, 1 May 2005 10:10:56 +0000 Subject: - Update to 0.8.6d - Fix df output (Kb required) (*) Submitted by: Zoltan Frombach (*) --- net/cacti/Makefile | 22 ++++++---------------- net/cacti/distinfo | 24 ++---------------------- net/cacti/files/patch-fix_df_output | 27 +++++++++++++++++++++++++++ net/cacti/pkg-plist | 3 ++- 4 files changed, 37 insertions(+), 39 deletions(-) create mode 100644 net/cacti/files/patch-fix_df_output (limited to 'net/cacti') diff --git a/net/cacti/Makefile b/net/cacti/Makefile index e703f216f50f..cea422f1cba0 100644 --- a/net/cacti/Makefile +++ b/net/cacti/Makefile @@ -6,26 +6,17 @@ # PORTNAME= cacti -PORTVERSION= 0.8.6c -PORTREVISION= 2 +PORTVERSION= 0.8.6d CATEGORIES= net www MASTER_SITES= http://www.cacti.net/downloads/ MAINTAINER= sem@FreeBSD.org COMMENT= Web-driven graphing interface for RRDTool -PATCH_SITES= http://www.cacti.net/downloads/patches/0.8.6c/ -PATCHFILES= rrd_fetch_negative_numbers.patch \ - no_auth_no_graphs_in_tree_bug.patch \ - device_create_multiple_graphs.patch \ - undefined_index_custom_problem_in_graph_view.patch \ - poller_recache_timeout.patch \ - output_field_name_period.patch \ - ping_sysdescription_to_sysuptime.patch \ - netsnmp_reduce_output_from_loaded_mibs.patch \ - php_snmp_v2.patch \ - config_php_include_order.patch -PATCH_DIST_STRIP=-p1 +# Vendor's patches +#PATCH_SITES= http://www.cacti.net/downloads/patches/0.8.6c/ +#PATCHFILES= rrd_fetch_negative_numbers.patch +#PATCH_DIST_STRIP=-p1 RUN_DEPENDS= rrdtool:${PORTSDIR}/net/rrdtool \ net-snmp-config:${PORTSDIR}/net-mgmt/net-snmp @@ -47,8 +38,7 @@ SUB_LIST+= CACTIDIR=${CACTIDIR} CACTIUSER=${CACTIUSER} \ post-patch: @${FIND} ${WRKSRC} -name \*.orig -delete; \ - ${MV} ${WRKSRC}/include/config.php ${WRKSRC}/include/config.php.orig; \ - ${RM} -d ${WRKSRC}/include/lang/en ${WRKSRC}/include/lang + ${MV} ${WRKSRC}/include/config.php ${WRKSRC}/include/config.php.orig pre-install: @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL; \ diff --git a/net/cacti/distinfo b/net/cacti/distinfo index 41a200eedab3..7bc712eec401 100644 --- a/net/cacti/distinfo +++ b/net/cacti/distinfo @@ -1,22 +1,2 @@ -MD5 (cacti-0.8.6c.tar.gz) = f48b1cc12ebdf96358563760c812e227 -SIZE (cacti-0.8.6c.tar.gz) = 1038183 -MD5 (rrd_fetch_negative_numbers.patch) = 768046e4089798cc9e40a9f4ccbee4f5 -SIZE (rrd_fetch_negative_numbers.patch) = 601 -MD5 (no_auth_no_graphs_in_tree_bug.patch) = bcdbcbda14b6f4d884384f1715b421c1 -SIZE (no_auth_no_graphs_in_tree_bug.patch) = 588 -MD5 (device_create_multiple_graphs.patch) = 3115b49bc17ee75bca18936e311d22d3 -SIZE (device_create_multiple_graphs.patch) = 1713 -MD5 (undefined_index_custom_problem_in_graph_view.patch) = a53c6c8c592a029d64a85ba64f39546e -SIZE (undefined_index_custom_problem_in_graph_view.patch) = 763 -MD5 (poller_recache_timeout.patch) = 29759c5badd81a4427be26ce003319e1 -SIZE (poller_recache_timeout.patch) = 614 -MD5 (output_field_name_period.patch) = 500c585678d184c3ecde59dfd86cc42b -SIZE (output_field_name_period.patch) = 772 -MD5 (ping_sysdescription_to_sysuptime.patch) = 82b2cc1f2aa35404effd70e8564882b8 -SIZE (ping_sysdescription_to_sysuptime.patch) = 630 -MD5 (netsnmp_reduce_output_from_loaded_mibs.patch) = b20f13d760830a1fb067e3364cac2d2b -SIZE (netsnmp_reduce_output_from_loaded_mibs.patch) = 1335 -MD5 (php_snmp_v2.patch) = 5fd1f3a832740c4e0711cb5635df42d4 -SIZE (php_snmp_v2.patch) = 2762 -MD5 (config_php_include_order.patch) = 444863320b787346855a96db4982052a -SIZE (config_php_include_order.patch) = 2190 +MD5 (cacti-0.8.6d.tar.gz) = f149a874dd06b639a5b6b78cf994b4cb +SIZE (cacti-0.8.6d.tar.gz) = 1037551 diff --git a/net/cacti/files/patch-fix_df_output b/net/cacti/files/patch-fix_df_output new file mode 100644 index 000000000000..705f16930164 --- /dev/null +++ b/net/cacti/files/patch-fix_df_output @@ -0,0 +1,27 @@ +--- scripts/diskfree.pl.orig Fri Apr 29 17:32:01 2005 ++++ scripts/diskfree.pl Wed Mar 23 02:19:37 2005 +@@ -1,6 +1,6 @@ + #!/usr/bin/perl + +-$ret = `df --block-size=1024 -P $ARGV[0] | grep -v Filesystem`; ++$ret = `df -k $ARGV[0] | grep -v Filesystem`; + $ret =~ s/($ARGV[0])(.* )(.*[0-9])(.* )(.*[0-9])(.* )(.*[0-9])(.* )(.*[0-9])%(.* )//; + + print "megabytes:$7 percent:$9"; +--- scripts/diskfree.sh.orig Fri Apr 29 17:32:01 2005 ++++ scripts/diskfree.sh Wed Mar 23 02:19:47 2005 +@@ -1,2 +1,2 @@ + #!/bin/sh +-df --block-size=1024 -P $1 | perl -ape '$F[4]=~tr/%//d;}{print "megabytes:$F[3] percent:$F[4]"'; ++df -k $1 | perl -ape '$F[4]=~tr/%//d;}{print "megabytes:$F[3] percent:$F[4]"'; +--- scripts/query_unix_partitions.pl.orig Sat Apr 30 01:50:01 2005 ++++ scripts/query_unix_partitions.pl Sat Apr 30 01:50:13 2005 +@@ -5,7 +5,7 @@ + exit; + } + +-open(DF, "/bin/df -P|"); ++open(DF, "/bin/df -k|"); + + while () { + #/dev/hda2 20157744 18553884 579860 97% /var diff --git a/net/cacti/pkg-plist b/net/cacti/pkg-plist index 530ea61c03fc..3ce0ab2fc292 100644 --- a/net/cacti/pkg-plist +++ b/net/cacti/pkg-plist @@ -94,6 +94,7 @@ %%CACTIDIR%%/images/button_save.gif %%CACTIDIR%%/images/button_view.gif %%CACTIDIR%%/images/button_yes.gif +%%CACTIDIR%%/images/cacti_about_logo.gif %%CACTIDIR%%/images/cacti_backdrop.gif %%CACTIDIR%%/images/cacti_backdrop2.gif %%CACTIDIR%%/images/cacti_logo.gif @@ -107,7 +108,6 @@ %%CACTIDIR%%/images/menu_line.gif %%CACTIDIR%%/images/move_down.gif %%CACTIDIR%%/images/move_up.gif -%%CACTIDIR%%/images/raxnet_logo.gif %%CACTIDIR%%/images/reload_icon_small.gif %%CACTIDIR%%/images/shadow.gif %%CACTIDIR%%/images/shadow_gray.gif @@ -198,6 +198,7 @@ %%CACTIDIR%%/install/0_8_4_to_0_8_5.php %%CACTIDIR%%/install/0_8_5a_to_0_8_6.php %%CACTIDIR%%/install/0_8_6_to_0_8_6a.php +%%CACTIDIR%%/install/0_8_6c_to_0_8_6d.php %%CACTIDIR%%/install/0_8_to_0_8_1.php %%CACTIDIR%%/install/index.php %%CACTIDIR%%/install/install_finish.gif -- cgit