Attachment #156878 for bug #200284

Lines 2-9 Link Here

(-)w/lang/rust/Makefile (-6 / +10 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= rust	4	PORTNAME= rust
5	PORTVERSION= 0.12.0	5	PORTVERSION= 1.0.0
6	PORTREVISION= 1
7	CATEGORIES= lang	6	CATEGORIES= lang
8	MASTER_SITES= http://static.rust-lang.org/dist/:src \	7	MASTER_SITES= http://static.rust-lang.org/dist/:src \
9	http://static.rust-lang.org/stage0-snapshots/:bootstrap	8	http://static.rust-lang.org/stage0-snapshots/:bootstrap
Lines 23-31 LICENSE_FILE= ${WRKSRC}/LICENSE-APACHE \ Link Here
23	ONLY_FOR_ARCHS= amd64	22	ONLY_FOR_ARCHS= amd64
24	ONLY_FOR_ARCHS_REASON= requires prebuilt bootstrap compiler	23	ONLY_FOR_ARCHS_REASON= requires prebuilt bootstrap compiler
25		24
26	RUST_SOURCE= ${DISTNAME}${EXTRACT_SUFX}	25	RUST_SOURCE= rustc-${DISTVERSIONFULL}-src${EXTRACT_SUFX}
27	RUST_BOOT= rust-stage0-${RUST_BOOT_SIG}.tar.bz2	26	RUST_BOOT= rust-stage0-${RUST_BOOT_SIG}.tar.bz2
28	RUST_BOOT_SIG= 2014-10-04-749ff5e-freebsd-x86_64-f39d94487d29b3d48217b1295ad2cda8c941e694	27	RUST_BOOT_SIG= 2015-04-27-857ef6e-freebsd-x86_64-18925db56f6298cc190d1f41615ab5871de1dda0
		28	WRKSRC= ${WRKDIR}/rustc-${DISTVERSIONFULL}
29		29
30	USES= gmake perl5 python:2	30	USES= gmake perl5 python:2
31	HAS_CONFIGURE= yes	31	HAS_CONFIGURE= yes
Lines 59-66 post-extract: Link Here
59	${LN} -sf ${DISTDIR}/${RUST_BOOT} ${WRKSRC}/dl	59	${LN} -sf ${DISTDIR}/${RUST_BOOT} ${WRKSRC}/dl
60		60
61	post-install:	61	post-install:
62	@${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/manifest	62	@${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/manifest-rustc
		63	@${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/install.log
		64	@${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/uninstall.sh
63	@${STRIP_CMD} `${GREP} -v -e '^@dir' -e '^man' -e 'rlib$$' \	65	@${STRIP_CMD} `${GREP} -v -e '^@dir' -e '^man' -e 'rlib$$' \
64	-e '^.*\.a$$' ${PLIST} \| ${SED} 's:^:${STAGEDIR}${PREFIX}/:'`	66	-e '^.\.a$$' -e '^.\.py$$' -e '^%' -e '^.*/rust-gdb$$' \
		67	-e '^.rustlib/components$$' -e '^./rust-installer-version$$' \
		68	${PLIST} \| ${SED} 's:^:${STAGEDIR}${PREFIX}/:'`
65		69
66	.include <bsd.port.post.mk>	70	.include <bsd.port.post.mk>

Lines 1-4 Link Here

(-)w/lang/rust/distinfo (-4 / +4 lines)
1	SHA256 (rust-0.12.0.tar.gz) = 883e66b24d90d9957c5c538469fcde6f0668e5fb6448beecfc60884060e769b7	1	SHA256 (rustc-1.0.0-src.tar.gz) = c304cbd4f7b25d116b73c249f66bdb5c9da8645855ce195a41bda5077b995eba
2	SIZE (rust-0.12.0.tar.gz) = 21223176	2	SIZE (rustc-1.0.0-src.tar.gz) = 22121878
3	SHA256 (rust-stage0-2014-10-04-749ff5e-freebsd-x86_64-f39d94487d29b3d48217b1295ad2cda8c941e694.tar.bz2) = 3f486b75a92c96b4bb63cb043037e6ff58bf5adde9d29e9e197959d6959de0b2	3	SHA256 (rust-stage0-2015-04-27-857ef6e-freebsd-x86_64-18925db56f6298cc190d1f41615ab5871de1dda0.tar.bz2) = c09d2f622217129b4c5a5ae0b889315606d993c22c3f6ee2ffc06e997940f113
4	SIZE (rust-stage0-2014-10-04-749ff5e-freebsd-x86_64-f39d94487d29b3d48217b1295ad2cda8c941e694.tar.bz2) = 12701560	4	SIZE (rust-stage0-2015-04-27-857ef6e-freebsd-x86_64-18925db56f6298cc190d1f41615ab5871de1dda0.tar.bz2) = 12915343




--- configure.orig	2015-05-15 18:50:36 UTC
+++ configure
@@ -678,7 +678,6 @@ putvar CFG_BOOTSTRAP_KEY
 
 step_msg "looking for build programs"
 
 probe_need CFG_PERL        perl
-probe_need CFG_CURLORWGET  curl wget
 probe_need CFG_PYTHON      python2.7 python2.6 python2 python
 
 python_version=$($CFG_PYTHON -V 2>&1)
@@ -805,13 +804,6 @@ then
     putvar CFG_LOCAL_RUST_ROOT
 fi
 
-# Force freebsd to build with clang; gcc doesn't like us there

-then
-    step_msg "on FreeBSD, forcing use of clang"
-    CFG_ENABLE_CLANG=1
-    putvar CFG_ENABLE_CLANG
-fi
-
 # Force bitrig to build with clang; gcc doesn't like us there
 if [ $CFG_OSTYPE = unknown-bitrig ]
 then
     err "either clang or gcc is required"

Lines 1-91 Link Here

(-)w/lang/rust/pkg-plist (-73 / +63 lines)
		1	bin/rust-gdb
1	bin/rustc	2	bin/rustc
2	bin/rustdoc	3	bin/rustdoc
		4	lib/libarena-4e7c5e5c.so
		5	lib/libflate-4e7c5e5c.so
		6	lib/libfmt_macros-4e7c5e5c.so
3	lib/libgetopts-4e7c5e5c.so	7	lib/libgetopts-4e7c5e5c.so
		8	lib/libgraphviz-4e7c5e5c.so
		9	lib/liblog-4e7c5e5c.so
		10	lib/librbml-4e7c5e5c.so
		11	lib/librustc-4e7c5e5c.so
		12	lib/librustc_back-4e7c5e5c.so
		13	lib/librustc_borrowck-4e7c5e5c.so
		14	lib/librustc_driver-4e7c5e5c.so
		15	lib/librustc_lint-4e7c5e5c.so
4	lib/librustc_llvm-4e7c5e5c.so	16	lib/librustc_llvm-4e7c5e5c.so
		17	lib/librustc_privacy-4e7c5e5c.so
		18	lib/librustc_resolve-4e7c5e5c.so
		19	lib/librustc_trans-4e7c5e5c.so
		20	lib/librustc_typeck-4e7c5e5c.so
5	lib/librustdoc-4e7c5e5c.so	21	lib/librustdoc-4e7c5e5c.so
6	lib/libnative-4e7c5e5c.so	22	lib/libserialize-4e7c5e5c.so
7	lib/rustlib/x86_64-unknown-freebsd/lib/libstd-4e7c5e5c.rlib	23	lib/libstd-4e7c5e5c.so
8	lib/rustlib/x86_64-unknown-freebsd/lib/libfourcc-4e7c5e5c.so	24	lib/libsyntax-4e7c5e5c.so
9	lib/rustlib/x86_64-unknown-freebsd/lib/liblog-4e7c5e5c.rlib	25	lib/libterm-4e7c5e5c.so
10	lib/rustlib/x86_64-unknown-freebsd/lib/libcollections-4e7c5e5c.rlib	26	lib/libtest-4e7c5e5c.so
11	lib/rustlib/x86_64-unknown-freebsd/lib/librbml-4e7c5e5c.rlib	27	lib/rustlib/components
		28	lib/rustlib/etc/gdb_load_rust_pretty_printers.py
		29	lib/rustlib/etc/gdb_rust_pretty_printing.py
		30	lib/rustlib/rust-installer-version
12	lib/rustlib/x86_64-unknown-freebsd/lib/liballoc-4e7c5e5c.rlib	31	lib/rustlib/x86_64-unknown-freebsd/lib/liballoc-4e7c5e5c.rlib
13	lib/rustlib/x86_64-unknown-freebsd/lib/libuuid-4e7c5e5c.so	32	lib/rustlib/x86_64-unknown-freebsd/lib/libarena-4e7c5e5c.rlib
14	lib/rustlib/x86_64-unknown-freebsd/lib/libtime-4e7c5e5c.rlib	33	lib/rustlib/x86_64-unknown-freebsd/lib/libarena-4e7c5e5c.so
		34	lib/rustlib/x86_64-unknown-freebsd/lib/libcollections-4e7c5e5c.rlib
		35	lib/rustlib/x86_64-unknown-freebsd/lib/libcompiler-rt.a
		36	lib/rustlib/x86_64-unknown-freebsd/lib/libcore-4e7c5e5c.rlib
		37	lib/rustlib/x86_64-unknown-freebsd/lib/libflate-4e7c5e5c.rlib
		38	lib/rustlib/x86_64-unknown-freebsd/lib/libflate-4e7c5e5c.so
		39	lib/rustlib/x86_64-unknown-freebsd/lib/libfmt_macros-4e7c5e5c.so
		40	lib/rustlib/x86_64-unknown-freebsd/lib/libgetopts-4e7c5e5c.rlib
15	lib/rustlib/x86_64-unknown-freebsd/lib/libgetopts-4e7c5e5c.so	41	lib/rustlib/x86_64-unknown-freebsd/lib/libgetopts-4e7c5e5c.so
16	lib/rustlib/x86_64-unknown-freebsd/lib/librustc_llvm-4e7c5e5c.so	42	lib/rustlib/x86_64-unknown-freebsd/lib/libgraphviz-4e7c5e5c.rlib
17	lib/rustlib/x86_64-unknown-freebsd/lib/librustdoc-4e7c5e5c.so	43	lib/rustlib/x86_64-unknown-freebsd/lib/libgraphviz-4e7c5e5c.so
		44	lib/rustlib/x86_64-unknown-freebsd/lib/liblibc-4e7c5e5c.rlib
		45	lib/rustlib/x86_64-unknown-freebsd/lib/liblog-4e7c5e5c.rlib
		46	lib/rustlib/x86_64-unknown-freebsd/lib/liblog-4e7c5e5c.so
18	lib/rustlib/x86_64-unknown-freebsd/lib/libmorestack.a	47	lib/rustlib/x86_64-unknown-freebsd/lib/libmorestack.a
19	lib/rustlib/x86_64-unknown-freebsd/lib/libnative-4e7c5e5c.so	48	lib/rustlib/x86_64-unknown-freebsd/lib/librand-4e7c5e5c.rlib
20	lib/rustlib/x86_64-unknown-freebsd/lib/libcore-4e7c5e5c.rlib	49	lib/rustlib/x86_64-unknown-freebsd/lib/librbml-4e7c5e5c.rlib
21	lib/rustlib/x86_64-unknown-freebsd/lib/libhexfloat-4e7c5e5c.so	50	lib/rustlib/x86_64-unknown-freebsd/lib/librbml-4e7c5e5c.so
		51	lib/rustlib/x86_64-unknown-freebsd/lib/librustc-4e7c5e5c.so
22	lib/rustlib/x86_64-unknown-freebsd/lib/librustc_back-4e7c5e5c.so	52	lib/rustlib/x86_64-unknown-freebsd/lib/librustc_back-4e7c5e5c.so
23	lib/rustlib/x86_64-unknown-freebsd/lib/librustrt-4e7c5e5c.rlib	53	lib/rustlib/x86_64-unknown-freebsd/lib/librustc_bitflags-4e7c5e5c.rlib
24	lib/rustlib/x86_64-unknown-freebsd/lib/libunicode-4e7c5e5c.rlib	54	lib/rustlib/x86_64-unknown-freebsd/lib/librustc_borrowck-4e7c5e5c.so
25	lib/rustlib/x86_64-unknown-freebsd/lib/libgetopts-4e7c5e5c.rlib	55	lib/rustlib/x86_64-unknown-freebsd/lib/librustc_driver-4e7c5e5c.so
26	lib/rustlib/x86_64-unknown-freebsd/lib/libflate-4e7c5e5c.so	56	lib/rustlib/x86_64-unknown-freebsd/lib/librustc_lint-4e7c5e5c.so
27	lib/rustlib/x86_64-unknown-freebsd/lib/libsync-4e7c5e5c.rlib	57	lib/rustlib/x86_64-unknown-freebsd/lib/librustc_llvm-4e7c5e5c.so
28	lib/rustlib/x86_64-unknown-freebsd/lib/librlibc-4e7c5e5c.rlib	58	lib/rustlib/x86_64-unknown-freebsd/lib/librustc_privacy-4e7c5e5c.so
29	lib/rustlib/x86_64-unknown-freebsd/lib/libflate-4e7c5e5c.rlib	59	lib/rustlib/x86_64-unknown-freebsd/lib/librustc_resolve-4e7c5e5c.so
		60	lib/rustlib/x86_64-unknown-freebsd/lib/librustc_trans-4e7c5e5c.so
		61	lib/rustlib/x86_64-unknown-freebsd/lib/librustc_typeck-4e7c5e5c.so
		62	lib/rustlib/x86_64-unknown-freebsd/lib/librustdoc-4e7c5e5c.so
30	lib/rustlib/x86_64-unknown-freebsd/lib/libserialize-4e7c5e5c.rlib	63	lib/rustlib/x86_64-unknown-freebsd/lib/libserialize-4e7c5e5c.rlib
31	lib/rustlib/x86_64-unknown-freebsd/lib/libregex-4e7c5e5c.so	64	lib/rustlib/x86_64-unknown-freebsd/lib/libserialize-4e7c5e5c.so
32	lib/rustlib/x86_64-unknown-freebsd/lib/liburl-4e7c5e5c.rlib	65	lib/rustlib/x86_64-unknown-freebsd/lib/libstd-4e7c5e5c.rlib
33	lib/rustlib/x86_64-unknown-freebsd/lib/libregex_macros-4e7c5e5c.so	66	lib/rustlib/x86_64-unknown-freebsd/lib/libstd-4e7c5e5c.so
34	lib/rustlib/x86_64-unknown-freebsd/lib/libgreen-4e7c5e5c.rlib
35	lib/rustlib/x86_64-unknown-freebsd/lib/libgraphviz-4e7c5e5c.so
36	lib/rustlib/x86_64-unknown-freebsd/lib/libsyntax-4e7c5e5c.so	67	lib/rustlib/x86_64-unknown-freebsd/lib/libsyntax-4e7c5e5c.so
37	lib/rustlib/x86_64-unknown-freebsd/lib/libdebug-4e7c5e5c.rlib
38	lib/rustlib/x86_64-unknown-freebsd/lib/libnum-4e7c5e5c.rlib
39	lib/rustlib/x86_64-unknown-freebsd/lib/libnative-4e7c5e5c.rlib
40	lib/rustlib/x86_64-unknown-freebsd/lib/librand-4e7c5e5c.rlib
41	lib/rustlib/x86_64-unknown-freebsd/lib/libterm-4e7c5e5c.rlib	68	lib/rustlib/x86_64-unknown-freebsd/lib/libterm-4e7c5e5c.rlib
42	lib/rustlib/x86_64-unknown-freebsd/lib/libtest-4e7c5e5c.rlib
43	lib/rustlib/x86_64-unknown-freebsd/lib/libarena-4e7c5e5c.rlib
44	lib/rustlib/x86_64-unknown-freebsd/lib/libcompiler-rt.a
45	lib/rustlib/x86_64-unknown-freebsd/lib/libarena-4e7c5e5c.so
46	lib/rustlib/x86_64-unknown-freebsd/lib/libtime-4e7c5e5c.so
47	lib/rustlib/x86_64-unknown-freebsd/lib/liblog-4e7c5e5c.so
48	lib/rustlib/x86_64-unknown-freebsd/lib/libregex-4e7c5e5c.rlib
49	lib/rustlib/x86_64-unknown-freebsd/lib/librbml-4e7c5e5c.so
50	lib/rustlib/x86_64-unknown-freebsd/lib/libglob-4e7c5e5c.so
51	lib/rustlib/x86_64-unknown-freebsd/lib/libterm-4e7c5e5c.so	69	lib/rustlib/x86_64-unknown-freebsd/lib/libterm-4e7c5e5c.so
52	lib/rustlib/x86_64-unknown-freebsd/lib/libserialize-4e7c5e5c.so	70	lib/rustlib/x86_64-unknown-freebsd/lib/libtest-4e7c5e5c.rlib
53	lib/rustlib/x86_64-unknown-freebsd/lib/libdebug-4e7c5e5c.so
54	lib/rustlib/x86_64-unknown-freebsd/lib/libnum-4e7c5e5c.so
55	lib/rustlib/x86_64-unknown-freebsd/lib/libsemver-4e7c5e5c.so
56	lib/rustlib/x86_64-unknown-freebsd/lib/libglob-4e7c5e5c.rlib
57	lib/rustlib/x86_64-unknown-freebsd/lib/libtest-4e7c5e5c.so	71	lib/rustlib/x86_64-unknown-freebsd/lib/libtest-4e7c5e5c.so
58	lib/rustlib/x86_64-unknown-freebsd/lib/libgreen-4e7c5e5c.so	72	lib/rustlib/x86_64-unknown-freebsd/lib/libunicode-4e7c5e5c.rlib
59	lib/rustlib/x86_64-unknown-freebsd/lib/librustrt-4e7c5e5c.so
60	lib/rustlib/x86_64-unknown-freebsd/lib/libsemver-4e7c5e5c.rlib
61	lib/rustlib/x86_64-unknown-freebsd/lib/libfmt_macros-4e7c5e5c.so
62	lib/rustlib/x86_64-unknown-freebsd/lib/libgraphviz-4e7c5e5c.rlib
63	lib/rustlib/x86_64-unknown-freebsd/lib/libuuid-4e7c5e5c.rlib
64	lib/rustlib/x86_64-unknown-freebsd/lib/libsync-4e7c5e5c.so
65	lib/rustlib/x86_64-unknown-freebsd/lib/libstd-4e7c5e5c.so
66	lib/rustlib/x86_64-unknown-freebsd/lib/liburl-4e7c5e5c.so
67	lib/rustlib/x86_64-unknown-freebsd/lib/librustc-4e7c5e5c.so
68	lib/rustlib/x86_64-unknown-freebsd/lib/liblibc-4e7c5e5c.rlib
69	lib/librustc_back-4e7c5e5c.so
70	lib/libflate-4e7c5e5c.so
71	lib/libregex-4e7c5e5c.so
72	lib/libgraphviz-4e7c5e5c.so
73	lib/libsyntax-4e7c5e5c.so
74	lib/libarena-4e7c5e5c.so
75	lib/libtime-4e7c5e5c.so
76	lib/liblog-4e7c5e5c.so
77	lib/librbml-4e7c5e5c.so
78	lib/libterm-4e7c5e5c.so
79	lib/libserialize-4e7c5e5c.so
80	lib/libdebug-4e7c5e5c.so
81	lib/libtest-4e7c5e5c.so
82	lib/librustrt-4e7c5e5c.so
83	lib/libfmt_macros-4e7c5e5c.so
84	lib/libsync-4e7c5e5c.so
85	lib/libstd-4e7c5e5c.so
86	lib/librustc-4e7c5e5c.so
87	man/man1/rustdoc.1.gz
88	man/man1/rustc.1.gz	73	man/man1/rustc.1.gz
		74	man/man1/rustdoc.1.gz
89	@dir lib/rustlib/x86_64-unknown-freebsd/lib	75	@dir lib/rustlib/x86_64-unknown-freebsd/lib
90	@dir lib/rustlib/x86_64-unknown-freebsd	76	@dir lib/rustlib/x86_64-unknown-freebsd
91	@dir lib/rustlib	77	@dir lib/rustlib
		78	%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
		79	%%PORTDOCS%%%%DOCSDIR%%/LICENSE-APACHE
		80	%%PORTDOCS%%%%DOCSDIR%%/LICENSE-MIT
		81	%%PORTDOCS%%%%DOCSDIR%%/README.md

Return to bug 200284

Lines 1-15 Link Here

(-)w/lang/rust/files/patch-configure (-9 / +8 lines)
1	--- configure.orig 2014-01-20 12:44:20.637789551 +0800	1	--- configure.orig 2015-05-15 18:50:36 UTC
2	+++ configure 2014-01-20 12:45:23.726260411 +0800	2	+++ configure
3	@@ -424,7 +424,6 @@	3	@@ -678,7 +678,6 @@ putvar CFG_BOOTSTRAP_KEY
		4
4	step_msg "looking for build programs"	5	step_msg "looking for build programs"
5		6
6	probe_need CFG_PERL perl
7	-probe_need CFG_CURLORWGET curl wget	7	-probe_need CFG_CURLORWGET curl wget
8	probe_need CFG_PYTHON python2.7 python2.6 python2 python	8	probe_need CFG_PYTHON python2.7 python2.6 python2 python
9		9
10	python_version=$($CFG_PYTHON -V 2>&1)	10	python_version=$($CFG_PYTHON -V 2>&1)
11	@@ -547,14 +546,6 @@	11	@@ -805,13 +804,6 @@ then
12	fi	12	putvar CFG_LOCAL_RUST_ROOT
13	fi	13	fi
14		14
15	-# Force freebsd to build with clang; gcc doesn't like us there	15	-# Force freebsd to build with clang; gcc doesn't like us there
Lines 17-25 Link Here
17	-then	17	-then
18	- step_msg "on FreeBSD, forcing use of clang"	18	- step_msg "on FreeBSD, forcing use of clang"
19	- CFG_ENABLE_CLANG=1	19	- CFG_ENABLE_CLANG=1
20	- putvar CFG_ENABLE_CLANG
21	-fi	20	-fi
22	-	21	-
23	if [ -z "$CFG_ENABLE_CLANG" -a -z "$CFG_GCC" ]	22	# Force bitrig to build with clang; gcc doesn't like us there
		23	if [ $CFG_OSTYPE = unknown-bitrig ]
24	then	24	then
25	err "either clang or gcc is required"