terraform014: Honors providers installed via terraform/provider.mk

[Leonardo Taccari <leot%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Sun Mar 28 01:37:26 2021 +0100
Changeset:	dacfc883943249315ee19457c4a715718220eaf2

Modified Files:
	terraform014/Makefile
	terraform014/distinfo
Added Files:
	terraform014/patches/patch-provider__source.go

Log Message:
terraform014: Honors providers installed via terraform/provider.mk

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=dacfc883943249315ee19457c4a715718220eaf2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 terraform014/Makefile                          |  6 ++++++
 terraform014/distinfo                          |  1 +
 terraform014/patches/patch-provider__source.go | 16 ++++++++++++++++
 3 files changed, 23 insertions(+)

diffs:
diff --git a/terraform014/Makefile b/terraform014/Makefile
index 054e44102a..8fe05c1c74 100644
--- a/terraform014/Makefile
+++ b/terraform014/Makefile
@@ -15,6 +15,12 @@ LICENSE=	mpl-2.0
 
 GO_BUILD_PATTERN=	.
 
+SUBST_CLASSES+=			providers-prefix
+SUBST_STAGE.providers-prefix=	pre-configure
+SUBST_MESSAGE.providers-prefix=	Honor providers installed via pkgsrc
+SUBST_FILES.providers-prefix=	provider_source.go
+SUBST_VARS.providers-prefix=	PREFIX
+
 CHECK_RELRO_SKIP+=	bin/terraform
 
 WRKSRC=	${WRKDIR}/${DISTNAME}
diff --git a/terraform014/distinfo b/terraform014/distinfo
index 1039f56c71..def1958927 100644
--- a/terraform014/distinfo
+++ b/terraform014/distinfo
@@ -3984,3 +3984,4 @@ SHA1 (terraform-0.14.9.tar.gz) = 7e4a21cebd8f7ab7ca28cc573eaab84211e60c00
 RMD160 (terraform-0.14.9.tar.gz) = a12ae5242d10d835bb4c83c800910e2b69319b32
 SHA512 (terraform-0.14.9.tar.gz) = 224cec89180322902a3ff95bb1de5af7ecf351889fdc99ddc5c574bf9f61e7f3b9ba3eead870239fa4f977c6c337a322bbc2260af301295bad7b2d2fb28a0da1
 Size (terraform-0.14.9.tar.gz) = 2800597 bytes
+SHA1 (patch-provider__source.go) = 587b576f571eb0c4755aabf2b6f0eda7990b4be8
diff --git a/terraform014/patches/patch-provider__source.go b/terraform014/patches/patch-provider__source.go
new file mode 100644
index 0000000000..0cc532207e
--- /dev/null
+++ b/terraform014/patches/patch-provider__source.go
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Honors providers installed via pkgsrc.
+
+--- provider_source.go.orig	2021-03-24 18:39:36.000000000 +0000
++++ provider_source.go
+@@ -160,6 +160,9 @@ func implicitProviderSource(services *di
+ 		addLocalDir(dir)
+ 	}
+ 
++	// Providers installed via pkgsrc
++	addLocalDir(filepath.Join("@PREFIX@", "share/terraform/plugins"))
++
+ 	// Anything we found in local directories above is excluded from being
+ 	// looked up via the registry source we're about to construct.
+ 	var directExcluded getproviders.MultiSourceMatchingPatterns