From owner-svn-ports-head@freebsd.org Wed May 2 10:50:21 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B0ACFFC9369; Wed, 2 May 2018 10:50:21 +0000 (UTC) (envelope-from rm@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5AA5173C07; Wed, 2 May 2018 10:50:21 +0000 (UTC) (envelope-from rm@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 3B7A37F32; Wed, 2 May 2018 10:50:21 +0000 (UTC) (envelope-from rm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w42AoLU0066977; Wed, 2 May 2018 10:50:21 GMT (envelope-from rm@FreeBSD.org) Received: (from rm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w42AoKau066974; Wed, 2 May 2018 10:50:20 GMT (envelope-from rm@FreeBSD.org) Message-Id: <201805021050.w42AoKau066974@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rm set sender to rm@FreeBSD.org using -f From: Ruslan Makhmatkhanov Date: Wed, 2 May 2018 10:50:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r468823 - in head/databases/tsearch_extras: . files X-SVN-Group: ports-head X-SVN-Commit-Author: rm X-SVN-Commit-Paths: in head/databases/tsearch_extras: . files X-SVN-Commit-Revision: 468823 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 May 2018 10:50:21 -0000 Author: rm Date: Wed May 2 10:50:20 2018 New Revision: 468823 URL: https://svnweb.freebsd.org/changeset/ports/468823 Log: databases/tsearch_extras: update to 0.3 - add upstream patch to fix build with PostgreSQL 10.x Added: head/databases/tsearch_extras/files/ head/databases/tsearch_extras/files/patch-tsearch_extras.c (contents, props changed) Modified: head/databases/tsearch_extras/Makefile head/databases/tsearch_extras/distinfo Modified: head/databases/tsearch_extras/Makefile ============================================================================== --- head/databases/tsearch_extras/Makefile Wed May 2 10:49:13 2018 (r468822) +++ head/databases/tsearch_extras/Makefile Wed May 2 10:50:20 2018 (r468823) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= tsearch_extras -PORTVERSION= 0.2 +PORTVERSION= 0.3 CATEGORIES= databases MAINTAINER= rm@FreeBSD.org Modified: head/databases/tsearch_extras/distinfo ============================================================================== --- head/databases/tsearch_extras/distinfo Wed May 2 10:49:13 2018 (r468822) +++ head/databases/tsearch_extras/distinfo Wed May 2 10:50:20 2018 (r468823) @@ -1,3 +1,3 @@ -TIMESTAMP = 1469800079 -SHA256 (zulip-tsearch_extras-0.2_GH0.tar.gz) = cb52159a609627c032183cdb2adff0e5fe90476c1d5c614d3d51a556562a8ec6 -SIZE (zulip-tsearch_extras-0.2_GH0.tar.gz) = 4428 +TIMESTAMP = 1525257515 +SHA256 (zulip-tsearch_extras-0.3_GH0.tar.gz) = 5bf3bd1a3b6b8dbee636e69177ca980315f6d5bce69d3c10020e65daedb6d2e3 +SIZE (zulip-tsearch_extras-0.3_GH0.tar.gz) = 4666 Added: head/databases/tsearch_extras/files/patch-tsearch_extras.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/tsearch_extras/files/patch-tsearch_extras.c Wed May 2 10:50:20 2018 (r468823) @@ -0,0 +1,24 @@ + +Upstream patch for building with PostgreSQL 10.x +https://github.com/zulip/tsearch_extras/issues/3 + +diff --git a/tsearch_extras.c b/tsearch_extras.c +index 062dcdb..7464c71 100644 +--- tsearch_extras.c ++++ tsearch_extras.c +@@ -77,9 +77,15 @@ ts_match_locs_setup(Oid cfgId, TsMatchesData *mdata, text* in, TSQuery query) + + hlparsetext(cfgId, &prs, query, VARDATA(in), VARSIZE(in) - VARHDRSZ); + ++ #if PG_VERSION_NUM >= 100000 ++ headline_options = lappend(headline_options, ++ makeDefElem(pstrdup("HighlightAll"), ++ (Node *) makeString(pstrdup("1")), -1)); ++ #else + headline_options = lappend(headline_options, + makeDefElem(pstrdup("HighlightAll"), + (Node *) makeString(pstrdup("1")))); ++ #endif + + FunctionCall3(&(prsobj->prsheadline), + PointerGetDatum(&prs),