Attachment #186451 for bug #222359

Lines 3-9 Link Here

(-)Makefile (-2 / +9 lines)
3		3
4	PORTNAME= rust	4	PORTNAME= rust
5	PORTVERSION?= 1.19.0	5	PORTVERSION?= 1.19.0
6	PORTREVISION?= 2	6	PORTREVISION?= 3
7	CATEGORIES= lang	7	CATEGORIES= lang
8	MASTER_SITES= http://static.rust-lang.org/dist/:src \	8	MASTER_SITES= http://static.rust-lang.org/dist/:src \
9	https://static.rust-lang.org/dist/:rust_bootstrap \	9	https://static.rust-lang.org/dist/:rust_bootstrap \
Lines 198-203 Link Here
198	if test "$$regex"; then \	198	if test "$$regex"; then \
199	${REINPLACE_CMD} -E $$regex .cargo-checksum.json; \	199	${REINPLACE_CMD} -E $$regex .cargo-checksum.json; \
200	fi	200	fi
		201
		202	@cd "${WRKSRC}/src/vendor/openssl-sys"; \
		203	old_checksum=$$(${SHA256} -q "build.rs.orig"); \
		204	new_checksum=$$(${SHA256} -q "build.rs"); \
		205	${REINPLACE_CMD} 's\|\"build.rs\":\"'$${old_checksum}'\"\|\"build.rs\":\"'$${new_checksum}'\"\|' ${WRKSRC}/src/vendor/openssl-sys/.cargo-checksum.json
		206
201	# We make a backup of a few files before the FreeBSD 10 autotools	207	# We make a backup of a few files before the FreeBSD 10 autotools
202	# fix is applied. We'll need them in `do-configure` to update the	208	# fix is applied. We'll need them in `do-configure` to update the
203	# `.cargo-checksum.json` files.	209	# `.cargo-checksum.json` files.
Lines 343-348 Link Here
343	fi	349	fi
344		350
345	# Note that make test does not work when rust is already installed.	351	# Note that make test does not work when rust is already installed.
		352	.if {PORT_OPTIONS:MTEST}
346	do-test:	353	do-test:
347	cd ${WRKSRC} && \	354	cd ${WRKSRC} && \
348	${SETENV} ${X_PY_ENV} \	355	${SETENV} ${X_PY_ENV} \
Lines 351-355 Link Here
351	--verbose \	358	--verbose \
352	--config ./config.toml \	359	--config ./config.toml \
353	--jobs ${MAKE_JOBS_NUMBER}	360	--jobs ${MAKE_JOBS_NUMBER}
354		361	.endif
355	.include <bsd.port.post.mk>	362	.include <bsd.port.post.mk>




--- src/vendor/openssl-sys/build.rs.prig	2017-09-16 13:08:12 UTC
+++ src/vendor/openssl-sys/build.rs
@@ -241,7 +241,7 @@ fn validate_headers(include_dirs: &[Path
 #include <openssl/opensslconf.h>
 
 #if LIBRESSL_VERSION_NUMBER >= 0x20505000
-RUST_LIBRESSL_NEW
+RUST_LIBRESSL_255
 #elif LIBRESSL_VERSION_NUMBER >= 0x20504000
 RUST_LIBRESSL_254
 #elif LIBRESSL_VERSION_NUMBER >= 0x20503000
@@ -347,6 +347,12 @@ See rust-openssl README for more informa
         println!("cargo:libressl=true");
         println!("cargo:version=101");
         Version::Libressl
+    } else if expanded.contains("RUST_LIBRESSL_255") {
+	println!("cargo:rustc-cfg=libressl");
+        println!("cargo:rustc-cfg=libressl255");
+        println!("cargo:libressl=true");
+        println!("cargo:version=101");
+        Version::Libressl
     } else if expanded.contains("RUST_OPENSSL_110") {
         println!("cargo:rustc-cfg=ossl110");
         println!("cargo:version=110");

Return to bug 222359

Line 0 Link Here

(-)files/patch-vendor_openssl-sys_build_rs (+24 lines)
	1	--- src/vendor/openssl-sys/build.rs.prig 2017-09-16 13:08:12 UTC
	2	+++ src/vendor/openssl-sys/build.rs
	3	@@ -241,7 +241,7 @@ fn validate_headers(include_dirs: &[Path
	4	#include <openssl/opensslconf.h>
	5
	6	#if LIBRESSL_VERSION_NUMBER >= 0x20505000
	7	-RUST_LIBRESSL_NEW
	8	+RUST_LIBRESSL_255
	9	#elif LIBRESSL_VERSION_NUMBER >= 0x20504000
	10	RUST_LIBRESSL_254
	11	#elif LIBRESSL_VERSION_NUMBER >= 0x20503000
	12	@@ -347,6 +347,12 @@ See rust-openssl README for more informa
	13	println!("cargo:libressl=true");
	14	println!("cargo:version=101");
	15	Version::Libressl
	16	+ } else if expanded.contains("RUST_LIBRESSL_255") {
	17	+ println!("cargo:rustc-cfg=libressl");
	18	+ println!("cargo:rustc-cfg=libressl255");
	19	+ println!("cargo:libressl=true");
	20	+ println!("cargo:version=101");
	21	+ Version::Libressl
	22	} else if expanded.contains("RUST_OPENSSL_110") {
	23	println!("cargo:rustc-cfg=ossl110");
	24	println!("cargo:version=110");