summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--MOVED1
-rw-r--r--databases/Makefile1
-rw-r--r--databases/rrdtool10/Makefile2
-rw-r--r--net-mgmt/jffnms/Makefile2
-rw-r--r--net/Makefile1
-rw-r--r--net/rrdtool10/Makefile71
-rw-r--r--net/rrdtool10/distinfo3
-rw-r--r--net/rrdtool10/files/patch-aa11
-rw-r--r--net/rrdtool10/files/patch-ac36
-rw-r--r--net/rrdtool10/files/patch-ae14
-rw-r--r--net/rrdtool10/files/patch-af11
-rw-r--r--net/rrdtool10/files/patch-ag11
-rw-r--r--net/rrdtool10/files/patch-ak11
-rw-r--r--net/rrdtool10/pkg-descr10
-rw-r--r--net/rrdtool10/pkg-plist95
15 files changed, 4 insertions, 276 deletions
diff --git a/MOVED b/MOVED
index 2e6794f93708..f950b6664d0d 100644
--- a/MOVED
+++ b/MOVED
@@ -3143,3 +3143,4 @@ editors/flim113||2007-08-05|Expired: distfile no longer available
editors/semi113||2007-08-05|Expired: distfile no longer available
deskutils/intclock|x11-clocks/intclock|2007-08-08|Moved to a more appropriate category
net/smokeping|net-mgmt/smokeping|2007-08-10|Moved to a more appropriate category
+net/rrdtool10|databases/rrdtool10|2007-08-11|Moved to a more appropriate category
diff --git a/databases/Makefile b/databases/Makefile
index 4bc228d39493..d89689dea34e 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -467,6 +467,7 @@
SUBDIR += rdfdb
SUBDIR += rrdman
SUBDIR += rrdtool
+ SUBDIR += rrdtool10
SUBDIR += ruby-bdb
SUBDIR += ruby-bdb1
SUBDIR += ruby-cdb
diff --git a/databases/rrdtool10/Makefile b/databases/rrdtool10/Makefile
index da30bc4b63a3..5601a2c8f706 100644
--- a/databases/rrdtool10/Makefile
+++ b/databases/rrdtool10/Makefile
@@ -8,7 +8,7 @@
PORTNAME= rrdtool
PORTVERSION= 1.0.50
PORTREVISION= 1
-CATEGORIES= net
+CATEGORIES= databases
MASTER_SITES= http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-1.0.x/
MAINTAINER= lth@FreeBSD.org
diff --git a/net-mgmt/jffnms/Makefile b/net-mgmt/jffnms/Makefile
index 2d661ce4dec2..86287c39ed5e 100644
--- a/net-mgmt/jffnms/Makefile
+++ b/net-mgmt/jffnms/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= farrokhi@FreeBSD.org
COMMENT= Very advanced network monitoring and control system
RUN_DEPENDS= neato:${PORTSDIR}/graphics/graphviz \
- rrdtool:${PORTSDIR}/net/rrdtool10 \
+ rrdtool:${PORTSDIR}/databases/rrdtool10 \
nmap:${PORTSDIR}/security/nmap \
${LOCALBASE}/sbin/tmpwatch:${PORTSDIR}/sysutils/tmpwatch
diff --git a/net/Makefile b/net/Makefile
index 1efb7d25d0c0..b87f2cdd1326 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -732,7 +732,6 @@
SUBDIR += rmsg
SUBDIR += roadrunner
SUBDIR += rp-pppoe
- SUBDIR += rrdtool10
SUBDIR += rshell
SUBDIR += rsync
SUBDIR += rtg
diff --git a/net/rrdtool10/Makefile b/net/rrdtool10/Makefile
deleted file mode 100644
index da30bc4b63a3..000000000000
--- a/net/rrdtool10/Makefile
+++ /dev/null
@@ -1,71 +0,0 @@
-# New ports collection makefile for: rrdtool
-# Date created: 20 July 1999
-# Whom: Dmitry Sivachenko <dima@Chg.RU>
-#
-# $FreeBSD$
-#
-
-PORTNAME= rrdtool
-PORTVERSION= 1.0.50
-PORTREVISION= 1
-CATEGORIES= net
-MASTER_SITES= http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-1.0.x/
-
-MAINTAINER= lth@FreeBSD.org
-COMMENT= Round Robin Database Tools
-
-USE_PERL5= yes
-MAKE_ENV= PERL=${PERL}
-
-CONFLICTS= rrdtool-1.2*
-LATEST_LINK= rrdtool10
-
-USE_AUTOTOOLS= libtool:15
-INSTALLS_SHLIB= yes
-CONFIGURE_ARGS= --enable-shared --enable-local-zlib \
- --program-transform-name=''
-CONFIGURE_ENV= PERL=${PERL} PERL_MAKE_OPTIONS="PREFIX=${PREFIX}"
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib -fPIC
-LDFLAGS+= -L${LOCALBASE}/lib
-CFLAGS:= ${CFLAGS:N-ffast-math}
-
-MAN1= RRDp.1 RRDs.1 bin_dec_hex.1 rrdcgi.1 rrdcreate.1 rrddump.1 \
- rrdfetch.1 rrdgraph.1 rrdlast.1 rrdresize.1 rrdrestore.1 \
- rrdtool.1 rrdtune.1 rrdtutorial.1 rrdtutorial.es.1 rrdupdate.1 \
- cdeftutorial.1 rpntutorial.1 rrdinfo.1 rrdxport.1 rrd-beginners.1 \
- rrdfirst.1
-MAN3= RRDp.3 RRDs.3
-MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
-
-OPTIONS= "ISO-8859-2 fonts support" off
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_LATIN2)
-CONFIGURE_ARGS+=--enable-latin2
-.endif
-
-.if ${ARCH} == "amd64"
-CONFIGURE_ARGS+=--with-pic
-.endif
-
-.if ${ARCH} == "ia64"
-BROKEN= "Does not build on ia64"
-.endif
-
-post-extract:
-.if defined(NOPORTDOCS)
- @${REINPLACE_CMD} -e 's/install-idocDATA install-ihtmlDATA//g' \
- ${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/rrdtool10/distinfo b/net/rrdtool10/distinfo
deleted file mode 100644
index 25f26fc6effd..000000000000
--- a/net/rrdtool10/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (rrdtool-1.0.50.tar.gz) = c466e2e7df95fa8e318e46437da87686
-SHA256 (rrdtool-1.0.50.tar.gz) = 42aa7c213dedbd95d33ca84d92f4187880f7e96062c6a3fb05bfb16f77ba2a91
-SIZE (rrdtool-1.0.50.tar.gz) = 1474200
diff --git a/net/rrdtool10/files/patch-aa b/net/rrdtool10/files/patch-aa
deleted file mode 100644
index 8436cf0346fb..000000000000
--- a/net/rrdtool10/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- perl-shared/Makefile.PL.in.orig Thu Apr 8 01:04:53 2004
-+++ perl-shared/Makefile.PL.in Sun Aug 8 18:11:16 2004
-@@ -10,7 +10,7 @@
- 'NAME' => 'RRDs',
- 'VERSION_FROM' => '@top_srcdir@/perl-shared/RRDs.pm', # finds $VERSION
- 'DEFINE' => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}",
-- 'INC' => '-I@top_srcdir@ -I@top_srcdir@/src -I@top_srcdir@/gd1.3',
-+ 'INC' => '-I../ -I@top_srcdir@ -I@top_srcdir@/src -I@top_srcdir@/gd1.3',
- 'CCFLAGS' => "$Config{ccflags} -DHAVE_CONFIG_H",
- # where to look for the necessary libraries
- # Perl will figure out which one is valid
diff --git a/net/rrdtool10/files/patch-ac b/net/rrdtool10/files/patch-ac
deleted file mode 100644
index 5d34a7b5d9e1..000000000000
--- a/net/rrdtool10/files/patch-ac
+++ /dev/null
@@ -1,36 +0,0 @@
---- Makefile.in.orig Sun Aug 8 12:40:15 2004
-+++ Makefile.in Wed Mar 16 21:26:50 2005
-@@ -633,21 +633,7 @@
- # lets schedule the perl stuff for installation
- # the special call to install-sh is because the -d switch is not portable
- # mac os X has its perl module in bundles so it seems
--install-data-local:
-- @if test "x$(PERL)" != "xno"; then \
-- echo "$(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs"; \
-- $(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs; \
-- echo "$(INSTALL) -m 644 $(top_srcdir)/perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl"; \
-- $(INSTALL) -m 644 $(top_srcdir)/perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl; \
-- echo "$(INSTALL) -m 644 $(top_srcdir)/perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl"; \
-- $(INSTALL) -m 644 $(top_srcdir)/perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl; \
-- echo "$(INSTALL) -m 644 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs"; \
-- $(INSTALL) -m 644 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs; \
-- echo "test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true"; \
-- test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true; \
-- echo "test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs|| true"; \
-- test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs|| true; \
-- fi
-+install-data-local: site-perl-inst
-
- # rules for building the perl module
-
-@@ -727,8 +713,8 @@
- site-perl-inst: site-perl-install
-
- site-perl-install: all perl-piped/Makefile perl-shared/Makefile
-- cd perl-piped && $(MAKE) install
-- cd perl-shared && $(MAKE) install
-+ cd perl-piped && $(MAKE) pure_install
-+ cd perl-shared && $(MAKE) pure_install
-
- site-tcl-install: all
- cd tcl && $(MAKE) tcl-install
diff --git a/net/rrdtool10/files/patch-ae b/net/rrdtool10/files/patch-ae
deleted file mode 100644
index b1465ab16354..000000000000
--- a/net/rrdtool10/files/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
---- doc/Makefile.in.orig Sun Apr 14 11:51:02 2002
-+++ doc/Makefile.in Wed May 1 16:05:42 2002
-@@ -110,9 +110,9 @@
- EXTRA_DIST = $(POD) $(HTML) $(TXT)
-
- # some install rules
--idocdir = $(prefix)/doc
-+idocdir = $(prefix)/share/doc/rrdtool/
- idoc_DATA = $(POD) $(TXT)
--ihtmldir = $(prefix)/html
-+ihtmldir = $(prefix)/share/doc/rrdtool/html
- ihtml_DATA = $(HTML)
- imandir = $(prefix)/man/man1
- iman_DATA = $(MAN)
diff --git a/net/rrdtool10/files/patch-af b/net/rrdtool10/files/patch-af
deleted file mode 100644
index 6fe55fd6132f..000000000000
--- a/net/rrdtool10/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- examples/Makefile.in.orig Sat Jul 23 13:27:58 2005
-+++ examples/Makefile.in Sat Jul 23 13:29:30 2005
-@@ -188,7 +188,7 @@
- target_os = @target_os@
- target_vendor = @target_vendor@
- EXTRA_DIST = cgi-demo.cgi.in piped-demo.pl.in shared-demo.pl.in stripes.pl.in bigtops.pl.in minmax.pl.in
--examplesdir = $(prefix)/examples
-+examplesdir = $(prefix)/share/examples/rrdtool
- examples_SCRIPTS = cgi-demo.cgi piped-demo.pl shared-demo.pl stripes.pl bigtops.pl minmax.pl
- all: all-am
-
diff --git a/net/rrdtool10/files/patch-ag b/net/rrdtool10/files/patch-ag
deleted file mode 100644
index 205d5ac7228c..000000000000
--- a/net/rrdtool10/files/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/Makefile.in.orig Sun Apr 14 11:51:05 2002
-+++ contrib/Makefile.in Wed May 1 16:08:10 2002
-@@ -88,7 +88,7 @@
- ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
-
- SUBDIRS = trytime
--contribdir = $(prefix)/contrib
-+contribdir = $(prefix)/share/examples/rrdtool
- contrib_DATA = README
- EXTRA_DIST = rrdview log2rrd rrd-file-icon rrdproc rrdlastds add_ds killspike rrdfetchnames snmpstats rrdexplorer php3 php4
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
diff --git a/net/rrdtool10/files/patch-ak b/net/rrdtool10/files/patch-ak
deleted file mode 100644
index 982c95f4fd38..000000000000
--- a/net/rrdtool10/files/patch-ak
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/trytime/Makefile.in.orig Mon Apr 5 02:03:53 2004
-+++ contrib/trytime/Makefile.in Tue Apr 6 11:17:12 2004
-@@ -162,7 +162,7 @@
- target_vendor = @target_vendor@
- AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/gd1.3
- EXTRA_DIST = trytime.c
--contribdir = $(prefix)/contrib/trytime
-+contribdir = $(prefix)/share/examples/rrdtool/trytime
- contrib_DATA = README trytime.c
- bin_PROGRAMS = trytime
- trytime_SOURCES = trytime.c
diff --git a/net/rrdtool10/pkg-descr b/net/rrdtool10/pkg-descr
deleted file mode 100644
index 2d47a2220ffc..000000000000
--- a/net/rrdtool10/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/rrdtool10/pkg-plist b/net/rrdtool10/pkg-plist
deleted file mode 100644
index 65883b7d1358..000000000000
--- a/net/rrdtool10/pkg-plist
+++ /dev/null
@@ -1,95 +0,0 @@
-bin/rrdtool
-bin/rrdcgi
-bin/trytime
-bin/rrdupdate
-lib/librrd.a
-lib/librrd.la
-lib/librrd.so.0
-lib/librrd.so
-include/rrd.h
-%%EXAMPLESDIR%%/cgi-demo.cgi
-%%EXAMPLESDIR%%/piped-demo.pl
-%%EXAMPLESDIR%%/shared-demo.pl
-%%EXAMPLESDIR%%/stripes.pl
-%%EXAMPLESDIR%%/bigtops.pl
-%%EXAMPLESDIR%%/minmax.pl
-%%EXAMPLESDIR%%/trytime/trytime.c
-%%EXAMPLESDIR%%/trytime/README
-%%EXAMPLESDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/rrdtool.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdinfo.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdlast.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdcreate.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdupdate.pod
-%%PORTDOCS%%%%DOCSDIR%%/cdeftutorial.pod
-%%PORTDOCS%%%%DOCSDIR%%/rpntutorial.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdgraph.pod
-%%PORTDOCS%%%%DOCSDIR%%/bin_dec_hex.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdfetch.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdrestore.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrddump.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdtune.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdresize.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdcgi.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdtutorial.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdtutorial.es.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdxport.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrd-beginners.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdtool.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrdinfo.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrdlast.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrdcreate.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrdupdate.txt
-%%PORTDOCS%%%%DOCSDIR%%/cdeftutorial.txt
-%%PORTDOCS%%%%DOCSDIR%%/rpntutorial.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrdgraph.txt
-%%PORTDOCS%%%%DOCSDIR%%/bin_dec_hex.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrdfetch.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrdrestore.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrddump.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrdtune.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrdresize.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrdcgi.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrdtutorial.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrdtutorial.es.txt
-%%PORTDOCS%%%%DOCSDIR%%/RRDs.txt
-%%PORTDOCS%%%%DOCSDIR%%/RRDp.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrdxport.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrd-beginners.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrdfirst.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdfirst.txt
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdtool.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdinfo.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdlast.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdcreate.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdupdate.html
-%%PORTDOCS%%%%DOCSDIR%%/html/cdeftutorial.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rpntutorial.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdgraph.html
-%%PORTDOCS%%%%DOCSDIR%%/html/bin_dec_hex.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdfetch.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdrestore.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrddump.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdtune.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdresize.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdcgi.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdtutorial.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdtutorial.es.html
-%%PORTDOCS%%%%DOCSDIR%%/html/RRDs.html
-%%PORTDOCS%%%%DOCSDIR%%/html/RRDp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdxport.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrd-beginners.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdfirst.html
-%%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
-@dirrm %%EXAMPLESDIR%%/trytime
-@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-11 00:35:03 +0000