aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2023-03-26 15:46:59 +0000
committerJan Beich <jbeich@FreeBSD.org>2023-04-04 08:21:17 +0000
commit046448bdb1f4183eefde0793f8b7ef23d4523a2f (patch)
tree8c7920599ec140df0f0157a28c10592b57ecbd2d
parent118dcbb10afe85317a6b76de3d80369266020926 (diff)
downloadports-046448bdb1f4183eefde0793f8b7ef23d4523a2f.tar.gz
ports-046448bdb1f4183eefde0793f8b7ef23d4523a2f.zip
Mk/Uses/cargo.mk: unbundle archivers/zstd
Tested by: kai (games/anki) Differential Revision: https://reviews.freebsd.org/D39279
-rw-r--r--Mk/Uses/cargo.mk5
-rw-r--r--devel/git-cinnabar/Makefile4
-rw-r--r--games/jumpy/Makefile4
-rw-r--r--security/arti/Makefile3
-rw-r--r--sysutils/fselect/Makefile2
-rw-r--r--textproc/meilisearch/Makefile2
-rw-r--r--www/deno/Makefile3
-rw-r--r--www/miniserve/Makefile1
-rw-r--r--www/rustypaste/Makefile4
-rw-r--r--www/wasm-pack/Makefile3
-rw-r--r--x11/wezterm/Makefile4
11 files changed, 29 insertions, 6 deletions
diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk
index 9206938b544f..ea8409eb87b5 100644
--- a/Mk/Uses/cargo.mk
+++ b/Mk/Uses/cargo.mk
@@ -249,6 +249,11 @@ CARGO_ENV+= OPENSSL_LIB_DIR=${OPENSSLLIB} \
.include "${USESDIR}/pkgconfig.mk"
. endif
+. if ${_CARGO_CRATES:Mzstd-sys}
+# Use the system's zstd instead of building the bundled version
+CARGO_ENV+= ZSTD_SYS_USE_PKG_CONFIG=1
+. endif
+
. for _index _crate _name _version in ${_CARGO_CRATES}
# Split up semantic version and try to sanitize it by removing
# pre-release identifier (-) or build metadata (+)
diff --git a/devel/git-cinnabar/Makefile b/devel/git-cinnabar/Makefile
index 54be58e62026..a6d001f0a0ec 100644
--- a/devel/git-cinnabar/Makefile
+++ b/devel/git-cinnabar/Makefile
@@ -1,5 +1,6 @@
PORTNAME= git-cinnabar
DISTVERSION= 0.6.0
+PORTREVISION= 1
CATEGORIES= devel
MAINTAINER= jbeich@FreeBSD.org
@@ -9,7 +10,8 @@ WWW= https://github.com/glandium/git-cinnabar
LICENSE= GPLv2 MPL20
LICENSE_COMB= multi
-LIB_DEPENDS= libcurl.so:ftp/curl
+LIB_DEPENDS= libzstd.so:archivers/zstd \
+ libcurl.so:ftp/curl
RUN_DEPENDS= git:devel/git
USES= cargo gmake
diff --git a/games/jumpy/Makefile b/games/jumpy/Makefile
index d5fee92d81da..ec3b07fb0735 100644
--- a/games/jumpy/Makefile
+++ b/games/jumpy/Makefile
@@ -1,6 +1,7 @@
PORTNAME= jumpy
DISTVERSIONPREFIX= v
DISTVERSION= 0.6.1
+PORTREVISION= 1
CATEGORIES= games wayland
MAINTAINER= jbeich@FreeBSD.org
@@ -11,7 +12,8 @@ LICENSE= CC-BY-NC-4.0 MIT
LICENSE_COMB= multi
LICENSE_FILE_MIT= ${WRKSRC}/licenses/LICENSE-MIT
-LIB_DEPENDS= libasound.so:audio/alsa-lib \
+LIB_DEPENDS= libzstd.so:archivers/zstd \
+ libasound.so:audio/alsa-lib \
libudev.so:devel/libudev-devd
RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \
${LOCALBASE}/lib/libvulkan.so:graphics/vulkan-loader
diff --git a/security/arti/Makefile b/security/arti/Makefile
index 4958b12ada34..39dce967b574 100644
--- a/security/arti/Makefile
+++ b/security/arti/Makefile
@@ -1,5 +1,6 @@
PORTNAME= arti
DISTVERSION= 1.1.3
+PORTREVISION= 1
CATEGORIES= security
MAINTAINER= cs@FreeBSD.org
@@ -8,6 +9,8 @@ WWW= https://arti.torproject.org/
LICENSE= MIT
+LIB_DEPENDS= libzstd.so:archivers/zstd
+
USES= cargo sqlite ssl
USE_RC_SUBR= arti
GROUPS= _arti
diff --git a/sysutils/fselect/Makefile b/sysutils/fselect/Makefile
index 1e5dadf0aea2..1979576a4cbf 100644
--- a/sysutils/fselect/Makefile
+++ b/sysutils/fselect/Makefile
@@ -12,6 +12,8 @@ LICENSE_COMB= dual
LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE-APACHE
LICENSE_FILE_MIT= ${WRKSRC}/LICENSE-MIT
+BUILD_DEPENDS= zstd>0:archivers/zstd
+
USES= cargo
USE_GITHUB= yes
GH_ACCOUNT= jhspetersson
diff --git a/textproc/meilisearch/Makefile b/textproc/meilisearch/Makefile
index 5910b77c9069..5b8b442ad7ac 100644
--- a/textproc/meilisearch/Makefile
+++ b/textproc/meilisearch/Makefile
@@ -15,6 +15,8 @@ WWW= https://www.meilisearch.com/
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
+BUILD_DEPENDS= zstd>0:archivers/zstd
+
USES= cargo pkgconfig
USE_GITHUB= yes
# Following is generated with following:
diff --git a/www/deno/Makefile b/www/deno/Makefile
index 4ec976c7e7a8..7763960d4317 100644
--- a/www/deno/Makefile
+++ b/www/deno/Makefile
@@ -1,7 +1,7 @@
PORTNAME= deno
DISTVERSIONPREFIX= v
DISTVERSION= 1.31.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MAINTAINER= mikael@FreeBSD.org
@@ -15,6 +15,7 @@ BROKEN_i386= cargo:warning=c/freebsd.c:31:10: error: conflicting types for 'get_
BUILD_DEPENDS= gn:devel/gn \
libunwind>0:devel/libunwind
+LIB_DEPENDS= libzstd.so:archivers/zstd
USES= cargo compiler:c++17-lang cpe gmake gnome ninja:build pkgconfig:build python:3.9+,build
diff --git a/www/miniserve/Makefile b/www/miniserve/Makefile
index cd71636ac7da..a7447ef1d8a3 100644
--- a/www/miniserve/Makefile
+++ b/www/miniserve/Makefile
@@ -11,6 +11,7 @@ LICENSE= APACHE20 BSD3CLAUSE CC0-1.0 ISCL MIT MPL20 UNLICENSE
LICENSE_COMB= multi
LICENSE_FILE_MIT= ${WRKSRC}/LICENSE
+BUILD_DEPENDS= zstd>0:archivers/zstd
LIB_DEPENDS= libonig.so:devel/oniguruma
USES= cargo ssl:build
diff --git a/www/rustypaste/Makefile b/www/rustypaste/Makefile
index b71a057875dd..83a5ee6cce06 100644
--- a/www/rustypaste/Makefile
+++ b/www/rustypaste/Makefile
@@ -1,7 +1,7 @@
PORTNAME= rustypaste
DISTVERSIONPREFIX= v
DISTVERSION= 0.8.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www
MAINTAINER= DtxdF@disroot.org
@@ -11,6 +11,8 @@ WWW= https://github.com/orhun/rustypaste/
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
+LIB_DEPENDS= libzstd.so:archivers/zstd
+
USES= cargo
USE_GITHUB= yes
GH_ACCOUNT= orhun
diff --git a/www/wasm-pack/Makefile b/www/wasm-pack/Makefile
index 48033babf6d5..96ad65d6d6ab 100644
--- a/www/wasm-pack/Makefile
+++ b/www/wasm-pack/Makefile
@@ -12,7 +12,8 @@ LICENSE_COMB= dual
LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE-APACHE
LICENSE_FILE_MIT= ${WRKSRC}/LICENSE-MIT
-BUILD_DEPENDS= gmake:devel/gmake
+BUILD_DEPENDS= gmake:devel/gmake \
+ zstd>0:archivers/zstd
LIB_DEPENDS= libcurl.so:ftp/curl
USES= cargo perl5 pkgconfig
diff --git a/x11/wezterm/Makefile b/x11/wezterm/Makefile
index a3d226803adf..799b04f1c7b8 100644
--- a/x11/wezterm/Makefile
+++ b/x11/wezterm/Makefile
@@ -1,5 +1,6 @@
PORTNAME= wezterm
DISTVERSION= 20230326-111934-3666303c
+PORTREVISION= 1
CATEGORIES= x11 wayland
MAINTAINER= jbeich@FreeBSD.org
@@ -9,7 +10,8 @@ WWW= https://wezfurlong.org/wezterm/
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.md
-LIB_DEPENDS= libwayland-egl.so:graphics/wayland \
+LIB_DEPENDS= libzstd.so:archivers/zstd \
+ libwayland-egl.so:graphics/wayland \
libssh2.so:security/libssh2 \
libfontconfig.so:x11-fonts/fontconfig \
libxkbcommon-x11.so:x11/libxkbcommon \