flux2: Use SUBST framework instead of patching

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

Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Wed Apr 28 12:55:28 2021 +0200
Changeset:	eadf66135aba6dc5eb71953cfa323c3e8a3f8c8f

Modified Files:
	flux2/Makefile
	flux2/distinfo
Removed Files:
	flux2/patches/patch-manifests_scripts_bundle.sh

Log Message:
flux2: Use SUBST framework instead of patching

It is just oneliner and probably easier to maintain as a SUBST_SED command
instead as a patch.

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

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

diffstat:
 flux2/Makefile                                  |  6 ++++++
 flux2/distinfo                                  |  1 -
 flux2/patches/patch-manifests_scripts_bundle.sh | 17 -----------------
 3 files changed, 6 insertions(+), 18 deletions(-)

diffs:
diff --git a/flux2/Makefile b/flux2/Makefile
index eae224ca6c..d8303d8dca 100644
--- a/flux2/Makefile
+++ b/flux2/Makefile
@@ -16,6 +16,12 @@ TOOL_DEPENDS+=	kustomize-[0-9]*:../../wip/kustomize
 
 GO_BUILD_PATTERN+=	./cmd/flux
 
+SUBST_CLASSES+=		path
+SUBST_STAGE.path=	pre-configure
+SUBST_MESSAGE.path=	Avoid to use git on non-git repository
+SUBST_FILES.path=	manifests/scripts/bundle.sh
+SUBST_SED.path+=	-e 's,$$(git rev-parse --show-toplevel),.,g'
+
 REPLACE_BASH+=	manifests/scripts/bundle.sh
 
 # Build the embedded manifests
diff --git a/flux2/distinfo b/flux2/distinfo
index 91566e4d74..d3e930c582 100644
--- a/flux2/distinfo
+++ b/flux2/distinfo
@@ -6252,4 +6252,3 @@ SHA1 (vbom.ml_util_@v_v0.0.0-20160121211510-db5cfe13f5cc.zip) = db03ab922d992d94
 RMD160 (vbom.ml_util_@v_v0.0.0-20160121211510-db5cfe13f5cc.zip) = 4bd25479a12a3d6aecf3c44700beb32c80484923
 SHA512 (vbom.ml_util_@v_v0.0.0-20160121211510-db5cfe13f5cc.zip) = 77441a4a14c9b5c266eedde3c9eb6d7499a7a2ca57139071197b71fe2d3d1d1cc63c3eed95673733a2b855f329ccb30dcab568e1d743231eb1238ca0154524e6
 Size (vbom.ml_util_@v_v0.0.0-20160121211510-db5cfe13f5cc.zip) = 27337 bytes
-SHA1 (patch-manifests_scripts_bundle.sh) = bf595ddfa8d674fd95f18f3356179831d562c815
diff --git a/flux2/patches/patch-manifests_scripts_bundle.sh b/flux2/patches/patch-manifests_scripts_bundle.sh
deleted file mode 100644
index eafa3c8310..0000000000
--- a/flux2/patches/patch-manifests_scripts_bundle.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-Avoid to use `git' and fail because it is not a Git repository
-
---- manifests/scripts/bundle.sh.orig	2021-04-23 10:51:40.000000000 +0000
-+++ manifests/scripts/bundle.sh
-@@ -16,8 +16,8 @@
- 
- set -e
- 
--IN_PATH=${1:-"$(git rev-parse --show-toplevel)/manifests"}
--OUT_PATH=${2:-"$(git rev-parse --show-toplevel)/cmd/flux/manifests"}
-+IN_PATH=${1:-"./manifests"}
-+OUT_PATH=${2:-"./cmd/flux/manifests"}
- TAR=${3}
- 
- info() {