Index: head/Mk/Uses/cargo.mk =================================================================== --- head/Mk/Uses/cargo.mk (revision 496794) +++ head/Mk/Uses/cargo.mk (revision 496795) @@ -1,300 +1,312 @@ # $FreeBSD$ # # This file contains logic to ease porting of Rust packages or # binaries using the `cargo` command. # # Feature: cargo # Usage: USES=cargo # Valid ARGS: none # # MAINTAINER: ports@FreeBSD.org .if !defined(_INCLUDE_USES_CARGO_MK) _INCLUDE_USES_CARGO_MK= yes .if !empty(cargo_ARGS) IGNORE+= USES=cargo takes no arguments .endif # List of static dependencies. The format is cratename-version. # CARGO_CRATES will be downloaded from MASTER_SITES_CRATESIO. CARGO_CRATES?= # List of features to build (space separated list). CARGO_FEATURES?= # Name of the local directory for vendoring crates. CARGO_VENDOR_DIR?= ${WRKSRC}/cargo-crates # Default path for cargo manifest. CARGO_CARGOTOML?= ${WRKSRC}/Cargo.toml CARGO_CARGOLOCK?= ${WRKSRC}/Cargo.lock # Save crates inside ${DISTDIR}/rust/crates by default. CARGO_DIST_SUBDIR?= rust/crates # Generate list of DISTFILES. .for _crate in ${CARGO_CRATES} MASTER_SITES+= CRATESIO/${_crate:C/^(.*)-[0-9].*/\1/}/${_crate:C/^.*-([0-9].*)/\1/}:cargo_${_crate:S/-//g:S/.//g} DISTFILES+= ${CARGO_DIST_SUBDIR}/${_crate}.tar.gz:cargo_${_crate:S/-//g:S/.//g} .endfor # Build dependencies. CARGO_BUILDDEP?= yes .if ${CARGO_BUILDDEP:tl} == "yes" BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.33.0:lang/${RUST_DEFAULT} .endif # Location of cargo binary (default to lang/rust's Cargo binary) CARGO_CARGO_BIN?= ${LOCALBASE}/bin/cargo # Location of the cargo output directory. CARGO_TARGET_DIR?= ${WRKDIR}/target # Environment for cargo # - CARGO_HOME: local cache of the registry index # - CARGO_BUILD_JOBS: configure number of jobs to run # - CARGO_TARGET_DIR: location of where to place all generated artifacts # - RUSTC: path of rustc binary (default to lang/rust) # - RUSTDOC: path of rustdoc binary (default to lang/rust) # - RUSTFLAGS: custom flags to pass to all compiler invocations that Cargo performs CARGO_ENV+= \ CARGO_HOME=${WRKDIR}/cargo-home \ CARGO_BUILD_JOBS=${MAKE_JOBS_NUMBER} \ CARGO_TARGET_DIR=${CARGO_TARGET_DIR} \ RUSTC=${LOCALBASE}/bin/rustc \ RUSTDOC=${LOCALBASE}/bin/rustdoc \ RUSTFLAGS="${RUSTFLAGS} -C linker=${CC:Q} ${LDFLAGS:C/.+/-C link-arg=&/}" # Adjust -C target-cpu if -march/-mcpu is set by bsd.cpu.mk .if ${ARCH} == amd64 || ${ARCH} == i386 RUSTFLAGS+= ${CFLAGS:M-march=*:S/-march=/-C target-cpu=/} .else RUSTFLAGS+= ${CFLAGS:M-mcpu=*:S/-mcpu=/-C target-cpu=/} .endif .if ${ARCH} == powerpc64 USE_GCC?= yes .endif # Helper to shorten cargo calls. CARGO_CARGO_RUN= \ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${CARGO_ENV} \ ${CARGO_CARGO_BIN} # User arguments for cargo targets. CARGO_BUILD_ARGS?= CARGO_INSTALL_ARGS?= CARGO_TEST_ARGS?= CARGO_UPDATE_ARGS?= # Use module targets ? CARGO_BUILD?= yes CARGO_CONFIGURE?= yes CARGO_INSTALL?= yes CARGO_TEST?= yes + +# Set CARGO_USE_GIT{HUB,LAB} to yes if your application requires +# some dependencies from git repositories hosted on GitHub or +# GitLab instances. All Cargo.toml files will be patched to point +# to the right offline sources based on what is defined in +# {GH,GL}_TUPLE. This makes sure that cargo does not attempt to +# access the network during the build. CARGO_USE_GITHUB?= no +CARGO_USE_GITLAB?= no -# If your application has multiple Cargo.toml files which all use -# git-sourced dependencies and require the use of CARGO_USE_GITHUB and -# GH_TUPLE, then you add them to CARGO_GH_CARGOTOML to also point them -# to the correct offline sources. -CARGO_GH_CARGOTOML?= ${CARGO_CARGOTOML} - # Manage crate features. .if !empty(CARGO_FEATURES) CARGO_BUILD_ARGS+= --features='${CARGO_FEATURES}' CARGO_INSTALL_ARGS+= --features='${CARGO_FEATURES}' CARGO_TEST_ARGS+= --features='${CARGO_FEATURES}' .endif .if !defined(WITH_DEBUG) CARGO_BUILD_ARGS+= --release CARGO_TEST_ARGS+= --release .else CARGO_INSTALL_ARGS+= --debug .endif .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:Mgettext-sys-[0-9]*} .include "${USESDIR}/gettext.mk" CARGO_ENV+= GETTEXT_BIN_DIR=${LOCALBASE}/bin \ GETTEXT_INCLUDE_DIR=${LOCALBASE}/include \ GETTEXT_LIB_DIR=${LOCALBASE}/lib .endif .for libc in ${CARGO_CRATES:Mlibc-[0-9]*} # FreeBSD 12.0 changed ABI: r318736 and r320043 # https://github.com/rust-lang/libc/commit/78f93220d70e # https://github.com/rust-lang/libc/commit/969ad2b73cdc _libc_VER= ${libc:C/.*-//} . if ${_libc_VER:R:R} == 0 && (${_libc_VER:R:E} < 2 || ${_libc_VER:R:E} == 2 && ${_libc_VER:E} < 38) DEV_WARNING+= "CARGO_CRATES=${libc} may be unstable on FreeBSD 12.0. Consider updating to the latest version (higher than 0.2.37)." . endif . if ${_libc_VER:R:R} == 0 && (${_libc_VER:R:E} < 2 || ${_libc_VER:R:E} == 2 && ${_libc_VER:E} < 49) DEV_WARNING+= "CARGO_CRATES=${libc} may be unstable on aarch64 or not build on armv6, armv7, powerpc64. Consider updating to the latest version (higher than 0.2.49)." . endif .undef _libc_VER .endfor .if ${CARGO_CRATES:Mlibgit2-sys-[0-9]*} # Use the system's libgit2 instead of building the bundled version CARGO_ENV+= LIBGIT2_SYS_USE_PKG_CONFIG=1 LIB_DEPENDS+= libgit2.so:devel/libgit2 .endif .if ${CARGO_CRATES:Mlibssh2-sys-[0-9]*} # Use the system's libssh2 instead of building the bundled version CARGO_ENV+= LIBSSH2_SYS_USE_PKG_CONFIG=1 LIB_DEPENDS+= libssh2.so:security/libssh2 .endif .if ${CARGO_CRATES:Monig_sys-[0-9]*} # onig_sys always prefers the system library but will try to link # statically with it. Since devel/oniguruma doesn't provide a static # library it'll link to libonig.so instead. Strictly speaking setting # RUSTONIG_SYSTEM_LIBONIG is not necessary, but will force onig_sys to # always use the system's libonig as returned by `pkg-config oniguruma`. CARGO_ENV+= RUSTONIG_SYSTEM_LIBONIG=1 LIB_DEPENDS+= libonig.so:devel/oniguruma .endif .if ${CARGO_CRATES:Mopenssl-0.[0-9].*} # FreeBSD 12.0 updated base OpenSSL in r339270: # https://github.com/sfackler/rust-openssl/commit/276577553501 . if !exists(${PATCHDIR}/patch-openssl-1.1.1) # skip if backported _openssl_VER= ${CARGO_CRATES:Mopenssl-0.[0-9].*:C/.*-//} . if ${_openssl_VER:R:R} == 0 && (${_openssl_VER:R:E} < 10 || ${_openssl_VER:R:E} == 10 && ${_openssl_VER:E} < 4) DEV_WARNING+= "CARGO_CRATES=openssl-0.10.3 or older do not support OpenSSL 1.1.1. Consider updating to the latest version." . endif . endif .undef _openssl_VER .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} # Silence bogus QA warning about needing USES=ssl QA_ENV+= USESSSL=yes .endif .if ${CARGO_CRATES:Mpkg-config-[0-9]*} .include "${USESDIR}/pkgconfig.mk" .endif .if ${CARGO_CRATES:Mthrussh-libsodium-[0-9]*} LIB_DEPENDS+= libsodium.so:security/libsodium .endif _USES_extract+= 600:cargo-extract cargo-extract: # target for preparing crates directory. It will put all crates in # the local crates directory. @${ECHO_MSG} "===> Moving crates to ${CARGO_VENDOR_DIR}" @${MKDIR} ${CARGO_VENDOR_DIR} .for _crate in ${CARGO_CRATES} @${MV} ${WRKDIR}/${_crate} ${CARGO_VENDOR_DIR}/${_crate} @${PRINTF} '{"package":"%s","files":{}}' \ $$(${SHA256} -q ${DISTDIR}/${CARGO_DIST_SUBDIR}/${_crate}.tar.gz) \ > ${CARGO_VENDOR_DIR}/${_crate}/.cargo-checksum.json .endfor +_CARGO_GIT_PATCH_CARGOTOML= .if ${CARGO_USE_GITHUB:tl} == "yes" -_USES_patch+= 600:cargo-patch-github - -.for _group in ${GH_TUPLE:C@^[^:]*:[^:]*:[^:]*:(([^:/]*)?)((/.*)?)@\2@} -_CARGO_GH_PATCH_CARGOTOML:= ${_CARGO_GH_PATCH_CARGOTOML} \ +. for _group in ${GH_TUPLE:C@^[^:]*:[^:]*:[^:]*:(([^:/]*)?)((/.*)?)@\2@} +_CARGO_GIT_PATCH_CARGOTOML:= ${_CARGO_GIT_PATCH_CARGOTOML} \ -e 's@git = "(https|http|git)://github.com/${GH_ACCOUNT_${_group}}/${GH_PROJECT_${_group}}(\.git)?"@path = "${WRKSRC_${_group}}"@' -.endfor +. endfor +.endif +.if ${CARGO_USE_GITLAB:tl} == "yes" +. for _group in ${GL_TUPLE:C@^(([^:]*://[^:/]*(:[0-9]{1,5})?(/[^:]*[^/])?:)?)([^:]*):([^:]*):([^:]*)(:[^:/]*)((/.*)?)@\8@:S/^://} +_CARGO_GIT_PATCH_CARGOTOML:= ${_CARGO_GIT_PATCH_CARGOTOML} \ + -e 's@git = "${GL_SITE_${_group}}/${GL_ACCOUNT_${_group}}/${GL_PROJECT_${_group}}(\.git)?"@path = "${WRKSRC_${_group}}"@' +. endfor +.endif -cargo-patch-github: - @${SED} -i.dist -E ${_CARGO_GH_PATCH_CARGOTOML} ${CARGO_GH_CARGOTOML} +.if !empty(_CARGO_GIT_PATCH_CARGOTOML) +_USES_patch+= 600:cargo-patch-git + +cargo-patch-git: + @${FIND} ${WRKDIR} -name Cargo.toml -type f -exec \ + ${SED} -i.dist -E ${_CARGO_GIT_PATCH_CARGOTOML} {} + .endif .if !target(do-configure) && ${CARGO_CONFIGURE:tl} == "yes" # configure hook. Place a config file for overriding crates-io index # by local source directory. do-configure: @${MKDIR} ${WRKDIR}/.cargo @${ECHO_CMD} "[source.cargo]" > ${WRKDIR}/.cargo/config @${ECHO_CMD} "directory = '${CARGO_VENDOR_DIR}'" >> ${WRKDIR}/.cargo/config @${ECHO_CMD} "[source.crates-io]" >> ${WRKDIR}/.cargo/config @${ECHO_CMD} "replace-with = 'cargo'" >> ${WRKDIR}/.cargo/config @if ! ${GREP} -qF '[profile.release]' ${CARGO_CARGOTOML}; then \ ${ECHO_CMD} "" >> ${CARGO_CARGOTOML}; \ ${ECHO_CMD} "[profile.release]" >> ${CARGO_CARGOTOML}; \ ${ECHO_CMD} "opt-level = 2" >> ${CARGO_CARGOTOML}; \ ${ECHO_CMD} "debug = false" >> ${CARGO_CARGOTOML}; \ fi @${CARGO_CARGO_RUN} update \ --manifest-path ${CARGO_CARGOTOML} \ --verbose \ ${CARGO_UPDATE_ARGS} .endif .if !target(do-build) && ${CARGO_BUILD:tl} == "yes" do-build: @${CARGO_CARGO_RUN} build \ --manifest-path ${CARGO_CARGOTOML} \ --verbose \ ${CARGO_BUILD_ARGS} .endif .if !target(do-install) && ${CARGO_INSTALL:tl} == "yes" do-install: @${CARGO_CARGO_RUN} install \ --path . \ --root "${STAGEDIR}${PREFIX}" \ --verbose \ ${CARGO_INSTALL_ARGS} @${RM} -- "${STAGEDIR}${PREFIX}/.crates.toml" .endif .if !target(do-test) && ${CARGO_TEST:tl} == "yes" do-test: @${CARGO_CARGO_RUN} test \ --manifest-path ${CARGO_CARGOTOML} \ --verbose \ ${CARGO_TEST_ARGS} .endif # # Helper targets for port maintainers # # cargo-crates will output the crates list from Cargo.lock. If there # is no Cargo.lock for some reason, try and generate it first. cargo-crates: extract @if [ ! -r "${CARGO_CARGOLOCK}" ]; then \ ${ECHO_MSG} "===> ${CARGO_CARGOLOCK} not found. Trying to generate it..."; \ ${CARGO_CARGO_RUN} generate-lockfile \ --manifest-path ${CARGO_CARGOTOML} \ --verbose; \ fi @${SETENV} USE_GITHUB=${USE_GITHUB} \ ${AWK} -f ${SCRIPTSDIR}/cargo-crates.awk ${CARGO_CARGOLOCK} # cargo-crates-licenses will try to grab license information from # all downloaded crates. cargo-crates-licenses: configure @${FIND} ${CARGO_VENDOR_DIR} -name 'Cargo.toml' -maxdepth 2 \ -exec ${GREP} -H '^license' {} \; \ | ${SED} \ -e 's@^${CARGO_VENDOR_DIR}/@@' \ -e 's@/Cargo.toml:license.*= *"@|@' \ -e 's@"$$@@g' | sort | /usr/bin/column -t -s '|' .endif Index: head/audio/spotifyd/Makefile =================================================================== --- head/audio/spotifyd/Makefile (revision 496794) +++ head/audio/spotifyd/Makefile (revision 496795) @@ -1,338 +1,328 @@ # $FreeBSD$ PORTNAME= spotifyd DISTVERSIONPREFIX= v DISTVERSION= 0.2.5 CATEGORIES= audio MAINTAINER= tobik@FreeBSD.org COMMENT= Spotify daemon LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENCE LIB_DEPENDS= libogg.so:audio/libogg USES= cargo USE_GITHUB= yes GH_ACCOUNT= Spotifyd GH_TUPLE= plietar:rust-alsa:8c63543fa0ccd971cf15f5675293d19febd6f79e:alsa \ plietar:dns-parser:1d3e5a5591bc72eb061c23bd426c4a25f2f73791:dnsparser \ librespot-org:librespot:daeeeaa122fc2d71edf11e562e23038db4210b39:librespot \ plietar:rust-mdns:66a74033da6c9f1a06e7b0a29f4544fd189d6479:mdns \ awmath:rust-crypto:394c247254dbe2ac5d44483232cf335d10cf0260:rustcrypto \ plietar:rust-tremor:5958cc302e78f535dad90e9665da981ddff4000a:tremor CARGO_CRATES= MacTypes-sys-2.1.0 \ adler32-1.0.3 \ aho-corasick-0.6.9 \ alsa-0.2.1 \ alsa-sys-0.1.2 \ arc-swap-0.3.7 \ arrayvec-0.4.10 \ atty-0.2.11 \ autocfg-0.1.2 \ backtrace-0.3.13 \ backtrace-sys-0.1.28 \ base64-0.10.1 \ base64-0.5.2 \ base64-0.6.0 \ base64-0.9.3 \ bit-set-0.4.0 \ bit-vec-0.4.4 \ bitflags-0.3.3 \ bitflags-0.7.0 \ bitflags-0.9.1 \ bitflags-1.0.4 \ byteorder-0.5.3 \ byteorder-1.3.1 \ bytes-0.4.11 \ c_linked_list-1.1.1 \ cc-1.0.28 \ cfg-if-0.1.6 \ chrono-0.4.6 \ cloudabi-0.0.3 \ core-foundation-0.5.1 \ core-foundation-sys-0.5.1 \ crc32fast-1.1.2 \ crossbeam-0.6.0 \ crossbeam-channel-0.3.6 \ crossbeam-deque-0.6.3 \ crossbeam-epoch-0.7.0 \ crossbeam-utils-0.6.3 \ ctrlc-3.1.1 \ daemonize-0.3.0 \ dbus-0.6.4 \ dbus-tokio-0.2.1 \ derive-error-chain-0.10.1 \ derive_builder-0.5.1 \ derive_builder_core-0.2.0 \ dotenv-0.10.1 \ dtoa-0.4.3 \ either-1.5.0 \ encoding_rs-0.8.14 \ env_logger-0.4.3 \ env_logger-0.5.13 \ error-chain-0.10.0 \ error-chain-0.11.0 \ extprim-1.6.0 \ failure-0.1.5 \ failure_derive-0.1.5 \ fnv-1.0.6 \ foreign-types-0.3.2 \ foreign-types-shared-0.1.1 \ fuchsia-cprng-0.1.0 \ fuchsia-zircon-0.3.3 \ fuchsia-zircon-sys-0.3.3 \ futures-0.1.25 \ futures-cpupool-0.1.8 \ gcc-0.3.55 \ get_if_addrs-0.5.3 \ get_if_addrs-sys-0.1.1 \ getopts-0.2.18 \ h2-0.1.16 \ hostname-0.1.5 \ http-0.1.15 \ httparse-1.3.3 \ humantime-1.2.0 \ hyper-0.11.27 \ hyper-0.12.23 \ hyper-proxy-0.4.1 \ hyper-tls-0.3.1 \ idna-0.1.5 \ indexmap-1.0.2 \ iovec-0.1.2 \ itertools-0.7.11 \ itoa-0.3.4 \ itoa-0.4.3 \ kernel32-sys-0.2.2 \ language-tags-0.2.2 \ lazy_static-0.2.11 \ lazy_static-1.2.0 \ lazycell-1.2.1 \ lewton-0.9.3 \ libc-0.2.49 \ libdbus-sys-0.1.5 \ libflate-0.1.19 \ libpulse-sys-0.0.0 \ linear-map-1.2.0 \ lock_api-0.1.5 \ log-0.3.9 \ log-0.4.6 \ matches-0.1.8 \ memchr-2.1.3 \ memoffset-0.2.1 \ mime-0.3.13 \ mime_guess-2.0.0-alpha.6 \ mio-0.6.16 \ mio-named-pipes-0.1.6 \ mio-uds-0.6.7 \ miow-0.2.1 \ miow-0.3.3 \ multimap-0.4.0 \ native-tls-0.2.2 \ net2-0.2.33 \ nix-0.11.0 \ nix-0.9.0 \ nodrop-0.1.13 \ num-bigint-0.1.44 \ num-integer-0.1.39 \ num-traits-0.1.43 \ num-traits-0.2.6 \ num_cpus-1.9.0 \ ogg-0.7.0 \ ogg-sys-0.0.9 \ openssl-0.10.16 \ openssl-probe-0.1.2 \ openssl-sys-0.9.40 \ owning_ref-0.4.0 \ parking_lot-0.7.1 \ parking_lot_core-0.4.0 \ percent-encoding-1.0.1 \ phf-0.7.24 \ phf_codegen-0.7.24 \ phf_generator-0.7.24 \ phf_shared-0.7.24 \ pkg-config-0.3.14 \ portaudio-rs-0.3.0 \ portaudio-sys-0.1.1 \ proc-macro2-0.4.26 \ protobuf-1.7.4 \ protobuf-2.2.5 \ protobuf-codegen-2.2.5 \ protoc-2.2.5 \ protoc-rust-2.2.5 \ quick-error-1.2.2 \ quote-0.3.15 \ quote-0.6.11 \ rand-0.3.23 \ rand-0.4.6 \ rand-0.5.6 \ rand-0.6.5 \ rand_chacha-0.1.1 \ rand_core-0.3.1 \ rand_core-0.4.0 \ rand_hc-0.1.0 \ rand_isaac-0.1.1 \ rand_jitter-0.1.0 \ rand_os-0.1.1 \ rand_pcg-0.1.1 \ rand_xorshift-0.1.1 \ random-0.12.2 \ rdrand-0.4.0 \ redox_syscall-0.1.51 \ redox_termios-0.1.1 \ regex-0.2.11 \ regex-1.1.0 \ regex-syntax-0.5.6 \ regex-syntax-0.6.5 \ relay-0.1.1 \ remove_dir_all-0.5.1 \ reqwest-0.9.9 \ rpassword-0.3.1 \ rspotify-0.2.5 \ rust-crypto-0.2.36 \ rust-ini-0.10.3 \ rustc-demangle-0.1.13 \ rustc-serialize-0.3.24 \ rustc_version-0.2.3 \ ryu-0.2.7 \ safemem-0.2.0 \ safemem-0.3.0 \ schannel-0.1.14 \ scoped-tls-0.1.2 \ scopeguard-0.3.3 \ security-framework-0.2.2 \ security-framework-sys-0.2.3 \ semver-0.9.0 \ semver-parser-0.7.0 \ serde-0.9.15 \ serde-1.0.85 \ serde_codegen_internals-0.14.2 \ serde_derive-0.9.15 \ serde_derive-1.0.85 \ serde_json-0.9.10 \ serde_json-1.0.37 \ serde_urlencoded-0.5.4 \ shannon-0.2.0 \ signal-hook-0.1.7 \ simplelog-0.4.4 \ siphasher-0.2.3 \ slab-0.3.0 \ slab-0.4.2 \ smallvec-0.2.1 \ smallvec-0.6.8 \ socket2-0.2.4 \ socket2-0.3.8 \ stable_deref_trait-1.1.1 \ string-0.1.3 \ syn-0.11.11 \ syn-0.15.26 \ synom-0.11.3 \ synstructure-0.10.1 \ syslog-3.3.0 \ take-0.1.0 \ tempfile-2.2.0 \ tempfile-3.0.5 \ term-0.4.6 \ termcolor-1.0.4 \ termion-1.5.1 \ termios-0.2.2 \ thread_local-0.3.6 \ time-0.1.42 \ tokio-0.1.15 \ tokio-codec-0.1.1 \ tokio-core-0.1.17 \ tokio-current-thread-0.1.4 \ tokio-executor-0.1.6 \ tokio-fs-0.1.5 \ tokio-io-0.1.11 \ tokio-process-0.2.3 \ tokio-proto-0.1.1 \ tokio-reactor-0.1.8 \ tokio-service-0.1.0 \ tokio-signal-0.1.5 \ tokio-signal-0.2.7 \ tokio-sync-0.1.0 \ tokio-tcp-0.1.3 \ tokio-threadpool-0.1.11 \ tokio-timer-0.2.9 \ tokio-udp-0.1.3 \ tokio-uds-0.2.5 \ try-lock-0.1.0 \ try-lock-0.2.2 \ ucd-util-0.1.3 \ unicase-1.4.2 \ unicase-2.2.0 \ unicode-bidi-0.3.4 \ unicode-normalization-0.1.8 \ unicode-width-0.1.5 \ unicode-xid-0.0.4 \ unicode-xid-0.1.0 \ unix_socket-0.5.0 \ unreachable-1.0.0 \ url-1.7.2 \ utf8-ranges-1.0.2 \ uuid-0.4.0 \ uuid-0.7.1 \ vcpkg-0.2.6 \ vergen-0.1.1 \ version_check-0.1.5 \ void-1.0.2 \ want-0.0.4 \ want-0.0.6 \ webbrowser-0.2.2 \ winapi-0.2.8 \ winapi-0.3.6 \ winapi-build-0.1.1 \ winapi-i686-pc-windows-gnu-0.4.0 \ winapi-util-0.1.2 \ winapi-x86_64-pc-windows-gnu-0.4.0 \ wincolor-1.0.1 \ winutil-0.1.1 \ ws2_32-sys-0.2.1 \ xdg-2.2.0 CARGO_USE_GITHUB= yes -CARGO_GH_CARGOTOML= ${CARGO_CARGOTOML} \ - ${WRKSRC_alsa}/Cargo.toml \ - ${WRKSRC_dnsparser}/Cargo.toml \ - ${WRKSRC_librespot}/audio/Cargo.toml \ - ${WRKSRC_librespot}/Cargo.toml \ - ${WRKSRC_librespot}/connect/Cargo.toml \ - ${WRKSRC_librespot}/playback/Cargo.toml \ - ${WRKSRC_mdns}/Cargo.toml \ - ${WRKSRC_rustcrypto}/Cargo.toml \ - ${WRKSRC_tremor}/Cargo.toml CARGO_BUILD_ARGS= --no-default-features CARGO_INSTALL_ARGS= --no-default-features CARGO_TEST_ARGS= --no-default-features PLIST_FILES= bin/spotifyd PORTDOCS= README.md OPTIONS_DEFINE= DBUS DOCS PORTAUDIO PULSEAUDIO OPTIONS_DEFAULT= PORTAUDIO DBUS_DESC= D-Bus MPRIS support DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus DBUS_VARS= CARGO_FEATURES+=dbus_mpris PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio PORTAUDIO_VARS= CARGO_FEATURES+=portaudio_backend PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_VARS= CARGO_FEATURES+=pulseaudio_backend post-patch: @${REINPLACE_CMD} 's,/etc/,${PREFIX}/etc/,g' ${WRKSRC}/src/config.rs post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/spotifyd post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} .include Index: head/devel/bingrep/Makefile =================================================================== --- head/devel/bingrep/Makefile (revision 496794) +++ head/devel/bingrep/Makefile (revision 496795) @@ -1,81 +1,80 @@ # $FreeBSD$ PORTNAME= bingrep PORTVERSION= g20171111 PORTREVISION= 8 CATEGORIES= devel MAINTAINER= ports@FreeBSD.org COMMENT= Grep through binaries LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE USES= cargo USE_GITHUB= yes GH_ACCOUNT= m4b GH_TAGNAME= a1ac993e44260bcd3b152a5a274ee386e264e479 GH_TUPLE= m4b:goblin:3575947292644797dd81b471ab4ac4cb88615a9a:goblin \ m4b:metagoblin:308e7d7ec3b1c61b859ff1b46e021178eac187f4:metagoblin CARGO_CRATES= aho-corasick-0.6.3 \ ansi_term-0.9.0 \ atty-0.2.2 \ bitflags-0.7.0 \ bitflags-0.9.1 \ byteorder-1.1.0 \ clap-2.26.0 \ csv-0.15.0 \ encode_unicode-0.3.1 \ env_logger-0.4.3 \ fuchsia-zircon-0.2.1 \ fuchsia-zircon-sys-0.2.0 \ hexplay-0.2.0 \ kernel32-sys-0.2.2 \ lazy_static-0.2.8 \ libc-0.2.49 \ log-0.3.8 \ memchr-1.0.1 \ memrange-0.1.3 \ plain-0.2.1 \ prettytable-rs-0.6.7 \ quote-0.3.15 \ rand-0.3.18 \ redox_syscall-0.1.31 \ regex-0.2.2 \ regex-syntax-0.4.1 \ rustc-demangle-0.1.5 \ rustc-serialize-0.3.24 \ scroll-0.7.0 \ scroll_derive-0.8.0 \ strsim-0.6.0 \ structopt-0.0.5 \ structopt-derive-0.0.5 \ syn-0.11.11 \ synom-0.11.3 \ term-0.4.6 \ term_size-0.3.0 \ termcolor-0.3.2 \ textwrap-0.7.0 \ theban_interval_tree-0.7.1 \ thread_local-0.3.4 \ time-0.1.38 \ unicode-segmentation-1.2.0 \ unicode-width-0.1.4 \ unicode-xid-0.0.4 \ unreachable-1.0.0 \ utf8-ranges-1.0.0 \ vec_map-0.8.0 \ void-1.0.2 \ winapi-0.2.8 \ winapi-build-0.1.1 \ wincolor-0.1.4 CARGO_USE_GITHUB= yes -CARGO_GH_CARGOTOML= ${WRKSRC}/Cargo.toml ${WRKSRC_metagoblin}/Cargo.toml PLIST_FILES= bin/bingrep post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/bingrep .include