From nobody Sun Jul 17 15:29:15 2022 X-Original-To: dev-commits-ports-main@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 4Lm8CH6yYNz4WZQG; Sun, 17 Jul 2022 15:29:15 +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 4Lm8CH6QHCz3mDm; Sun, 17 Jul 2022 15:29:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658071755; 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=43tYgyJ0JzJPxUOpmDafVBSFqIUbhreOjeiA6i6nYKc=; b=qrojnMj+tAyRFeJkBiUKNYu7RLmMWfEjtPzvj46ztqCPag2g+li/3tpJrKLn1rA4+aEbXf e5tVfIy48rDBN8nS0gR2f1WNjUxc/rbwPvBCIl1gdRMmO3pj/SmsrmXTsUjwWiBFPjwOi1 gVYGO8CJZiDZsQzuIBPKY/TZEmMVgfXuz/l+PuymLXA8sOcf+SYcPhBW8a+vILLKuhe28M ApPq0MCg4v5lhYO7Zc3gFWnqW5hfRuIy3LfT2zNXYfjANYMd1s3t8FL1G85nxkAAIITH6w Jwb4iOAlh8U1jVOa9YvHALNqvlw+3giFsSH9/nkVlAHuudDVq0XnXsDb1FgwVg== 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 4Lm8CH5F7Wz14hy; Sun, 17 Jul 2022 15:29:15 +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 26HFTFWg039951; Sun, 17 Jul 2022 15:29:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26HFTFTQ039950; Sun, 17 Jul 2022 15:29:15 GMT (envelope-from git) Date: Sun, 17 Jul 2022 15:29:15 GMT Message-Id: <202207171529.26HFTFTQ039950@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: b396608f5209 - main - databases/pgadmin3: unbreak build with PgSQL 13+ List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: b396608f52094b80f0f4af88e908b7e94ba15fb4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658071755; 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=43tYgyJ0JzJPxUOpmDafVBSFqIUbhreOjeiA6i6nYKc=; b=nexoshG+9a0ID3551/CVVxbi5dgwTDF0Cc52dQIMiBEsczANtwpLzP7jzBUMgyOkn5KAEa pLtZINwy5fOwN9f5JHtQVnO6VGWu/44hmZ5t6qGB5tIe0v2aDMMe4k6Jdr4e9ADB0k8UNR CZ1VN1eQtm6wdMDSFFUo6JGzsU2yhBE1AkZk6kPH3fqLNicCtwe09R/vyWk9S9GBZKrHww H4LBDQ7ySEi17375Wda+G2lHoub0NPLiEtIeqQ23bjQO+K6q47D26bcB5MB8axzdwX/x3a 9m635Ifh1s7uOs9OeiIkqoXJ/kHxWuE/7BjC3c1dZcIy6wKNFcG62iFNj7XVjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658071755; a=rsa-sha256; cv=none; b=iMwO4PIuFMW4394Ilmn8GNgJgC/BTdMDKTxR5mOf0HFUSK/YKrtdiq1SfDqePIrUKAHebg zP0znzBceQPXxBsSMDH0L8u811NJwmRTO5RtZLPctu3Ria/XzlA2tvUcNW+BIKlht9yO/k NtcySHYCOj+D9ni65xVXUU8UOfiDJuRLx9Cl6HUejGt7M725yK12C28bDJaf+Q3tum7xdb TDYOjyk1PI04v0nO2/xtOuRU429ENVGWufJCdDKorNTG4dmF2BDGZgyN8PXbm8RM5OGLJi ENRtSwxGNC2pqiNuo+icl0+x4eMRGitF+KMoQ3yeS30JX+dIwMW6a5UWHkvSbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=b396608f52094b80f0f4af88e908b7e94ba15fb4 commit b396608f52094b80f0f4af88e908b7e94ba15fb4 Author: Dima Panov AuthorDate: 2022-07-17 15:28:13 +0000 Commit: Dima Panov CommitDate: 2022-07-17 15:28:13 +0000 databases/pgadmin3: unbreak build with PgSQL 13+ PR: 264306 MFH: 2022Q3 --- 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 + };