Index | Thread | Search

From:
Johannes Thyssen Tishman <jtt@openbsd.org>
Subject:
Re: [update] sysutils/trash-d 19 -> 21
To:
ports@openbsd.org
Date:
Sat, 6 Jun 2026 11:23:36 +0000

Download raw body.

Thread
2026-05-31T20:00:03+0000 Johannes Thyssen Tishman <jtt@openbsd.org>:
> Please find below an update for sysutils/trash-d to version 21.
> 
> Changelog: https://github.com/rushsteve1/trash-d/compare/19...21
> 
> Notes about this update:
> 1. Use gdc compiler as dmd is currently broken
> 2. Tests are passing (see added comment)
> 3. Install new fish and zsh shell completions (untested as I don't use
>    these shells)

ping

Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/trash-d/Makefile,v
diff -u -p -r1.8 Makefile
--- Makefile	11 Feb 2026 15:12:26 -0000	1.8
+++ Makefile	31 May 2026 19:57:25 -0000
@@ -6,35 +6,37 @@ CATEGORIES =	sysutils
 
 GH_ACCOUNT =	rushsteve1
 GH_PROJECT =	trash-d
-GH_TAGNAME =	19
-REVISION =	1
+GH_TAGNAME =	21
 
 # MIT
 PERMIT_PACKAGE =	Yes
 
-WANTLIB += c c++abi execinfo m pthread
+WANTLIB += c m pthread
 
-MODULES = lang/ruby
+BUILD_DEPENDS =	lang/gcc/15,-dlang \
+		textproc/scdoc
 
-BUILD_DEPENDS =	lang/dmd \
-		textproc/ruby-ronn
-
-MODRUBY_RUNDEP = No
-
-# dub,dmd includes dmd compiler
-TEST_DEPENDS =	devel/dub,dmd
+TEST_DEPENDS =	lang/gcc/15,-dlang
 
 do-build:
-	cd ${WRKSRC} && dmd -O -release -inline -Isource -J. -oftrash \
-		source/app.d source/trash/*.d
+	cd ${WRKSRC} && egdc -O -frelease -finline-functions -Isource -J. \
+		-otrash source/app.d source/trash/*.d
+	cd ${WRKSRC} && scdoc < MANUAL.scd > trash.1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/trash ${PREFIX}/bin
-	ronn${GEM_BIN_SUFFIX} --roff --pipe ${WRKSRC}/MANUAL.md > \
-		${PREFIX}/man/man1/trash.1
+	${INSTALL_MAN} ${WRKSRC}/trash.1 ${PREFIX}/man/man1
+	${INSTALL_DATA_DIR} \
+		${PREFIX}/share/fish/vendor_completions.d \
+		${PREFIX}/share/zsh/site-functions
+	${INSTALL_DATA} ${WRKSRC}/completions/fish/trash.fish \
+		${PREFIX}/share/fish/vendor_completions.d/trash.fish
+	${INSTALL_DATA} ${WRKSRC}/completions/zsh/_trash \
+		${PREFIX}/share/zsh/site-functions/_trash
 
+# If tests pass, exit code is 0 and output contains: 1 modules passed unittests
 do-test:
-	cd ${WRKSRC} && \
-		env HOME=${WRKDIR} dub test --cache=local --compiler=dmd
+	cd ${WRKSRC} && egdc -fmain -funittest -Isource -J. -otests \
+		source/tests.d source/trash/*.d && ./tests
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/trash-d/distinfo,v
diff -u -p -r1.4 distinfo
--- distinfo	29 Oct 2024 16:32:19 -0000	1.4
+++ distinfo	31 May 2026 19:57:25 -0000
@@ -1,2 +1,2 @@
-SHA256 (trash-d-19.tar.gz) = nq5us12G4bOIpElb0y4hvSV/zQJjVDD0uwOhNLhc7v8=
-SIZE (trash-d-19.tar.gz) = 17318
+SHA256 (trash-d-21.tar.gz) = /HFE5rzwrqKM4rM+UhGZJhO5IO2+si+L64l7nc9HzlQ=
+SIZE (trash-d-21.tar.gz) = 18857
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/trash-d/pkg/PLIST,v
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST	13 Mar 2022 21:25:36 -0000	1.1.1.1
+++ pkg/PLIST	31 May 2026 19:57:25 -0000
@@ -1,2 +1,8 @@
 @bin bin/trash
 @man man/man1/trash.1
+share/fish/
+share/fish/vendor_completions.d/
+share/fish/vendor_completions.d/trash.fish
+share/zsh/
+share/zsh/site-functions/
+share/zsh/site-functions/_trash