2 files changed, 59 insertions, 71 deletions

diff --git a/sysutils/munin-node/Makefile b/sysutils/munin-node/Makefile
index 63cd918fdf07..7d9d5b327188 100644
--- a/sysutils/munin-node/Makefile
+++ b/sysutils/munin-node/Makefile
@@ -16,15 +16,11 @@ DISTNAME=	${PORTNAME}_${PORTVERSION:S/.p/pre/}
 MAINTAINER=	lupe@lupe-christoph.de
 COMMENT=	Node-specific part of Munin
 
-BUILD_DEPENDS=	${RUN_DEPENDS}
-RUN_DEPENDS=	${SITE_PERL}/Net/Server/Fork.pm:${PORTSDIR}/net/p5-Net-Server
+BUILD_DEPENDS=	${SITE_PERL}/Net/Server/Fork.pm:${PORTSDIR}/net/p5-Net-Server
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 502126
-BROKEN=		"Broken pkg-plist"
-.endif
-
 .if ${PERL_LEVEL} < 500800
 RUN_DEPENDS+=	${SITE_PERL}/Net/Domain.pm:${PORTSDIR}/net/p5-Net
 .endif
@@ -41,7 +37,7 @@ MAN5=		munin-node.conf.5
 MAN8=		munin-node-configure.8 munin-node.8 munin-run.8
 
 pre-install:
-	@${SED} 's@%%PREFIX%%@${LOCALBASE}@g' ${FILESDIR}/pkg-message > ${PKGMESSAGE}
+	@${SED} 's@%%PREFIX%%@${PREFIX}@g' ${FILESDIR}/pkg-message > ${PKGMESSAGE}
 	@PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL
 
 post-install:
diff --git a/sysutils/munin-node/pkg-plist b/sysutils/munin-node/pkg-plist
index 3c97a2459096..8946d4d3d308 100644
--- a/sysutils/munin-node/pkg-plist
+++ b/sysutils/munin-node/pkg-plist
@@ -1,75 +1,67 @@
+etc/munin/VERSION.node
 etc/munin/munin-node.conf
 etc/munin/plugin-conf.d/plugins.conf
 etc/rc.d/munin-node.sh
 sbin/munin-node
 sbin/munin-node-configure
 sbin/munin-run
-share/munin/plugins/acpi
-share/munin/plugins/amavis
-share/munin/plugins/apache_accesses
-share/munin/plugins/apache_processes
-share/munin/plugins/apache_volume
-share/munin/plugins/apc_envunit_
-share/munin/plugins/bind9
-share/munin/plugins/cpu
-share/munin/plugins/df
-share/munin/plugins/df_inode
-share/munin/plugins/exim_mailqueue
-share/munin/plugins/exim_mailstats
-share/munin/plugins/folding@home
-share/munin/plugins/hddtemp
-share/munin/plugins/hddtemp2
-share/munin/plugins/if_
-share/munin/plugins/if_errcoll_
-share/munin/plugins/ipac-ng
-share/munin/plugins/ircu
-share/munin/plugins/load
-share/munin/plugins/mailman
-share/munin/plugins/memory
-share/munin/plugins/multips
-share/munin/plugins/munin_graph
-share/munin/plugins/munin_update
-share/munin/plugins/mysql_bytes
-share/munin/plugins/mysql_isam_space_
-share/munin/plugins/mysql_queries
-share/munin/plugins/mysql_slowqueries
-share/munin/plugins/mysql_threads
-share/munin/plugins/named
-share/munin/plugins/netstat
-share/munin/plugins/open_files
-share/munin/plugins/plugins.history
-share/munin/plugins/pm3users
-share/munin/plugins/pop_stats
-share/munin/plugins/postfix_mailqueue
-share/munin/plugins/postfix_mailstats
-share/munin/plugins/postfix_mailvolume
-share/munin/plugins/processes
-share/munin/plugins/ps_
-share/munin/plugins/psu_
-share/munin/plugins/samba
-share/munin/plugins/sendmail_mailqueue
-share/munin/plugins/sendmail_mailstats
-share/munin/plugins/sendmail_mailtraffic
-share/munin/plugins/snmp__df
-share/munin/plugins/snmp__fc_if_
-share/munin/plugins/snmp__fc_if_err_
-share/munin/plugins/snmp__if_
-share/munin/plugins/snmp__if_err_
-share/munin/plugins/snmp__load
-share/munin/plugins/snmp__processes
-share/munin/plugins/snmp__users
-share/munin/plugins/spamstats
-share/munin/plugins/squid_cache
-share/munin/plugins/squid_icp
-share/munin/plugins/squid_requests
-share/munin/plugins/squid_traffic
-share/munin/plugins/surfboard
-share/munin/plugins/swap
-share/munin/plugins/sybase_space
-share/munin/plugins/vmstat
+%%DATADIR%%/plugins/acpi
+%%DATADIR%%/plugins/amavis
+%%DATADIR%%/plugins/apache_accesses
+%%DATADIR%%/plugins/apache_processes
+%%DATADIR%%/plugins/apache_volume
+%%DATADIR%%/plugins/apc_envunit_
+%%DATADIR%%/plugins/bind9
+%%DATADIR%%/plugins/df
+%%DATADIR%%/plugins/df_inode
+%%DATADIR%%/plugins/exim_mailqueue
+%%DATADIR%%/plugins/exim_mailstats
+%%DATADIR%%/plugins/folding@home
+%%DATADIR%%/plugins/hddtemp
+%%DATADIR%%/plugins/hddtemp2
+%%DATADIR%%/plugins/ipac-ng
+%%DATADIR%%/plugins/ircu
+%%DATADIR%%/plugins/mailman
+%%DATADIR%%/plugins/multips
+%%DATADIR%%/plugins/munin_graph
+%%DATADIR%%/plugins/munin_update
+%%DATADIR%%/plugins/mysql_bytes
+%%DATADIR%%/plugins/mysql_isam_space_
+%%DATADIR%%/plugins/mysql_queries
+%%DATADIR%%/plugins/mysql_slowqueries
+%%DATADIR%%/plugins/mysql_threads
+%%DATADIR%%/plugins/named
+%%DATADIR%%/plugins/plugins.history
+%%DATADIR%%/plugins/pm3users
+%%DATADIR%%/plugins/pop_stats
+%%DATADIR%%/plugins/postfix_mailqueue
+%%DATADIR%%/plugins/postfix_mailstats
+%%DATADIR%%/plugins/postfix_mailvolume
+%%DATADIR%%/plugins/ps_
+%%DATADIR%%/plugins/psu_
+%%DATADIR%%/plugins/samba
+%%DATADIR%%/plugins/sendmail_mailqueue
+%%DATADIR%%/plugins/sendmail_mailstats
+%%DATADIR%%/plugins/sendmail_mailtraffic
+%%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__load
+%%DATADIR%%/plugins/snmp__processes
+%%DATADIR%%/plugins/snmp__users
+%%DATADIR%%/plugins/spamstats
+%%DATADIR%%/plugins/squid_cache
+%%DATADIR%%/plugins/squid_icp
+%%DATADIR%%/plugins/squid_requests
+%%DATADIR%%/plugins/squid_traffic
+%%DATADIR%%/plugins/surfboard
+%%DATADIR%%/plugins/sybase_space
+%%DATADIR%%/plugins/vmstat
 @unexec rmdir %D/var/munin/plugin-state 2>/dev/null || true
 @unexec rmdir %D/var/munin 2>/dev/null || true
-@unexec rmdir %D/share/munin 2>/dev/null || true
+@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
 @unexec rmdir %D/etc/munin/plugin-conf.d 2>/dev/null || true
 @unexec rmdir %D/etc/munin 2>/dev/null || true
 @unexec echo "If you want to *completely* remove munin-node, you have to"