git: 1278cf655f09 - 2022Q3 - databases/pgadmin3: unbreak build with PgSQL 13+
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 17 Jul 2022 15:29:57 UTC
The branch 2022Q3 has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=1278cf655f091b602e673b576fdebcf3df7b3323 commit 1278cf655f091b602e673b576fdebcf3df7b3323 Author: Dima Panov <fluffy@FreeBSD.org> AuthorDate: 2022-07-17 15:28:13 +0000 Commit: Dima Panov <fluffy@FreeBSD.org> 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 <bsd.port.pre.mk> + +.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 <bsd.port.mk> +.include <bsd.port.post.mk> 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 <parser/kwlist.h> + };