[PR PATCH] drist: update to 2.0, New package: drist1

[PaperMountainStudio <PaperMountainStudio@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 411 bytes --]

There is a new pull request by PaperMountainStudio against master on the void-packages repository

https://github.com/PaperMountainStudio/void-packages drist2
https://github.com/void-linux/void-packages/pull/24834

drist: update to 2.0, New package: drist1
Scripts written for drist v1 are not compatible with drist v2,

A patch file from https://github.com/void-linux/void-packages/pull/24834.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-drist2-24834.patch --]
[-- Type: text/x-diff, Size: 4082 bytes --]

From 6b725a84fda6a354ab9aed5c15c6e08ef6f2c9dd Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Fri, 11 Sep 2020 21:32:25 +0200
Subject: [PATCH 1/2] drist: update to 2.02

---
 srcpkgs/drist/INSTALL.md                    |  2 ++
 srcpkgs/drist/patches/fix_permissions.patch | 14 --------------
 srcpkgs/drist/template                      | 20 +++++++++++++-------
 3 files changed, 15 insertions(+), 21 deletions(-)
 create mode 100644 srcpkgs/drist/INSTALL.md
 delete mode 100644 srcpkgs/drist/patches/fix_permissions.patch

diff --git a/srcpkgs/drist/INSTALL.md b/srcpkgs/drist/INSTALL.md
new file mode 100644
index 00000000000..78a3c65c3ea
--- /dev/null
+++ b/srcpkgs/drist/INSTALL.md
@@ -0,0 +1,2 @@
+CAUTION: version 2 of drist is not compatible with v1 scripts.
+drist v1 is still present in package called drist1
diff --git a/srcpkgs/drist/patches/fix_permissions.patch b/srcpkgs/drist/patches/fix_permissions.patch
deleted file mode 100644
index 5bc7421ce56..00000000000
--- a/srcpkgs/drist/patches/fix_permissions.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -11,9 +11,9 @@
- 
- install: 
- 	@echo installing executable to "${DESTDIR}${PREFIX}/bin"
--	@install -D "${BIN}" "${DESTDIR}${BINDIR}/${BIN}"
-+	@install -D -m 755 "${BIN}" "${DESTDIR}${BINDIR}/${BIN}"
- 	@echo installing manual page to ${DESTDIR}${MANDIR}/man1
--	@install -D "${BIN}.1" "${DESTDIR}${MANDIR}/man1/${BIN}.1"
-+	@install -D -m 644 "${BIN}.1" "${DESTDIR}${MANDIR}/man1/${BIN}.1"
- 
- uninstall:
- 	@echo removing executable file from "${DESTDIR}${PREFIX}/bin"
diff --git a/srcpkgs/drist/template b/srcpkgs/drist/template
index 89f39b7eec8..baec5ce33f1 100644
--- a/srcpkgs/drist/template
+++ b/srcpkgs/drist/template
@@ -1,9 +1,8 @@
 # Template file for 'drist'
 pkgname=drist
-version=1.04
+version=2.02
 revision=1
-archs=noarch
-wrksrc=$pkgname-v$version
+wrksrc="$pkgname-v$version"
 build_style=gnu-makefile
 depends="openssh rsync"
 short_desc="Remote deployment tool"
@@ -11,10 +10,17 @@ maintainer="Paper <paper@tilde.institute>"
 license="BSD-2-Clause"
 homepage="gopher://bitreich.org/1/scm/drist/"
 distfiles="ftp://bitreich.org/releases/drist/drist-v$version.tgz"
-checksum=174e243b4ae41a3c3c9919b351f6fbe0c94e07b9b728310c78bfa767e810910d
+checksum=329107d1ee63d0514c907a893dfc5b8beb166f643ec5300e044e9493d4961711
+alternatives="
+	drist:/usr/bin/drist:/usr/bin/drist2
+	drist:/usr/share/examples/drist:/usr/share/examples/drist2
+	drist:/usr/share/man/man1/drist.1:/usr/share/man/man1/drist2.1
+"
 
-post_install() {
+do_install() {
+	vbin drist drist2
+	vman drist.1 drist2.1
+	vmkdir usr/share/examples/drist2/
+	vcopy examples usr/share/examples/drist2/
 	vlicense LICENSE
-	vmkdir usr/share/drist
-	vcopy examples /usr/share/drist/
 }

From f0801306cf61afa614479c4e15a94e987c784a95 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Fri, 11 Sep 2020 21:33:51 +0200
Subject: [PATCH 2/2] New package: drist 1.05.

---
 srcpkgs/drist1/template | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 srcpkgs/drist1/template

diff --git a/srcpkgs/drist1/template b/srcpkgs/drist1/template
new file mode 100644
index 00000000000..36220e20f37
--- /dev/null
+++ b/srcpkgs/drist1/template
@@ -0,0 +1,26 @@
+# Template file for 'drist1'
+pkgname=drist1
+version=1.05
+revision=1
+wrksrc="drist-v$version"
+build_style=gnu-makefile
+depends="openssh rsync"
+short_desc="Remote deployment tool (v1)"
+maintainer="Paper <paper@tilde.institute>"
+license="BSD-2-Clause"
+homepage="gopher://bitreich.org/1/scm/drist/"
+distfiles="ftp://bitreich.org/releases/drist/drist-v$version.tgz"
+checksum=26b972d433fc6ca54a074634da7049f15a9bbc9717925f6983eb37cdc228abee
+alternatives="
+	drist:/usr/bin/drist:/usr/bin/drist1
+	drist:/usr/share/examples/drist:/usr/share/examples/drist1
+	drist:/usr/share/man/man1/drist.1:/usr/share/man/man1/drist1.1
+"
+
+do_install() {
+	vbin drist drist1
+	vman drist.1 drist1.1
+	vmkdir usr/share/examples/drist1/
+	vcopy examples usr/share/examples/drist1/
+	vlicense LICENSE
+}