From owner-svn-ports-all@freebsd.org Wed Sep 16 20:05:01 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C67FA3EFDBD; Wed, 16 Sep 2020 20:05:01 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BsB0F4slwz4ClR; Wed, 16 Sep 2020 20:05:01 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8A6F11E5E6; Wed, 16 Sep 2020 20:05:01 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08GK51eA077130; Wed, 16 Sep 2020 20:05:01 GMT (envelope-from flo@FreeBSD.org) Received: (from flo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08GK51wv077128; Wed, 16 Sep 2020 20:05:01 GMT (envelope-from flo@FreeBSD.org) Message-Id: <202009162005.08GK51wv077128@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: flo set sender to flo@FreeBSD.org using -f From: Florian Smeets Date: Wed, 16 Sep 2020 20:05:01 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: flo X-SVN-Commit-Paths: in head/databases/pecl-rrd: . files X-SVN-Commit-Revision: 548797 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Sep 2020 20:05:01 -0000 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 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;