git: e55e46bd71b0 - 2025Q3 - bsd.gecko.mk: fix merge error
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 28 Jul 2025 19:57:13 UTC
The branch 2025Q3 has been updated by cmt:
URL: https://cgit.FreeBSD.org/ports/commit/?id=e55e46bd71b02f9fcf88397e096be2d1b83468d3
commit e55e46bd71b02f9fcf88397e096be2d1b83468d3
Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
AuthorDate: 2025-07-28 19:52:10 +0000
Commit: Christoph Moench-Tegeder <cmt@FreeBSD.org>
CommitDate: 2025-07-28 19:53:57 +0000
bsd.gecko.mk: fix merge error
from resolving conflicts in b76ea50e4f when merging 6a939a7aab.
direct commit as only branch is affected
---
Mk/bsd.gecko.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index c4cc663346cb..98844eede6b8 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -77,7 +77,7 @@ ELF_FEATURES+= +wxneeded:dist/bin/${MOZILLA} +wxneeded:dist/bin/${MOZILLA}-bin
BUNDLE_LIBS= yes
BUILD_DEPENDS+= rust-cbindgen>=0.28.0:devel/rust-cbindgen \
- ${RUST_DEFAULT}>=1.87.0:lang/${RUST_DEFAULT} \
+ ${RUST_DEFAULT}>=1.87.0:lang/${RUST_DEFAULT}
LIB_DEPENDS+= libdrm.so:graphics/libdrm
RUN_DEPENDS+= ${LOCALBASE}/lib/libpci.so:devel/libpci
LIB_DEPENDS+= libepoll-shim.so:devel/libepoll-shim