Index: head/lang/rust-nightly/Makefile =================================================================== --- head/lang/rust-nightly/Makefile (revision 509172) +++ head/lang/rust-nightly/Makefile (revision 509173) @@ -1,38 +1,38 @@ # Created by: Jean-Sébastien Pédron # $FreeBSD$ PORTVERSION= 1.39.0.${NIGHTLY_DATE:C,-,,g} # Always set PORTREVISION explicitly as otherwise it is inherited from lang/rust -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -nightly DISTNAME= rustc-nightly-src MASTERDIR= ${.CURDIR}/../rust PATCHDIR= ${.CURDIR}/files DISTINFO_FILE= ${.CURDIR}/distinfo CONFLICTS_INSTALL= rust # Which source to pull: # https://static.rust-lang.org/dist/${NIGHTLY_DATE}/rustc-nightly-src.tar.gz # https://static.rust-lang.org/dist/channel-rust-nightly.toml NIGHTLY_DATE= 2019-08-17 NIGHTLY_SUBDIR= ${NIGHTLY_DATE}/ # See WRKSRC/src/stage0.txt for this date BOOTSTRAPS_DATE= 2019-08-13 RUST_BOOTSTRAP_VERSION= beta CARGO_BOOTSTRAP_VERSION= beta CARGO_VENDOR_DIR= ${WRKSRC}/vendor # Other bootstraps aren't provided by upstream yet ONLY_FOR_ARCHS= amd64 i386 post-configure: nightly-post-configure nightly-post-configure: # Don't abort if optional tools fail to build # https://github.com/rust-lang/rust/commit/53254a888b42 @${ECHO_CMD} 'missing-tools = true' >>${WRKSRC}/config.toml .include "${MASTERDIR}/Makefile" Index: head/lang/rust-nightly/files/patch-vendor_libgit2-sys_lib.rs =================================================================== --- head/lang/rust-nightly/files/patch-vendor_libgit2-sys_lib.rs (nonexistent) +++ head/lang/rust-nightly/files/patch-vendor_libgit2-sys_lib.rs (revision 509173) @@ -0,0 +1,30 @@ +Revert to libgit2 0.28 API per https://github.com/rust-lang/git2-rs/issues/458 + +--- vendor/libgit2-sys/lib.rs.orig 2019-08-16 20:27:18.000000000 +0000 ++++ vendor/libgit2-sys/lib.rs 2019-08-17 19:47:11.087276682 +0000 +@@ -331,7 +331,6 @@ pub struct git_remote_callbacks { + pub push_negotiation: Option, + pub transport: Option, + pub payload: *mut c_void, +- pub resolve_url: Option, + } + + #[repr(C)] +@@ -385,8 +384,6 @@ pub type git_push_negotiation = + + pub type git_push_update_reference_cb = + extern "C" fn(*const c_char, *const c_char, *mut c_void) -> c_int; +-pub type git_url_resolve_cb = +- extern "C" fn(*mut git_buf, *const c_char, c_int, *mut c_void) -> c_int; + + #[repr(C)] + pub struct git_push_update { +@@ -2233,7 +2230,7 @@ extern "C" { + source: *const git_tree, + ) -> c_int; + pub fn git_treebuilder_clear(bld: *mut git_treebuilder); +- pub fn git_treebuilder_entrycount(bld: *mut git_treebuilder) -> size_t; ++ pub fn git_treebuilder_entrycount(bld: *mut git_treebuilder) -> c_uint; + pub fn git_treebuilder_free(bld: *mut git_treebuilder); + pub fn git_treebuilder_get( + bld: *mut git_treebuilder, Property changes on: head/lang/rust-nightly/files/patch-vendor_libgit2-sys_lib.rs ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property