aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MOVED1
-rw-r--r--databases/Makefile1
-rw-r--r--databases/mysqlard/Makefile2
-rw-r--r--databases/p5-POE-Component-RRDTool/Makefile2
-rw-r--r--databases/p5-RRD-Simple/Makefile2
-rw-r--r--databases/php4-rrdtool/Makefile2
-rw-r--r--databases/php5-rrdtool/Makefile2
-rw-r--r--databases/py-rrdpipe/Makefile2
-rw-r--r--databases/py-rrdtool_lgpl/Makefile2
-rw-r--r--databases/rrdman/Makefile2
-rw-r--r--databases/rrdtool/Makefile2
-rw-r--r--databases/rubygem-rrdtool/Makefile2
-rw-r--r--devel/p5-RRDTool-OO/Makefile2
-rw-r--r--graphics/orca/Makefile2
-rw-r--r--mail/couriergraph/Makefile2
-rw-r--r--mail/mailgraph/Makefile2
-rw-r--r--net-mgmt/bigsister/Makefile2
-rw-r--r--net-mgmt/cacti/Makefile2
-rw-r--r--net-mgmt/cricket/Makefile2
-rw-r--r--net-mgmt/flowscan/Makefile2
-rw-r--r--net-mgmt/ifgraph/Makefile2
-rw-r--r--net-mgmt/junipoll/Makefile2
-rw-r--r--net-mgmt/nagiosgraph/Makefile2
-rw-r--r--net-mgmt/nagiostat/Makefile2
-rw-r--r--net-mgmt/nfdump-devel/Makefile2
-rw-r--r--net-mgmt/nfsen-devel/Makefile2
-rw-r--r--net-mgmt/nfsen/Makefile2
-rw-r--r--net-mgmt/nrg/Makefile2
-rw-r--r--net-mgmt/ourmon/Makefile2
-rw-r--r--net-mgmt/smokeping/Makefile2
-rw-r--r--net-mgmt/torrus/Makefile2
-rw-r--r--net/Makefile1
-rw-r--r--net/p5-POE-Component-RRDTool/Makefile2
-rw-r--r--net/p5-RRD-Simple/Makefile2
-rw-r--r--net/php4-rrdtool/Makefile2
-rw-r--r--net/php5-rrdtool/Makefile2
-rw-r--r--net/py-rrdpipe/Makefile2
-rw-r--r--net/py-rrdtool_lgpl/Makefile2
-rw-r--r--net/rrdman/Makefile2
-rw-r--r--net/rrdtool/Makefile82
-rw-r--r--net/rrdtool/distinfo3
-rw-r--r--net/rrdtool/files/patch-bindings-Makefile.in26
-rw-r--r--net/rrdtool/files/patch-doc-Makefile.in14
-rw-r--r--net/rrdtool/files/patch-examples-Makefile.in11
-rw-r--r--net/rrdtool/pkg-descr10
-rw-r--r--net/rrdtool/pkg-plist119
-rw-r--r--net/rubygem-rrdtool/Makefile2
-rw-r--r--net/smokeping/Makefile2
-rw-r--r--security/amavis-stats/Makefile2
-rw-r--r--sysutils/dtc/Makefile2
-rw-r--r--sysutils/ganglia-monitor-core/Makefile2
-rw-r--r--sysutils/munin-main/Makefile2
-rw-r--r--sysutils/munin-master/Makefile2
-rw-r--r--sysutils/symon/Makefile2
-rw-r--r--www/drraw/Makefile2
55 files changed, 47 insertions, 311 deletions
diff --git a/MOVED b/MOVED
index 8ab8d73b21d3..d077dd422fa8 100644
--- a/MOVED
+++ b/MOVED
@@ -3092,3 +3092,4 @@ multimedia/libdivxdecore||2007-07-04|Obsolete port
multimedia/libdivxdecore-devel||2007-07-04|Obsolete port
multimedia/handbrake-gtk2||2007-07-04|Obsolete, getting old to keep unsupport version around
audio/amarokFS||2007-07-04|Removed
+net/rrdtool|databases/rrdtool|2007-07-05|Move to better category
diff --git a/databases/Makefile b/databases/Makefile
index 9dab4a2d9310..c31e1d9d376e 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -457,6 +457,7 @@
SUBDIR += qt4-sqlite3-plugin
SUBDIR += rdb
SUBDIR += rdfdb
+ SUBDIR += rrdtool
SUBDIR += ruby-bdb
SUBDIR += ruby-bdb1
SUBDIR += ruby-cdb
diff --git a/databases/mysqlard/Makefile b/databases/mysqlard/Makefile
index fc50ef605729..14131a51b8ae 100644
--- a/databases/mysqlard/Makefile
+++ b/databases/mysqlard/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://gert.sos.be/downloads/mysqlar/
MAINTAINER= gregoryba@gmail.com
COMMENT= A tool to collect and graph database statistics from mysql
-BUILD_DEPENDS= rrdtool:${PORTSDIR}/net/rrdtool
+BUILD_DEPENDS= rrdtool:${PORTSDIR}/databases/rrdtool
RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_APACHE= 1.3+
diff --git a/databases/p5-POE-Component-RRDTool/Makefile b/databases/p5-POE-Component-RRDTool/Makefile
index b07a1a24fe65..d248779b5b09 100644
--- a/databases/p5-POE-Component-RRDTool/Makefile
+++ b/databases/p5-POE-Component-RRDTool/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= skv@FreeBSD.org
COMMENT= POE interface to Round Robin Database Tools
BUILD_DEPENDS= ${SITE_PERL}/POE.pm:${PORTSDIR}/devel/p5-POE \
- ${LOCALBASE}/bin/rrdtool:${PORTSDIR}/net/rrdtool
+ ${LOCALBASE}/bin/rrdtool:${PORTSDIR}/databases/rrdtool
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/databases/p5-RRD-Simple/Makefile b/databases/p5-RRD-Simple/Makefile
index cb6e066885e4..8f5b1fd01958 100644
--- a/databases/p5-RRD-Simple/Makefile
+++ b/databases/p5-RRD-Simple/Makefile
@@ -18,7 +18,7 @@ COMMENT= Simple interface to create and store data in RRD files
BUILD_DEPENDS= ${SITE_PERL}/Test/Deep.pm:${PORTSDIR}/devel/p5-Test-Deep \
p5-Test-Pod>=0.90:${PORTSDIR}/devel/p5-Test-Pod \
p5-Test-Pod-Coverage>0:${PORTSDIR}/devel/p5-Test-Pod-Coverage \
- ${SITE_PERL}/${PERL_ARCH}/RRDs.pm:${PORTSDIR}/net/rrdtool
+ ${SITE_PERL}/${PERL_ARCH}/RRDs.pm:${PORTSDIR}/databases/rrdtool
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_MODBUILD= yes
diff --git a/databases/php4-rrdtool/Makefile b/databases/php4-rrdtool/Makefile
index 0bc031bf9b82..e5a0274767ac 100644
--- a/databases/php4-rrdtool/Makefile
+++ b/databases/php4-rrdtool/Makefile
@@ -16,7 +16,7 @@ DISTNAME= ${UNIQUENAME}-${PORTVERSION}
MAINTAINER= mat@FreeBSD.org
COMMENT= A php/rrdtool glue
-LIB_DEPENDS= rrd:${PORTSDIR}/net/rrdtool
+LIB_DEPENDS= rrd:${PORTSDIR}/databases/rrdtool
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}/${UNIQUENAME}-${PORTVERSION}
diff --git a/databases/php5-rrdtool/Makefile b/databases/php5-rrdtool/Makefile
index 54b6fa21fb15..32f6832bc366 100644
--- a/databases/php5-rrdtool/Makefile
+++ b/databases/php5-rrdtool/Makefile
@@ -18,7 +18,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= rick@wzoeterwoude.net
COMMENT= A php 5 rrdtool glue
-LIB_DEPENDS= rrd:${PORTSDIR}/net/rrdtool
+LIB_DEPENDS= rrd:${PORTSDIR}/databases/rrdtool
WRKSRC= ${WRKDIR}/rrdtool
diff --git a/databases/py-rrdpipe/Makefile b/databases/py-rrdpipe/Makefile
index cb7c0138a928..08f743db7c25 100644
--- a/databases/py-rrdpipe/Makefile
+++ b/databases/py-rrdpipe/Makefile
@@ -17,7 +17,7 @@ DISTNAME= PyRRDpipe-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Portable Python module to access RRDTool files via pipes
-LIB_DEPENDS= rrd:${PORTSDIR}/net/rrdtool
+LIB_DEPENDS= rrd:${PORTSDIR}/databases/rrdtool
USE_PYTHON= yes
NO_BUILD= yes
diff --git a/databases/py-rrdtool_lgpl/Makefile b/databases/py-rrdtool_lgpl/Makefile
index 83a6f5479581..900f9b7ac9dc 100644
--- a/databases/py-rrdtool_lgpl/Makefile
+++ b/databases/py-rrdtool_lgpl/Makefile
@@ -16,7 +16,7 @@ DISTNAME= py-rrdtool-${PORTVERSION}
MAINTAINER= perky@FreeBSD.org
COMMENT= Python interface to RRDTool, the graphing and logging utility
-LIB_DEPENDS= rrd:${PORTSDIR}/net/rrdtool
+LIB_DEPENDS= rrd:${PORTSDIR}/databases/rrdtool
USE_PYTHON= yes
USE_PYDISTUTILS=yes
diff --git a/databases/rrdman/Makefile b/databases/rrdman/Makefile
index 70b4591deeb7..0838e399257f 100644
--- a/databases/rrdman/Makefile
+++ b/databases/rrdman/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= rrfw
MAINTAINER= janos.mohacsi@bsd.hu
COMMENT= Apply Holt-Winters prediction parameters to RRD data
-BUILD_DEPENDS= rrdtool:${PORTSDIR}/net/rrdtool
+BUILD_DEPENDS= rrdtool:${PORTSDIR}/databases/rrdtool
RUN_DEPENDS= ${BUILD_DEPENDS}
GNU_CONFIGURE= YES
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 6558e3f49dea..82c7c7e8d78a 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rrdtool
PORTVERSION= 1.2.23
-CATEGORIES= net
+CATEGORIES= databases graphics
MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/
MAINTAINER= demon@FreeBSD.org
diff --git a/databases/rubygem-rrdtool/Makefile b/databases/rubygem-rrdtool/Makefile
index d504645a60bb..c3e25e7a4721 100644
--- a/databases/rubygem-rrdtool/Makefile
+++ b/databases/rubygem-rrdtool/Makefile
@@ -14,7 +14,7 @@ DISTNAME= RubyRRDtool-${PORTVERSION}
MAINTAINER= saurbier@math.uni-bielefeld.de
COMMENT= A Ruby interface to RRDTool
-LIB_DEPENDS= rrd:${PORTSDIR}/net/rrdtool
+LIB_DEPENDS= rrd:${PORTSDIR}/databases/rrdtool
BUILD_DEPENDS= sow:${PORTSDIR}/devel/rubygem-hoe
GEM_NAME= RubyRRDtool-0.6.0
diff --git a/devel/p5-RRDTool-OO/Makefile b/devel/p5-RRDTool-OO/Makefile
index 906c5ff5defd..755779ed18af 100644
--- a/devel/p5-RRDTool-OO/Makefile
+++ b/devel/p5-RRDTool-OO/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= stefan@fh-mainz.de
COMMENT= RRDTool::OO - Object-oriented interface to RRDTool
-BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/RRDs.pm:${PORTSDIR}/net/rrdtool \
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/RRDs.pm:${PORTSDIR}/databases/rrdtool\
${SITE_PERL}/Log/Log4perl.pm:${PORTSDIR}/devel/p5-Log-Log4perl
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/graphics/orca/Makefile b/graphics/orca/Makefile
index 61fbed9da526..bc12a4b7e8d8 100644
--- a/graphics/orca/Makefile
+++ b/graphics/orca/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS= \
${SITE_PERL}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate \
${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
${SITE_PERL}/Math/Interpolate.pm:${PORTSDIR}/math/p5-Math-Interpolate \
- ${SITE_PERL}/${PERL_ARCH}/RRDs.pm:${PORTSDIR}/net/rrdtool \
+ ${SITE_PERL}/${PERL_ARCH}/RRDs.pm:${PORTSDIR}/databases/rrdtool\
${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
diff --git a/mail/couriergraph/Makefile b/mail/couriergraph/Makefile
index 6fcd87c01c34..3776da4becaa 100644
--- a/mail/couriergraph/Makefile
+++ b/mail/couriergraph/Makefile
@@ -14,7 +14,7 @@ DIST_SUBDIR= ${PORTNAME}
MAINTAINER= kiwi@oav.net
COMMENT= A RRDtool frontend for Courier statistics
-RUN_DEPENDS= ${SITE_PERL}/RRDp.pm:${PORTSDIR}/net/rrdtool \
+RUN_DEPENDS= ${SITE_PERL}/RRDp.pm:${PORTSDIR}/databases/rrdtool \
${SITE_PERL}/File/Tail.pm:${PORTSDIR}/devel/p5-File-Tail
NO_BUILD= yes
diff --git a/mail/mailgraph/Makefile b/mail/mailgraph/Makefile
index 07312b95bff3..bdec0d4c40d4 100644
--- a/mail/mailgraph/Makefile
+++ b/mail/mailgraph/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://mailgraph.schweikert.ch/pub/ \
MAINTAINER= rafan@FreeBSD.org
COMMENT= A RRDtool frontend for Postfix statistics
-RUN_DEPENDS= ${SITE_PERL}/RRDp.pm:${PORTSDIR}/net/rrdtool \
+RUN_DEPENDS= ${SITE_PERL}/RRDp.pm:${PORTSDIR}/databases/rrdtool \
${SITE_PERL}/File/Tail.pm:${PORTSDIR}/devel/p5-File-Tail
NO_BUILD= yes
diff --git a/net-mgmt/bigsister/Makefile b/net-mgmt/bigsister/Makefile
index c1a168c78e7b..4bd6121d4f77 100644
--- a/net-mgmt/bigsister/Makefile
+++ b/net-mgmt/bigsister/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= freebsd@troback.com
COMMENT= SNMP-based network and system monitor with web interface
RUN_DEPENDS= \
- rrdtool:${PORTSDIR}/net/rrdtool \
+ rrdtool:${PORTSDIR}/databases/rrdtool \
${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD \
${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww \
${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net \
diff --git a/net-mgmt/cacti/Makefile b/net-mgmt/cacti/Makefile
index 8582a440c06d..2426414ecc16 100644
--- a/net-mgmt/cacti/Makefile
+++ b/net-mgmt/cacti/Makefile
@@ -22,7 +22,7 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= sem@FreeBSD.org
COMMENT= Web-driven graphing interface for RRDTool
-RUN_DEPENDS= rrdtool:${PORTSDIR}/net/rrdtool
+RUN_DEPENDS= rrdtool:${PORTSDIR}/databases/rrdtool
PATCHLEVEL= .3
PATCH_STRIP= -p1
diff --git a/net-mgmt/cricket/Makefile b/net-mgmt/cricket/Makefile
index d941dea259a8..1e251f1de635 100644
--- a/net-mgmt/cricket/Makefile
+++ b/net-mgmt/cricket/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A high performance, extremely flexible monitoring system
RUN_DEPENDS= ${SITE_PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
- ${SITE_PERL_ARCH}/RRDs.pm:${PORTSDIR}/net/rrdtool \
+ ${SITE_PERL_ARCH}/RRDs.pm:${PORTSDIR}/databases/rrdtool \
${SITE_PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
${SITE_PERL}/SNMP_Session.pm:${PORTSDIR}/net-mgmt/p5-SNMP_Session \
diff --git a/net-mgmt/flowscan/Makefile b/net-mgmt/flowscan/Makefile
index e85b41703db3..708a1934efab 100644
--- a/net-mgmt/flowscan/Makefile
+++ b/net-mgmt/flowscan/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Processes IP flows recorded in cflowd-format raw flow files
BUILD_DEPENDS= ksh:${PORTSDIR}/shells/pdksh \
- rrdtool:${PORTSDIR}/net/rrdtool \
+ rrdtool:${PORTSDIR}/databases/rrdtool \
${LOCALBASE}/sbin/cflowd:${PORTSDIR}/net-mgmt/cflowd \
${SITE_PERL}/Boulder/Stream.pm:${PORTSDIR}/converters/p5-Boulder \
${SITE_PERL}/ConfigReader/DirectiveStyle.pm:${PORTSDIR}/devel/p5-ConfigReader \
diff --git a/net-mgmt/ifgraph/Makefile b/net-mgmt/ifgraph/Makefile
index 1012ee62386e..5d358132cfa0 100644
--- a/net-mgmt/ifgraph/Makefile
+++ b/net-mgmt/ifgraph/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= lth@FreeBSD.org
COMMENT= Simple grapher of SNMP data with RRD
-RUN_DEPENDS= rrdtool:${PORTSDIR}/net/rrdtool \
+RUN_DEPENDS= rrdtool:${PORTSDIR}/databases/rrdtool \
p5-Color-Rgb>0:${PORTSDIR}/graphics/p5-Color-Rgb
BUILD_DEPENDS= ${RUN_DEPENDS}
diff --git a/net-mgmt/junipoll/Makefile b/net-mgmt/junipoll/Makefile
index ca4b7eee1ec4..43b50bf664a8 100644
--- a/net-mgmt/junipoll/Makefile
+++ b/net-mgmt/junipoll/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= . old
MAINTAINER= farrokhi@FreeBSD.org
COMMENT= JUNIper router snmp POLLer for firewall filter counters
-RUN_DEPENDS= rrdtool:${PORTSDIR}/net/rrdtool \
+RUN_DEPENDS= rrdtool:${PORTSDIR}/databases/rrdtool \
${SITE_PERL}/Altoids.pm:${PORTSDIR}/net-mgmt/p5-Altoids
PERL_CONFIGURE= yes
diff --git a/net-mgmt/nagiosgraph/Makefile b/net-mgmt/nagiosgraph/Makefile
index 0464a4b5dd17..9b5119388070 100644
--- a/net-mgmt/nagiosgraph/Makefile
+++ b/net-mgmt/nagiosgraph/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= dsh@vlink.ru
COMMENT= Generate rrdtool\'s graphs by performance data from nagios plugins
RUN_DEPENDS= ${LOCALBASE}/bin/nagios:${PORTSDIR}/net-mgmt/nagios \
- ${SITE_PERL}/${PERL_ARCH}/RRDs.pm:${PORTSDIR}/net/rrdtool
+ ${SITE_PERL}/${PERL_ARCH}/RRDs.pm:${PORTSDIR}/databases/rrdtool
USE_PERL5_RUN= yes
NO_BUILD= yes
diff --git a/net-mgmt/nagiostat/Makefile b/net-mgmt/nagiostat/Makefile
index b99f81fbdf66..d90d7ac2c9cf 100644
--- a/net-mgmt/nagiostat/Makefile
+++ b/net-mgmt/nagiostat/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= janos.mohacsi@bsd.hu
COMMENT= Nagiostat parses performance-data from Nagios and generates graphs
-RUN_DEPENDS= rrdtool:${PORTSDIR}/net/rrdtool \
+RUN_DEPENDS= rrdtool:${PORTSDIR}/databases/rrdtool \
nagios:${PORTSDIR}/net-mgmt/nagios
USE_PERL5= yes
diff --git a/net-mgmt/nfdump-devel/Makefile b/net-mgmt/nfdump-devel/Makefile
index 23733cff5d44..010fe4594d02 100644
--- a/net-mgmt/nfdump-devel/Makefile
+++ b/net-mgmt/nfdump-devel/Makefile
@@ -15,7 +15,7 @@ DISTNAME= nfdump-snapshot-${PORTVERSION}
MAINTAINER= janos.mohacsi@bsd.hu
COMMENT= Development version of tools to collect and process NetFlow data
-BUILD_DEPENDS= rrdtool:${PORTSDIR}/net/rrdtool
+BUILD_DEPENDS= rrdtool:${PORTSDIR}/databases/rrdtool
RUN_DEPENDS= ${BUILD_DEPENDS}
GNU_CONFIGURE= yes
diff --git a/net-mgmt/nfsen-devel/Makefile b/net-mgmt/nfsen-devel/Makefile
index 2e7c680bc62e..4ccbe861d967 100644
--- a/net-mgmt/nfsen-devel/Makefile
+++ b/net-mgmt/nfsen-devel/Makefile
@@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}-snapshot-20060810
MAINTAINER= janos.mohacsi@bsd.hu
COMMENT= Web based frontend to nfdump netflow collector
-RUN_DEPENDS= ${SITE_PERL}/RRDp.pm:${PORTSDIR}/net/rrdtool \
+RUN_DEPENDS= ${SITE_PERL}/RRDp.pm:${PORTSDIR}/databases/rrdtool \
nfdump:${PORTSDIR}/net-mgmt/nfdump
USE_ICONV= yes
diff --git a/net-mgmt/nfsen/Makefile b/net-mgmt/nfsen/Makefile
index 2e7c680bc62e..4ccbe861d967 100644
--- a/net-mgmt/nfsen/Makefile
+++ b/net-mgmt/nfsen/Makefile
@@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}-snapshot-20060810
MAINTAINER= janos.mohacsi@bsd.hu
COMMENT= Web based frontend to nfdump netflow collector
-RUN_DEPENDS= ${SITE_PERL}/RRDp.pm:${PORTSDIR}/net/rrdtool \
+RUN_DEPENDS= ${SITE_PERL}/RRDp.pm:${PORTSDIR}/databases/rrdtool \
nfdump:${PORTSDIR}/net-mgmt/nfdump
USE_ICONV= yes
diff --git a/net-mgmt/nrg/Makefile b/net-mgmt/nrg/Makefile
index f29d59e7712c..360c770ebb3e 100644
--- a/net-mgmt/nrg/Makefile
+++ b/net-mgmt/nrg/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://nrg.hep.wisc.edu/pub/src/nrg/ \
MAINTAINER= mranner@inode.at
COMMENT= Tool for visualizing network and resource utilization data
-BUILD_DEPENDS= ${SITE_PERL}/RRDp.pm:${PORTSDIR}/net/rrdtool \
+BUILD_DEPENDS= ${SITE_PERL}/RRDp.pm:${PORTSDIR}/databases/rrdtool \
${LOCALBASE}/bin/snmpget:${PORTSDIR}/net-mgmt/net-snmp4
RUN_DEPENDS= ${BUILD_DEPENDS} \
${SITE_PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
diff --git a/net-mgmt/ourmon/Makefile b/net-mgmt/ourmon/Makefile
index c5ca21d3a9a5..cdce5da2dbdf 100644
--- a/net-mgmt/ourmon/Makefile
+++ b/net-mgmt/ourmon/Makefile
@@ -16,7 +16,7 @@ COMMENT= A libpcap-based network monitoring and anomaly detection system
BUILD_DEPENDS= ${LOCALBASE}/lib/libpcap.a:${PORTSDIR}/net/libpcap
LIB_DEPENDS= gd:$(PORTSDIR)/graphics/gd
-RUN_DEPENDS= rrdtool:$(PORTSDIR)/net/rrdtool
+RUN_DEPENDS= rrdtool:$(PORTSDIR)/databases/rrdtool
#IS_INTERACTIVE= yes
WRKSRC= ${WRKDIR}/mrourmon
diff --git a/net-mgmt/smokeping/Makefile b/net-mgmt/smokeping/Makefile
index 7894a08e0ab8..289fbc9f02ca 100644
--- a/net-mgmt/smokeping/Makefile
+++ b/net-mgmt/smokeping/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://oss.oetiker.ch/smokeping/pub/ \
MAINTAINER= lth@FreeBSD.org
COMMENT= Latency logging and graphing system
-RUN_DEPENDS= rrdtool:${PORTSDIR}/net/rrdtool \
+RUN_DEPENDS= rrdtool:${PORTSDIR}/databases/rrdtool \
${SITE_PERL}/CGI/SpeedyCGI.pm:${PORTSDIR}/www/p5-CGI-SpeedyCGI \
${SITE_PERL}/BER.pm:${PORTSDIR}/net-mgmt/p5-SNMP_Session \
${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \
diff --git a/net-mgmt/torrus/Makefile b/net-mgmt/torrus/Makefile
index 41bd0408285d..3ea40fac7c8d 100644
--- a/net-mgmt/torrus/Makefile
+++ b/net-mgmt/torrus/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= corsmith@gmail.com
COMMENT= The Data Series Processing Framework - think mrtg with xml configs
-BUILD_DEPENDS= ${SITE_PERL}/RRDp.pm:${PORTSDIR}/net/rrdtool \
+BUILD_DEPENDS= ${SITE_PERL}/RRDp.pm:${PORTSDIR}/databases/rrdtool \
${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML \
${SITE_PERL}/${PERL_ARCH}/BerkeleyDB.pm:${PORTSDIR}/databases/p5-BerkeleyDB \
${SITE_PERL}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit \
diff --git a/net/Makefile b/net/Makefile
index 1a08394951a9..9605865856ab 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -731,7 +731,6 @@
SUBDIR += roadrunner
SUBDIR += rp-pppoe
SUBDIR += rrdman
- SUBDIR += rrdtool
SUBDIR += rrdtool10
SUBDIR += rshell
SUBDIR += rsync
diff --git a/net/p5-POE-Component-RRDTool/Makefile b/net/p5-POE-Component-RRDTool/Makefile
index b07a1a24fe65..d248779b5b09 100644
--- a/net/p5-POE-Component-RRDTool/Makefile
+++ b/net/p5-POE-Component-RRDTool/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= skv@FreeBSD.org
COMMENT= POE interface to Round Robin Database Tools
BUILD_DEPENDS= ${SITE_PERL}/POE.pm:${PORTSDIR}/devel/p5-POE \
- ${LOCALBASE}/bin/rrdtool:${PORTSDIR}/net/rrdtool
+ ${LOCALBASE}/bin/rrdtool:${PORTSDIR}/databases/rrdtool
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/net/p5-RRD-Simple/Makefile b/net/p5-RRD-Simple/Makefile
index cb6e066885e4..8f5b1fd01958 100644
--- a/net/p5-RRD-Simple/Makefile
+++ b/net/p5-RRD-Simple/Makefile
@@ -18,7 +18,7 @@ COMMENT= Simple interface to create and store data in RRD files
BUILD_DEPENDS= ${SITE_PERL}/Test/Deep.pm:${PORTSDIR}/devel/p5-Test-Deep \
p5-Test-Pod>=0.90:${PORTSDIR}/devel/p5-Test-Pod \
p5-Test-Pod-Coverage>0:${PORTSDIR}/devel/p5-Test-Pod-Coverage \
- ${SITE_PERL}/${PERL_ARCH}/RRDs.pm:${PORTSDIR}/net/rrdtool
+ ${SITE_PERL}/${PERL_ARCH}/RRDs.pm:${PORTSDIR}/databases/rrdtool
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_MODBUILD= yes
diff --git a/net/php4-rrdtool/Makefile b/net/php4-rrdtool/Makefile
index 0bc031bf9b82..e5a0274767ac 100644
--- a/net/php4-rrdtool/Makefile
+++ b/net/php4-rrdtool/Makefile
@@ -16,7 +16,7 @@ DISTNAME= ${UNIQUENAME}-${PORTVERSION}
MAINTAINER= mat@FreeBSD.org
COMMENT= A php/rrdtool glue
-LIB_DEPENDS= rrd:${PORTSDIR}/net/rrdtool
+LIB_DEPENDS= rrd:${PORTSDIR}/databases/rrdtool
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}/${UNIQUENAME}-${PORTVERSION}
diff --git a/net/php5-rrdtool/Makefile b/net/php5-rrdtool/Makefile
index 54b6fa21fb15..32f6832bc366 100644
--- a/net/php5-rrdtool/Makefile
+++ b/net/php5-rrdtool/Makefile
@@ -18,7 +18,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= rick@wzoeterwoude.net
COMMENT= A php 5 rrdtool glue
-LIB_DEPENDS= rrd:${PORTSDIR}/net/rrdtool
+LIB_DEPENDS= rrd:${PORTSDIR}/databases/rrdtool
WRKSRC= ${WRKDIR}/rrdtool
diff --git a/net/py-rrdpipe/Makefile b/net/py-rrdpipe/Makefile
index cb7c0138a928..08f743db7c25 100644
--- a/net/py-rrdpipe/Makefile
+++ b/net/py-rrdpipe/Makefile
@@ -17,7 +17,7 @@ DISTNAME= PyRRDpipe-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Portable Python module to access RRDTool files via pipes
-LIB_DEPENDS= rrd:${PORTSDIR}/net/rrdtool
+LIB_DEPENDS= rrd:${PORTSDIR}/databases/rrdtool
USE_PYTHON= yes
NO_BUILD= yes
diff --git a/net/py-rrdtool_lgpl/Makefile b/net/py-rrdtool_lgpl/Makefile
index 83a6f5479581..900f9b7ac9dc 100644
--- a/net/py-rrdtool_lgpl/Makefile
+++ b/net/py-rrdtool_lgpl/Makefile
@@ -16,7 +16,7 @@ DISTNAME= py-rrdtool-${PORTVERSION}
MAINTAINER= perky@FreeBSD.org
COMMENT= Python interface to RRDTool, the graphing and logging utility
-LIB_DEPENDS= rrd:${PORTSDIR}/net/rrdtool
+LIB_DEPENDS= rrd:${PORTSDIR}/databases/rrdtool
USE_PYTHON= yes
USE_PYDISTUTILS=yes
diff --git a/net/rrdman/Makefile b/net/rrdman/Makefile
index 70b4591deeb7..0838e399257f 100644
--- a/net/rrdman/Makefile
+++ b/net/rrdman/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= rrfw
MAINTAINER= janos.mohacsi@bsd.hu
COMMENT= Apply Holt-Winters prediction parameters to RRD data
-BUILD_DEPENDS= rrdtool:${PORTSDIR}/net/rrdtool
+BUILD_DEPENDS= rrdtool:${PORTSDIR}/databases/rrdtool
RUN_DEPENDS= ${BUILD_DEPENDS}
GNU_CONFIGURE= YES
diff --git a/net/rrdtool/Makefile b/net/rrdtool/Makefile
deleted file mode 100644
index 6558e3f49dea..000000000000
--- a/net/rrdtool/Makefile
+++ /dev/null
@@ -1,82 +0,0 @@
-# New ports collection makefile for: rrdtool
-# Date created: 20 July 1999
-# Whom: Dmitry Sivachenko <dima@Chg.RU>
-#
-# $FreeBSD$
-#
-
-PORTNAME= rrdtool
-PORTVERSION= 1.2.23
-CATEGORIES= net
-MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/
-
-MAINTAINER= demon@FreeBSD.org
-COMMENT= Round Robin Database Tools
-
-LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
- art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl \
- png.5:${PORTSDIR}/graphics/png
-
-USE_AUTOTOOLS= libtool:15
-USE_PERL5= yes
-USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
-USE_GMAKE= yes
-
-CONFIGURE_ARGS= --enable-perl-site-install --disable-tcl
-
-OPTIONS= PYTHON_MODULE "Build PYTHON bindings" off \
- RUBY_MODULE "Build RUBY bindings" off
-
-.include <bsd.port.pre.mk>
-.if defined(WITH_PYTHON_MODULE)
-USE_PYTHON= yes
-.include "${PORTSDIR}/Mk/bsd.python.mk"
-PLIST_SUB+= WITH_PYTHON=""
-CONFIGURE_ARGS+= --enable-python
-.else
-CONFIGURE_ARGS+= --disable-python
-PLIST_SUB+= WITH_PYTHON="@comment "
-.endif
-
-.if defined(WITH_RUBY_MODULE)
-USE_RUBY= yes
-.include "${PORTSDIR}/Mk/bsd.ruby.mk"
-PLIST_SUB+= WITH_RUBY=""
-CONFIGURE_ARGS+= --enable-ruby
-.else
-CONFIGURE_ARGS+= --disable-ruby
-PLIST_SUB+= WITH_RUBY="@comment "
-.endif
-
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libart-2.0 -I${LOCALBASE}/include/freetype2
-LDFLAGS+= -L${LOCALBASE}/lib
-CFLAGS:= ${CFLAGS:N-ffast-math}
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-
-MAN1= bin_dec_hex.1 cdeftutorial.1 rpntutorial.1 rrd-beginners.1 \
- rrdbuild.1 rrdcgi.1 rrdcreate.1 rrddump.1 rrdfetch.1 rrdfirst.1 \
- rrdgraph.1 rrdgraph_data.1 rrdgraph_examples.1 rrdgraph_graph.1 \
- rrdgraph_rpn.1 rrdinfo.1 rrdlast.1 rrdresize.1 rrdrestore.1 \
- rrdthreads.1 rrdtool.1 rrdtune.1 rrdtutorial.1 rrdupdate.1 \
- rrdxport.1 rrdlastupdate.1
-MAN3= RRDp.3 RRDs.3
-MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VERSION}
-
-post-extract:
-.if defined(NOPORTDOCS)
- @${REINPLACE_CMD} -e 's/install-idocDATA install-ihtmlDATA//g' \
- -e 's/^ cd .* rrdtool.html index.html/ #/' \
- ${WRKSRC}/doc/Makefile.in
-.endif
-
-post-install:
-.if !defined(BATCH)
- @${ECHO_MSG} ""
- @${ECHO_MSG} "############################################################################"
- @${ECHO_MSG} "# See ${PREFIX}/share/examples/rrdtool for some demonstration code #"
- @${ECHO_MSG} "############################################################################"
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/net/rrdtool/distinfo b/net/rrdtool/distinfo
deleted file mode 100644
index 3c125af5e984..000000000000
--- a/net/rrdtool/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (rrdtool-1.2.23.tar.gz) = dafa161bc9c61e57636a6085c87c1fe8
-SHA256 (rrdtool-1.2.23.tar.gz) = 4b1df00b23a74a1c81734dd274e72e00d8bb29b11e1f3d2938ff87691ece1f0f
-SIZE (rrdtool-1.2.23.tar.gz) = 1061530
diff --git a/net/rrdtool/files/patch-bindings-Makefile.in b/net/rrdtool/files/patch-bindings-Makefile.in
deleted file mode 100644
index 09af0a5c23ca..000000000000
--- a/net/rrdtool/files/patch-bindings-Makefile.in
+++ /dev/null
@@ -1,26 +0,0 @@
---- ./bindings/Makefile.in.orig Thu May 3 02:06:59 2007
-+++ ./bindings/Makefile.in Tue May 29 03:45:40 2007
-@@ -539,18 +539,18 @@
- all-local: @COMP_PERL@ @COMP_RUBY@ @COMP_PYTHON@
-
- install-data-local:
-- test -f perl-piped/Makefile && cd perl-piped && $(MAKE) install || true
-- test -f perl-shared/Makefile && cd perl-shared && $(MAKE) install || true
-- test -f ruby/Makefile && cd ruby && $(MAKE) EPREFIX=$(exec_prefix) $(RUBY_MAKE_OPTIONS) install || true
-+ test -f perl-piped/Makefile && cd perl-piped && $(MAKE) pure_install || true
-+ test -f perl-shared/Makefile && cd perl-shared && $(MAKE) pure_install || true
-+ test -f ruby/Makefile && cd ruby && $(MAKE) EPREFIX=$(exec_prefix) install || true
- test -d python/build && cd python && env LIBDIR=$(libdir) $(PYTHON) setup.py install --skip-build --prefix=$(DESTDIR)$(prefix) --exec-prefix=$(DESTDIR)$(exec_prefix) || true
-
- # rules for buildung the ruby module
- ruby:
-- cd ruby && $(RUBY) extconf.rb && $(MAKE) EPREFIX=$(exec_prefix) $(RUBY_MAKE_OPTIONS)
-+ cd ruby && $(RUBY) extconf.rb && $(MAKE) EPREFIX=$(exec_prefix)
-
- # rules for buildung the pyton module
- python:
-- cd python && env LIBDIR=../../src/.libs $(PYTHON) setup.py build
-+ cd python && env LIBDIR=../../src/.libs INCDIR=../../src $(PYTHON) setup.py build
-
- # rules for building the perl module
- perl_piped: perl-piped/Makefile
diff --git a/net/rrdtool/files/patch-doc-Makefile.in b/net/rrdtool/files/patch-doc-Makefile.in
deleted file mode 100644
index 844bcc780935..000000000000
--- a/net/rrdtool/files/patch-doc-Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- doc/Makefile.in.orig Thu May 3 12:26:06 2007
-+++ doc/Makefile.in Thu May 3 12:26:35 2007
-@@ -239,9 +239,9 @@
-
- # what should go into the distribution
- EXTRA_DIST = $(POD) $(HTML) $(MAN) $(TXT) rrdtool-dump.dtd rrdtool-xport.dtd
--idocdir = $(RRDDOCDIR)/txt
-+idocdir = $(datadir)/doc/rrdtool/txt
- idoc_DATA = $(POD) $(TXT)
--ihtmldir = $(RRDDOCDIR)/html
-+ihtmldir = $(datadir)/doc/rrdtool/html
- ihtml_DATA = $(HTML)
- imandir = $(mandir)/man1
- iman_DATA = $(MAN)
diff --git a/net/rrdtool/files/patch-examples-Makefile.in b/net/rrdtool/files/patch-examples-Makefile.in
deleted file mode 100644
index a44b80f7eba4..000000000000
--- a/net/rrdtool/files/patch-examples-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- examples/Makefile.in.orig Thu May 3 12:27:17 2007
-+++ examples/Makefile.in Thu May 3 12:27:41 2007
-@@ -219,7 +219,7 @@
- target_os = @target_os@
- target_vendor = @target_vendor@
- EXTRA_DIST = cgi-demo.cgi.in
--examplesdir = $(pkgdatadir)/examples
-+examplesdir = $(datadir)/examples/rrdtool
- examples_SCRIPTS = cgi-demo.cgi piped-demo.pl shared-demo.pl \
- stripes.pl bigtops.pl minmax.pl 4charts.pl perftest.pl
-
diff --git a/net/rrdtool/pkg-descr b/net/rrdtool/pkg-descr
deleted file mode 100644
index 2d47a2220ffc..000000000000
--- a/net/rrdtool/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-It is pretty easy to gather status information from all sorts of things,
-ranging from the temperature in your office to the number of octets which
-have passed through the FDDI interface of your router. But it is not so
-trivial to store this data in a efficient and systematic manner. This is
-where RRDtool kicks in. It lets you log and analyze the data you gather from
-all kinds of data-sources. The data analysis part of RRDtool is based
-on the ability to quickly generate graphical representations of the data
-values collected over a definable time period.
-
-WWW: http://www.rrdtool.org/
diff --git a/net/rrdtool/pkg-plist b/net/rrdtool/pkg-plist
deleted file mode 100644
index 5b8cf2530223..000000000000
--- a/net/rrdtool/pkg-plist
+++ /dev/null
@@ -1,119 +0,0 @@
-bin/rrdtool
-bin/rrdcgi
-bin/rrdupdate
-lib/librrd.a
-lib/librrd.la
-lib/librrd.so
-lib/librrd.so.2
-lib/librrd_th.a
-lib/librrd_th.la
-lib/librrd_th.so
-lib/librrd_th.so.2
-include/rrd.h
-%%EXAMPLESDIR%%/4charts.pl
-%%EXAMPLESDIR%%/bigtops.pl
-%%EXAMPLESDIR%%/cgi-demo.cgi
-%%EXAMPLESDIR%%/minmax.pl
-%%EXAMPLESDIR%%/piped-demo.pl
-%%EXAMPLESDIR%%/perftest.pl
-%%EXAMPLESDIR%%/shared-demo.pl
-%%EXAMPLESDIR%%/stripes.pl
-%%PORTDOCS%%%%DOCSDIR%%/html/RRDp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/RRDs.html
-%%PORTDOCS%%%%DOCSDIR%%/html/bin_dec_hex.html
-%%PORTDOCS%%%%DOCSDIR%%/html/cdeftutorial.html
-%%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rpntutorial.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrd-beginners.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdbuild.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdcgi.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdcreate.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrddump.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdfetch.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdfirst.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdgraph.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdgraph_data.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdgraph_examples.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdgraph_graph.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdgraph_rpn.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdinfo.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdlast.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdlastupdate.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdresize.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdrestore.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdthreads.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdtool.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdtune.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdtutorial.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdupdate.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdxport.html
-%%PORTDOCS%%%%DOCSDIR%%/txt/bin_dec_hex.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/bin_dec_hex.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/cdeftutorial.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/cdeftutorial.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rpntutorial.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rpntutorial.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrd-beginners.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrd-beginners.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdbuild.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdbuild.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdcgi.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdcgi.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdcreate.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdcreate.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrddump.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrddump.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdfetch.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdfetch.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdfirst.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdfirst.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_data.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_data.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_examples.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_examples.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_graph.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_graph.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_rpn.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_rpn.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdinfo.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdinfo.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdlast.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdlast.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdlastupdate.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdlastupdate.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdresize.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdresize.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdrestore.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdrestore.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdthreads.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdthreads.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtool.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtool.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtune.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtune.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtutorial.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtutorial.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdupdate.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdupdate.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdxport.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdxport.txt
-%%DATADIR%%/fonts/DejaVuSansMono-Roman.ttf
-%%SITE_PERL%%/RRDp.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/RRDs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/ntmake.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/RRDs.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/RRDs.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/.packlist
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/rrdtoolmodule.so
-%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/RRD.so
-@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/fonts
-@dirrm %%DATADIR%%
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs
diff --git a/net/rubygem-rrdtool/Makefile b/net/rubygem-rrdtool/Makefile
index d504645a60bb..c3e25e7a4721 100644
--- a/net/rubygem-rrdtool/Makefile
+++ b/net/rubygem-rrdtool/Makefile
@@ -14,7 +14,7 @@ DISTNAME= RubyRRDtool-${PORTVERSION}
MAINTAINER= saurbier@math.uni-bielefeld.de
COMMENT= A Ruby interface to RRDTool
-LIB_DEPENDS= rrd:${PORTSDIR}/net/rrdtool
+LIB_DEPENDS= rrd:${PORTSDIR}/databases/rrdtool
BUILD_DEPENDS= sow:${PORTSDIR}/devel/rubygem-hoe
GEM_NAME= RubyRRDtool-0.6.0
diff --git a/net/smokeping/Makefile b/net/smokeping/Makefile
index 7894a08e0ab8..289fbc9f02ca 100644
--- a/net/smokeping/Makefile
+++ b/net/smokeping/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://oss.oetiker.ch/smokeping/pub/ \
MAINTAINER= lth@FreeBSD.org
COMMENT= Latency logging and graphing system
-RUN_DEPENDS= rrdtool:${PORTSDIR}/net/rrdtool \
+RUN_DEPENDS= rrdtool:${PORTSDIR}/databases/rrdtool \
${SITE_PERL}/CGI/SpeedyCGI.pm:${PORTSDIR}/www/p5-CGI-SpeedyCGI \
${SITE_PERL}/BER.pm:${PORTSDIR}/net-mgmt/p5-SNMP_Session \
${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \
diff --git a/security/amavis-stats/Makefile b/security/amavis-stats/Makefile
index dd64a2eb6520..2f24fd145899 100644
--- a/security/amavis-stats/Makefile
+++ b/security/amavis-stats/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://rekudos.net/download/
MAINTAINER= stone@tainet.lt
COMMENT= A simple AMaViS statistics generator based on rrdtool
-RUN_DEPENDS= ${SITE_PERL}/mach/RRDs.pm:${PORTSDIR}/net/rrdtool
+RUN_DEPENDS= ${SITE_PERL}/mach/RRDs.pm:${PORTSDIR}/databases/rrdtool
USE_PERL5_RUN= yes
USE_PHP= pcre
diff --git a/sysutils/dtc/Makefile b/sysutils/dtc/Makefile
index 9d687c6c21a4..aae4302e606d 100644
--- a/sysutils/dtc/Makefile
+++ b/sysutils/dtc/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/pear/Crypt/CBC.php:${PORTSDIR}/security/pear-Cry
${LOCALBASE}/bin/run-mailcap:${PORTSDIR}/misc/mime-support \
${LOCALBASE}/lib/nss_mysql.so:${PORTSDIR}/net/libnss-mysql \
${LOCALBASE}/sbin/chrootuid:${PORTSDIR}/security/chrootuid \
- ${LOCALBASE}/bin/rrdtool:${PORTSDIR}/net/rrdtool \
+ ${LOCALBASE}/bin/rrdtool:${PORTSDIR}/databases/rrdtool \
${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
${X11BASE}/lib/X11/fonts/webfonts/verdana.ttf:${PORTSDIR}/x11-fonts/webfonts \
${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql50-server
diff --git a/sysutils/ganglia-monitor-core/Makefile b/sysutils/ganglia-monitor-core/Makefile
index 59bff459afb8..05c947605031 100644
--- a/sysutils/ganglia-monitor-core/Makefile
+++ b/sysutils/ganglia-monitor-core/Makefile
@@ -63,7 +63,7 @@ USE_RC_SUBR= ganglia.sh
.if defined (WITH_GMETAD)
-LIB_DEPENDS= rrd.2:${PORTSDIR}/net/rrdtool
+LIB_DEPENDS= rrd.2:${PORTSDIR}/databases/rrdtool
CONFIGURE_ARGS+= --with-gmetad
PLIST_SUB+= GMETAD=
SUB_LIST+= GMETAD=
diff --git a/sysutils/munin-main/Makefile b/sysutils/munin-main/Makefile
index ac070ae84399..4d06e51e3497 100644
--- a/sysutils/munin-main/Makefile
+++ b/sysutils/munin-main/Makefile
@@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION:S/.r/rc/}
MAINTAINER= lupe@lupe-christoph.de
COMMENT= Collector part of Munin
-RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/RRDs.pm:${PORTSDIR}/net/rrdtool \
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/RRDs.pm:${PORTSDIR}/databases/rrdtool \
${SITE_PERL}/Net/Domain.pm:${PORTSDIR}/net/p5-Net \
${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template \
${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip
diff --git a/sysutils/munin-master/Makefile b/sysutils/munin-master/Makefile
index ac070ae84399..4d06e51e3497 100644
--- a/sysutils/munin-master/Makefile
+++ b/sysutils/munin-master/Makefile
@@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION:S/.r/rc/}
MAINTAINER= lupe@lupe-christoph.de
COMMENT= Collector part of Munin
-RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/RRDs.pm:${PORTSDIR}/net/rrdtool \
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/RRDs.pm:${PORTSDIR}/databases/rrdtool \
${SITE_PERL}/Net/Domain.pm:${PORTSDIR}/net/p5-Net \
${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template \
${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip
diff --git a/sysutils/symon/Makefile b/sysutils/symon/Makefile
index 61f7d0b4e77b..9eb61b0eff7c 100644
--- a/sysutils/symon/Makefile
+++ b/sysutils/symon/Makefile
@@ -22,7 +22,7 @@ WITHOUT_SYMUX= yes
.endif
.if !defined(WITHOUT_SYMUX)
-LIB_DEPENDS+= rrd.2:${PORTSDIR}/net/rrdtool
+LIB_DEPENDS+= rrd.2:${PORTSDIR}/databases/rrdtool
.endif
.if defined(WITHOUT_SYMUX) && defined(WITHOUT_SYMON)
diff --git a/www/drraw/Makefile b/www/drraw/Makefile
index ade52ecea2bb..c51beeb66389 100644
--- a/www/drraw/Makefile
+++ b/www/drraw/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://web.taranis.org/drraw/dist/ \
MAINTAINER= ports@christianserving.org
COMMENT= A simple web-based presentation front-end for RRDtool
-RUN_DEPENDS+= ${SITE_PERL}/RRDp.pm:${PORTSDIR}/net/rrdtool
+RUN_DEPENDS+= ${SITE_PERL}/RRDp.pm:${PORTSDIR}/databases/rrdtool
USE_PERL5_RUN= yes