aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MOVED1
-rw-r--r--databases/Makefile1
-rw-r--r--databases/py-rrdtool_lgpl/Makefile2
-rw-r--r--net-mgmt/nav/Makefile2
-rw-r--r--net/Makefile1
-rw-r--r--net/py-rrdtool_lgpl/Makefile27
-rw-r--r--net/py-rrdtool_lgpl/distinfo3
-rw-r--r--net/py-rrdtool_lgpl/files/patch-src::_rrdtoolmodule.c17
-rw-r--r--net/py-rrdtool_lgpl/pkg-descr6
-rw-r--r--net/py-rrdtool_lgpl/pkg-plist5
10 files changed, 4 insertions, 61 deletions
diff --git a/MOVED b/MOVED
index c971b9e6f119..6cf1878c720b 100644
--- a/MOVED
+++ b/MOVED
@@ -3148,3 +3148,4 @@ net/jrobin|databases/jrobin|2007-08-11|Moved to a more appropriate category
net/p5-POE-Component-RRDTool|databases/p5-POE-Component-RRDTool|2007-08-11|Moved to a more appropriate category
net/p5-RRD-Simple|databases/p5-RRD-Simple|2007-08-11|Moved to a more appropriate category
net/php4-rrdtool|databases/php4-rrdtool|2007-08-11|Moved to a more appropriate category
+net/py-rrdtool_lgpl|databases/py-rrdtool_lgpl|2007-08-11|Moved to a more appropriate category
diff --git a/databases/Makefile b/databases/Makefile
index 41345028f883..bb20ade3a1ce 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -444,6 +444,7 @@
SUBDIR += py-pyPgSQL
SUBDIR += py-qt4-sql
SUBDIR += py-rrdpipe
+ SUBDIR += py-rrdtool_lgpl
SUBDIR += py-sqlalchemy
SUBDIR += py-sqlite3
SUBDIR += py-sqlobject
diff --git a/databases/py-rrdtool_lgpl/Makefile b/databases/py-rrdtool_lgpl/Makefile
index 15f258244d57..ff9cde79c2bd 100644
--- a/databases/py-rrdtool_lgpl/Makefile
+++ b/databases/py-rrdtool_lgpl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rrdtool_lgpl
PORTVERSION= 0.2.1
PORTREVISION= 1
-CATEGORIES= net python
+CATEGORIES= databases python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= py-rrdtool
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/net-mgmt/nav/Makefile b/net-mgmt/nav/Makefile
index 2f97719f8311..0cdfb6c84842 100644
--- a/net-mgmt/nav/Makefile
+++ b/net-mgmt/nav/Makefile
@@ -48,7 +48,7 @@ BUILD_DEPENDS+= ${TOMCAT_DEPEND}
RUN_DEPENDS= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \
${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg \
${SITE_PERL}/${PERL_ARCH}/Pg.pm:${PORTSDIR}/databases/p5-Pg \
- ${PYTHON_SITELIBDIR}/rrdtool/_rrdtool.so:${PORTSDIR}/net/py-rrdtool_lgpl \
+ ${PYTHON_SITELIBDIR}/rrdtool/_rrdtool.so:${PORTSDIR}/databases/py-rrdtool_lgpl \
${PYTHON_SITELIBDIR}/psycopgmodule.so:${PORTSDIR}/databases/py-psycopg \
${LOCALBASE}/cricket/cricket/collect-subtrees:${PORTSDIR}/net-mgmt/cricket \
${JAVALIBDIR}/postgresql.jar:${PORTSDIR}/databases/postgresql-jdbc \
diff --git a/net/Makefile b/net/Makefile
index 87433fb03130..95ddfc034fe6 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -677,7 +677,6 @@
SUBDIR += py-pypcap
SUBDIR += py-qt4-network
SUBDIR += py-radix
- SUBDIR += py-rrdtool_lgpl
SUBDIR += py-rt
SUBDIR += py-s3cmd
SUBDIR += py-samba
diff --git a/net/py-rrdtool_lgpl/Makefile b/net/py-rrdtool_lgpl/Makefile
deleted file mode 100644
index 15f258244d57..000000000000
--- a/net/py-rrdtool_lgpl/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# Ports collection makefile for: py-rrdtool_lgpl
-# Date created: 8 January 2003
-# Whom: Hye-Shik Chang
-#
-# $FreeBSD$
-
-PORTNAME= rrdtool_lgpl
-PORTVERSION= 0.2.1
-PORTREVISION= 1
-CATEGORIES= net python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= py-rrdtool
-PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-DISTNAME= py-rrdtool-${PORTVERSION}
-
-MAINTAINER= perky@FreeBSD.org
-COMMENT= Python interface to RRDTool, the graphing and logging utility
-
-LIB_DEPENDS= rrd:${PORTSDIR}/databases/rrdtool
-
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_PKGNAME= py-rrdtool
-
-LIBDIR?= ${LOCALBASE}/lib # directory where librrd.so lives
-
-.include <bsd.port.mk>
diff --git a/net/py-rrdtool_lgpl/distinfo b/net/py-rrdtool_lgpl/distinfo
deleted file mode 100644
index 691bb31b76fc..000000000000
--- a/net/py-rrdtool_lgpl/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (py-rrdtool-0.2.1.tar.gz) = 32aa26ac40274419c4bbd68bed77407d
-SHA256 (py-rrdtool-0.2.1.tar.gz) = 3a72b6483c4da110e0a3563f0b0f233d891b78a0fa226d6981e9cc7dd5a53f05
-SIZE (py-rrdtool-0.2.1.tar.gz) = 18809
diff --git a/net/py-rrdtool_lgpl/files/patch-src::_rrdtoolmodule.c b/net/py-rrdtool_lgpl/files/patch-src::_rrdtoolmodule.c
deleted file mode 100644
index 358957220aaf..000000000000
--- a/net/py-rrdtool_lgpl/files/patch-src::_rrdtoolmodule.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/_rrdtoolmodule.c.orig Tue May 10 15:02:49 2005
-+++ src/_rrdtoolmodule.c Tue May 10 15:06:59 2005
-@@ -232,11 +232,13 @@
- PyObject *r;
- char **argv, **calcpr;
- int argc, xsize, ysize, i;
-+ double ymin, ymax;
-
- if (create_args("graph", args, &argc, &argv) < 0)
- return NULL;
-
-- if (rrd_graph(argc, argv, &calcpr, &xsize, &ysize) == -1) {
-+ if (rrd_graph(argc, argv, &calcpr, &xsize, &ysize, NULL,
-+ &ymin, &ymax) == -1) {
- PyErr_SetString(ErrorObject, rrd_get_error());
- rrd_clear_error();
- r = NULL;
diff --git a/net/py-rrdtool_lgpl/pkg-descr b/net/py-rrdtool_lgpl/pkg-descr
deleted file mode 100644
index 9256ac3fb534..000000000000
--- a/net/py-rrdtool_lgpl/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-The python-rrdtool provides a interface to rrdtool, the
-wonderful graphing and logging utility. This wrapper
-implementation has worked from the scratch (without SWIG),
-and it's under LGPL.
-
-WWW: http://sourceforge.net/projects/py-rrdtool/
diff --git a/net/py-rrdtool_lgpl/pkg-plist b/net/py-rrdtool_lgpl/pkg-plist
deleted file mode 100644
index 0df51430e879..000000000000
--- a/net/py-rrdtool_lgpl/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-%%PYTHON_SITELIBDIR%%/rrdtool/__init__.py
-%%PYTHON_SITELIBDIR%%/rrdtool/__init__.pyc
-%%PYTHON_SITELIBDIR%%/rrdtool/__init__.pyo
-%%PYTHON_SITELIBDIR%%/rrdtool/_rrdtool.so
-@dirrm %%PYTHON_SITELIBDIR%%/rrdtool