Page MenuHomeFreeBSD
Files F161323144

D15463.id42663.diff
No OneTemporary
Actions

D15463.id42663.diff
View Options

Index: Mk/Uses/cargo.mk
===================================================================
--- Mk/Uses/cargo.mk
+++ Mk/Uses/cargo.mk
@@ -117,20 +117,43 @@
CARGO_INSTALL_ARGS+= --debug
.endif
-.if ${CARGO_CRATES:Mlibgit2-sys-*}
+.if ${CARGO_CRATES:Mbacktrace-sys-[0-9]*}
+BUILD_DEPENDS+= gmake:devel/gmake
+.endif
+
+.if ${CARGO_CRATES:Mcmake-[0-9]*}
+BUILD_DEPENDS+= cmake:devel/cmake
+.endif
+
+.if ${CARGO_CRATES:Mfreetype-sys-[0-9]*}
+LIB_DEPENDS+= libfreetype.so:print/freetype2
+.endif
+
+.if ${CARGO_CRATES:Mlibc-0.2.3*}
+# To prevent ino64 related issues on 12.0-CURRENT.
+DEV_WARNING+= "Consider using libc-0.2.40 or newer instead of ${CARGO_CRATES:Mlibc-0.2.3*} to allow the port to work correctly on 12.0-CURRENT."
+.endif
+
+.if ${CARGO_CRATES:Mlibgit2-sys-[0-9]*}
# Use the system's libgit2 instead of building the bundled version
-LIB_DEPENDS+= libgit2.so:devel/libgit2
CARGO_ENV+= LIBGIT2_SYS_USE_PKG_CONFIG=1
+LIB_DEPENDS+= libgit2.so:devel/libgit2
.endif
-.if ${CARGO_CRATES:Mopenssl-sys-*}
+.if ${CARGO_CRATES:Monig_sys-[0-9]*}
+# Use the system's libonig instead of building the bundled version
+CARGO_ENV+= RUSTONIG_SYSTEM_LIBONIG=1
+LIB_DEPENDS+= libonig.so:devel/oniguruma
+.endif
+
+.if ${CARGO_CRATES:Mopenssl-sys-[0-9]*}
# Make sure that openssl-sys can find the correct version of OpenSSL
.include "${USESDIR}/ssl.mk"
CARGO_ENV+= OPENSSL_LIB_DIR=${OPENSSLLIB} \
OPENSSL_INCLUDE_DIR=${OPENSSLINC}
.endif
-.if ${CARGO_CRATES:Mpkg-config-*}
+.if ${CARGO_CRATES:Mpkg-config-[0-9]*}
.include "${USESDIR}/pkgconfig.mk"
.endif
@@ -222,5 +245,5 @@
| ${SED} \
-e 's@^${CARGO_VENDOR_DIR}/@@' \
-e 's@/Cargo.toml:license.*= *"@|@' \
- -e 's@"$$@@g' | /usr/bin/column -t -s '|'
+ -e 's@"$$@@g' | sort | /usr/bin/column -t -s '|'
.endif
Index: devel/pijul/Makefile
===================================================================
--- devel/pijul/Makefile
+++ devel/pijul/Makefile
@@ -14,9 +14,9 @@
BROKEN_aarch64= fails to compile: aesv8-armx-linux64.S:53:2: instruction requires: crypto aese v6.16b,v0.16b
-LIB_DEPENDS+= libsodium.so:security/libsodium
+LIB_DEPENDS= libsodium.so:security/libsodium
-USES= cargo gmake ssl
+USES= cargo
CARGO_CRATES= adler32-1.0.2 \
advapi32-sys-0.2.0 \
aho-corasick-0.6.4 \
Index: sysutils/flowgger/Makefile
===================================================================
--- sysutils/flowgger/Makefile
+++ sysutils/flowgger/Makefile
@@ -12,8 +12,7 @@
LICENSE= MPL20
LICENSE_FILE= ${WRKSRC}/LICENSE
-# gmake for backtrace-sys
-USES= cargo gmake
+USES= cargo
USE_GITHUB= yes
GH_ACCOUNT= jedisct1
GH_TUPLE= Manishearth:rust-clippy:387efd459c0ad3db7af15f1a573057b8587f9748:clippy \
Index: textproc/bat/Makefile
===================================================================
--- textproc/bat/Makefile
+++ textproc/bat/Makefile
@@ -3,6 +3,7 @@
PORTNAME= bat
DISTVERSIONPREFIX= v
DISTVERSION= 0.3.0
+PORTREVISION= 1
CATEGORIES= textproc
MAINTAINER= pizzamig@FreeBSD.org
@@ -10,7 +11,7 @@
LICENSE= APACHE20
-USES= cargo cmake:noninja gmake
+USES= cargo
USE_GITHUB= yes
GH_ACCOUNT= sharkdp
@@ -115,5 +116,6 @@
winapi-x86_64-pc-windows-gnu-0.4.0 \
xml-rs-0.7.0 \
yaml-rust-0.4.0
+CARGO_FEATURES= git2
.include <bsd.port.mk>
Index: x11/alacritty/Makefile
===================================================================
--- x11/alacritty/Makefile
+++ x11/alacritty/Makefile
@@ -11,9 +11,7 @@
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE-APACHE
-BUILD_DEPENDS= cmake:devel/cmake
-LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
- libfreetype.so:print/freetype2
+LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig
USES= cargo
USE_GITHUB= yes

File Metadata

Mime Type
text/plain
Expires
Fri, Jul 3, 7:45 PM (12 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34634949
Default Alt Text
D15463.id42663.diff (3 KB)

Event Timeline