From owner-svn-ports-branches@freebsd.org  Thu Aug 20 09:32:56 2020
Return-Path: <owner-svn-ports-branches@freebsd.org>
Delivered-To: svn-ports-branches@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 2EBD23B880D;
 Thu, 20 Aug 2020 09:32:56 +0000 (UTC)
 (envelope-from lwhsu@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 4BXKFN0VD7z49QT;
 Thu, 20 Aug 2020 09:32:56 +0000 (UTC)
 (envelope-from lwhsu@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 E954D122AC;
 Thu, 20 Aug 2020 09:32:55 +0000 (UTC)
 (envelope-from lwhsu@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07K9WtQ6023097;
 Thu, 20 Aug 2020 09:32:55 GMT (envelope-from lwhsu@FreeBSD.org)
Received: (from lwhsu@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07K9Wt0A023095;
 Thu, 20 Aug 2020 09:32:55 GMT (envelope-from lwhsu@FreeBSD.org)
Message-Id: <202008200932.07K9Wt0A023095@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to
 lwhsu@FreeBSD.org using -f
From: Li-Wen Hsu <lwhsu@FreeBSD.org>
Date: Thu, 20 Aug 2020 09:32:55 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r545513 - in branches/2020Q3/www/pecl-solr: . files
X-SVN-Group: ports-branches
X-SVN-Commit-Author: lwhsu
X-SVN-Commit-Paths: in branches/2020Q3/www/pecl-solr: . files
X-SVN-Commit-Revision: 545513
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Aug 2020 09:32:56 -0000

Author: lwhsu
Date: Thu Aug 20 09:32:55 2020
New Revision: 545513
URL: https://svnweb.freebsd.org/changeset/ports/545513

Log:
  MFH: r545512
  
  www/pecl-solr: Fix build for php 7.4
  
  PR:		247364
  Submitted by:	hagabard@gmail.com
  Approved by:	Hung-Yi Chen <gaod@hychen.org> (maintainer)
  
  Approved by:	portmgr (blanket: build fix)

Added:
  branches/2020Q3/www/pecl-solr/files/patch-src_php7_solr__types.h
     - copied unchanged from r545512, head/www/pecl-solr/files/patch-src_php7_solr__types.h
Modified:
  branches/2020Q3/www/pecl-solr/Makefile
Directory Properties:
  branches/2020Q3/   (props changed)

Modified: branches/2020Q3/www/pecl-solr/Makefile
==============================================================================
--- branches/2020Q3/www/pecl-solr/Makefile	Thu Aug 20 09:31:35 2020	(r545512)
+++ branches/2020Q3/www/pecl-solr/Makefile	Thu Aug 20 09:32:55 2020	(r545513)
@@ -3,6 +3,7 @@
 
 PORTNAME=	solr
 PORTVERSION=	2.5.0
+PORTREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	gaod@hychen.org
@@ -16,6 +17,8 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 
 USES=		php:pecl
 USE_PHP=	json:build
-IGNORE_WITH_PHP=	74
+
+CONFIGURE_ARGS=	LIBXML_CFLAGS=-I${LOCALBASE}/include/libxml2 \
+		LIBXML_LIBS=-L${LOCALBASE}/include/libxml2
 
 .include <bsd.port.mk>

Copied: branches/2020Q3/www/pecl-solr/files/patch-src_php7_solr__types.h (from r545512, head/www/pecl-solr/files/patch-src_php7_solr__types.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2020Q3/www/pecl-solr/files/patch-src_php7_solr__types.h	Thu Aug 20 09:32:55 2020	(r545513, copy of r545512, head/www/pecl-solr/files/patch-src_php7_solr__types.h)
@@ -0,0 +1,11 @@
+--- src/php7/solr_types.h.orig  2016-03-30 13:42:31 UTC
++++ src/php7/solr_types.h
+@@ -53,6 +53,7 @@
+ #include <libxml/tree.h>
+
+ typedef unsigned char solr_bool;
++typedef unsigned long   ulong;            /* Short for unsigned long */
+
+ #include "solr_string.h"
+
+