From 56a28fcfb725c4719361f80813dee555de5f318e Mon Sep 17 00:00:00 2001 From: sthen Date: Mon, 30 Jan 2023 13:28:38 +0000 Subject: [PATCH] remove DISTFILES setting for cargo ports using GH_*, no longer needed with cargo.port.mk r1.35 --- audio/ncspot/Makefile | 2 -- benchmarks/hyperfine/Makefile | 2 -- devel/cbindgen/Makefile | 3 --- devel/difftastic/Makefile | 3 +-- devel/maturin/Makefile | 2 -- net/dog/Makefile | 3 +-- net/routinator/Makefile | 3 +-- net/synapse/Makefile | 2 -- security/age-plugin-yubikey/Makefile | 1 - security/rust-openssl-tests/Makefile | 2 -- security/sn0int/Makefile | 3 --- security/vaultwarden/Makefile | 3 --- shells/nushell/Makefile | 3 --- sysutils/bat/Makefile | 3 --- sysutils/broot/Makefile | 3 --- sysutils/czkawka/Makefile | 1 - sysutils/exa/Makefile | 3 --- sysutils/fd/Makefile | 3 --- sysutils/fd/distinfo | 4 ++-- textproc/amber/Makefile | 3 --- textproc/delta/Makefile | 2 -- textproc/jless/Makefile | 1 - textproc/mdbook/Makefile | 3 --- textproc/ripgrep/Makefile | 3 --- textproc/tree-sitter/Makefile | 3 --- www/geckodriver/Makefile | 2 -- www/libreddit/Makefile | 1 - www/nextcloud_notify_push/Makefile | 2 -- www/zola/Makefile | 2 -- x11/alacritty/Makefile | 2 -- x11/xcolor/Makefile | 2 -- 31 files changed, 5 insertions(+), 70 deletions(-) diff --git a/audio/ncspot/Makefile b/audio/ncspot/Makefile index 1374ac0e177..f64c8c042ad 100644 --- a/audio/ncspot/Makefile +++ b/audio/ncspot/Makefile @@ -34,8 +34,6 @@ MODCARGO_FEATURES = cursive/termion-backend \ mpris \ portaudio_backend -DISTFILES += ${DISTNAME}${EXTRACT_SUFX} - .include "crates.inc" DOCDIR = ${PREFIX}/share/doc/ncspot/ diff --git a/benchmarks/hyperfine/Makefile b/benchmarks/hyperfine/Makefile index 7dc5b631e94..6c01b657b86 100644 --- a/benchmarks/hyperfine/Makefile +++ b/benchmarks/hyperfine/Makefile @@ -14,8 +14,6 @@ WANTLIB += c c++abi m pthread MODULES = devel/cargo -DISTFILES += ${DISTNAME}${EXTRACT_SUFX} - CONFIGURE_STYLE = cargo .include "crates.inc" diff --git a/devel/cbindgen/Makefile b/devel/cbindgen/Makefile index b855d3cc3fd..11e44e43608 100644 --- a/devel/cbindgen/Makefile +++ b/devel/cbindgen/Makefile @@ -10,9 +10,6 @@ CATEGORIES = devel # MPL-2.0 PERMIT_PACKAGE = Yes -# as devel/cargo MODULES adds DISTFILES, GH_* didn't -DISTFILES += ${DISTNAME}${EXTRACT_SUFX} - COMPILER = base-clang ports-gcc MODULES = devel/cargo diff --git a/devel/difftastic/Makefile b/devel/difftastic/Makefile index 5bccd14903b..9ee251e98c2 100644 --- a/devel/difftastic/Makefile +++ b/devel/difftastic/Makefile @@ -13,9 +13,8 @@ CATEGORIES = devel # MIT PERMIT_PACKAGE = Yes -DISTFILES += ${GH_DISTFILE} MODULES = devel/cargo -BUILD_DEPENDS = textproc/mdbook +BUILD_DEPENDS = textproc/mdbook COMPILER = base-clang ports-gcc WANTLIB += ${MODCARGO_WANTLIB} ${COMPILER_LIBCXX} m diff --git a/devel/maturin/Makefile b/devel/maturin/Makefile index 13bd5e5ed62..ae8f873188c 100644 --- a/devel/maturin/Makefile +++ b/devel/maturin/Makefile @@ -17,8 +17,6 @@ PERMIT_PACKAGE =Yes WANTLIB += bz2 c c++abi m pthread -DISTFILES += ${DISTNAME}${EXTRACT_SUFX} - MODULES = devel/cargo CONFIGURE_STYLE =cargo diff --git a/net/dog/Makefile b/net/dog/Makefile index 69d383d1fc1..e43287ef1b2 100644 --- a/net/dog/Makefile +++ b/net/dog/Makefile @@ -20,8 +20,7 @@ SEPARATE_BUILD = Yes HOMEPAGE = https://dns.lookup.dog/ MASTER_SITES0 = https://github.com/ogham/dog/releases/download/${GH_TAGNAME}/ -DISTFILES += ${DISTNAME}{${GH_TAGNAME}}${EXTRACT_SUFX} \ - dog-${GH_TAGNAME}-x86_64-apple-darwin.zip:0 +DISTFILES += dog-${GH_TAGNAME}-x86_64-apple-darwin.zip:0 # for riscv64 and powerpc64, please keep: cc >= 1.0.73 and libc >= 0.2.113 MODCARGO_CRATES_UPDATE = cc libc diff --git a/net/routinator/Makefile b/net/routinator/Makefile index ecdbe3f1a17..00d9bb3ecae 100644 --- a/net/routinator/Makefile +++ b/net/routinator/Makefile @@ -12,8 +12,7 @@ ROUTINATOR_UI_URL = https://github.com/NLnetLabs/routinator-ui/releases/download ROUTINATOR_UI_VERSION = 0.3.4 MASTER_SITES0 = ${ROUTINATOR_UI_URL}/v${ROUTINATOR_UI_VERSION}/ -DISTFILES += ${GH_DISTFILE} \ - routinator-ui-${ROUTINATOR_UI_VERSION}{routinator-ui-build}.tar.gz:0 +DISTFILES += routinator-ui-${ROUTINATOR_UI_VERSION}{routinator-ui-build}.tar.gz:0 # The routinator-ui crate expects its Vue.js parts to be in ../dist EXTRACT_CASES += routinator-ui-*.tar.gz) \ diff --git a/net/synapse/Makefile b/net/synapse/Makefile index 85c474cb5c3..994f99e04d7 100644 --- a/net/synapse/Makefile +++ b/net/synapse/Makefile @@ -27,8 +27,6 @@ MODCARGO_TEST = No MAKE_ENV += ${MODCARGO_ENV} -DISTFILES = ${DISTNAME}${EXTRACT_SUFX} - BUILD_DEPENDS += devel/py-setuptools-rust${MODPY_FLAVOR}>=1.3.0 # in same order as in pyproject.toml: mandatory section diff --git a/security/age-plugin-yubikey/Makefile b/security/age-plugin-yubikey/Makefile index 06c8ebfe891..21c1f5cf2c5 100644 --- a/security/age-plugin-yubikey/Makefile +++ b/security/age-plugin-yubikey/Makefile @@ -11,7 +11,6 @@ MAINTAINER= Volker Schlecht # MIT or Apache 2.0 PERMIT_PACKAGE= Yes WANTLIB+= ${MODCARGO_WANTLIB} m pcsclite -DISTFILES+= ${GH_DISTFILE} MODULES= devel/cargo diff --git a/security/rust-openssl-tests/Makefile b/security/rust-openssl-tests/Makefile index 207c76711ad..e07456419c6 100644 --- a/security/rust-openssl-tests/Makefile +++ b/security/rust-openssl-tests/Makefile @@ -8,8 +8,6 @@ GH_ACCOUNT = sfackler GH_PROJECT = rust-openssl GH_COMMIT = 78c241f2716320f509f284261ce04812c3751b4f -DISTFILES += ${GH_DISTFILE} - CATEGORIES = security devel MAINTAINER = Theo Buehler diff --git a/security/sn0int/Makefile b/security/sn0int/Makefile index e88b030f4b0..cc1d196bae9 100644 --- a/security/sn0int/Makefile +++ b/security/sn0int/Makefile @@ -19,9 +19,6 @@ PERMIT_PACKAGE = Yes LIB_DEPENDS = databases/sqlite3 security/libsodium ${MODLUA_LIB_DEPENDS} WANTLIB += c c++abi m pthread sqlite3 sodium ${MODLUA_WANTLIB} -# as devel/cargo MODULES adds DISTFILES, GH_* didn't -DISTFILES += ${DISTNAME}${EXTRACT_SUFX} - MODLUA_VERSION = 5.2 MODLUA_SA = Yes diff --git a/security/vaultwarden/Makefile b/security/vaultwarden/Makefile index 81e12f0a354..dd1d13230b1 100644 --- a/security/vaultwarden/Makefile +++ b/security/vaultwarden/Makefile @@ -25,9 +25,6 @@ WANTLIB += c c++abi crypto m pthread ssl MASTER_SITES7 = https://files.bsd.ac/openbsd-distfiles/ DISTFILES += vaultwarden-deps-${GH_TAGNAME}.tgz:7 -# as devel/cargo MODULES adds DISTFILES, GH_* didn't -DISTFILES += ${DISTNAME}${EXTRACT_SUFX} - MODULES = devel/cargo CONFIGURE_STYLE = cargo diff --git a/shells/nushell/Makefile b/shells/nushell/Makefile index a8d190862ef..cf9f9ea3dca 100644 --- a/shells/nushell/Makefile +++ b/shells/nushell/Makefile @@ -9,9 +9,6 @@ CATEGORIES = shells # MIT PERMIT_PACKAGE = Yes -# as devel/cargo MODULES adds DISTFILES, GH_* didn't -DISTFILES += ${DISTNAME}${EXTRACT_SUFX} - MODULES = devel/cargo MODCARGO_CRATES_KEEP += libsqlite3-sys diff --git a/sysutils/bat/Makefile b/sysutils/bat/Makefile index 01c06837017..650beaf9920 100644 --- a/sysutils/bat/Makefile +++ b/sysutils/bat/Makefile @@ -9,9 +9,6 @@ CATEGORIES = sysutils # Apache/MIT PERMIT_PACKAGE = Yes -# as devel/cargo MODULES adds DISTFILES, GH_* didn't -DISTFILES += ${DISTNAME}${EXTRACT_SUFX} - MODULES = devel/cargo # for riscv64 and powerpc64, please keep: cc >= 1.0.73 and libc >= 0.2.113 MODCARGO_CRATES_UPDATE = cc diff --git a/sysutils/broot/Makefile b/sysutils/broot/Makefile index d142e1841a8..748039c5412 100644 --- a/sysutils/broot/Makefile +++ b/sysutils/broot/Makefile @@ -13,9 +13,6 @@ PERMIT_PACKAGE = Yes WANTLIB += c c++abi m onig pthread z -# as devel/cargo MODULES adds DISTFILES, GH_* didn't -DISTFILES += ${DISTNAME}${EXTRACT_SUFX} - MODULES = devel/cargo MODCARGO_CRATES_KEEP += libgit2-sys diff --git a/sysutils/czkawka/Makefile b/sysutils/czkawka/Makefile index e9c61bb31ea..c005192d915 100644 --- a/sysutils/czkawka/Makefile +++ b/sysutils/czkawka/Makefile @@ -18,7 +18,6 @@ PERMIT_PACKAGE = Yes MULTI_PACKAGES = -main -gui -DISTFILES += ${DISTNAME}${EXTRACT_SUFX} MODULES = devel/cargo CONFIGURE_STYLE = cargo diff --git a/sysutils/exa/Makefile b/sysutils/exa/Makefile index fe5412cf4da..503db23c396 100644 --- a/sysutils/exa/Makefile +++ b/sysutils/exa/Makefile @@ -10,9 +10,6 @@ CATEGORIES = sysutils # Unlicense/MIT PERMIT_PACKAGE = Yes -# as devel/cargo MODULES adds DISTFILES, GH_* didn't -DISTFILES += ${DISTNAME}${EXTRACT_SUFX} - MODULES = devel/cargo .include "crates.inc" diff --git a/sysutils/fd/Makefile b/sysutils/fd/Makefile index 29836645953..ea20058c107 100644 --- a/sysutils/fd/Makefile +++ b/sysutils/fd/Makefile @@ -11,9 +11,6 @@ PERMIT_PACKAGE = Yes WANTLIB += ${MODCARGO_WANTLIB} pthread -# as devel/cargo MODULES adds DISTFILES, GH_* didn't -DISTFILES += ${DISTNAME}${EXTRACT_SUFX} - MODULES = devel/cargo CONFIGURE_STYLE = cargo diff --git a/sysutils/fd/distinfo b/sysutils/fd/distinfo index 2985c1d7f21..055768a72b7 100644 --- a/sysutils/fd/distinfo +++ b/sysutils/fd/distinfo @@ -118,7 +118,7 @@ SHA256 (cargo/windows_x86_64_gnu-0.42.0.tar.gz) = v3sbIbU2LLwxj2hhUOW86nXs7cdN0V SHA256 (cargo/windows_x86_64_gnullvm-0.42.0.tar.gz) = CdUl0row7rMpdmW9Q0pUKX5BcMfxpEytTvWAlbTNICg= SHA256 (cargo/windows_x86_64_msvc-0.36.1.tar.gz) = yBHKSoyFPvQgq9hZK6U927rJBBD6tpA7PnmXKmMfdoA= SHA256 (cargo/windows_x86_64_msvc-0.42.0.tar.gz) = 9AAJ2FdZclo02m2JqU5j173FCoYqzw28fI5Ijx7ctvU= -SHA256 (fd-8.5.3.tar.gz) = h3AHfrcLOYnBmQ1WoQGcu+onQhz1cbnvfjMPmJzVZCE= +SHA256 (fd-8.5.3.tar.gz) = RaZETPW7/PTuSDbZov8hBtMeZ9p3NBGDOSIlutyHzTU= SIZE (cargo/aho-corasick-0.7.19.tar.gz) = 113070 SIZE (cargo/android_system_properties-0.1.5.tar.gz) = 5243 SIZE (cargo/ansi_term-0.12.1.tar.gz) = 24838 @@ -239,4 +239,4 @@ SIZE (cargo/windows_x86_64_gnu-0.42.0.tar.gz) = 692493 SIZE (cargo/windows_x86_64_gnullvm-0.42.0.tar.gz) = 357906 SIZE (cargo/windows_x86_64_msvc-0.36.1.tar.gz) = 661999 SIZE (cargo/windows_x86_64_msvc-0.42.0.tar.gz) = 659377 -SIZE (fd-8.5.3.tar.gz) = 113931 +SIZE (fd-8.5.3.tar.gz) = 114097 diff --git a/textproc/amber/Makefile b/textproc/amber/Makefile index d183bd166c7..81ad8a894c3 100644 --- a/textproc/amber/Makefile +++ b/textproc/amber/Makefile @@ -13,9 +13,6 @@ PERMIT_PACKAGE = Yes WANTLIB += c c++abi pthread -# as devel/cargo MODULES adds DISTFILES, GH_* didn't -DISTFILES += ${DISTNAME}${EXTRACT_SUFX} - MODULES = devel/cargo CONFIGURE_STYLE = cargo SEPARATE_BUILD = Yes diff --git a/textproc/delta/Makefile b/textproc/delta/Makefile index 247a30b5c49..bc8442fc11a 100644 --- a/textproc/delta/Makefile +++ b/textproc/delta/Makefile @@ -13,8 +13,6 @@ HOMEPAGE = https://github.com/dandavison/delta # MIT PERMIT_PACKAGE = Yes -DISTFILES += ${GH_DISTFILE} - COMPILER = base-clang ports-gcc WANTLIB += ${MODCARGO_WANTLIB} m git2 onig diff --git a/textproc/jless/Makefile b/textproc/jless/Makefile index 6848faf70d2..a5bc4fc1322 100644 --- a/textproc/jless/Makefile +++ b/textproc/jless/Makefile @@ -16,7 +16,6 @@ HOMEPAGE = https://jless.io/ MODULES = devel/cargo \ lang/python -DISTFILES += ${GH_DISTFILE} CONFIGURE_STYLE = cargo # for riscv64 and powerpc64, please keep: cc >= 1.0.73 and libc >= 0.2.113 diff --git a/textproc/mdbook/Makefile b/textproc/mdbook/Makefile index e869db1d999..fae1c4c2817 100644 --- a/textproc/mdbook/Makefile +++ b/textproc/mdbook/Makefile @@ -14,9 +14,6 @@ PERMIT_PACKAGE = Yes WANTLIB += c c++abi m pthread -# as devel/cargo MODULES adds DISTFILES, GH_* didn't -DISTFILES += ${DISTNAME}${EXTRACT_SUFX} - MODULES = devel/cargo # for riscv64 and powerpc64, please keep: libc >= 0.2.113 diff --git a/textproc/ripgrep/Makefile b/textproc/ripgrep/Makefile index c0b58bcffc5..4ce9a5c24e2 100644 --- a/textproc/ripgrep/Makefile +++ b/textproc/ripgrep/Makefile @@ -12,9 +12,6 @@ PERMIT_PACKAGE = Yes WANTLIB += c c++abi pthread -# as devel/cargo MODULES adds DISTFILES, GH_* didn't -DISTFILES += ${DISTNAME}${EXTRACT_SUFX} - MODULES = devel/cargo BUILD_DEPENDS = textproc/asciidoctor diff --git a/textproc/tree-sitter/Makefile b/textproc/tree-sitter/Makefile index b018d964b18..9ecca79f8a0 100644 --- a/textproc/tree-sitter/Makefile +++ b/textproc/tree-sitter/Makefile @@ -15,9 +15,6 @@ PERMIT_PACKAGE = Yes WANTLIB += c c++abi pthread -# as devel/cargo MODULES adds DISTFILES, GH_* didn't -DISTFILES += ${DISTNAME}${EXTRACT_SUFX} - # fix sparc64 build COMPILER = base-clang ports-gcc diff --git a/www/geckodriver/Makefile b/www/geckodriver/Makefile index bb66c33e3af..d91f2e6d420 100644 --- a/www/geckodriver/Makefile +++ b/www/geckodriver/Makefile @@ -10,8 +10,6 @@ CATEGORIES = www # mozilla public license PERMIT_PACKAGE = Yes -DISTFILES += ${DISTNAME}${EXTRACT_SUFX} - MODULES = devel/cargo CONFIGURE_STYLE = cargo diff --git a/www/libreddit/Makefile b/www/libreddit/Makefile index 9b8f600883b..293b41ee3fd 100644 --- a/www/libreddit/Makefile +++ b/www/libreddit/Makefile @@ -22,7 +22,6 @@ BUILD_DEPENDS = security/rust-ring SEPARATE_BUILD = Yes NO_TEST = Yes -DISTFILES += ${DISTNAME}${EXTRACT_SUFX} CONFIGURE_STYLE = cargo diff --git a/www/nextcloud_notify_push/Makefile b/www/nextcloud_notify_push/Makefile index 2180bdf165d..0d40fe5cde7 100644 --- a/www/nextcloud_notify_push/Makefile +++ b/www/nextcloud_notify_push/Makefile @@ -20,8 +20,6 @@ PERMIT_PACKAGE = Yes # a tarball is shipped on github, but without Cargo.lock, and contains linux binaries.. # MASTER_SITES = https://github.com/nextcloud/notify_push/releases/download/v0.1.7/ -# as devel/cargo MODULES adds DISTFILES, GH_* didn't -DISTFILES += ${DISTNAME}${EXTRACT_SUFX} COMPILER = base-clang ports-gcc diff --git a/www/zola/Makefile b/www/zola/Makefile index 92c2cc1a87a..ef37b359e90 100644 --- a/www/zola/Makefile +++ b/www/zola/Makefile @@ -10,8 +10,6 @@ REVISION = 3 HOMEPAGE = https://www.getzola.org -DISTFILES += ${DISTNAME}${EXTRACT_SUFX} - CATEGORIES = www MAINTAINER = Peter H. Ezetta diff --git a/x11/alacritty/Makefile b/x11/alacritty/Makefile index 9ba642f037e..451ff05e18a 100644 --- a/x11/alacritty/Makefile +++ b/x11/alacritty/Makefile @@ -1,6 +1,4 @@ COMMENT = cross-platform, GPU-accelerated terminal emulator -# devel/cargo MODULES adds DISTFILES, GH_* didn't -DISTFILES += ${DISTNAME}${EXTRACT_SUFX} CATEGORIES = x11 MAINTAINER = Eric Auge diff --git a/x11/xcolor/Makefile b/x11/xcolor/Makefile index 4b4ca0c7d17..3edc376d5c1 100644 --- a/x11/xcolor/Makefile +++ b/x11/xcolor/Makefile @@ -23,8 +23,6 @@ MODULES = devel/cargo \ MODPY_RUNDEP = No -DISTFILES += ${DISTNAME}${EXTRACT_SUFX} - .include "crates.inc" CONFIGURE_STYLE = cargo