Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 16 Sep 2020 20:05:01 +0000 (UTC)
From:      Florian Smeets <flo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r548797 - in head/databases/pecl-rrd: . files
Message-ID:  <202009162005.08GK51wv077128@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: flo
Date: Wed Sep 16 20:05:00 2020
New Revision: 548797
URL: https://svnweb.freebsd.org/changeset/ports/548797

Log:
  Fix build with PHP 7.4
  
  PR:		248961
  Submitted by:	garga

Added:
  head/databases/pecl-rrd/files/
  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	Wed Sep 16 20:00:11 2020	(r548796)
+++ head/databases/pecl-rrd/Makefile	Wed Sep 16 20:05:00 2020	(r548797)
@@ -12,6 +12,5 @@ LICENSE=	PHP301
 
 LIB_DEPENDS=	librrd.so:databases/rrdtool
 USES=		php:pecl localbase pkgconfig
-IGNORE_WITH_PHP=	74
 
 .include <bsd.port.mk>

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	Wed Sep 16 20:05:00 2020	(r548797)
@@ -0,0 +1,25 @@
+--- rrd.c.orig	2020-08-28 12:06:18 UTC
++++ rrd.c
+@@ -55,7 +55,7 @@ PHP_FUNCTION(rrd_fetch)
+ 	rrd_args *argv;
+ 	/* returned values if rrd_fetch doesn't fail */
+ 	time_t start, end;
+-	ulong step,
++	u_long step,
+ 	ds_cnt; /* count of data sources */
+ 	char **ds_namv; /* list of data source names */
+ 	rrd_value_t *ds_data; /* all data from all sources */
+@@ -396,11 +396,11 @@ PHP_FUNCTION(rrd_xport)
+ 	/* return values from rrd_xport */
+ 	int xxsize;
+ 	time_t start, end, time_index;
+-	ulong step, outvar_count;
++	u_long step, outvar_count;
+ 	char **legend_v;
+ 	rrd_value_t *data, *data_ptr;
+ 	zval zv_data;
+-	ulong outvar_index;
++	u_long outvar_index;
+ 
+ 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "a", &zv_arr_options) == FAILURE) {
+ 		return;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009162005.08GK51wv077128>