diff --git a/databases/influxdb/Makefile b/databases/influxdb/Makefile index 3273b265723..4e1ecd9c10a 100644 --- a/databases/influxdb/Makefile +++ b/databases/influxdb/Makefile @@ -22,7 +22,7 @@ BUILD_DEPENDS = textproc/xmlto \ #some dists have -w FIX_CLEANUP_PERMISSIONS = Yes -WANTLIB += c c++abi pthread +WANTLIB += ${MODCARGO_WANTLIB} COMPILER = base-clang ports-gcc MODCARGO_BUILD = No diff --git a/devel/cargo-audit/Makefile b/devel/cargo-audit/Makefile index 4050d518cc5..84b04b5b359 100644 --- a/devel/cargo-audit/Makefile +++ b/devel/cargo-audit/Makefile @@ -17,7 +17,7 @@ HOMEPAGE = https://github.com/RustSec/rustsec/tree/main/cargo-audit # Apache 2/MIT PERMIT_PACKAGE = Yes -WANTLIB += c c++abi crypto git2 m pthread ssh2 ssl +WANTLIB += ${MODCARGO_WANTLIB} crypto git2 m ssh2 ssl LIB_DEPENDS = devel/libgit2/libgit2 \ security/libssh2 diff --git a/devel/cbindgen/Makefile b/devel/cbindgen/Makefile index a936f8cf1f3..fe21d37d328 100644 --- a/devel/cbindgen/Makefile +++ b/devel/cbindgen/Makefile @@ -15,7 +15,7 @@ MODULES = devel/cargo CONFIGURE_STYLE = cargo -WANTLIB += c c++abi pthread +WANTLIB += ${MODCARGO_WANTLIB} TEST_ENV = CC=${CC} CXX=${CXX} diff --git a/devel/elfcat/Makefile b/devel/elfcat/Makefile index 9f39131061b..0690e9b8ce7 100644 --- a/devel/elfcat/Makefile +++ b/devel/elfcat/Makefile @@ -10,9 +10,9 @@ CATEGORIES = devel # zlib PERMIT_PACKAGE = Yes -WANTLIB += c c++abi m pthread +WANTLIB += ${MODCARGO_WANTLIB} m -MODULES = devel/cargo +MODULES = devel/cargo CONFIGURE_STYLE = cargo diff --git a/devel/snare/Makefile b/devel/snare/Makefile index 1d66fc2dbe8..578e6edfe5f 100644 --- a/devel/snare/Makefile +++ b/devel/snare/Makefile @@ -14,7 +14,7 @@ MAINTAINER = Laurence Tratt # Apache-2.0/MIT PERMIT_PACKAGE = Yes -WANTLIB += c c++abi m pthread +WANTLIB += ${MODCARGO_WANTLIB} m DISTFILES += ${DISTNAME}${EXTRACT_SUFX} MODULES = devel/cargo diff --git a/mail/meli/Makefile b/mail/meli/Makefile index dc826e74ee0..de623161881 100644 --- a/mail/meli/Makefile +++ b/mail/meli/Makefile @@ -30,7 +30,7 @@ LIB_DEPENDS = devel/pcre2 \ net/curl \ databases/sqlite3 -WANTLIB += c c++abi crypto curl m pcre2-8 pthread sqlite3 ssl +WANTLIB += ${MODCARGO_WANTLIB} crypto curl m pcre2-8 sqlite3 ssl PORTHOME = ${WRKDIR} post-install: diff --git a/mail/stalwart/cli/Makefile b/mail/stalwart/cli/Makefile index da577c90c7f..849247e5788 100644 --- a/mail/stalwart/cli/Makefile +++ b/mail/stalwart/cli/Makefile @@ -6,6 +6,6 @@ REVISION = 1 .include "crates.inc" -WANTLIB += c c++abi m pthread +WANTLIB += ${MODCARGO_WANTLIB} m .include diff --git a/mail/stalwart/imap/Makefile b/mail/stalwart/imap/Makefile index cdae1252aa7..c79d59deefe 100644 --- a/mail/stalwart/imap/Makefile +++ b/mail/stalwart/imap/Makefile @@ -13,7 +13,7 @@ MODCARGO_CRATES += jmap-client 0.2.0 # Apache-2.0 OR MIT MODCARGO_CRATES += mail-parser 0.7.0 # Apache-2.0 OR MIT MODCARGO_CRATES += reqwest 0.11.11 # MIT/Apache-2.0 -WANTLIB += c c++abi pthread +WANTLIB += ${MODCARGO_WANTLIB} post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/stalwart/imap diff --git a/mail/stalwart/smtp/Makefile b/mail/stalwart/smtp/Makefile index b962ba98c81..9e0ba33eaa3 100644 --- a/mail/stalwart/smtp/Makefile +++ b/mail/stalwart/smtp/Makefile @@ -22,7 +22,7 @@ MODCARGO_CRATES_KEEP += libsqlite3-sys BUILD_DEPENDS = devel/protobuf LIB_DEPENDS = archivers/zstd \ archivers/bzip2 -WANTLIB += bz2 c c++abi m pthread zstd +WANTLIB += ${MOCARGO_WANTLIB} bz2 m zstd post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/stalwart/smtp diff --git a/net/bore/Makefile b/net/bore/Makefile index 2940d721e48..51cef834e69 100644 --- a/net/bore/Makefile +++ b/net/bore/Makefile @@ -10,7 +10,7 @@ MAINTAINER = Delan Azabani PERMIT_PACKAGE = Yes # uses pledge(2) -WANTLIB += c c++abi pthread +WANTLIB += ${MODCARGO_WANTLIB} SITES = https://bitbucket.org/delan/nonymous/get/ diff --git a/net/dog/Makefile b/net/dog/Makefile index 62f37d9a971..069701f07fc 100644 --- a/net/dog/Makefile +++ b/net/dog/Makefile @@ -10,7 +10,7 @@ CATEGORIES = net # EUPL PERMIT_PACKAGE = Yes -WANTLIB += c c++abi crypto pthread ssl +WANTLIB += ${MODCARGO_WANTLIB} crypto ssl MODULES = devel/cargo diff --git a/net/routinator/Makefile b/net/routinator/Makefile index 20b497c5fc8..d1415f413cb 100644 --- a/net/routinator/Makefile +++ b/net/routinator/Makefile @@ -27,7 +27,7 @@ CATEGORIES = net PERMIT_PACKAGE = Yes PERMIT_DISTFILES = includes bundled ARIN TAL which requires agreement with https://www.arin.net/resources/manage/rpki/rpa.pdf -WANTLIB += c c++abi m pthread +WANTLIB += ${MODCARGO_WANTLIB} m MODULES = devel/cargo diff --git a/security/py-cryptography/Makefile b/security/py-cryptography/Makefile index 937166c5737..b17f995cd5b 100644 --- a/security/py-cryptography/Makefile +++ b/security/py-cryptography/Makefile @@ -14,7 +14,7 @@ HOMEPAGE= https://cryptography.io/ # dual: BSD or Apache 2 PERMIT_PACKAGE= Yes -WANTLIB= ${MODPY_WANTLIB} c crypto c++abi pthread ssl +WANTLIB= ${MODPY_WANTLIB} ${MODCARGO_WANTLIB} crypto ssl FLAVORS= python3 FLAVOR= python3 diff --git a/security/rbw/Makefile b/security/rbw/Makefile index 7b861eba305..c3a7b5b32b1 100644 --- a/security/rbw/Makefile +++ b/security/rbw/Makefile @@ -15,7 +15,7 @@ SITES = https://git.tozt.net/rbw/snapshot/ # MIT X11 PERMIT_PACKAGE = Yes -WANTLIB += c c++abi crypto m pthread ssl +WANTLIB += ${MODCARGO_WANTLIB} crypto m ssl DISTFILES += ${DISTNAME}${EXTRACT_SUFX} diff --git a/security/sn0int/Makefile b/security/sn0int/Makefile index 28a8d6ee6eb..f1265505f57 100644 --- a/security/sn0int/Makefile +++ b/security/sn0int/Makefile @@ -17,7 +17,7 @@ PERMIT_PACKAGE = Yes # uses pledge() LIB_DEPENDS = databases/sqlite3 security/libsodium ${MODLUA_LIB_DEPENDS} -WANTLIB += c c++abi m pthread sqlite3 sodium ${MODLUA_WANTLIB} +WANTLIB += m sqlite3 sodium ${MODLUA_WANTLIB} ${MODCARGO_WANTLIB} MODLUA_VERSION = 5.2 MODLUA_SA = Yes diff --git a/sysutils/bat/Makefile b/sysutils/bat/Makefile index 0545520b3e1..53f02ab4929 100644 --- a/sysutils/bat/Makefile +++ b/sysutils/bat/Makefile @@ -13,7 +13,7 @@ MODULES = devel/cargo # for riscv64 and powerpc64, please keep: cc >= 1.0.73 and libc >= 0.2.113 MODCARGO_CRATES_UPDATE = cc -WANTLIB += c c++abi git2 m onig pthread +WANTLIB += ${MODCARGO_WANTLIB} git2 m onig CONFIGURE_STYLE = cargo SEPARATE_BUILD = Yes diff --git a/sysutils/broot/Makefile b/sysutils/broot/Makefile index 4c992740c1a..e9e88fbf3fa 100644 --- a/sysutils/broot/Makefile +++ b/sysutils/broot/Makefile @@ -11,7 +11,7 @@ HOMEPAGE = https://dystroy.org/broot/ # MIT PERMIT_PACKAGE = Yes -WANTLIB += c c++abi m onig pthread z +WANTLIB += ${MODCARGO_WANTLIB} m onig z MODULES = devel/cargo MODCARGO_CRATES_KEEP += libgit2-sys diff --git a/sysutils/fclones/Makefile b/sysutils/fclones/Makefile index 7d02d6de7e0..ee794f167d2 100644 --- a/sysutils/fclones/Makefile +++ b/sysutils/fclones/Makefile @@ -9,7 +9,7 @@ MAINTAINER = Frederic Cambus # MIT PERMIT_PACKAGE = Yes -WANTLIB += ${MODCARGO_WANTLIB} m pthread +WANTLIB += ${MODCARGO_WANTLIB} m MODULES = devel/cargo diff --git a/textproc/amber/Makefile b/textproc/amber/Makefile index 81ad8a894c3..51de7350567 100644 --- a/textproc/amber/Makefile +++ b/textproc/amber/Makefile @@ -11,7 +11,7 @@ MAINTAINER = Edd Barrett # MIT PERMIT_PACKAGE = Yes -WANTLIB += c c++abi pthread +WANTLIB += ${MODCARGO_WANTLIB} MODULES = devel/cargo CONFIGURE_STYLE = cargo diff --git a/textproc/jless/Makefile b/textproc/jless/Makefile index 5bcf471055f..e6a564abcba 100644 --- a/textproc/jless/Makefile +++ b/textproc/jless/Makefile @@ -10,7 +10,7 @@ CATEGORIES = textproc # BSD PERMIT_PACKAGE = Yes -WANTLIB += c c++abi pthread xcb +WANTLIB += ${MODCARGO_WANTLIB} xcb HOMEPAGE = https://jless.io/ diff --git a/textproc/mdbook/Makefile b/textproc/mdbook/Makefile index fae1c4c2817..d14310a2f95 100644 --- a/textproc/mdbook/Makefile +++ b/textproc/mdbook/Makefile @@ -12,7 +12,7 @@ MAINTAINER = Edd Barrett # MPL-2.0 + dependencies below. PERMIT_PACKAGE = Yes -WANTLIB += c c++abi m pthread +WANTLIB += ${MODCARGO_WANTLIB} m MODULES = devel/cargo diff --git a/www/castor/Makefile b/www/castor/Makefile index 63d437810b9..5b338f00062 100644 --- a/www/castor/Makefile +++ b/www/castor/Makefile @@ -13,7 +13,7 @@ HOMEPAGE= https://git.sr.ht/~julienxx/castor # MIT PERMIT_PACKAGE= Yes -WANTLIB += c c++abi crypto gdk-3 glib-2.0 gobject-2.0 gtk-3 pthread +WANTLIB += ${MODCARGO_WANTLIB} crypto gdk-3 glib-2.0 gobject-2.0 gtk-3 WANTLIB += ssl SITES= https://git.sr.ht/~julienxx/ diff --git a/www/geckodriver/Makefile b/www/geckodriver/Makefile index d91f2e6d420..371919e46da 100644 --- a/www/geckodriver/Makefile +++ b/www/geckodriver/Makefile @@ -18,6 +18,6 @@ SEPARATE_BUILD = Yes .include "modules.inc" LIB_DEPENDS += archivers/bzip2 -WANTLIB += c c++abi m pthread bz2 +WANTLIB += ${MODCARGO_WANTLIB} m bz2 .include diff --git a/www/nextcloud_notify_push/Makefile b/www/nextcloud_notify_push/Makefile index 28aba6d3a70..30993f6d65d 100644 --- a/www/nextcloud_notify_push/Makefile +++ b/www/nextcloud_notify_push/Makefile @@ -27,7 +27,7 @@ MODULES = devel/cargo .include "crates.inc" MODCARGO_CRATES_KEEP += libsqlite3-sys -WANTLIB += c c++abi m pthread +WANTLIB += ${MODCARGO_WANTLIB} m CONFIGURE_STYLE = cargo SEPARATE_BUILD = Yes diff --git a/www/py-adblock/Makefile b/www/py-adblock/Makefile index fce42c421c1..fd7e486facb 100644 --- a/www/py-adblock/Makefile +++ b/www/py-adblock/Makefile @@ -18,7 +18,7 @@ CATEGORIES = www # MIT PERMIT_PACKAGE =Yes -WANTLIB += c c++abi pthread +WANTLIB += ${MODCARGO_WANTLIB} MODULES = devel/cargo \ lang/python diff --git a/x11/alacritty/Makefile b/x11/alacritty/Makefile index 0bf6a48de8f..a2002a96479 100644 --- a/x11/alacritty/Makefile +++ b/x11/alacritty/Makefile @@ -12,7 +12,7 @@ HOMEPAGE = https://alacritty.org/ # Apache 2.0 PERMIT_PACKAGE = Yes -WANTLIB += c c++abi fontconfig freetype m pthread util +WANTLIB += ${MODCARGO_WANTLIB} fontconfig freetype m util # xcb is dlopen()'d WANTLIB += xcb diff --git a/x11/xcolor/Makefile b/x11/xcolor/Makefile index 3edc376d5c1..38808e85c0e 100644 --- a/x11/xcolor/Makefile +++ b/x11/xcolor/Makefile @@ -16,7 +16,7 @@ MAINTAINER = Laurence Tratt # MIT PERMIT_PACKAGE = Yes -WANTLIB += c c++abi m pthread xcb xcb-shape X11 X11-xcb Xcursor +WANTLIB += ${MODCARGO_WANTLIB} m xcb xcb-shape X11 X11-xcb Xcursor MODULES = devel/cargo \ lang/python