Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 914B884E68 for ; Sun, 9 Jul 2023 13:57:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id iZZbj4Tj9ayF for ; Sun, 9 Jul 2023 13:57:20 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id A355A84D39 for ; Sun, 9 Jul 2023 13:57:20 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 92482FBDB; Sun, 9 Jul 2023 13:57:20 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_168891104024840" MIME-Version: 1.0 Date: Sun, 9 Jul 2023 13:57:20 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/databases To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20230709135720.92482FBDB@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_168891104024840 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Sun Jul 9 13:57:20 UTC 2023 Modified Files: pkgsrc/databases/postgresql11-client: buildlink3.mk pkgsrc/databases/postgresql12-client: buildlink3.mk pkgsrc/databases/postgresql13-client: buildlink3.mk pkgsrc/databases/postgresql14-client: buildlink3.mk pkgsrc/databases/postgresql15-client: buildlink3.mk Log Message: postgresql-client: When dependening modules include libpq server headers, they can then attempt to include the gssapi headers if postgres was compiled with the gssapi option. In this case, include gssapi in the buildlink3 tree. Should fix the build of various modules on various platforms. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 pkgsrc/databases/postgresql11-client/buildlink3.mk cvs rdiff -u -r1.5 -r1.6 pkgsrc/databases/postgresql12-client/buildlink3.mk cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/postgresql13-client/buildlink3.mk cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/postgresql14-client/buildlink3.mk cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/postgresql15-client/buildlink3.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_168891104024840 Content-Disposition: inline Content-Length: 4807 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/databases/postgresql11-client/buildlink3.mk diff -u pkgsrc/databases/postgresql11-client/buildlink3.mk:1.5 pkgsrc/databases/postgresql11-client/buildlink3.mk:1.6 --- pkgsrc/databases/postgresql11-client/buildlink3.mk:1.5 Tue Jun 28 11:31:33 2022 +++ pkgsrc/databases/postgresql11-client/buildlink3.mk Sun Jul 9 13:57:19 2023 @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2022/06/28 11:31:33 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2023/07/09 13:57:19 nia Exp $ BUILDLINK_TREE+= postgresql11-client @@ -21,6 +21,13 @@ BUILDLINK_FILES.postgresql11-client+= bi .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" + +pkgbase := postgresql11-client +.include "../../mk/pkg-build-options.mk" + +.if ${PKG_BUILD_OPTIONS.postgresql11-client:Mgssapi} +. include "../../mk/krb5.buildlink3.mk" +.endif .endif # POSTGRESQL11_CLIENT_BUILDLINK3_MK BUILDLINK_TREE+= -postgresql11-client Index: pkgsrc/databases/postgresql12-client/buildlink3.mk diff -u pkgsrc/databases/postgresql12-client/buildlink3.mk:1.5 pkgsrc/databases/postgresql12-client/buildlink3.mk:1.6 --- pkgsrc/databases/postgresql12-client/buildlink3.mk:1.5 Tue Jun 28 11:31:34 2022 +++ pkgsrc/databases/postgresql12-client/buildlink3.mk Sun Jul 9 13:57:20 2023 @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2022/06/28 11:31:34 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2023/07/09 13:57:20 nia Exp $ BUILDLINK_TREE+= postgresql12-client @@ -21,6 +21,13 @@ BUILDLINK_FILES.postgresql12-client+= bi .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" + +pkgbase := postgresql12-client +.include "../../mk/pkg-build-options.mk" + +.if ${PKG_BUILD_OPTIONS.postgresql12-client:Mgssapi} +. include "../../mk/krb5.buildlink3.mk" +.endif .endif # POSTGRESQL12_CLIENT_BUILDLINK3_MK BUILDLINK_TREE+= -postgresql12-client Index: pkgsrc/databases/postgresql13-client/buildlink3.mk diff -u pkgsrc/databases/postgresql13-client/buildlink3.mk:1.4 pkgsrc/databases/postgresql13-client/buildlink3.mk:1.5 --- pkgsrc/databases/postgresql13-client/buildlink3.mk:1.4 Tue Jun 28 11:31:35 2022 +++ pkgsrc/databases/postgresql13-client/buildlink3.mk Sun Jul 9 13:57:20 2023 @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2022/06/28 11:31:35 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2023/07/09 13:57:20 nia Exp $ BUILDLINK_TREE+= postgresql13-client @@ -21,6 +21,13 @@ BUILDLINK_FILES.postgresql13-client+= bi .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" + +pkgbase := postgresql13-client +.include "../../mk/pkg-build-options.mk" + +.if ${PKG_BUILD_OPTIONS.postgresql13-client:Mgssapi} +. include "../../mk/krb5.buildlink3.mk" +.endif .endif # POSTGRESQL13_CLIENT_BUILDLINK3_MK BUILDLINK_TREE+= -postgresql13-client Index: pkgsrc/databases/postgresql14-client/buildlink3.mk diff -u pkgsrc/databases/postgresql14-client/buildlink3.mk:1.3 pkgsrc/databases/postgresql14-client/buildlink3.mk:1.4 --- pkgsrc/databases/postgresql14-client/buildlink3.mk:1.3 Wed Oct 19 08:09:40 2022 +++ pkgsrc/databases/postgresql14-client/buildlink3.mk Sun Jul 9 13:57:20 2023 @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2022/10/19 08:09:40 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2023/07/09 13:57:20 nia Exp $ BUILDLINK_TREE+= postgresql14-client @@ -28,6 +28,10 @@ pkgbase := postgresql14-client .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" + +.if ${PKG_BUILD_OPTIONS.postgresql14-client:Mgssapi} +. include "../../mk/krb5.buildlink3.mk" +.endif .endif # POSTGRESQL14_CLIENT_BUILDLINK3_MK BUILDLINK_TREE+= -postgresql14-client Index: pkgsrc/databases/postgresql15-client/buildlink3.mk diff -u pkgsrc/databases/postgresql15-client/buildlink3.mk:1.1 pkgsrc/databases/postgresql15-client/buildlink3.mk:1.2 --- pkgsrc/databases/postgresql15-client/buildlink3.mk:1.1 Wed Oct 19 13:16:45 2022 +++ pkgsrc/databases/postgresql15-client/buildlink3.mk Sun Jul 9 13:57:20 2023 @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2022/10/19 13:16:45 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2023/07/09 13:57:20 nia Exp $ BUILDLINK_TREE+= postgresql15-client @@ -28,6 +28,10 @@ pkgbase := postgresql15-client .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" + +.if ${PKG_BUILD_OPTIONS.postgresql15-client:Mgssapi} +. include "../../mk/krb5.buildlink3.mk" +.endif .endif # POSTGRESQL15_CLIENT_BUILDLINK3_MK BUILDLINK_TREE+= -postgresql15-client --_----------=_168891104024840--