1 files changed, 119 insertions, 41 deletions

diff --git a/sysutils/munin-node/pkg-plist b/sysutils/munin-node/pkg-plist
index a96e2e5fcd32..5042f619b5b9 100644
--- a/sysutils/munin-node/pkg-plist
+++ b/sysutils/munin-node/pkg-plist
@@ -1,74 +1,125 @@
-@exec mkdir -p %D/etc/munin/plugins
-@exec mkdir -p %D/etc/munin/plugin-conf.d && chmod 755 %D/etc/munin/plugin-conf.d
-@exec mkdir -p %D/var/munin/plugin-state && chgrp munin %D/var/munin/plugin-state && chmod 775 %D/var/munin/plugin-state
-@unexec rm %D/bin/munin-node-revive 2>/dev/null || true
-@unexec if [ -n "$PACKAGE_BUILDING" ]; then rm -f %D/etc/munin/VERSION.node; fi
-@unexec if cmp -s %D/etc/munin/munin-node.conf %D/etc/munin/munin-node.conf.sample; then rm -f %D/etc/munin/munin-node.conf; fi
+bin/munindoc
+etc/munin/VERSION.node
 etc/munin/munin-node.conf.sample
-@unexec if cmp -s %D/etc/munin/plugin-conf.d/plugins.conf %D/etc/munin/plugin-conf.d/plugins.conf.sample; then rm -f %D/etc/munin/plugin-conf.d/plugins.conf; fi
 etc/munin/plugin-conf.d/plugins.conf.sample
-bin/munindoc
-etc/rc.d/munin-node.sh
+%%SITE_PERL%%/Munin/Node/Config.pm
+%%SITE_PERL%%/Munin/Node/Configure/Debug.pm
+%%SITE_PERL%%/Munin/Node/Configure/History.pm
+%%SITE_PERL%%/Munin/Node/Configure/HostEnumeration.pm
+%%SITE_PERL%%/Munin/Node/Configure/Plugin.pm
+%%SITE_PERL%%/Munin/Node/Configure/PluginList.pm
+%%SITE_PERL%%/Munin/Node/Logger.pm
+%%SITE_PERL%%/Munin/Node/OS.pm
+%%SITE_PERL%%/Munin/Node/SNMPConfig.pm
+%%SITE_PERL%%/Munin/Node/Server.pm
+%%SITE_PERL%%/Munin/Node/Service.pm
+%%SITE_PERL%%/Munin/Node/Session.pm
+%%SITE_PERL%%/Munin/Node/Utils.pm
 %%SITE_PERL%%/Munin/Plugin.pm
+%%SITE_PERL%%/Munin/Plugin/Pgsql.pm
+%%SITE_PERL%%/Munin/Plugin/SNMP.pm
 sbin/munin-node
 sbin/munin-node-configure
-sbin/munin-node-configure-snmp
 sbin/munin-run
-%%DATADIR%%/plugins/acpi
 %%DATADIR%%/plugins/amavis
 %%DATADIR%%/plugins/apache_accesses
 %%DATADIR%%/plugins/apache_processes
 %%DATADIR%%/plugins/apache_volume
 %%DATADIR%%/plugins/apc_envunit_
 %%DATADIR%%/plugins/apc_nis
+%%DATADIR%%/plugins/asterisk_channels
+%%DATADIR%%/plugins/asterisk_channelstypes
+%%DATADIR%%/plugins/asterisk_codecs
+%%DATADIR%%/plugins/asterisk_meetme
+%%DATADIR%%/plugins/asterisk_meetmeusers
+%%DATADIR%%/plugins/asterisk_sipchannels
+%%DATADIR%%/plugins/asterisk_sippeers
+%%DATADIR%%/plugins/asterisk_voicemail
 %%DATADIR%%/plugins/bind9
 %%DATADIR%%/plugins/bind9_rndc
+%%DATADIR%%/plugins/cmc_tc_sensor_
+%%DATADIR%%/plugins/colour_tester
+%%DATADIR%%/plugins/coretemp
 %%DATADIR%%/plugins/courier_
 %%DATADIR%%/plugins/courier_mta_mailqueue
 %%DATADIR%%/plugins/courier_mta_mailstats
 %%DATADIR%%/plugins/courier_mta_mailvolume
 %%DATADIR%%/plugins/cpu
 %%DATADIR%%/plugins/cupsys_pages
+%%DATADIR%%/plugins/dev_cpu_
 %%DATADIR%%/plugins/df
 %%DATADIR%%/plugins/df_inode
 %%DATADIR%%/plugins/dhcpd3
+%%DATADIR%%/plugins/digitemp_
+%%DATADIR%%/plugins/ejabberd_
+%%DATADIR%%/plugins/env
 %%DATADIR%%/plugins/exim_mailqueue
 %%DATADIR%%/plugins/exim_mailqueue_alt
 %%DATADIR%%/plugins/exim_mailstats
+%%DATADIR%%/plugins/extinfo_tester
+%%DATADIR%%/plugins/fail2ban
 %%DATADIR%%/plugins/foldingathome
 %%DATADIR%%/plugins/foldingathome_rank
 %%DATADIR%%/plugins/foldingathome_wu
+%%DATADIR%%/plugins/freeradius_acct
+%%DATADIR%%/plugins/freeradius_auth
+%%DATADIR%%/plugins/freeradius_proxy_acct
+%%DATADIR%%/plugins/freeradius_proxy_auth
+%%DATADIR%%/plugins/haproxy_
 %%DATADIR%%/plugins/hddtemp
 %%DATADIR%%/plugins/hddtemp2
 %%DATADIR%%/plugins/hddtemp_smartctl
 %%DATADIR%%/plugins/hddtempd
+%%DATADIR%%/plugins/http_loadtime
+%%DATADIR%%/plugins/id
 %%DATADIR%%/plugins/if_
 %%DATADIR%%/plugins/if_errcoll_
+%%DATADIR%%/plugins/ifx_concurrent_sessions_
+%%DATADIR%%/plugins/iostat
 %%DATADIR%%/plugins/ipac-ng
+%%DATADIR%%/plugins/ipmi_sensor_
 %%DATADIR%%/plugins/ircu
+%%DATADIR%%/plugins/jmx_
 %%DATADIR%%/plugins/load
 %%DATADIR%%/plugins/loggrep
+%%DATADIR%%/plugins/lpstat
 %%DATADIR%%/plugins/mailman
 %%DATADIR%%/plugins/mailscanner
 %%DATADIR%%/plugins/mbmon_
+%%DATADIR%%/plugins/memcached_
 %%DATADIR%%/plugins/memory
 %%DATADIR%%/plugins/mhttping
+%%DATADIR%%/plugins/multigraph_tester
+%%DATADIR%%/plugins/multiping
 %%DATADIR%%/plugins/multips
-%%DATADIR%%/plugins/munin_graph
+%%DATADIR%%/plugins/multips_memory
+%%DATADIR%%/plugins/munin_stats
 %%DATADIR%%/plugins/munin_update
+%%DATADIR%%/plugins/mysql_
 %%DATADIR%%/plugins/mysql_bytes
+%%DATADIR%%/plugins/mysql_innodb
 %%DATADIR%%/plugins/mysql_isam_space_
 %%DATADIR%%/plugins/mysql_queries
 %%DATADIR%%/plugins/mysql_slowqueries
 %%DATADIR%%/plugins/mysql_threads
 %%DATADIR%%/plugins/named
+%%DATADIR%%/plugins/netopia
 %%DATADIR%%/plugins/netstat
+%%DATADIR%%/plugins/nginx_request
+%%DATADIR%%/plugins/nginx_status
+%%DATADIR%%/plugins/nomadix_users_
 %%DATADIR%%/plugins/ntp_
+%%DATADIR%%/plugins/ntp_kernel_err
+%%DATADIR%%/plugins/ntp_kernel_pll_freq
+%%DATADIR%%/plugins/ntp_kernel_pll_off
 %%DATADIR%%/plugins/ntp_offset
 %%DATADIR%%/plugins/ntp_states
 %%DATADIR%%/plugins/nut_misc
 %%DATADIR%%/plugins/nut_volts
+%%DATADIR%%/plugins/nutups_
+%%DATADIR%%/plugins/nvidia_
 %%DATADIR%%/plugins/open_files
+%%DATADIR%%/plugins/openvpn
 %%DATADIR%%/plugins/perdition
 %%DATADIR%%/plugins/ping_
 %%DATADIR%%/plugins/plugin.sh
@@ -78,21 +129,49 @@ sbin/munin-run
 %%DATADIR%%/plugins/postfix_mailqueue
 %%DATADIR%%/plugins/postfix_mailstats
 %%DATADIR%%/plugins/postfix_mailvolume
+%%DATADIR%%/plugins/postgres_bgwriter
+%%DATADIR%%/plugins/postgres_cache_
+%%DATADIR%%/plugins/postgres_checkpoints
+%%DATADIR%%/plugins/postgres_connections_
+%%DATADIR%%/plugins/postgres_connections_db
+%%DATADIR%%/plugins/postgres_locks_
+%%DATADIR%%/plugins/postgres_querylength_
+%%DATADIR%%/plugins/postgres_scans_
+%%DATADIR%%/plugins/postgres_size_
+%%DATADIR%%/plugins/postgres_transactions_
+%%DATADIR%%/plugins/postgres_tuples_
+%%DATADIR%%/plugins/postgres_users
+%%DATADIR%%/plugins/postgres_xlog
 %%DATADIR%%/plugins/processes
 %%DATADIR%%/plugins/ps_
 %%DATADIR%%/plugins/psu_
+%%DATADIR%%/plugins/qmailqstat
+%%DATADIR%%/plugins/qmailscan
+%%DATADIR%%/plugins/qmailscan-simple
 %%DATADIR%%/plugins/samba
 %%DATADIR%%/plugins/sendmail_mailqueue
 %%DATADIR%%/plugins/sendmail_mailstats
 %%DATADIR%%/plugins/sendmail_mailtraffic
+%%DATADIR%%/plugins/slapd_
+%%DATADIR%%/plugins/slapd_bdb_cache_
+%%DATADIR%%/plugins/slony_lag_
 %%DATADIR%%/plugins/smart_
+%%DATADIR%%/plugins/snmp__cpuload
 %%DATADIR%%/plugins/snmp__df
 %%DATADIR%%/plugins/snmp__fc_if_
 %%DATADIR%%/plugins/snmp__fc_if_err_
 %%DATADIR%%/plugins/snmp__if_
 %%DATADIR%%/plugins/snmp__if_err_
+%%DATADIR%%/plugins/snmp__if_multi
 %%DATADIR%%/plugins/snmp__load
+%%DATADIR%%/plugins/snmp__memory
+%%DATADIR%%/plugins/snmp__netapp_diskusage_
+%%DATADIR%%/plugins/snmp__netapp_inodeusage_
+%%DATADIR%%/plugins/snmp__netstat
+%%DATADIR%%/plugins/snmp__print_pages
+%%DATADIR%%/plugins/snmp__print_supplies
 %%DATADIR%%/plugins/snmp__processes
+%%DATADIR%%/plugins/snmp__rdp_users
 %%DATADIR%%/plugins/snmp__sensors_fsc_bx_fan
 %%DATADIR%%/plugins/snmp__sensors_fsc_bx_temp
 %%DATADIR%%/plugins/snmp__sensors_fsc_fan
@@ -100,48 +179,47 @@ sbin/munin-run
 %%DATADIR%%/plugins/snmp__sensors_mbm_fan
 %%DATADIR%%/plugins/snmp__sensors_mbm_temp
 %%DATADIR%%/plugins/snmp__sensors_mbm_volt
+%%DATADIR%%/plugins/snmp__swap
+%%DATADIR%%/plugins/snmp__uptime
 %%DATADIR%%/plugins/snmp__users
+%%DATADIR%%/plugins/snmp__winload
+%%DATADIR%%/plugins/snmp__winmem
+%%DATADIR%%/plugins/snort_alerts
+%%DATADIR%%/plugins/snort_bytes_pkt
+%%DATADIR%%/plugins/snort_drop_rate
+%%DATADIR%%/plugins/snort_pattern_match
+%%DATADIR%%/plugins/snort_pkts
+%%DATADIR%%/plugins/snort_traffic
 %%DATADIR%%/plugins/spamstats
+%%DATADIR%%/plugins/squeezebox_
 %%DATADIR%%/plugins/squid_cache
 %%DATADIR%%/plugins/squid_icp
+%%DATADIR%%/plugins/squid_objectsize
 %%DATADIR%%/plugins/squid_requests
 %%DATADIR%%/plugins/squid_traffic
 %%DATADIR%%/plugins/surfboard
 %%DATADIR%%/plugins/swap
 %%DATADIR%%/plugins/sybase_space
+%%DATADIR%%/plugins/systat
+%%DATADIR%%/plugins/tomcat_
+%%DATADIR%%/plugins/tomcat_access
+%%DATADIR%%/plugins/tomcat_jvm
+%%DATADIR%%/plugins/tomcat_threads
+%%DATADIR%%/plugins/tomcat_volume
+%%DATADIR%%/plugins/uptime
+%%DATADIR%%/plugins/users
+%%DATADIR%%/plugins/varnish_
 %%DATADIR%%/plugins/vmstat
-@unexec rm -f /var/run/munin/munin-node.pid
-@unexec rmdir /var/run/munin 2>/dev/null || true
+%%DATADIR%%/plugins/warning_tester
+%%DATADIR%%/plugins/zimbra_
 @dirrmtry var/munin/plugin-state
 @dirrmtry var/munin
-@dirrmtry %%DATADIR%%/plugins
+@dirrm %%DATADIR%%/plugins
 @dirrmtry %%DATADIR%%
-@dirrmtry %%SITE_PERL%%/Munin/Plugin
+@dirrm %%SITE_PERL%%/Munin/Plugin
+@dirrm %%SITE_PERL%%/Munin/Node/Configure
+@dirrm %%SITE_PERL%%/Munin/Node
 @dirrmtry %%SITE_PERL%%/Munin
-@dirrmtry etc/munin/plugin-conf.d
 @dirrmtry etc/munin/plugins
+@dirrmtry etc/munin/plugin-conf.d
 @dirrmtry etc/munin
-@unexec echo remove %%SITE_PERL%%/Munin/Plugin
-@unexec echo remove %%SITE_PERL%%/Munin
-@dirrmtry %%SITE_PERL%%/Munin/Plugin
-@dirrmtry %%SITE_PERL%%/Munin
-@unexec echo
-@unexec echo '********************************************************************'
-@unexec echo "If you want to *completely* remove munin-node, you have to"
-@unexec echo
-@unexec echo "    rm -rf %D/etc/munin/VERSION.node %D/etc/munin/plugins \\"
-@unexec if [ -d %D/var/munin/plugin-state ]; then echo "           %D/var/munin/plugin-state \\"; fi
-@unexec if [ -f %D/etc/munin/munin-node.conf ]; then echo "           %D/etc/munin/munin-node.conf \\"; fi
-@unexec if [ -d %D/var/munin/plugin-state ]; then echo "           %D/var/munin/plugin-state \\"; fi
-@unexec if [ -d %%LOCALBASE%%/%%SITE_PERL%%/Munin/Plugin ]; then echo "           %%LOCALBASE%%/%%SITE_PERL%%/Munin/Plugin \\"; fi
-@unexec if [ -d %%LOCALBASE%%/%%SITE_PERL%%/Munin ]; then echo "           %%LOCALBASE%%/%%SITE_PERL%%/Munin/Plugin \\"; fi
-@unexec echo "           /var/log/munin-node.log*"
-@unexec echo
-@unexec echo "If you have already deinstalled munin-main, you can also"
-@unexec echo
-@unexec echo "    rmdir %D/etc/munin %D/var/munin"
-@unexec echo
-@unexec echo "These files and directories have to be left on the system because"
-@unexec echo "you may be performing an update. This process can't tell."
-@unexec echo '********************************************************************'
-@unexec echo