2 files changed, 59 insertions, 58 deletions

diff --git a/net-mgmt/rrdbot/Makefile b/net-mgmt/rrdbot/Makefile
index d07a435c15f8..017ff7c797f7 100644
--- a/net-mgmt/rrdbot/Makefile
+++ b/net-mgmt/rrdbot/Makefile
@@ -16,7 +16,8 @@ COMMENT=	Threaded SNMP polling daemon which stores data in RRDs
 LIB_DEPENDS=	rrd:${PORTSDIR}/databases/rrdtool
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--datarootdir=${PREFIX}/share/rrdbot
+CONFIGURE_ARGS=	--libdir=${LOCALBASE}/lib --includedir=${LOCALBASE}/include \
+			--datarootdir=${PREFIX}/share/rrdbot
 
 SUB_FILES=	pkg-message
 USE_RC_SUBR=	rrdbot
diff --git a/net-mgmt/rrdbot/pkg-plist b/net-mgmt/rrdbot/pkg-plist
index 0e6e48a33858..b3288666d441 100644
--- a/net-mgmt/rrdbot/pkg-plist
+++ b/net-mgmt/rrdbot/pkg-plist
@@ -1,61 +1,61 @@
 sbin/rrdbot-create
 sbin/rrdbot-get
 sbin/rrdbotd
-share/rrdbot/mib/AGENTX-MIB.txt
-share/rrdbot/mib/BEGEMOT-MIB.txt
-share/rrdbot/mib/BGP4-MIB.txt
-share/rrdbot/mib/BRIDGE-MIB.txt
-share/rrdbot/mib/DISMAN-SCHEDULE-MIB.txt
-share/rrdbot/mib/DISMAN-SCRIPT-MIB.txt
-share/rrdbot/mib/EtherLike-MIB.txt
-share/rrdbot/mib/FOKUS-MIB.txt
-share/rrdbot/mib/GNOME-SMI.txt
-share/rrdbot/mib/HCNUM-TC.txt
-share/rrdbot/mib/HOST-RESOURCES-MIB.txt
-share/rrdbot/mib/HOST-RESOURCES-TYPES.txt
-share/rrdbot/mib/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt
-share/rrdbot/mib/IANA-LANGUAGE-MIB.txt
-share/rrdbot/mib/IANAifType-MIB.txt
-share/rrdbot/mib/JAILS-MIB.txt
-share/rrdbot/mib/IF-INVERTED-STACK-MIB.txt
-share/rrdbot/mib/IF-MIB.txt
-share/rrdbot/mib/INET-ADDRESS-MIB.txt
-share/rrdbot/mib/IP-FORWARD-MIB.txt
-share/rrdbot/mib/IP-MIB.txt
-share/rrdbot/mib/IPV6-ICMP-MIB.txt
-share/rrdbot/mib/IPV6-MIB.txt
-share/rrdbot/mib/IPV6-TC.txt
-share/rrdbot/mib/IPV6-TCP-MIB.txt
-share/rrdbot/mib/IPV6-UDP-MIB.txt
-share/rrdbot/mib/LM-SENSORS-MIB.txt
-share/rrdbot/mib/NOTIFICATION-LOG-MIB.txt
-share/rrdbot/mib/OSPF-MIB.txt
-share/rrdbot/mib/PCAP-MIB.txt
-share/rrdbot/mib/REGEX-MIB.txt
-share/rrdbot/mib/RFC-1215.txt
-share/rrdbot/mib/RFC1155-SMI.txt
-share/rrdbot/mib/RFC1213-MIB.txt
-share/rrdbot/mib/RIPv2-MIB.txt
-share/rrdbot/mib/RMON-MIB.txt
-share/rrdbot/mib/SMUX-MIB.txt
-share/rrdbot/mib/SNMP-COMMUNITY-MIB.txt
-share/rrdbot/mib/SNMP-FRAMEWORK-MIB.txt
-share/rrdbot/mib/SNMP-MPD-MIB.txt
-share/rrdbot/mib/SNMP-NOTIFICATION-MIB.txt
-share/rrdbot/mib/SNMP-PROXY-MIB.txt
-share/rrdbot/mib/SNMP-TARGET-MIB.txt
-share/rrdbot/mib/SNMP-USER-BASED-SM-MIB.txt
-share/rrdbot/mib/SNMP-USM-AES-MIB.txt
-share/rrdbot/mib/SNMP-VIEW-BASED-ACM-MIB.txt
-share/rrdbot/mib/SNMPv2-CONF.txt
-share/rrdbot/mib/SNMPv2-MIB.txt
-share/rrdbot/mib/SNMPv2-SMI.txt
-share/rrdbot/mib/SNMPv2-TC.txt
-share/rrdbot/mib/SNMPv2-TM.txt
-share/rrdbot/mib/SOURCE-ROUTING-MIB.txt
-share/rrdbot/mib/UCD-SNMP-MIB.txt
-share/rrdbot/mib/TCP-MIB.txt
-share/rrdbot/mib/UDP-MIB.txt
-@dirrm share/rrdbot/mib
-@dirrm share/rrdbot
+%%DATADIR%%/mib/AGENTX-MIB.txt
+%%DATADIR%%/mib/BEGEMOT-MIB.txt
+%%DATADIR%%/mib/BGP4-MIB.txt
+%%DATADIR%%/mib/BRIDGE-MIB.txt
+%%DATADIR%%/mib/DISMAN-SCHEDULE-MIB.txt
+%%DATADIR%%/mib/DISMAN-SCRIPT-MIB.txt
+%%DATADIR%%/mib/EtherLike-MIB.txt
+%%DATADIR%%/mib/FOKUS-MIB.txt
+%%DATADIR%%/mib/GNOME-SMI.txt
+%%DATADIR%%/mib/HCNUM-TC.txt
+%%DATADIR%%/mib/HOST-RESOURCES-MIB.txt
+%%DATADIR%%/mib/HOST-RESOURCES-TYPES.txt
+%%DATADIR%%/mib/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt
+%%DATADIR%%/mib/IANA-LANGUAGE-MIB.txt
+%%DATADIR%%/mib/IANAifType-MIB.txt
+%%DATADIR%%/mib/JAILS-MIB.txt
+%%DATADIR%%/mib/IF-INVERTED-STACK-MIB.txt
+%%DATADIR%%/mib/IF-MIB.txt
+%%DATADIR%%/mib/INET-ADDRESS-MIB.txt
+%%DATADIR%%/mib/IP-FORWARD-MIB.txt
+%%DATADIR%%/mib/IP-MIB.txt
+%%DATADIR%%/mib/IPV6-ICMP-MIB.txt
+%%DATADIR%%/mib/IPV6-MIB.txt
+%%DATADIR%%/mib/IPV6-TC.txt
+%%DATADIR%%/mib/IPV6-TCP-MIB.txt
+%%DATADIR%%/mib/IPV6-UDP-MIB.txt
+%%DATADIR%%/mib/LM-SENSORS-MIB.txt
+%%DATADIR%%/mib/NOTIFICATION-LOG-MIB.txt
+%%DATADIR%%/mib/OSPF-MIB.txt
+%%DATADIR%%/mib/PCAP-MIB.txt
+%%DATADIR%%/mib/REGEX-MIB.txt
+%%DATADIR%%/mib/RFC-1215.txt
+%%DATADIR%%/mib/RFC1155-SMI.txt
+%%DATADIR%%/mib/RFC1213-MIB.txt
+%%DATADIR%%/mib/RIPv2-MIB.txt
+%%DATADIR%%/mib/RMON-MIB.txt
+%%DATADIR%%/mib/SMUX-MIB.txt
+%%DATADIR%%/mib/SNMP-COMMUNITY-MIB.txt
+%%DATADIR%%/mib/SNMP-FRAMEWORK-MIB.txt
+%%DATADIR%%/mib/SNMP-MPD-MIB.txt
+%%DATADIR%%/mib/SNMP-NOTIFICATION-MIB.txt
+%%DATADIR%%/mib/SNMP-PROXY-MIB.txt
+%%DATADIR%%/mib/SNMP-TARGET-MIB.txt
+%%DATADIR%%/mib/SNMP-USER-BASED-SM-MIB.txt
+%%DATADIR%%/mib/SNMP-USM-AES-MIB.txt
+%%DATADIR%%/mib/SNMP-VIEW-BASED-ACM-MIB.txt
+%%DATADIR%%/mib/SNMPv2-CONF.txt
+%%DATADIR%%/mib/SNMPv2-MIB.txt
+%%DATADIR%%/mib/SNMPv2-SMI.txt
+%%DATADIR%%/mib/SNMPv2-TC.txt
+%%DATADIR%%/mib/SNMPv2-TM.txt
+%%DATADIR%%/mib/SOURCE-ROUTING-MIB.txt
+%%DATADIR%%/mib/UCD-SNMP-MIB.txt
+%%DATADIR%%/mib/TCP-MIB.txt
+%%DATADIR%%/mib/UDP-MIB.txt
+@dirrm %%DATADIR%%/mib
+@dirrm %%DATADIR%%
 @dirrmtry etc/rrdbot