pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

terraform*: get rid of default version



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Tue Sep 9 18:31:21 2025 +0200
Changeset:	f98d8fcf0bbb341eae8e10b52acc23ff6182d621

Modified Files:
	terraform/version.mk
	terraform014/Makefile
	terraform014/PLIST
	terraform015/Makefile
	terraform015/PLIST
	terraform11/Makefile
	terraform11/PLIST
	terraform13/Makefile
	terraform13/PLIST

Log Message:
terraform*: get rid of default version

This was used for TERRAFORMVERSSUFFIX but it is no longer needed now
that terraform-provider-* do not depends on Terraform anymore.

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

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

diffstat:
 terraform/version.mk  | 14 --------------
 terraform014/Makefile |  2 +-
 terraform014/PLIST    |  2 +-
 terraform015/Makefile |  2 +-
 terraform015/PLIST    |  2 +-
 terraform11/Makefile  |  2 +-
 terraform11/PLIST     |  2 +-
 terraform13/Makefile  |  2 +-
 terraform13/PLIST     |  2 +-
 9 files changed, 8 insertions(+), 22 deletions(-)

diffs:
diff --git a/terraform/version.mk b/terraform/version.mk
index 5eda4681ca..396e30561e 100644
--- a/terraform/version.mk
+++ b/terraform/version.mk
@@ -10,17 +10,3 @@ TERRAFORM014_VERSION=	0.14.11
 
 .include "../../lang/go/go-vars.mk"
 .include "../../mk/bsd.prefs.mk"
-
-TERRAFORM_VERSION_DEFAULT?=	015
-
-# FIXME: This is used in `do-install:' target and should be fixed in order to be
-# FIXME: able to install different terraform version without adjusting
-# FIXME: TERRAFORM_VERSION_DEFAULT. In some way we need a mapping between
-# FIXME: TERRAFORM_VERSION and TERRAFORMVERSSUFFIX.
-.if !empty(TERRAFORM_VERSION_DEFAULT)
-TERRAFORMVERSSUFFIX=		${TERRAFORM_VERSION_DEFAULT}
-.endif
-
-PLIST_SUBST+=	TERRAFORMVERSSUFFIX=${TERRAFORMVERSSUFFIX:Q}
-
-PRINT_PLIST_AWK+=	{ sub("${TERRAFORMVERSSUFFIX}", "$${TERRAFORMVERSSUFFIX}") }
diff --git a/terraform014/Makefile b/terraform014/Makefile
index 8ae6f65501..7192eea399 100644
--- a/terraform014/Makefile
+++ b/terraform014/Makefile
@@ -29,7 +29,7 @@ WRKSRC=	${WRKDIR}/${DISTNAME}
 INSTALLATION_DIRS+=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/.gopath/bin/terraform ${DESTDIR}${PREFIX}/bin/terraform${TERRAFORMVERSSUFFIX}
+	${INSTALL_PROGRAM} ${WRKDIR}/.gopath/bin/terraform ${DESTDIR}${PREFIX}/bin/terraform014
 
 .include "go-modules.mk"
 
diff --git a/terraform014/PLIST b/terraform014/PLIST
index 2ae80a9fa1..883397bd81 100644
--- a/terraform014/PLIST
+++ b/terraform014/PLIST
@@ -1,2 +1,2 @@
 @comment $NetBSD: PLIST,v 1.3 2020/05/29 06:27:54 adam Exp $
-bin/terraform${TERRAFORMVERSSUFFIX}
+bin/terraform014
diff --git a/terraform015/Makefile b/terraform015/Makefile
index b9cb00d0a1..2de9297828 100644
--- a/terraform015/Makefile
+++ b/terraform015/Makefile
@@ -29,7 +29,7 @@ WRKSRC=	${WRKDIR}/${DISTNAME}
 INSTALLATION_DIRS+=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/.gopath/bin/terraform ${DESTDIR}${PREFIX}/bin/terraform${TERRAFORMVERSSUFFIX}
+	${INSTALL_PROGRAM} ${WRKDIR}/.gopath/bin/terraform ${DESTDIR}${PREFIX}/bin/terraform015
 
 .include "go-modules.mk"
 
diff --git a/terraform015/PLIST b/terraform015/PLIST
index 2ae80a9fa1..81b9c85c48 100644
--- a/terraform015/PLIST
+++ b/terraform015/PLIST
@@ -1,2 +1,2 @@
 @comment $NetBSD: PLIST,v 1.3 2020/05/29 06:27:54 adam Exp $
-bin/terraform${TERRAFORMVERSSUFFIX}
+bin/terraform015
diff --git a/terraform11/Makefile b/terraform11/Makefile
index 7632a5f1a1..4229f0ab4b 100644
--- a/terraform11/Makefile
+++ b/terraform11/Makefile
@@ -27,7 +27,7 @@ WRKSRC=	${WRKDIR}/${DISTNAME}
 INSTALLATION_DIRS+=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/.gopath/bin/terraform ${DESTDIR}${PREFIX}/bin/terraform${TERRAFORMVERSSUFFIX}
+	${INSTALL_PROGRAM} ${WRKDIR}/.gopath/bin/terraform ${DESTDIR}${PREFIX}/bin/terraform11
 
 .include "go-modules.mk"
 
diff --git a/terraform11/PLIST b/terraform11/PLIST
index 2ae80a9fa1..1bcf8a8711 100644
--- a/terraform11/PLIST
+++ b/terraform11/PLIST
@@ -1,2 +1,2 @@
 @comment $NetBSD: PLIST,v 1.3 2020/05/29 06:27:54 adam Exp $
-bin/terraform${TERRAFORMVERSSUFFIX}
+bin/terraform11
diff --git a/terraform13/Makefile b/terraform13/Makefile
index 65da4ce2ae..dc9c1fa2c5 100644
--- a/terraform13/Makefile
+++ b/terraform13/Makefile
@@ -27,7 +27,7 @@ WRKSRC=	${WRKDIR}/${DISTNAME}
 INSTALLATION_DIRS+=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/.gopath/bin/terraform ${DESTDIR}${PREFIX}/bin/terraform${TERRAFORMVERSSUFFIX}
+	${INSTALL_PROGRAM} ${WRKDIR}/.gopath/bin/terraform ${DESTDIR}${PREFIX}/bin/terraform13
 
 .include "go-modules.mk"
 
diff --git a/terraform13/PLIST b/terraform13/PLIST
index 2ae80a9fa1..08d8b04e94 100644
--- a/terraform13/PLIST
+++ b/terraform13/PLIST
@@ -1,2 +1,2 @@
 @comment $NetBSD: PLIST,v 1.3 2020/05/29 06:27:54 adam Exp $
-bin/terraform${TERRAFORMVERSSUFFIX}
+bin/terraform13


Home | Main Index | Thread Index | Old Index