From nobody Sun Jul 17 15:29:57 2022 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Lm8D55QvXz4WZTQ; Sun, 17 Jul 2022 15:29:57 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Lm8D54wjrz3mgy; Sun, 17 Jul 2022 15:29:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658071797; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0/gDmV1g2HVsakbyNXXhEB0O813ELQQVo5wA+sckaFQ=; b=to+oB5plMWIW7/en5OdiL+cwvAd1xQ3eWGxwmMmXNe3qC4bysTnZPk2PL5gyLn+fZ4fte0 XeX4cuHL+uuFhyfjhEKDSveTTBWCjcPbR+GASA6XjkcqGSC6SeUx+8c+B/egu4fxAYSJ8V LG1Va1cinMGNCUI5ol1hg56OFN9hIZ5FCpmPhBDB//8ZBIWcP66AHPAVSonCrP9huF6R/g sRbZEN4TwyzWzR24hX9OGJ6jjzsIv2grOVCKtuq8dT08/z5oQZiFo5pLN1EVqj5OKfoaZi EuWIul0afH4qcIvaCp5xhjjJYATKuvf/aGVY7avlYSlhm3jcsfTYgYUtACAQFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Lm8D53h0Xz14x1; Sun, 17 Jul 2022 15:29:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26HFTvF1040130; Sun, 17 Jul 2022 15:29:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26HFTv7P040129; Sun, 17 Jul 2022 15:29:57 GMT (envelope-from git) Date: Sun, 17 Jul 2022 15:29:57 GMT Message-Id: <202207171529.26HFTv7P040129@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dima Panov Subject: git: 1278cf655f09 - 2022Q3 - databases/pgadmin3: unbreak build with PgSQL 13+ List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q3 X-Git-Reftype: branch X-Git-Commit: 1278cf655f091b602e673b576fdebcf3df7b3323 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658071797; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0/gDmV1g2HVsakbyNXXhEB0O813ELQQVo5wA+sckaFQ=; b=JVUq2CdGSJJCm3UwBD8G1zMHplIM1TGDO9jhH2PFEdkpHAQTHJsXY/V5bqf2QB5KPW7KTb xdGd3NmSUUyjL65wJFKC+nDYX9skSQJ5YeXiNgrDS4pDg8yn+O9QyBjHTzeYj/RlmQF01s VHntofRh7UcJcqgmdLZUWd00Z4UVnt6Gp94riIRtVP8CmD9Ji/rwUti5lH5EfhJ0GFDDVl 7TW2aaSyyQdHGiT01Sht/DFM5/yIb2gIlzaLe4VMdqB14UnckdR8pTHEsbYHmeQJsajqx1 zNw9DyrKb782krIyKYe/YAB3JJo1VDBPhPhZp8fM0L65RjLaWaQokzXW264IlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658071797; a=rsa-sha256; cv=none; b=mcXdaqHrqVfIOmV+8yEitG1m/4D/zvE95zonWp49lnRxs8CAFnM8x1GYVLYpO8oW2ZbYC6 LZOOXK5/XnsiB845GJxnWztsRIo16MyGJMaQSUuBNFUMg04WNa1bIkGyeFXdafrN2Gzng4 BL6vesSr4qYEpeqWy9pn17LD6MVCQ51CckxQ0pCtwVFtHFSasi7NWlkPDE2WtMJE+QbpCO JvHFzXaUFpQG9A2yRDhFfvijpKjfhmcogkf7Uw2bNDwDFcgczTfqfJM9B1JYR3MLBLsHXt Zx8cyT294edhjVMclWDLVtfhaDQF7pWpBdk9IVtjhVYaM7ytW0RxDRI4RAawXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=1278cf655f091b602e673b576fdebcf3df7b3323 commit 1278cf655f091b602e673b576fdebcf3df7b3323 Author: Dima Panov AuthorDate: 2022-07-17 15:28:13 +0000 Commit: Dima Panov CommitDate: 2022-07-17 15:29:47 +0000 databases/pgadmin3: unbreak build with PgSQL 13+ PR: 264306 MFH: 2022Q3 (cherry picked from commit b396608f52094b80f0f4af88e908b7e94ba15fb4) --- databases/pgadmin3/Makefile | 8 +++++++- databases/pgadmin3/files/extrapatch-pg13 | 11 +++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/databases/pgadmin3/Makefile b/databases/pgadmin3/Makefile index 0db42fbe276e..a13b3fb6fc7d 100644 --- a/databases/pgadmin3/Makefile +++ b/databases/pgadmin3/Makefile @@ -31,6 +31,12 @@ PLIST_FILES+= share/icons/hicolor/${SZ}x${SZ}/apps/pgAdmin3.png .endfor PORTDATA= * +.include + +.if ${PGSQL_VER}>=13 +EXTRA_PATCHES+= ${FILESDIR}/extrapatch-pg13 +.endif + post-patch: @${REINPLACE_CMD} -e 's,/wx-config,/${WX_CONFIG:T},' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's,wxrc ,${WXRC_CMD:T} ,' ${WRKSRC}/pgadmin/ui/embed-xrc @@ -50,4 +56,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/pgadmin/include/images/pgAdmin3-${SZ}.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}x${SZ}/apps/pgAdmin3.png .endfor -.include +.include diff --git a/databases/pgadmin3/files/extrapatch-pg13 b/databases/pgadmin3/files/extrapatch-pg13 new file mode 100644 index 000000000000..fdcab829e84a --- /dev/null +++ b/databases/pgadmin3/files/extrapatch-pg13 @@ -0,0 +1,11 @@ +--- pgadmin/db/keywords.c.orig 2015-02-25 10:44:26 UTC ++++ pgadmin/db/keywords.c +@@ -28,7 +28,7 @@ + /* + * List of (keyword-name, keyword-token-value) pairs. + */ +-#define PG_KEYWORD(a,b,c) {a,c}, ++#define PG_KEYWORD(a,b,c,d) {a,c}, + const ScanKeyword ScanKeywords[] = { + #include + };