svn commit: r405901 - in head/databases/pecl-rrd: . files
Renato Botelho
garga at FreeBSD.org
Tue Jan 12 18:22:28 UTC 2016
Author: garga
Date: Tue Jan 12 18:22:26 2016
New Revision: 405901
URL: https://svnweb.freebsd.org/changeset/ports/405901
Log:
Make databases/pecl-rrd to build when rrdtool has no GRAPH support enabled
PR: 206156
Approved by: flo (maintainer)
Obtained from: pfSense
Sponsored by: Rubicon Communications (Netgate)
Added:
head/databases/pecl-rrd/files/
head/databases/pecl-rrd/files/patch-config.m4 (contents, props changed)
head/databases/pecl-rrd/files/patch-rrd.c (contents, props changed)
Modified:
head/databases/pecl-rrd/Makefile
Modified: head/databases/pecl-rrd/Makefile
==============================================================================
--- head/databases/pecl-rrd/Makefile Tue Jan 12 18:01:28 2016 (r405900)
+++ head/databases/pecl-rrd/Makefile Tue Jan 12 18:22:26 2016 (r405901)
@@ -2,7 +2,7 @@
PORTNAME= rrd
DISTVERSION= 1.1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases pear
MASTER_SITES= http://pecl.php.net/get/
PKGNAMEPREFIX= pecl-
Added: head/databases/pecl-rrd/files/patch-config.m4
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/pecl-rrd/files/patch-config.m4 Tue Jan 12 18:22:26 2016 (r405901)
@@ -0,0 +1,24 @@
+--- config.m4.orig 2016-01-12 12:40:08 UTC
++++ config.m4
+@@ -59,9 +59,11 @@ if test "$PHP_RRD" != "no"; then
+ LDFLAGS="$LDFLAGS -L$RRDTOOL_LIBDIR"
+
+ dnl rrd_graph_v is available in 1.3.0+
++ rrd_graph_c=""
+ PHP_CHECK_FUNC(rrd_graph_v, rrd)
+- if test "$ac_cv_func_rrd_graph_v" != yes; then
+- AC_MSG_ERROR([rrd lib version seems older than 1.3.0, update to 1.3.0+])
++ if test "$ac_cv_func_rrd_graph_v" == yes; then
++ AC_DEFINE(HAVE_RRD_GRAPH, 1, [ ])
++ rrd_graph_c="rrd_graph.c"
+ fi
+
+ dnl rrd_lastupdate_r available in 1.4.0+
+@@ -72,6 +74,6 @@ if test "$PHP_RRD" != "no"; then
+
+ LDFLAGS=$old_LDFLAGS
+
+- PHP_NEW_EXTENSION(rrd, rrd.c rrd_graph.c rrd_create.c rrd_update.c rrd_info.c, $ext_shared)
++ PHP_NEW_EXTENSION(rrd, rrd.c $rrd_graph_c rrd_create.c rrd_update.c rrd_info.c, $ext_shared)
+ PHP_SUBST(RRD_SHARED_LIBADD)
+ fi
Added: head/databases/pecl-rrd/files/patch-rrd.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/pecl-rrd/files/patch-rrd.c Tue Jan 12 18:22:26 2016 (r405901)
@@ -0,0 +1,81 @@
+--- rrd.c.orig 2016-01-12 12:42:39 UTC
++++ rrd.c
+@@ -19,7 +19,9 @@
+ #include <rrd.h>
+
+ #include "php_rrd.h"
++#ifdef HAVE_RRD_GRAPH
+ #include "rrd_graph.h"
++#endif
+ #include "rrd_create.h"
+ #include "rrd_update.h"
+ #include "rrd_info.h"
+@@ -387,6 +389,7 @@ PHP_FUNCTION(rrd_tune)
+ }
+ /* }}} */
+
++#ifdef HAVE_RRD_GRAPH
+ /* {{{ proto array rrd_xport(array options)
+ * Creates a graph based on options passed via an array
+ */
+@@ -480,6 +483,7 @@ PHP_FUNCTION(rrd_xport)
+ free(data);
+ }
+ /* }}} */
++#endif
+
+ #ifdef HAVE_RRDC_DISCONNECT
+ /* {{{ proto void rrdc_disconnect()
+@@ -537,18 +541,22 @@ ZEND_BEGIN_ARG_INFO(arginfo_rrd_tune, 0)
+ ZEND_ARG_INFO(0, options)
+ ZEND_END_ARG_INFO()
+
++#ifdef HAVE_RRD_GRAPH
+ ZEND_BEGIN_ARG_INFO(arginfo_rrd_xport, 0)
+ ZEND_ARG_INFO(0, options)
+ ZEND_END_ARG_INFO()
++#endif
+
+ ZEND_BEGIN_ARG_INFO(arginfo_rrd_info, 0)
+ ZEND_ARG_INFO(0, file)
+ ZEND_END_ARG_INFO()
+
++#ifdef HAVE_RRD_GRAPH
+ ZEND_BEGIN_ARG_INFO(arginfo_rrd_graph, 0)
+ ZEND_ARG_INFO(0, file)
+ ZEND_ARG_INFO(0, options)
+ ZEND_END_ARG_INFO()
++#endif
+
+ ZEND_BEGIN_ARG_INFO(arginfo_rrd_create, 0)
+ ZEND_ARG_INFO(0, filename)
+@@ -565,7 +573,9 @@ ZEND_END_ARG_INFO()
+ static zend_function_entry rrd_functions[] = {
+ PHP_FE(rrd_update, arginfo_rrd_update)
+ PHP_FE(rrd_create, arginfo_rrd_create)
++#ifdef HAVE_RRD_GRAPH
+ PHP_FE(rrd_graph, arginfo_rrd_graph)
++#endif
+ PHP_FE(rrd_error, NULL)
+ PHP_FE(rrd_fetch, arginfo_rrd_fetch)
+ PHP_FE(rrd_first, arginfo_rrd_first)
+@@ -574,7 +584,9 @@ static zend_function_entry rrd_functions
+ PHP_FE(rrd_lastupdate, arginfo_rrd_lastupdate)
+ PHP_FE(rrd_restore, arginfo_rrd_restore)
+ PHP_FE(rrd_tune, arginfo_rrd_tune)
++#ifdef HAVE_RRD_GRAPH
+ PHP_FE(rrd_xport, arginfo_rrd_xport)
++#endif
+ #ifdef HAVE_RRDC_DISCONNECT
+ PHP_FE(rrdc_disconnect, NULL)
+ #endif
+@@ -590,7 +602,9 @@ static zend_function_entry rrd_functions
+ /* {{{ PHP_MINIT_FUNCTION */
+ static PHP_MINIT_FUNCTION(rrd)
+ {
++#ifdef HAVE_RRD_GRAPH
+ rrd_graph_minit(TSRMLS_C);
++#endif
+ rrd_create_minit(TSRMLS_C);
+ rrd_update_minit(TSRMLS_C);
+ return SUCCESS;
More information about the svn-ports-all
mailing list