Index: head/lang/rust/files/patch-src_vendor_libc_src_unix_bsd_freebsdlike_freebsd_x86.rs
===================================================================
--- head/lang/rust/files/patch-src_vendor_libc_src_unix_bsd_freebsdlike_freebsd_x86.rs (revision 490600)
+++ head/lang/rust/files/patch-src_vendor_libc_src_unix_bsd_freebsdlike_freebsd_x86.rs (nonexistent)
@@ -1,7 +0,0 @@
---- vendor/libc/src/unix/bsd/freebsdlike/freebsd/x86.rs.orig 2018-06-19 05:52:22 UTC
-+++ vendor/libc/src/unix/bsd/freebsdlike/freebsd/x86.rs
-@@ -1,3 +1,4 @@
-+pub type c_char = i8;
- pub type c_long = i32;
- pub type c_ulong = u32;
- pub type time_t = i32;
Property changes on: head/lang/rust/files/patch-src_vendor_libc_src_unix_bsd_freebsdlike_freebsd_x86.rs
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/lang/rust/files/patch-src_vendor_openssl-sys_build_main.rs
===================================================================
--- head/lang/rust/files/patch-src_vendor_openssl-sys_build_main.rs (revision 490600)
+++ head/lang/rust/files/patch-src_vendor_openssl-sys_build_main.rs (nonexistent)
@@ -1,66 +0,0 @@
-https://github.com/sfackler/rust-openssl/commit/9fd7584a8416
-https://github.com/sfackler/rust-openssl/commit/e75793e8962d
-
---- vendor/openssl-sys/build/main.rs.orig 2018-12-05 01:24:32 UTC
-+++ vendor/openssl-sys/build/main.rs
-@@ -1,9 +1,9 @@
- extern crate cc;
-+#[cfg(feature = "vendored")]
-+extern crate openssl_src;
- extern crate pkg_config;
- #[cfg(target_env = "msvc")]
- extern crate vcpkg;
--#[cfg(feature = "vendored")]
--extern crate openssl_src;
-
- use std::collections::HashSet;
- use std::env;
-@@ -103,20 +103,23 @@ fn main() {
-
- #[cfg(feature = "vendored")]
- mod imp {
-- use std::path::PathBuf;
-- use openssl_src;
-+ use openssl_src;
-+ use std::path::PathBuf;
-
-- pub fn get_openssl(_target: &str) -> (PathBuf, PathBuf) {
-- let artifacts = openssl_src::Build::new().build();
-- (artifacts.lib_dir().to_path_buf(), artifacts.include_dir().to_path_buf())
-- }
-+ pub fn get_openssl(_target: &str) -> (PathBuf, PathBuf) {
-+ let artifacts = openssl_src::Build::new().build();
-+ (
-+ artifacts.lib_dir().to_path_buf(),
-+ artifacts.include_dir().to_path_buf(),
-+ )
-+ }
- }
-
- #[cfg(not(feature = "vendored"))]
- mod imp {
- use pkg_config;
-- use std::path::{Path, PathBuf};
- use std::ffi::OsString;
-+ use std::path::{Path, PathBuf};
- use std::process::{self, Command};
-
- use super::env;
-@@ -500,6 +503,8 @@ See rust-openssl README for more information:
- (7, _) => ('7', 'x'),
- (8, 0) => ('8', '0'),
- (8, 1) => ('8', '1'),
-+ (8, _) => ('8', 'x'),
-+ (9, 0) => ('9', '0'),
- _ => version_error(),
- };
-
-@@ -540,7 +545,7 @@ fn version_error() -> ! {
- "
-
- This crate is only compatible with OpenSSL 1.0.1 through 1.1.1, or LibreSSL 2.5
--through 2.8.1, but a different version of OpenSSL was found. The build is now aborting
-+through 2.9.0, but a different version of OpenSSL was found. The build is now aborting
- due to this version mismatch.
-
- "
Property changes on: head/lang/rust/files/patch-src_vendor_openssl-sys_build_main.rs
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/lang/rust/files/patch-src_vendor_libc_src_unix_bsd_freebsdlike_freebsd_x86__64.rs
===================================================================
--- head/lang/rust/files/patch-src_vendor_libc_src_unix_bsd_freebsdlike_freebsd_x86__64.rs (revision 490600)
+++ head/lang/rust/files/patch-src_vendor_libc_src_unix_bsd_freebsdlike_freebsd_x86__64.rs (nonexistent)
@@ -1,7 +0,0 @@
---- vendor/libc/src/unix/bsd/freebsdlike/freebsd/x86_64.rs.orig 2018-06-19 05:52:22 UTC
-+++ vendor/libc/src/unix/bsd/freebsdlike/freebsd/x86_64.rs
-@@ -1,3 +1,4 @@
-+pub type c_char = i8;
- pub type c_long = i64;
- pub type c_ulong = u64;
- pub type time_t = i64;
Property changes on: head/lang/rust/files/patch-src_vendor_libc_src_unix_bsd_freebsdlike_freebsd_x86__64.rs
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/lang/rust/files/patch-src_vendor_libc_src_unix_bsd_freebsdlike_dragonfly_mod.rs
===================================================================
--- head/lang/rust/files/patch-src_vendor_libc_src_unix_bsd_freebsdlike_dragonfly_mod.rs (revision 490600)
+++ head/lang/rust/files/patch-src_vendor_libc_src_unix_bsd_freebsdlike_dragonfly_mod.rs (nonexistent)
@@ -1,7 +0,0 @@
---- vendor/libc/src/unix/bsd/freebsdlike/dragonfly/mod.rs.orig 2018-06-19 05:52:22 UTC
-+++ vendor/libc/src/unix/bsd/freebsdlike/dragonfly/mod.rs
-@@ -1,3 +1,4 @@
-+pub type c_char = i8;
- pub type clock_t = u64;
- pub type ino_t = u64;
- pub type lwpid_t = i32;
Property changes on: head/lang/rust/files/patch-src_vendor_libc_src_unix_bsd_freebsdlike_dragonfly_mod.rs
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/lang/rust/files/patch-src_vendor_libc_src_unix_bsd_freebsdlike_freebsd_aarch64.rs
===================================================================
--- head/lang/rust/files/patch-src_vendor_libc_src_unix_bsd_freebsdlike_freebsd_aarch64.rs (revision 490600)
+++ head/lang/rust/files/patch-src_vendor_libc_src_unix_bsd_freebsdlike_freebsd_aarch64.rs (nonexistent)
@@ -1,7 +0,0 @@
---- vendor/libc/src/unix/bsd/freebsdlike/freebsd/aarch64.rs.orig 2018-06-19 05:52:22 UTC
-+++ vendor/libc/src/unix/bsd/freebsdlike/freebsd/aarch64.rs
-@@ -1,3 +1,4 @@
-+pub type c_char = u8;
- pub type c_long = i64;
- pub type c_ulong = u64;
- pub type time_t = i64;
Property changes on: head/lang/rust/files/patch-src_vendor_libc_src_unix_bsd_freebsdlike_freebsd_aarch64.rs
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/lang/rust/files/patch-src_vendor_libc_src_unix_bsd_freebsdlike_mod.rs
===================================================================
--- head/lang/rust/files/patch-src_vendor_libc_src_unix_bsd_freebsdlike_mod.rs (revision 490600)
+++ head/lang/rust/files/patch-src_vendor_libc_src_unix_bsd_freebsdlike_mod.rs (nonexistent)
@@ -1,18 +0,0 @@
---- vendor/libc/src/unix/bsd/freebsdlike/mod.rs.orig 2018-06-19 05:52:22 UTC
-+++ vendor/libc/src/unix/bsd/freebsdlike/mod.rs
-@@ -1,4 +1,3 @@
--pub type c_char = i8;
- pub type dev_t = u32;
- pub type mode_t = u16;
- pub type pthread_attr_t = *mut ::c_void;
-@@ -84,7 +83,10 @@ s! {
-
- pub struct stack_t {
- // In FreeBSD 11 and later, ss_sp is actually a void*
-+ #[cfg(not(target_arch = "aarch64"))]
- pub ss_sp: *mut ::c_char,
-+ #[cfg(target_arch = "aarch64")]
-+ pub ss_sp: *mut ::c_void,
- pub ss_size: ::size_t,
- pub ss_flags: ::c_int,
- }
Property changes on: head/lang/rust/files/patch-src_vendor_libc_src_unix_bsd_freebsdlike_mod.rs
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_dragonfly_mod.rs
===================================================================
--- head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_dragonfly_mod.rs (nonexistent)
+++ head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_dragonfly_mod.rs (revision 490601)
@@ -0,0 +1,7 @@
+--- vendor/libc/src/unix/bsd/freebsdlike/dragonfly/mod.rs.orig 2018-06-19 05:52:22 UTC
++++ vendor/libc/src/unix/bsd/freebsdlike/dragonfly/mod.rs
+@@ -1,3 +1,4 @@
++pub type c_char = i8;
+ pub type clock_t = u64;
+ pub type ino_t = u64;
+ pub type lwpid_t = i32;
Property changes on: head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_dragonfly_mod.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
Index: head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_aarch64.rs
===================================================================
--- head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_aarch64.rs (nonexistent)
+++ head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_aarch64.rs (revision 490601)
@@ -0,0 +1,7 @@
+--- vendor/libc/src/unix/bsd/freebsdlike/freebsd/aarch64.rs.orig 2018-06-19 05:52:22 UTC
++++ vendor/libc/src/unix/bsd/freebsdlike/freebsd/aarch64.rs
+@@ -1,3 +1,4 @@
++pub type c_char = u8;
+ pub type c_long = i64;
+ pub type c_ulong = u64;
+ pub type time_t = i64;
Property changes on: head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_aarch64.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
Index: head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_x86.rs
===================================================================
--- head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_x86.rs (nonexistent)
+++ head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_x86.rs (revision 490601)
@@ -0,0 +1,7 @@
+--- vendor/libc/src/unix/bsd/freebsdlike/freebsd/x86.rs.orig 2018-06-19 05:52:22 UTC
++++ vendor/libc/src/unix/bsd/freebsdlike/freebsd/x86.rs
+@@ -1,3 +1,4 @@
++pub type c_char = i8;
+ pub type c_long = i32;
+ pub type c_ulong = u32;
+ pub type time_t = i32;
Property changes on: head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_x86.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
Index: head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_x86__64.rs
===================================================================
--- head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_x86__64.rs (nonexistent)
+++ head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_x86__64.rs (revision 490601)
@@ -0,0 +1,7 @@
+--- vendor/libc/src/unix/bsd/freebsdlike/freebsd/x86_64.rs.orig 2018-06-19 05:52:22 UTC
++++ vendor/libc/src/unix/bsd/freebsdlike/freebsd/x86_64.rs
+@@ -1,3 +1,4 @@
++pub type c_char = i8;
+ pub type c_long = i64;
+ pub type c_ulong = u64;
+ pub type time_t = i64;
Property changes on: head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_x86__64.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
Index: head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_mod.rs
===================================================================
--- head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_mod.rs (nonexistent)
+++ head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_mod.rs (revision 490601)
@@ -0,0 +1,18 @@
+--- vendor/libc/src/unix/bsd/freebsdlike/mod.rs.orig 2018-06-19 05:52:22 UTC
++++ vendor/libc/src/unix/bsd/freebsdlike/mod.rs
+@@ -1,4 +1,3 @@
+-pub type c_char = i8;
+ pub type dev_t = u32;
+ pub type mode_t = u16;
+ pub type pthread_attr_t = *mut ::c_void;
+@@ -84,7 +83,10 @@ s! {
+
+ pub struct stack_t {
+ // In FreeBSD 11 and later, ss_sp is actually a void*
++ #[cfg(not(target_arch = "aarch64"))]
+ pub ss_sp: *mut ::c_char,
++ #[cfg(target_arch = "aarch64")]
++ pub ss_sp: *mut ::c_void,
+ pub ss_size: ::size_t,
+ pub ss_flags: ::c_int,
+ }
Property changes on: head/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_mod.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
Index: head/lang/rust/files/patch-vendor_openssl-sys_build_main.rs
===================================================================
--- head/lang/rust/files/patch-vendor_openssl-sys_build_main.rs (nonexistent)
+++ head/lang/rust/files/patch-vendor_openssl-sys_build_main.rs (revision 490601)
@@ -0,0 +1,66 @@
+https://github.com/sfackler/rust-openssl/commit/9fd7584a8416
+https://github.com/sfackler/rust-openssl/commit/e75793e8962d
+
+--- vendor/openssl-sys/build/main.rs.orig 2018-12-05 01:24:32 UTC
++++ vendor/openssl-sys/build/main.rs
+@@ -1,9 +1,9 @@
+ extern crate cc;
++#[cfg(feature = "vendored")]
++extern crate openssl_src;
+ extern crate pkg_config;
+ #[cfg(target_env = "msvc")]
+ extern crate vcpkg;
+-#[cfg(feature = "vendored")]
+-extern crate openssl_src;
+
+ use std::collections::HashSet;
+ use std::env;
+@@ -103,20 +103,23 @@ fn main() {
+
+ #[cfg(feature = "vendored")]
+ mod imp {
+- use std::path::PathBuf;
+- use openssl_src;
++ use openssl_src;
++ use std::path::PathBuf;
+
+- pub fn get_openssl(_target: &str) -> (PathBuf, PathBuf) {
+- let artifacts = openssl_src::Build::new().build();
+- (artifacts.lib_dir().to_path_buf(), artifacts.include_dir().to_path_buf())
+- }
++ pub fn get_openssl(_target: &str) -> (PathBuf, PathBuf) {
++ let artifacts = openssl_src::Build::new().build();
++ (
++ artifacts.lib_dir().to_path_buf(),
++ artifacts.include_dir().to_path_buf(),
++ )
++ }
+ }
+
+ #[cfg(not(feature = "vendored"))]
+ mod imp {
+ use pkg_config;
+- use std::path::{Path, PathBuf};
+ use std::ffi::OsString;
++ use std::path::{Path, PathBuf};
+ use std::process::{self, Command};
+
+ use super::env;
+@@ -500,6 +503,8 @@ See rust-openssl README for more information:
+ (7, _) => ('7', 'x'),
+ (8, 0) => ('8', '0'),
+ (8, 1) => ('8', '1'),
++ (8, _) => ('8', 'x'),
++ (9, 0) => ('9', '0'),
+ _ => version_error(),
+ };
+
+@@ -540,7 +545,7 @@ fn version_error() -> ! {
+ "
+
+ This crate is only compatible with OpenSSL 1.0.1 through 1.1.1, or LibreSSL 2.5
+-through 2.8.1, but a different version of OpenSSL was found. The build is now aborting
++through 2.9.0, but a different version of OpenSSL was found. The build is now aborting
+ due to this version mismatch.
+
+ "
Property changes on: head/lang/rust/files/patch-vendor_openssl-sys_build_main.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