Solaris has a different set of plugins, adapt plist.

2 files changed, 34 insertions, 15 deletions

diff --git a/sysutils/munin-node/Makefile b/sysutils/munin-node/Makefile
index b684f449cdd..cc8d2bdcbc0 100644
--- a/sysutils/munin-node/Makefile
+++ b/sysutils/munin-node/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/02/17 18:58:34 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2009/08/30 08:19:43 tonnerre Exp $
 #
 
 DISTNAME=	munin_${VER}
@@ -16,12 +16,22 @@ DEPENDS+=	p5-Net-Server>=0:../../net/p5-Net-Server
 DEPENDS+=	p5-Net-SSLeay>=0:../../security/p5-Net-SSLeay
 DEPENDS+=	munin-doc>=1.3.1:../../sysutils/munin-doc
 
+.include "../../mk/bsd.prefs.mk"
+
 USE_TOOLS+=	perl:run tar
 USE_TOOLS+=	gmake
 USE_PKGINSTALL=	YES
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S:_:-:}
 
+PLIST_VARS+=	sunos not-sunos
+
+.if ${OPSYS} == "SunOS"
+PLIST.sunos=	yes
+.else
+PLIST.not-sunos= yes
+.endif
+
 PKG_GROUPS_VARS+=	MUNIN_GROUP
 PKG_USERS_VARS+=	MUNIN_USER
 
@@ -56,6 +66,7 @@ INSTALL_TARGET=	install-node install-node-plugins
 BUILD_TARGET=	build
 
 #MAKE_ENV+=	PERL5_SITELIB=${PERL5_SITELIB}
+MAKE_ENV+=	PREFIX=${PREFIX}
 MAKE_ENV+=	CONFDIR=${PKG_SYSCONFDIR}
 MAKE_ENV+=	MUNIN_USER=${MUNIN_USER}
 MAKE_ENV+=	MUNIN_GROUP=${MUNIN_GROUP}
diff --git a/sysutils/munin-node/PLIST b/sysutils/munin-node/PLIST
index 8d3b22a3fb7..402d5310d19 100644
--- a/sysutils/munin-node/PLIST
+++ b/sysutils/munin-node/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 21:28:47 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2009/08/30 08:19:43 tonnerre Exp $
 lib/munin/plugins/acpi
 lib/munin/plugins/amavis
 lib/munin/plugins/apache_accesses
@@ -23,27 +23,32 @@ lib/munin/plugins/exim_mailstats
 lib/munin/plugins/foldingathome
 lib/munin/plugins/foldingathome_rank
 lib/munin/plugins/foldingathome_wu
-lib/munin/plugins/forks
+${PLIST.not-sunos}lib/munin/plugins/forks
+${PLIST.sunos}lib/munin/plugins/fs_df
+${PLIST.sunos}lib/munin/plugins/fs_inodes
 lib/munin/plugins/hddtemp
 lib/munin/plugins/hddtemp2
 lib/munin/plugins/hddtemp_smartctl
 lib/munin/plugins/hddtempd
 lib/munin/plugins/if_
 lib/munin/plugins/if_errcoll_
-lib/munin/plugins/interrupts
-lib/munin/plugins/iostat
-lib/munin/plugins/iostat_ops
+${PLIST.not-sunos}lib/munin/plugins/interrupts
+${PLIST.sunos}lib/munin/plugins/io_busy_
+${PLIST.sunos}lib/munin/plugins/io_bytes_
+${PLIST.sunos}lib/munin/plugins/io_ops_
+${PLIST.not-sunos}lib/munin/plugins/iostat
+${PLIST.not-sunos}lib/munin/plugins/iostat_ops
 lib/munin/plugins/ipac-ng
 lib/munin/plugins/ircu
-lib/munin/plugins/irqstats
+${PLIST.not-sunos}lib/munin/plugins/irqstats
 lib/munin/plugins/load
 lib/munin/plugins/loggrep
 lib/munin/plugins/mailman
 lib/munin/plugins/mailscanner
 lib/munin/plugins/mbmon_
 lib/munin/plugins/memory
-lib/munin/plugins/memory_pools
-lib/munin/plugins/memory_types
+${PLIST.not-sunos}lib/munin/plugins/memory_pools
+${PLIST.not-sunos}lib/munin/plugins/memory_types
 lib/munin/plugins/mhttping
 lib/munin/plugins/multips
 lib/munin/plugins/munin_graph
@@ -55,8 +60,8 @@ lib/munin/plugins/mysql_slowqueries
 lib/munin/plugins/mysql_threads
 lib/munin/plugins/named
 lib/munin/plugins/netstat
-lib/munin/plugins/nfs_client
-lib/munin/plugins/nfsd
+${PLIST.not-sunos}lib/munin/plugins/nfs_client
+${PLIST.not-sunos}lib/munin/plugins/nfsd
 lib/munin/plugins/ntp_
 lib/munin/plugins/ntp_kernel_err
 lib/munin/plugins/ntp_kernel_pll_freq
@@ -64,7 +69,9 @@ lib/munin/plugins/ntp_kernel_pll_off
 lib/munin/plugins/ntp_states
 lib/munin/plugins/nut_misc
 lib/munin/plugins/nut_volts
-lib/munin/plugins/open_files
+${PLIST.not-sunos}lib/munin/plugins/open_files
+${PLIST.sunos}lib/munin/plugins/paging_in
+${PLIST.sunos}lib/munin/plugins/paging_out
 lib/munin/plugins/perdition
 lib/munin/plugins/ping_
 lib/munin/plugins/plugins.history
@@ -80,7 +87,7 @@ lib/munin/plugins/samba
 lib/munin/plugins/sendmail_mailqueue
 lib/munin/plugins/sendmail_mailstats
 lib/munin/plugins/sendmail_mailtraffic
-lib/munin/plugins/sensors_
+${PLIST.not-sunos}lib/munin/plugins/sensors_
 lib/munin/plugins/smart_
 lib/munin/plugins/snmp__cpuload
 lib/munin/plugins/snmp__df
@@ -104,9 +111,10 @@ lib/munin/plugins/squid_icp
 lib/munin/plugins/squid_requests
 lib/munin/plugins/squid_traffic
 lib/munin/plugins/surfboard
-lib/munin/plugins/swap
+${PLIST.not-sunos}lib/munin/plugins/swap
 lib/munin/plugins/sybase_space
-lib/munin/plugins/uptime
+${PLIST.sunos}lib/munin/plugins/temperature
+${PLIST.not-sunos}lib/munin/plugins/uptime
 lib/munin/plugins/vmstat
 sbin/munin-node
 sbin/munin-node-configure