Index: head/Mk/Uses/cargo.mk =================================================================== --- head/Mk/Uses/cargo.mk (revision 472372) +++ head/Mk/Uses/cargo.mk (revision 472373) @@ -1,226 +1,270 @@ # $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 # Define MASTER_SITES_CRATESIO for crates.io MASTER_SITES_CRATESIO= https://crates.io/api/v1/crates # Save crates inside ${DISTDIR}/rust/crates by default. CARGO_DIST_SUBDIR?= rust/crates # Generate list of DISTFILES. .for _crate in ${CARGO_CRATES} MASTER_SITES+= ${MASTER_SITES_CRATESIO}/${_crate:C/-[0-9].*$//}/${_crate:C/^.*-([0-9].*)/\1/}/download?dummy=/: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>=1.19.0_2:lang/rust .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 # # XXX LDFLAGS => -C link-arg=$1 (via RUSTFLAGS) 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}" # 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 # 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 CARGO_USE_GITHUB?= 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: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: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 + +.if ${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= ${CARGO_CRATES:Mlibc-[0-9]*: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-0.2.37 or older maybe unstable on FreeBSD 12.0. Consider updating to the latest version." +. endif +.undef _libc_VER +.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]*} +# 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-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 +.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 .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} \ -e 's@git = "(https|http|git)://github.com/${GH_ACCOUNT_${_group}}/${GH_PROJECT_${_group}}(\.git)?"@path = "${WRKSRC_${_group}}"@' .endfor cargo-patch-github: @${SED} -i.dist -E ${_CARGO_GH_PATCH_CARGOTOML} ${CARGO_GH_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 \ --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. cargo-crates: extract @${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' | /usr/bin/column -t -s '|' + -e 's@"$$@@g' | sort | /usr/bin/column -t -s '|' .endif Index: head/devel/pijul/Makefile =================================================================== --- head/devel/pijul/Makefile (revision 472372) +++ head/devel/pijul/Makefile (revision 472373) @@ -1,220 +1,218 @@ # Created by: Carlo Strub # $FreeBSD$ PORTNAME= pijul PORTVERSION= 0.10.0 CATEGORIES= devel MASTER_SITES= https://pijul.org/releases/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= cs@FreeBSD.org COMMENT= Distributed version control system LICENSE= GPLv2 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 - -USES= cargo gmake ssl +USES= cargo CARGO_CRATES= adler32-1.0.2 \ advapi32-sys-0.2.0 \ aho-corasick-0.6.4 \ ansi_term-0.11.0 \ arrayvec-0.4.7 \ atty-0.2.8 \ backtrace-0.3.6 \ backtrace-sys-0.1.16 \ base64-0.8.0 \ base64-0.9.0 \ bincode-0.8.0 \ bit-vec-0.4.4 \ bitflags-0.9.1 \ bitflags-1.0.1 \ bs58-0.2.0 \ build_const-0.2.1 \ byteorder-1.2.2 \ bytes-0.4.6 \ cc-1.0.10 \ cfg-if-0.1.2 \ chrono-0.4.2 \ clap-2.31.2 \ core-foundation-0.2.3 \ core-foundation-sys-0.2.3 \ crc-1.7.0 \ crossbeam-0.2.12 \ crossbeam-deque-0.3.0 \ crossbeam-epoch-0.4.1 \ crossbeam-utils-0.2.2 \ crossbeam-utils-0.3.2 \ cryptovec-0.4.4 \ dtoa-0.4.2 \ encoding_rs-0.7.2 \ env_logger-0.4.3 \ env_logger-0.5.8 \ errno-0.2.3 \ error-chain-0.11.0 \ filetime-0.2.0 \ flate2-1.0.1 \ fnv-1.0.6 \ foreign-types-0.3.2 \ foreign-types-shared-0.1.1 \ fs2-0.4.3 \ fuchsia-zircon-0.3.3 \ fuchsia-zircon-sys-0.3.3 \ futures-0.1.21 \ futures-cpupool-0.1.8 \ getch-0.2.0 \ globset-0.2.1 \ hex-0.3.2 \ httparse-1.2.4 \ humantime-1.1.1 \ hyper-0.11.25 \ hyper-tls-0.1.3 \ idna-0.1.4 \ ignore-0.3.1 \ iovec-0.1.2 \ isatty-0.1.7 \ itoa-0.3.4 \ itoa-0.4.1 \ kernel32-sys-0.2.2 \ language-tags-0.2.2 \ lazy_static-0.2.11 \ lazy_static-1.0.0 \ lazycell-0.6.0 \ libc-0.2.40 \ libflate-0.1.14 \ libpijul-0.10.1 \ line-0.1.1 \ log-0.3.9 \ log-0.4.1 \ matches-0.1.6 \ memchr-2.0.1 \ memmap-0.6.2 \ memoffset-0.2.1 \ mime-0.3.5 \ mime_guess-2.0.0-alpha.4 \ miniz-sys-0.1.10 \ mio-0.6.14 \ mio-uds-0.6.4 \ miow-0.2.1 \ native-tls-0.1.5 \ net2-0.2.32 \ nodrop-0.1.12 \ num-0.1.42 \ num-bigint-0.1.43 \ num-complex-0.1.43 \ num-integer-0.1.36 \ num-iter-0.1.35 \ num-rational-0.1.42 \ num-traits-0.1.43 \ num-traits-0.2.2 \ num_cpus-1.8.0 \ openssl-0.10.6 \ openssl-0.9.24 \ openssl-sys-0.9.28 \ pager-0.14.0 \ percent-encoding-1.0.1 \ phf-0.7.21 \ phf_codegen-0.7.21 \ phf_generator-0.7.21 \ phf_shared-0.7.21 \ pkg-config-0.3.9 \ proc-macro2-0.3.6 \ progrs-0.1.1 \ quick-error-1.2.1 \ quote-0.5.1 \ rand-0.3.22 \ rand-0.4.2 \ redox_syscall-0.1.37 \ redox_termios-0.1.1 \ regex-0.2.10 \ regex-syntax-0.5.5 \ relay-0.1.1 \ remove_dir_all-0.5.1 \ reqwest-0.8.5 \ rpassword-2.0.0 \ rustc-demangle-0.1.7 \ rustc-serialize-0.3.24 \ safemem-0.2.0 \ same-file-1.0.2 \ sanakirja-0.8.16 \ schannel-0.1.12 \ scoped-tls-0.1.1 \ scopeguard-0.3.3 \ security-framework-0.1.16 \ security-framework-sys-0.1.16 \ serde-1.0.41 \ serde_derive-1.0.41 \ serde_derive_internals-0.23.1 \ serde_json-1.0.15 \ serde_urlencoded-0.5.1 \ shell-escape-0.1.4 \ siphasher-0.2.2 \ slab-0.3.0 \ slab-0.4.0 \ smallvec-0.2.1 \ strsim-0.7.0 \ syn-0.13.1 \ take-0.1.0 \ tar-0.4.15 \ tempdir-0.3.7 \ term-0.5.1 \ termcolor-0.3.6 \ termion-1.5.1 \ termios-0.2.2 \ textwrap-0.9.0 \ thread_local-0.3.5 \ thrussh-0.19.5 \ thrussh-keys-0.9.5 \ thrussh-libsodium-0.1.3 \ time-0.1.39 \ tokio-0.1.5 \ tokio-core-0.1.17 \ tokio-executor-0.1.2 \ tokio-io-0.1.6 \ tokio-proto-0.1.1 \ tokio-reactor-0.1.1 \ tokio-service-0.1.0 \ tokio-tcp-0.1.0 \ tokio-threadpool-0.1.2 \ tokio-timer-0.2.1 \ tokio-tls-0.1.4 \ tokio-udp-0.1.0 \ tokio-uds-0.1.7 \ toml-0.4.6 \ ucd-util-0.1.1 \ unicase-1.4.2 \ unicase-2.1.0 \ unicode-bidi-0.3.4 \ unicode-normalization-0.1.5 \ unicode-width-0.1.4 \ unicode-xid-0.1.0 \ unreachable-1.0.0 \ url-1.7.0 \ username-0.2.0 \ utf8-ranges-1.0.0 \ utf8parse-0.1.0 \ uuid-0.5.1 \ vcpkg-0.2.3 \ vec_map-0.8.0 \ version_check-0.1.3 \ void-1.0.2 \ walkdir-2.1.4 \ winapi-0.2.8 \ winapi-0.3.4 \ winapi-build-0.1.1 \ winapi-i686-pc-windows-gnu-0.4.0 \ winapi-x86_64-pc-windows-gnu-0.4.0 \ wincolor-0.1.6 \ ws2_32-sys-0.2.1 \ xattr-0.2.1 \ yasna-0.1.3 \ PLIST_FILES= bin/pijul WRKSRC_SUBDIR= pijul post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/pijul .include Index: head/sysutils/flowgger/Makefile =================================================================== --- head/sysutils/flowgger/Makefile (revision 472372) +++ head/sysutils/flowgger/Makefile (revision 472373) @@ -1,127 +1,126 @@ # $FreeBSD$ PORTNAME= flowgger DISTVERSION= 0.2.6-28 DISTVERSIONSUFFIX= -gab572a0 PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= ports@FreeBSD.org COMMENT= Fast data collector 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 \ zonyitoo:coio-rs:f5f6f4044a7cceff387ace0f04ffeb3bc3ab979a:coio \ spicavigo:kafka-rust:9a3b427bd702810bcd13cf60e58cb18d5f403c1a:kafka # Bumped openssl crates to 0.9.21 manually to support LibreSSL 2.6.x CARGO_CRATES= ansi_term-0.9.0 \ atty-0.2.2 \ backtrace-0.3.3 \ backtrace-sys-0.1.14 \ bitflags-0.7.0 \ bitflags-0.9.1 \ build_const-0.2.0 \ byteorder-0.5.3 \ byteorder-1.1.0 \ capnp-0.8.11 \ capnpc-0.8.7 \ cargo_metadata-0.2.3 \ cc-1.0.0 \ cfg-if-0.1.2 \ chrono-0.4.0 \ clap-2.26.2 \ context-2.0.0 \ conv-0.3.3 \ crc-1.5.0 \ crc-core-0.1.0 \ custom_derive-0.1.7 \ dbghelp-sys-0.2.0 \ deque-0.3.2 \ dtoa-0.2.2 \ dtoa-0.4.2 \ either-1.1.0 \ error-chain-0.10.0 \ flate2-0.2.20 \ fnv-1.0.5 \ foreign-types-0.2.0 \ gcc-0.3.54 \ getopts-0.2.15 \ idna-0.1.4 \ iovec-0.1.0 \ itertools-0.6.3 \ itoa-0.1.1 \ itoa-0.3.4 \ kernel32-sys-0.2.2 \ lazy_static-0.2.8 \ lazycell-0.5.1 \ libc-0.2.40 \ linked-hash-map-0.4.2 \ log-0.3.8 \ magenta-0.1.1 \ magenta-sys-0.1.1 \ matches-0.1.6 \ miniz-sys-0.1.10 \ mio-0.6.10 \ miow-0.2.1 \ net2-0.2.31 \ num-0.1.40 \ num-integer-0.1.35 \ num-iter-0.1.34 \ num-traits-0.1.40 \ openssl-0.9.21 \ openssl-sys-0.9.21 \ percent-encoding-1.0.0 \ pkg-config-0.3.9 \ pulldown-cmark-0.0.15 \ quine-mc_cluskey-0.2.4 \ quote-0.3.15 \ rand-0.3.16 \ redis-0.8.0 \ redox_syscall-0.1.31 \ ref_slice-1.1.1 \ regex-syntax-0.4.1 \ rustc-demangle-0.1.5 \ rustc-serialize-0.3.24 \ semver-0.6.0 \ semver-parser-0.7.0 \ serde-0.8.23 \ serde-1.0.15 \ serde_derive-1.0.15 \ serde_derive_internals-0.16.0 \ serde_json-0.8.6 \ serde_json-1.0.3 \ sha1-0.2.0 \ slab-0.3.0 \ snap-0.2.2 \ strsim-0.6.0 \ syn-0.11.11 \ synom-0.11.3 \ term_size-0.3.0 \ textwrap-0.8.0 \ time-0.1.38 \ toml-0.2.1 \ toml-0.4.5 \ twox-hash-1.1.0 \ unicode-bidi-0.3.4 \ unicode-normalization-0.1.5 \ unicode-width-0.1.4 \ unicode-xid-0.0.4 \ url-1.5.1 \ vcpkg-0.2.2 \ vec_map-0.8.0 \ winapi-0.2.8 \ winapi-build-0.1.1 \ ws2_32-sys-0.2.1 CARGO_USE_GITHUB= yes post-install: ${INSTALL_DATA} ${WRKSRC}/flowgger.toml ${STAGEDIR}${PREFIX}/etc/flowgger.toml.sample .include Index: head/textproc/bat/Makefile =================================================================== --- head/textproc/bat/Makefile (revision 472372) +++ head/textproc/bat/Makefile (revision 472373) @@ -1,121 +1,118 @@ # $FreeBSD$ PORTNAME= bat DISTVERSIONPREFIX= v DISTVERSION= 0.4.1 CATEGORIES= textproc MAINTAINER= pizzamig@FreeBSD.org COMMENT= Clone of cat with syntax highlighting LICENSE= APACHE20 -LIB_DEPENDS= libonig.so:devel/oniguruma -CARGO_ENV+= RUSTONIG_SYSTEM_LIBONIG=1 - -USES= cargo cmake:noninja +USES= cargo USE_GITHUB= yes GH_ACCOUNT= sharkdp PLIST_FILES= bin/bat CARGO_CRATES= aho-corasick-0.6.4 \ ansi_term-0.10.2 \ ansi_term-0.11.0 \ atty-0.2.10 \ base64-0.8.0 \ bincode-1.0.0 \ bitflags-1.0.3 \ byteorder-1.2.2 \ bytes-0.4.7 \ cc-1.0.15 \ cfg-if-0.1.3 \ chrono-0.4.2 \ clap-2.31.2 \ clicolors-control-0.2.0 \ cmake-0.1.31 \ console-0.6.1 \ directories-0.10.0 \ dtoa-0.4.2 \ duct-0.10.0 \ error-chain-0.11.0 \ flate2-1.0.1 \ fnv-1.0.6 \ fuchsia-zircon-0.3.3 \ fuchsia-zircon-sys-0.3.3 \ gcc-0.3.54 \ git2-0.7.1 \ idna-0.1.4 \ iovec-0.1.2 \ itoa-0.4.1 \ kernel32-sys-0.2.2 \ lazy_static-0.2.11 \ lazy_static-1.0.0 \ lazycell-0.6.0 \ libc-0.2.40 \ libgit2-sys-0.7.1 \ libz-sys-1.0.18 \ linked-hash-map-0.5.1 \ log-0.4.1 \ matches-0.1.6 \ memchr-2.0.1 \ miniz-sys-0.1.10 \ nix-0.10.0 \ num-integer-0.1.36 \ num-traits-0.2.2 \ onig-3.2.2 \ onig_sys-68.0.1 \ os_pipe-0.6.1 \ owning_ref-0.3.3 \ parking_lot-0.5.5 \ parking_lot_core-0.2.14 \ percent-encoding-1.0.1 \ pkg-config-0.3.11 \ plist-0.2.4 \ proc-macro2-0.3.8 \ quote-0.5.2 \ rand-0.4.2 \ redox_syscall-0.1.37 \ redox_termios-0.1.1 \ regex-0.2.11 \ regex-syntax-0.4.2 \ regex-syntax-0.5.6 \ safemem-0.2.0 \ same-file-1.0.2 \ serde-1.0.51 \ serde_derive-1.0.51 \ serde_json-1.0.17 \ shared_child-0.3.2 \ smallvec-0.6.1 \ stable_deref_trait-1.0.0 \ strsim-0.7.0 \ syn-0.13.7 \ syntect-2.1.0 \ term_size-0.3.1 \ termion-1.5.1 \ termios-0.2.2 \ textwrap-0.9.0 \ thread_local-0.3.5 \ time-0.1.39 \ ucd-util-0.1.1 \ unicode-bidi-0.3.4 \ unicode-normalization-0.1.6 \ unicode-width-0.1.4 \ unicode-xid-0.1.0 \ unreachable-1.0.0 \ url-1.7.0 \ utf8-ranges-1.0.0 \ vcpkg-0.2.3 \ void-1.0.2 \ walkdir-2.1.4 \ winapi-0.2.8 \ winapi-0.3.4 \ winapi-build-0.1.1 \ winapi-i686-pc-windows-gnu-0.4.0 \ winapi-x86_64-pc-windows-gnu-0.4.0 \ xml-rs-0.7.0 \ yaml-rust-0.4.0 post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/bat .include Index: head/x11/alacritty/Makefile =================================================================== --- head/x11/alacritty/Makefile (revision 472372) +++ head/x11/alacritty/Makefile (revision 472373) @@ -1,201 +1,199 @@ # $FreeBSD$ PORTNAME= alacritty PORTVERSION= g20180126 PORTREVISION= 3 CATEGORIES= x11 MAINTAINER= zeising@FreeBSD.org COMMENT= GPU-accelerated terminal emulator 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 GH_ACCOUNT= jwilm GH_TAGNAME= b82622e9948d1c90fc628739c7f328816214fb33 GH_TUPLE= jwilm:rust-fontconfig:be2b94de833ec69cf767186262a5fb8360fa5b45:servofontconfig \ jwilm:libfontconfig:5c1845e1bffa11cf4d3e6fb27f456bf5c814ce1b:servofontconfigsys PLIST_FILES= bin/alacritty \ ${DESKTOPDIR:S,^${PREFIX}/,,}/Alacritty.desktop CARGO_CRATES= aho-corasick-0.6.4 \ android_glue-0.2.3 \ ansi_term-0.10.2 \ approx-0.1.1 \ arraydeque-0.2.3 \ atty-0.2.6 \ base64-0.9.0 \ bitflags-0.4.0 \ bitflags-0.7.0 \ bitflags-0.8.2 \ bitflags-0.9.1 \ bitflags-1.0.1 \ block-0.1.6 \ byteorder-1.2.1 \ bytes-0.3.0 \ cargo_metadata-0.2.3 \ cc-1.0.4 \ cfg-if-0.1.2 \ cgl-0.2.1 \ cgmath-0.16.0 \ chrono-0.4.0 \ clap-2.29.2 \ clippy-0.0.182 \ clippy_lints-0.0.182 \ cmake-0.1.29 \ cocoa-0.13.0 \ core-foundation-0.4.6 \ core-foundation-sys-0.4.6 \ core-graphics-0.12.4 \ core-text-8.0.0 \ dlib-0.4.0 \ dtoa-0.4.2 \ dwmapi-sys-0.1.1 \ either-1.4.0 \ env_logger-0.5.3 \ errno-0.2.3 \ euclid-0.16.2 \ expat-sys-2.1.5 \ filetime-0.1.15 \ fnv-1.0.6 \ foreign-types-0.3.2 \ foreign-types-shared-0.1.1 \ freetype-rs-0.13.0 \ freetype-sys-0.4.0 \ fsevent-0.2.17 \ fsevent-sys-0.1.6 \ fuchsia-zircon-0.3.3 \ fuchsia-zircon-sys-0.3.3 \ gdi32-sys-0.1.2 \ getopts-0.2.17 \ gl_generator-0.7.0 \ gl_generator-0.8.0 \ gleam-0.4.20 \ glutin-0.12.0 \ idna-0.1.4 \ if_chain-0.1.2 \ inotify-0.3.0 \ iovec-0.1.1 \ itertools-0.6.5 \ itoa-0.3.4 \ kernel32-sys-0.2.2 \ khronos_api-2.0.0 \ lazy_static-1.0.0 \ lazycell-0.4.0 \ lazycell-0.6.0 \ libc-0.2.40 \ libloading-0.4.3 \ libz-sys-1.0.18 \ linked-hash-map-0.5.0 \ log-0.3.9 \ log-0.4.1 \ malloc_buf-0.0.6 \ matches-0.1.6 \ memchr-2.0.1 \ memmap-0.6.2 \ mio-0.5.1 \ mio-0.6.12 \ mio-more-0.1.0 \ miow-0.1.5 \ miow-0.2.1 \ net2-0.2.31 \ nix-0.5.1 \ nodrop-0.1.12 \ notify-4.0.3 \ num-0.1.41 \ num-integer-0.1.35 \ num-iter-0.1.34 \ num-traits-0.1.42 \ objc-0.2.2 \ objc-foundation-0.1.1 \ objc_id-0.1.0 \ odds-0.2.26 \ osmesa-sys-0.1.2 \ owning_ref-0.3.3 \ parking_lot-0.5.3 \ parking_lot_core-0.2.10 \ percent-encoding-1.0.1 \ pkg-config-0.3.9 \ pulldown-cmark-0.0.15 \ quine-mc_cluskey-0.2.4 \ quote-0.3.15 \ rand-0.3.20 \ rand-0.4.2 \ redox_syscall-0.1.37 \ redox_termios-0.1.1 \ regex-0.2.5 \ regex-syntax-0.4.2 \ safemem-0.2.0 \ same-file-1.0.2 \ semver-0.6.0 \ semver-parser-0.7.0 \ serde-1.0.27 \ serde_derive-1.0.27 \ serde_derive_internals-0.19.0 \ serde_json-1.0.9 \ serde_yaml-0.7.3 \ shared_library-0.1.8 \ shell32-sys-0.1.2 \ slab-0.1.3 \ slab-0.3.0 \ smallvec-0.6.0 \ stable_deref_trait-1.0.0 \ strsim-0.6.0 \ syn-0.11.11 \ synom-0.11.3 \ tempfile-2.2.0 \ termcolor-0.3.3 \ termion-1.5.1 \ textwrap-0.9.0 \ thread_local-0.3.5 \ time-0.1.39 \ token_store-0.1.2 \ toml-0.4.5 \ unicode-bidi-0.3.4 \ unicode-normalization-0.1.5 \ unicode-width-0.1.4 \ unicode-xid-0.0.4 \ unreachable-1.0.0 \ url-1.6.0 \ user32-sys-0.1.3 \ utf8-ranges-1.0.0 \ utf8parse-0.1.0 \ vcpkg-0.2.2 \ vec_map-0.8.0 \ void-1.0.2 \ vte-0.3.2 \ walkdir-2.0.1 \ wayland-client-0.12.5 \ wayland-kbd-0.13.1 \ wayland-protocols-0.12.5 \ wayland-scanner-0.12.5 \ wayland-sys-0.12.5 \ wayland-window-0.13.2 \ winapi-0.2.8 \ winapi-0.3.4 \ winapi-build-0.1.1 \ winapi-i686-pc-windows-gnu-0.4.0 \ winapi-x86_64-pc-windows-gnu-0.4.0 \ wincolor-0.1.4 \ winit-0.10.0 \ ws2_32-sys-0.2.1 \ x11-dl-2.17.2 \ xdg-2.1.0 \ xml-rs-0.7.0 \ yaml-rust-0.4.0 CARGO_USE_GITHUB= yes CARGO_GH_CARGOTOML= ${CARGO_CARGOTOML} \ ${WRKSRC}/font/Cargo.toml \ ${WRKSRC_servofontconfig}/Cargo.toml post-install: ${INSTALL_DATA} ${WRKSRC}/Alacritty.desktop ${STAGEDIR}${DESKTOPDIR} .include