From: "Johannes Thyssen Tishman" <johannes@thyssentishman.com>
Subject: [update] sysutils/trash-d 18 -> 19
To: <ports@openbsd.org>
Date: Tue, 27 Aug 2024 13:21:50 +0200

Please find below an update for sysutils/trash-d to version 19.

I just discovered this port that I'd like to try out and saw that it was
outdated. Although there are virtually no changes in this update, Dub
now requires SemVer for packages which allows us to drop our patches.

Additionally, the man page is now generated with ronn. I wasn't sure if
I should add this step in the do-install hook because I'd have to
hard-code the ronn33 binary and I assume the name will change when the
ruby version changes as well. Is something like ronn${RUBY_VERSION}
possible?

diff /usr/ports
commit - 2003574914afffd3e34aeabd766f49c0fc7ed7a0
path + /usr/ports
blob - f70621820d7345d1d44ac0da05becdba829d70e0
file + sysutils/trash-d/Makefile
--- sysutils/trash-d/Makefile
+++ sysutils/trash-d/Makefile
@@ -7,7 +7,7 @@ CATEGORIES =	sysutils
 
 GH_ACCOUNT =	rushsteve1
 GH_PROJECT =	trash-d
-GH_TAGNAME =	18
+GH_TAGNAME =	19
 
 MAINTAINER =	Brian Callahan <bcallah@openbsd.org>
 
@@ -22,11 +22,12 @@ BUILD_DEPENDS =	lang/dmd
 TEST_DEPENDS =	devel/dub,dmd
 
 # Check to see if the manual page needs to be updated.
-# To update: pandoc -s -f markdown -t man MANUAL.md -o trash.1
+# To update: install textproc/ruby-ronn
+#            ronn33 --roff --pipe MANUAL.md > trash.1
 #            Put the new trash.1 in ${FILESDIR}
 #            Update sha256 hash here
 post-patch:
-	@[ `sha256 < ${WRKSRC}/MANUAL.md` == 3b6f8936d018781146eb4036a492281443ea60de06adea6471f065c70d1c466e ] || \
+	@[ `sha256 < ${WRKSRC}/MANUAL.md` == 15e532c8776d569c9220ef0e5569ad349d36894fa6ac1aa0bcbf127ba73b5480 ] || \
 		(echo "*** manpage changed; regenerate ${FILESDIR}/trash.1"; sleep 3)
 
 do-build:
blob - 4eeef1d25f06d806d7843a6eae61516ba65100df
file + sysutils/trash-d/distinfo
--- sysutils/trash-d/distinfo
+++ sysutils/trash-d/distinfo
@@ -1,2 +1,2 @@
-SHA256 (trash-d-18.tar.gz) = SJMqcL0J7Po7l1UG07KcIyMSa87jzVjQaisiPavp//I=
-SIZE (trash-d-18.tar.gz) = 16994
+SHA256 (trash-d-19.tar.gz) = nq5us12G4bOIpElb0y4hvSV/zQJjVDD0uwOhNLhc7v8=
+SIZE (trash-d-19.tar.gz) = 17318
blob - 9ac3edb2ed14a1949be10e373bc2aee58c5b3443
file + sysutils/trash-d/files/trash.1
--- sysutils/trash-d/files/trash.1
+++ sysutils/trash-d/files/trash.1
@@ -1,13 +1,13 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "TRASH" "1" "July 2022" "" ""
+.TH "TRASH" "1" "March 2023" "" ""
 .
 .SH "NAME"
 \fBtrash\fR \- A near drop\-in replacement for \fBrm\fR that uses the trash bin
 .
 .P
-\fBNote:\fR The name of this software is "trash\-d" however its executable is simply called \fB\fBtrash\fR\fR\. This manual favors the latter, but the two should be considered interchangable\.
+\fBNote:\fR The name of this software is "trash\-d" however its executable is simply called \fB\fBtrash\fR\fR\. This manual favors the latter, but the two should be considered interchangeable\.
 .
 .SH "SYNOPSIS"
 trash [\fIoption\fR]\.\.\. \fIfile\fR\.\.\.
blob - 53c44848b8557cdf860f30e151bbd4e8ffbdac2e
file + /dev/null
--- sysutils/trash-d/patches/patch-dub_json
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: dub.json
---- dub.json.orig
-+++ dub.json
-@@ -2,7 +2,8 @@
- 	"authors": ["Steven vanZyl <rushsteve1@rushsteve1.us>"],
- 	"copyright": "Copyright © 2022, Steven vanZyl",
- 	"description": "A near drop-in replacement for rm that uses the trash bin",
--	"version": "18",
-+	"version": "18.0.0",
-+	"shortVersion": "18",
- 	"versionName": "M. Bison",
- 	"license": "MIT",
- 	"name": "trash-d",
blob - 9f9ba81c0c645bdde92ad6fb2c1fb8bd47323281
file + /dev/null
--- sysutils/trash-d/patches/patch-source_trash_ver_d
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: source/trash/ver.d
---- source/trash/ver.d.orig
-+++ source/trash/ver.d
-@@ -25,7 +25,7 @@ const string VER_TEXT = format("trash-d version %s '%s
- const string COPY_TEXT = copy_text_from_json();
- 
- private int version_from_json() {
--	return DUB_JSON.parseJSON()["version"].str.to!int;
-+	return DUB_JSON.parseJSON()["shortVersion"].str.to!int;
- }
- 
- private string version_name_from_json() {