summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MOVED1
-rw-r--r--databases/Makefile1
-rw-r--r--databases/php4-rrdtool/Makefile2
-rw-r--r--net/Makefile1
-rw-r--r--net/php4-rrdtool/Makefile32
-rw-r--r--net/php4-rrdtool/distinfo3
-rw-r--r--net/php4-rrdtool/files/patch-rrdtool.c20
-rw-r--r--net/php4-rrdtool/pkg-descr5
-rw-r--r--net/php4-rrdtool/pkg-plist7
9 files changed, 3 insertions, 69 deletions
diff --git a/MOVED b/MOVED
index 726fe5c703b2..c971b9e6f119 100644
--- a/MOVED
+++ b/MOVED
@@ -3147,3 +3147,4 @@ net/rrdtool10|databases/rrdtool10|2007-08-11|Moved to a more appropriate categor
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
diff --git a/databases/Makefile b/databases/Makefile
index 067ab19845d9..41345028f883 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -360,6 +360,7 @@
SUBDIR += php4-odbc
SUBDIR += php4-oracle
SUBDIR += php4-pgsql
+ SUBDIR += php4-rrdtool
SUBDIR += php4-sybase_ct
SUBDIR += php5-creole
SUBDIR += php5-dba
diff --git a/databases/php4-rrdtool/Makefile b/databases/php4-rrdtool/Makefile
index e5a0274767ac..7d81db1068a1 100644
--- a/databases/php4-rrdtool/Makefile
+++ b/databases/php4-rrdtool/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rrdtool
PORTVERSION= 1.05
-CATEGORIES= net
+CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_LOCAL} http://www.joeym.net/
MASTER_SITE_SUBDIR= mat
PKGNAMEPREFIX= php4-
diff --git a/net/Makefile b/net/Makefile
index bd5b59d340e6..87433fb03130 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -628,7 +628,6 @@
SUBDIR += pfinger
SUBDIR += phamm
SUBDIR += php4-ldap
- SUBDIR += php4-rrdtool
SUBDIR += php4-sockets
SUBDIR += php4-xmlrpc
SUBDIR += php4-yp
diff --git a/net/php4-rrdtool/Makefile b/net/php4-rrdtool/Makefile
deleted file mode 100644
index e5a0274767ac..000000000000
--- a/net/php4-rrdtool/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# New ports collection makefile for: php4-rrdtool
-# Date created: 26 Aug 2004
-# Whom: mat
-#
-# $FreeBSD$
-#
-
-PORTNAME= rrdtool
-PORTVERSION= 1.05
-CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_LOCAL} http://www.joeym.net/
-MASTER_SITE_SUBDIR= mat
-PKGNAMEPREFIX= php4-
-DISTNAME= ${UNIQUENAME}-${PORTVERSION}
-
-MAINTAINER= mat@FreeBSD.org
-COMMENT= A php/rrdtool glue
-
-LIB_DEPENDS= rrd:${PORTSDIR}/databases/rrdtool
-
-GNU_CONFIGURE= yes
-WRKSRC= ${WRKDIR}/${UNIQUENAME}-${PORTVERSION}
-
-USE_PHP= yes
-USE_PHPEXT= yes
-
-post-install:
- @${MKDIR} ${EXAMPLESDIR}
- @${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
- @${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
-
-.include <bsd.port.mk>
diff --git a/net/php4-rrdtool/distinfo b/net/php4-rrdtool/distinfo
deleted file mode 100644
index 7bcb044e35a1..000000000000
--- a/net/php4-rrdtool/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (php4-rrdtool-1.05.tar.gz) = 17816fc591c38135e81856e143aaab6f
-SHA256 (php4-rrdtool-1.05.tar.gz) = 7250887228f12178e4121de54985355ae7173d3b957825af389ba483c5a5a523
-SIZE (php4-rrdtool-1.05.tar.gz) = 293555
diff --git a/net/php4-rrdtool/files/patch-rrdtool.c b/net/php4-rrdtool/files/patch-rrdtool.c
deleted file mode 100644
index 951af3a8f254..000000000000
--- a/net/php4-rrdtool/files/patch-rrdtool.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- rrdtool.c.orig Thu Jun 12 03:27:51 2003
-+++ rrdtool.c Tue May 10 12:39:24 2005
-@@ -331,6 +331,7 @@
- HashTable *args_arr;
- int i, xsize, ysize, argc;
- char **argv, **calcpr;
-+ double ymin, ymax;
-
-
- if ( rrd_test_error() )
-@@ -377,7 +378,8 @@
- }
-
- optind = 0; opterr = 0;
-- if ( rrd_graph(argc-1, &argv[1], &calcpr, &xsize, &ysize) != -1 )
-+ if ( rrd_graph(argc-1, &argv[1], &calcpr, &xsize, &ysize,
-+ NULL, &ymin, &ymax) != -1 )
- {
- array_init(return_value);
- add_assoc_long(return_value, "xsize", xsize);
diff --git a/net/php4-rrdtool/pkg-descr b/net/php4-rrdtool/pkg-descr
deleted file mode 100644
index efa020570b1f..000000000000
--- a/net/php4-rrdtool/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Contained herein are bindings to allow you to interface php scripts with RRD
-tool directly via RRD tool's 'librrd' library, thus avoiding the need to use
-system() calls to the rrdtool binary.
-
-WWW: http://www.joeym.net/
diff --git a/net/php4-rrdtool/pkg-plist b/net/php4-rrdtool/pkg-plist
deleted file mode 100644
index e4647ab69b32..000000000000
--- a/net/php4-rrdtool/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-%%PORTDOCS%%%%EXAMPLESDIR%%/etc3p16.rrd
-%%PORTDOCS%%%%EXAMPLESDIR%%/rrd_create.php
-%%PORTDOCS%%%%EXAMPLESDIR%%/rrd_graph.php
-%%PORTDOCS%%%%EXAMPLESDIR%%/rrd_last.php
-%%PORTDOCS%%%%EXAMPLESDIR%%/rrd_update.php
-%%PORTDOCS%%%%EXAMPLESDIR%%/test_fetch.php
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%