Index: head/lang/rust-nightly/pkg-plist.amd64
===================================================================
--- head/lang/rust-nightly/pkg-plist.amd64
+++ head/lang/rust-nightly/pkg-plist.amd64
@@ -1,111 +0,0 @@
-bin/rust-gdb
-bin/rust-lldb
-bin/rustc
-bin/rustdoc
-lib/libarena-8d2cc8030f9f9e51.so
-lib/libflate-973fda46ca6065f1.so
-lib/libfmt_macros-9d6e7242f0ddcbf7.so
-lib/libgetopts-14c98bbc4ab8bc3f.so
-lib/libgraphviz-aa6a755e4919c93d.so
-lib/liblog-e4305648ec68a46a.so
-lib/libproc_macro-4730696f57bacfa3.so
-lib/libproc_macro_plugin-69bd7c91eac0c254.so
-lib/librustc-6b01deb37863e1ca.so
-lib/librustc_back-427e3c868150f7b0.so
-lib/librustc_borrowck-a304a1e74e918d6b.so
-lib/librustc_const_eval-c69c066c119845ac.so
-lib/librustc_const_math-ccd5fbe2ff37b8d0.so
-lib/librustc_data_structures-b9404b12fbed1c74.so
-lib/librustc_driver-c04abcc58e3ffb91.so
-lib/librustc_errors-e031f7e8a7282cec.so
-lib/librustc_incremental-eb1b3a9ccd2d69f4.so
-lib/librustc_lint-2c84223e05fa41a5.so
-lib/librustc_llvm-2e9edcc4f41d6f9e.so
-lib/librustc_metadata-68c02ba8ed31bcbb.so
-lib/librustc_mir-d1ade9f855a3dd4e.so
-lib/librustc_passes-440684124770790d.so
-lib/librustc_platform_intrinsics-800e3ffa1075bf42.so
-lib/librustc_plugin-ea33519f778627e0.so
-lib/librustc_privacy-0e49074db03edd68.so
-lib/librustc_resolve-8f93f3b7cce6c6c6.so
-lib/librustc_save_analysis-bacd5488c3595e4e.so
-lib/librustc_trans-6e517a0c43def43a.so
-lib/librustc_typeck-0cda1f5e9ab6ae7e.so
-lib/librustdoc-4a80fdb0177544ad.so
-lib/libserialize-c2845ef911babcca.so
-lib/libstd-f2f8780747d93445.so
-lib/libsyntax-03351f557e53af0e.so
-lib/libsyntax_ext-6a1c3c07e6d676fa.so
-lib/libsyntax_pos-255190cc0bcdb455.so
-lib/libterm-eb27c73a2d4a57e7.so
-lib/libtest-b971548dd4e94068.so
-lib/rustlib/components
-lib/rustlib/etc/debugger_pretty_printers_common.py
-lib/rustlib/etc/gdb_load_rust_pretty_printers.py
-lib/rustlib/etc/gdb_rust_pretty_printing.py
-lib/rustlib/etc/lldb_rust_formatters.py
-%%PORTDOCS%%lib/rustlib/manifest-rust-docs
-lib/rustlib/manifest-rust-std-%%RUST_TARGET%%
-lib/rustlib/manifest-rustc
-lib/rustlib/rust-installer-version
-lib/rustlib/uninstall.sh
-lib/rustlib/%%RUST_TARGET%%/lib/liballoc-a8d9cdd7f7eb8506.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/liballoc_jemalloc-313310930119e25e.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/liballoc_system-f4d8f5b6d6a973bb.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libarena-8d2cc8030f9f9e51.so
-lib/rustlib/%%RUST_TARGET%%/lib/libcollections-2bdf2b02dc8a8446.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libcompiler_builtins-9b730c300ba40434.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libcore-da4919c977412e22.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libflate-973fda46ca6065f1.so
-lib/rustlib/%%RUST_TARGET%%/lib/libfmt_macros-9d6e7242f0ddcbf7.so
-lib/rustlib/%%RUST_TARGET%%/lib/libgetopts-14c98bbc4ab8bc3f.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libgetopts-14c98bbc4ab8bc3f.so
-lib/rustlib/%%RUST_TARGET%%/lib/libgraphviz-aa6a755e4919c93d.so
-lib/rustlib/%%RUST_TARGET%%/lib/liblibc-ea4991e691e95619.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/liblog-e4305648ec68a46a.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/liblog-e4305648ec68a46a.so
-lib/rustlib/%%RUST_TARGET%%/lib/libpanic_abort-b7a2099b7d96488a.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libpanic_unwind-335959aa35b8bd5d.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libproc_macro-4730696f57bacfa3.so
-lib/rustlib/%%RUST_TARGET%%/lib/libproc_macro_plugin-69bd7c91eac0c254.so
-lib/rustlib/%%RUST_TARGET%%/lib/librand-5013d660cd4b44f7.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/librustc-6b01deb37863e1ca.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_back-427e3c868150f7b0.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_bitflags-2af44cfa8afa54e9.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_borrowck-a304a1e74e918d6b.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_const_eval-c69c066c119845ac.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_const_math-ccd5fbe2ff37b8d0.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_data_structures-b9404b12fbed1c74.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_driver-c04abcc58e3ffb91.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_errors-e031f7e8a7282cec.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_incremental-eb1b3a9ccd2d69f4.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_lint-2c84223e05fa41a5.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_llvm-2e9edcc4f41d6f9e.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_metadata-68c02ba8ed31bcbb.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_mir-d1ade9f855a3dd4e.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_passes-440684124770790d.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_platform_intrinsics-800e3ffa1075bf42.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_plugin-ea33519f778627e0.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_privacy-0e49074db03edd68.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_resolve-8f93f3b7cce6c6c6.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_save_analysis-bacd5488c3595e4e.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_trans-6e517a0c43def43a.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_typeck-0cda1f5e9ab6ae7e.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustdoc-4a80fdb0177544ad.so
-lib/rustlib/%%RUST_TARGET%%/lib/libserialize-c2845ef911babcca.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libserialize-c2845ef911babcca.so
-lib/rustlib/%%RUST_TARGET%%/lib/libstd-f2f8780747d93445.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libstd-f2f8780747d93445.so
-lib/rustlib/%%RUST_TARGET%%/lib/libstd_shim-93e35d7db5ebf466.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libstd_unicode-c9431ed85229e521.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libsyntax-03351f557e53af0e.so
-lib/rustlib/%%RUST_TARGET%%/lib/libsyntax_ext-6a1c3c07e6d676fa.so
-lib/rustlib/%%RUST_TARGET%%/lib/libsyntax_pos-255190cc0bcdb455.so
-lib/rustlib/%%RUST_TARGET%%/lib/libterm-eb27c73a2d4a57e7.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libterm-eb27c73a2d4a57e7.so
-lib/rustlib/%%RUST_TARGET%%/lib/libtest-b971548dd4e94068.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libtest-b971548dd4e94068.so
-lib/rustlib/%%RUST_TARGET%%/lib/libtest_shim-6ea79bb2723d4a41.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libunwind-1602582b55d57366.rlib
-man/man1/rustc.1.gz
-man/man1/rustdoc.1.gz
Index: head/lang/rust-nightly/pkg-plist.i386
===================================================================
--- head/lang/rust-nightly/pkg-plist.i386
+++ head/lang/rust-nightly/pkg-plist.i386
@@ -1,111 +0,0 @@
-bin/rust-gdb
-bin/rust-lldb
-bin/rustc
-bin/rustdoc
-lib/libarena-cdf0295c70746a79.so
-lib/libflate-b9a5040f96aa402b.so
-lib/libfmt_macros-b3074e0c5da3df6d.so
-lib/libgetopts-d8895d105d310e76.so
-lib/libgraphviz-0059e64abf2c24b2.so
-lib/liblog-f9832bc037a53dcb.so
-lib/libproc_macro-a4c3e2756e12fcc8.so
-lib/libproc_macro_plugin-45d25669fd5fb1a5.so
-lib/librustc-4b28b6ad6d82e49f.so
-lib/librustc_back-2c1449f7f387d224.so
-lib/librustc_borrowck-6ac2c9c72eceeeda.so
-lib/librustc_const_eval-487905d175c99446.so
-lib/librustc_const_math-238fdc253dd7af24.so
-lib/librustc_data_structures-31344ba5b5be7057.so
-lib/librustc_driver-084f8accf1cc2bd1.so
-lib/librustc_errors-beefbf0f0264a079.so
-lib/librustc_incremental-6d23576ccbfa6527.so
-lib/librustc_lint-5a028635ff692d5b.so
-lib/librustc_llvm-6509896b779098aa.so
-lib/librustc_metadata-48efb0507a83f497.so
-lib/librustc_mir-188dca836b5f1b12.so
-lib/librustc_passes-198fc6e3469ee0e1.so
-lib/librustc_platform_intrinsics-fb42969088db1e17.so
-lib/librustc_plugin-f1ae7a111ce0ec6f.so
-lib/librustc_privacy-9ff96d587ab182b2.so
-lib/librustc_resolve-e44fc7af7ebcb411.so
-lib/librustc_save_analysis-54b37819ddd48dc5.so
-lib/librustc_trans-621f14613d5d3296.so
-lib/librustc_typeck-615f7784c66ad9b3.so
-lib/librustdoc-d30d7b89914f7571.so
-lib/libserialize-526524dfd837403a.so
-lib/libstd-d97890d0e362897a.so
-lib/libsyntax-4a8d4ba093890bd8.so
-lib/libsyntax_ext-c7946296933228f1.so
-lib/libsyntax_pos-a856932aa4fd541e.so
-lib/libterm-eb7b0c50c4d22983.so
-lib/libtest-0c4c2bc2990af5ab.so
-lib/rustlib/components
-lib/rustlib/etc/debugger_pretty_printers_common.py
-lib/rustlib/etc/gdb_load_rust_pretty_printers.py
-lib/rustlib/etc/gdb_rust_pretty_printing.py
-lib/rustlib/etc/lldb_rust_formatters.py
-%%PORTDOCS%%lib/rustlib/manifest-rust-docs
-lib/rustlib/manifest-rust-std-%%RUST_TARGET%%
-lib/rustlib/manifest-rustc
-lib/rustlib/rust-installer-version
-lib/rustlib/uninstall.sh
-lib/rustlib/%%RUST_TARGET%%/lib/liballoc-c57a879ed7447180.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/liballoc_jemalloc-ab82c164a23e3c08.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/liballoc_system-5ca4345bce998522.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libarena-cdf0295c70746a79.so
-lib/rustlib/%%RUST_TARGET%%/lib/libcollections-39e9e502ffbb788e.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libcompiler_builtins-9c20a1b3f18accdf.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libcore-b4d29dc3993f010d.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libflate-b9a5040f96aa402b.so
-lib/rustlib/%%RUST_TARGET%%/lib/libfmt_macros-b3074e0c5da3df6d.so
-lib/rustlib/%%RUST_TARGET%%/lib/libgetopts-d8895d105d310e76.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libgetopts-d8895d105d310e76.so
-lib/rustlib/%%RUST_TARGET%%/lib/libgraphviz-0059e64abf2c24b2.so
-lib/rustlib/%%RUST_TARGET%%/lib/liblibc-9d9d8e3c62702f96.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/liblog-f9832bc037a53dcb.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/liblog-f9832bc037a53dcb.so
-lib/rustlib/%%RUST_TARGET%%/lib/libpanic_abort-13d54537255281fa.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libpanic_unwind-f3eae4bff39c5871.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libproc_macro-a4c3e2756e12fcc8.so
-lib/rustlib/%%RUST_TARGET%%/lib/libproc_macro_plugin-45d25669fd5fb1a5.so
-lib/rustlib/%%RUST_TARGET%%/lib/librand-e74bb9084f28dd26.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/librustc-4b28b6ad6d82e49f.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_back-2c1449f7f387d224.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_bitflags-ebfe699cf089f29e.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_borrowck-6ac2c9c72eceeeda.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_const_eval-487905d175c99446.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_const_math-238fdc253dd7af24.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_data_structures-31344ba5b5be7057.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_driver-084f8accf1cc2bd1.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_errors-beefbf0f0264a079.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_incremental-6d23576ccbfa6527.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_lint-5a028635ff692d5b.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_llvm-6509896b779098aa.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_metadata-48efb0507a83f497.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_mir-188dca836b5f1b12.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_passes-198fc6e3469ee0e1.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_platform_intrinsics-fb42969088db1e17.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_plugin-f1ae7a111ce0ec6f.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_privacy-9ff96d587ab182b2.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_resolve-e44fc7af7ebcb411.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_save_analysis-54b37819ddd48dc5.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_trans-621f14613d5d3296.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_typeck-615f7784c66ad9b3.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustdoc-d30d7b89914f7571.so
-lib/rustlib/%%RUST_TARGET%%/lib/libserialize-526524dfd837403a.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libserialize-526524dfd837403a.so
-lib/rustlib/%%RUST_TARGET%%/lib/libstd-d97890d0e362897a.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libstd-d97890d0e362897a.so
-lib/rustlib/%%RUST_TARGET%%/lib/libstd_shim-41972075c970f4a3.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libstd_unicode-41233be8ebe06116.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libsyntax-4a8d4ba093890bd8.so
-lib/rustlib/%%RUST_TARGET%%/lib/libsyntax_ext-c7946296933228f1.so
-lib/rustlib/%%RUST_TARGET%%/lib/libsyntax_pos-a856932aa4fd541e.so
-lib/rustlib/%%RUST_TARGET%%/lib/libterm-eb7b0c50c4d22983.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libterm-eb7b0c50c4d22983.so
-lib/rustlib/%%RUST_TARGET%%/lib/libtest-0c4c2bc2990af5ab.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libtest-0c4c2bc2990af5ab.so
-lib/rustlib/%%RUST_TARGET%%/lib/libtest_shim-60bc9f5650ac5401.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libunwind-9da81a987ecdaf90.rlib
-man/man1/rustc.1.gz
-man/man1/rustdoc.1.gz
Index: head/lang/rust/Makefile
===================================================================
--- head/lang/rust/Makefile
+++ head/lang/rust/Makefile
@@ -21,7 +21,6 @@
 .endif
 DIST_SUBDIR?=	rust
 EXTRACT_ONLY?=	${DISTFILES:N*\:*bootstrap:C/:.*//}
-PLIST=		${.CURDIR}/pkg-plist.${ARCH}
 
 MAINTAINER?=	riggs@FreeBSD.org
 COMMENT=	Language with a focus on memory safety and concurrency
@@ -75,8 +74,6 @@
 		--mandir=${MANPREFIX}/man \
 		--release-channel=${RUST_CHANNEL}
 
-PORTDOCS=	*
-
 MAKE_ARGS+=	VERBOSE=1
 
 OPTIONS_DEFINE=		DOCS GDB LLNEXTGEN PORT_LLVM
@@ -98,6 +95,18 @@
 TEST_TARGET=	check
 TEST_ENV+=	ALLOW_NONZERO_RLIMIT_CORE=1
 
+# Rust manifests list all files and directories installed by rust-installer.
+# We use them in:
+#     - pre-install to cleanup the ${STAGEDIR}
+#     - post-install to populate the ${TMPPLIST}
+RUST_MANIFESTS=		lib/rustlib/manifest-rustc \
+			lib/rustlib/manifest-rust-std-${RUST_TARGET}
+RUST_DOCS_MANIFESTS=	lib/rustlib/manifest-rust-docs
+DOCS_VARS=		rust_manifests+=${RUST_DOCS_MANIFESTS}
+
+PLIST_FILES=		lib/rustlib/components \
+			lib/rustlib/rust-installer-version
+
 pre-fetch:
 	# FIXME: This is the same check for CONFLICTS as the standard
 	# one, except port origins are not compared. This allows
@@ -145,37 +154,50 @@
 # new ones. Otherwise, the staging directory is polluted with unneeded
 # files.
 pre-install:
-	@for f in manifest-rustc manifest-rust-std-${RUST_TARGET}; do \
-	    if test -f ${STAGEDIR}${PREFIX}/lib/rustlib/$$f; then \
-		${SED} -E -e 's,^(dir|file:),${STAGEDIR},' \
-		< ${STAGEDIR}${PREFIX}/lib/rustlib/$$f \
-		| ${XARGS} ${RM}; \
+	@for f in ${RUST_MANIFESTS} ${RUST_DOCS_MANIFESTS}; do \
+	    if test -f "${STAGEDIR}${PREFIX}/$$f"; then \
+	        ${SED} -E -e 's,^(file|dir):,${STAGEDIR},' \
+	            < "${STAGEDIR}${PREFIX}/$$f" \
+	            | ${XARGS} ${RM} -r; \
+	        ${RM} "${STAGEDIR}${PREFIX}/$$f"; \
 	    fi; \
 	done
-	@${RM} \
-		${STAGEDIR}${PREFIX}/lib/rustlib/components \
-		${STAGEDIR}${PREFIX}/lib/rustlib/manifest-rustc \
-		${STAGEDIR}${PREFIX}/lib/rustlib/manifest-rust-std-${RUST_TARGET} \
-		${STAGEDIR}${PREFIX}/lib/rustlib/rust-installer-version \
-		${STAGEDIR}${PREFIX}/lib/rustlib/uninstall.sh
-
-pre-install-DOCS-on:
-	@for f in manifest-rust-docs; do \
-	    if test -f ${STAGEDIR}${PREFIX}/lib/rustlib/$$f; then \
-		${SED} -E -e 's,^(dir|file:),${STAGEDIR},' \
-		< ${STAGEDIR}${PREFIX}/lib/rustlib/$$f \
-		| ${XARGS} ${RM}; \
-	    fi; \
+	@for f in ${PLIST_FILES}; do \
+	    ${RM} "${STAGEDIR}${PREFIX}/$$f"; \
 	done
-	@${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/manifest-rust-docs
 
+# In post-install, we use the manifests generated during Rust install
+# to in turn generate the PLIST. We do that, instead of the regular
+# `pkg-plist`, because several libraries have a computed filename based
+# on the absolute path of the source files. As it is user-specific, we
+# can't know their filename in advance.
+#
+# We fix manpage entries in the generated manifests because Rust
+# installs them uncompressed but the Ports framework compresses them.
 post-install:
-	@for f in manifest-rustc manifest-rust-std-${RUST_TARGET}; do \
-		${REINPLACE_CMD} -e 's|${STAGEDIR}||' \
-			${STAGEDIR}${PREFIX}/lib/rustlib/$$f; \
-		${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/$$f.bak; \
+	for f in ${RUST_MANIFESTS}; do \
+	    ${REINPLACE_CMD} -E \
+	        -e 's|:${STAGEDIR}|:|' \
+	        -e 's|(man/man[1-9]/.*\.[0-9])|\1.gz|' \
+	        ${STAGEDIR}${PREFIX}/$$f; \
+	    ${RM} ${STAGEDIR}${PREFIX}/$$f.bak; \
+	    ${ECHO} "${PREFIX}/$$f" >> ${TMPPLIST}; \
+	    ${AWK} '\
+	        /^file:/ { \
+	            file=$$0; \
+	            sub(/^file:/, "", file); \
+	            print file; \
+	        } \
+	        /^dir:/ { \
+	            dir=$$0; \
+	            sub(/^dir:/, "", dir); \
+	            system("find ${STAGEDIR}" dir " -type f | ${SED} -E -e \"s|${STAGEDIR}||\""); \
+	        }' \
+	        ${STAGEDIR}${PREFIX}/$$f >> ${TMPPLIST}; \
 	done
-	@${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/install.log
+	@${RM} \
+	    ${STAGEDIR}${PREFIX}/lib/rustlib/install.log \
+	    ${STAGEDIR}${PREFIX}/lib/rustlib/uninstall.sh
 # FIXME: Static libraries in lib/rustlib/*/lib/*.rlib are not stripped,
 # but they contain non-object files which make strip(1) unhappy.
 	@${STRIP_CMD} \
@@ -184,13 +206,6 @@
 		${STAGEDIR}${PREFIX}/lib/*.so \
 		${STAGEDIR}${PREFIX}/lib/rustlib/*/lib/*.so
 
-post-install-DOCS-on:
-	@for f in manifest-rust-docs; do \
-		${REINPLACE_CMD} -e 's|${STAGEDIR}||' \
-			${STAGEDIR}${PREFIX}/lib/rustlib/$$f; \
-		${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/$$f.bak; \
-	done
-
 .include <bsd.port.mk>
 
 # "make gen-registry" is a special target to ease this port update.
Index: head/lang/rust/pkg-plist.amd64
===================================================================
--- head/lang/rust/pkg-plist.amd64
+++ head/lang/rust/pkg-plist.amd64
@@ -1,113 +0,0 @@
-bin/rust-gdb
-bin/rust-lldb
-bin/rustc
-bin/rustdoc
-lib/libarena-22adfce669fd9832.so
-lib/libflate-e1e6e55ceb7251ef.so
-lib/libfmt_macros-ba80d211c09981a2.so
-lib/libgetopts-09faa2be228f2ddb.so
-lib/libgraphviz-6303af3dd8d718e9.so
-lib/liblog-761db57e43e641cb.so
-lib/libproc_macro-964c3339f3f8acda.so
-lib/libproc_macro_plugin-d9ebf1627378b721.so
-lib/libproc_macro_tokens-adc448e5e4f62f44.so
-lib/librustc-4221de92f27e804b.so
-lib/librustc_back-e247e25402404c1f.so
-lib/librustc_borrowck-68ef6be666920880.so
-lib/librustc_const_eval-14677cc7d4f412a3.so
-lib/librustc_const_math-7d31310a940ce777.so
-lib/librustc_data_structures-a29777375c573c9a.so
-lib/librustc_driver-9b159e7b54809b23.so
-lib/librustc_errors-da09828277bc171a.so
-lib/librustc_incremental-f9cea8a2dfb1093f.so
-lib/librustc_lint-ac6a304d2924921f.so
-lib/librustc_llvm-7a749f3ba5ac01da.so
-lib/librustc_metadata-0df9306a450c5744.so
-lib/librustc_mir-af6ee715a1ae6a07.so
-lib/librustc_passes-bdfaafb6f5c7f3fe.so
-lib/librustc_platform_intrinsics-12515fe496f9a823.so
-lib/librustc_plugin-4df4f6f2ea0b06f0.so
-lib/librustc_privacy-1ffbe0ad74c952f8.so
-lib/librustc_resolve-601ffa89350be577.so
-lib/librustc_save_analysis-8af316349017fac6.so
-lib/librustc_trans-3b154e537bd519a6.so
-lib/librustc_typeck-53963a21e3839eea.so
-lib/librustdoc-f458f9d50b770dc5.so
-lib/libserialize-967d73ca1a0a7c40.so
-lib/libstd-da49a473256a3892.so
-lib/libsyntax-2336662cab7e706b.so
-lib/libsyntax_ext-712f41e1ed978e55.so
-lib/libsyntax_pos-8802a44eb3221178.so
-lib/libterm-bed969971b58b7ed.so
-lib/libtest-098357d8bb203fcf.so
-lib/rustlib/components
-lib/rustlib/etc/debugger_pretty_printers_common.py
-lib/rustlib/etc/gdb_load_rust_pretty_printers.py
-lib/rustlib/etc/gdb_rust_pretty_printing.py
-lib/rustlib/etc/lldb_rust_formatters.py
-%%PORTDOCS%%lib/rustlib/manifest-rust-docs
-lib/rustlib/manifest-rust-std-%%RUST_TARGET%%
-lib/rustlib/manifest-rustc
-lib/rustlib/rust-installer-version
-lib/rustlib/uninstall.sh
-lib/rustlib/%%RUST_TARGET%%/lib/liballoc-332ff7daeb7e06b8.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/liballoc_jemalloc-e7607c19125f8392.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/liballoc_system-571dfebbf0f85a9f.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libarena-22adfce669fd9832.so
-lib/rustlib/%%RUST_TARGET%%/lib/libcollections-de8c3abb6b7777b0.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libcompiler_builtins-68612d8d1095fd06.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libcore-1bab58525600a9f4.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libflate-e1e6e55ceb7251ef.so
-lib/rustlib/%%RUST_TARGET%%/lib/libfmt_macros-ba80d211c09981a2.so
-lib/rustlib/%%RUST_TARGET%%/lib/libgetopts-09faa2be228f2ddb.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libgetopts-09faa2be228f2ddb.so
-lib/rustlib/%%RUST_TARGET%%/lib/libgraphviz-6303af3dd8d718e9.so
-lib/rustlib/%%RUST_TARGET%%/lib/liblibc-50f5b97a91634cfd.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/liblog-761db57e43e641cb.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/liblog-761db57e43e641cb.so
-lib/rustlib/%%RUST_TARGET%%/lib/libpanic_abort-b8f4cf2e638f3233.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libpanic_unwind-9739badf374daa6e.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libproc_macro-964c3339f3f8acda.so
-lib/rustlib/%%RUST_TARGET%%/lib/libproc_macro_plugin-d9ebf1627378b721.so
-lib/rustlib/%%RUST_TARGET%%/lib/libproc_macro_tokens-adc448e5e4f62f44.so
-lib/rustlib/%%RUST_TARGET%%/lib/librand-6dbadb1aa1c9735d.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/librustc-4221de92f27e804b.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_back-e247e25402404c1f.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_bitflags-9aa402a167df535a.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_borrowck-68ef6be666920880.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_const_eval-14677cc7d4f412a3.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_const_math-7d31310a940ce777.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_data_structures-a29777375c573c9a.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_driver-9b159e7b54809b23.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_errors-da09828277bc171a.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_incremental-f9cea8a2dfb1093f.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_lint-ac6a304d2924921f.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_llvm-7a749f3ba5ac01da.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_metadata-0df9306a450c5744.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_mir-af6ee715a1ae6a07.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_passes-bdfaafb6f5c7f3fe.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_platform_intrinsics-12515fe496f9a823.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_plugin-4df4f6f2ea0b06f0.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_privacy-1ffbe0ad74c952f8.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_resolve-601ffa89350be577.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_save_analysis-8af316349017fac6.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_trans-3b154e537bd519a6.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_typeck-53963a21e3839eea.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustdoc-f458f9d50b770dc5.so
-lib/rustlib/%%RUST_TARGET%%/lib/libserialize-967d73ca1a0a7c40.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libserialize-967d73ca1a0a7c40.so
-lib/rustlib/%%RUST_TARGET%%/lib/libstd-da49a473256a3892.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libstd-da49a473256a3892.so
-lib/rustlib/%%RUST_TARGET%%/lib/libstd_shim-51999e83180cf6a6.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libstd_unicode-df6dca325cb80ddd.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libsyntax-2336662cab7e706b.so
-lib/rustlib/%%RUST_TARGET%%/lib/libsyntax_ext-712f41e1ed978e55.so
-lib/rustlib/%%RUST_TARGET%%/lib/libsyntax_pos-8802a44eb3221178.so
-lib/rustlib/%%RUST_TARGET%%/lib/libterm-bed969971b58b7ed.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libterm-bed969971b58b7ed.so
-lib/rustlib/%%RUST_TARGET%%/lib/libtest-098357d8bb203fcf.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libtest-098357d8bb203fcf.so
-lib/rustlib/%%RUST_TARGET%%/lib/libtest_shim-0dc4520584a37d49.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libunwind-58a2f7d37c62243d.rlib
-man/man1/rustc.1.gz
-man/man1/rustdoc.1.gz
Index: head/lang/rust/pkg-plist.i386
===================================================================
--- head/lang/rust/pkg-plist.i386
+++ head/lang/rust/pkg-plist.i386
@@ -1,113 +0,0 @@
-bin/rust-gdb
-bin/rust-lldb
-bin/rustc
-bin/rustdoc
-lib/libarena-ff1b7a84bcfdf760.so
-lib/libflate-593505a091887d87.so
-lib/libfmt_macros-3b37f50c62e6879b.so
-lib/libgetopts-76aca13fa3c5ab82.so
-lib/libgraphviz-c246a6038857cc02.so
-lib/liblog-b025f6f08041d5ae.so
-lib/libproc_macro-61265b57ac238074.so
-lib/libproc_macro_plugin-3f881dfbbe60023f.so
-lib/libproc_macro_tokens-d4c016c5d91f26d3.so
-lib/librustc-3be965331bee4385.so
-lib/librustc_back-d2aaddf0636c6b47.so
-lib/librustc_borrowck-5360c3c94abd1039.so
-lib/librustc_const_eval-890d78250c35270e.so
-lib/librustc_const_math-e84456ed7e440c62.so
-lib/librustc_data_structures-41f19b174f869c45.so
-lib/librustc_driver-06f2b6dd1bcc4892.so
-lib/librustc_errors-da184ffe215e7e54.so
-lib/librustc_incremental-50d96f380ba89180.so
-lib/librustc_lint-6f9e571feb339ec3.so
-lib/librustc_llvm-92e7137623905fa8.so
-lib/librustc_metadata-c94950116e85a3a0.so
-lib/librustc_mir-b22a6896fdf0b64e.so
-lib/librustc_passes-eb0b4d3624709e93.so
-lib/librustc_platform_intrinsics-78262421afd85968.so
-lib/librustc_plugin-57e2f5d43c674558.so
-lib/librustc_privacy-b95d58910b29b7ee.so
-lib/librustc_resolve-e611aaa3d7f399a0.so
-lib/librustc_save_analysis-263a19155a17ca7d.so
-lib/librustc_trans-0b6c26ae33fcf4c8.so
-lib/librustc_typeck-5539f5895b1f44d6.so
-lib/librustdoc-4209e3d6ae14c061.so
-lib/libserialize-2b52638bfc0f80e7.so
-lib/libstd-574531589af3c21e.so
-lib/libsyntax-bbf5e8a99bfb4e8e.so
-lib/libsyntax_ext-39d6e52a8379a63d.so
-lib/libsyntax_pos-4d2925de87172be9.so
-lib/libterm-6d57aeb80cfa0ae6.so
-lib/libtest-8c54fc4bb6e4c286.so
-lib/rustlib/components
-lib/rustlib/etc/debugger_pretty_printers_common.py
-lib/rustlib/etc/gdb_load_rust_pretty_printers.py
-lib/rustlib/etc/gdb_rust_pretty_printing.py
-lib/rustlib/etc/lldb_rust_formatters.py
-%%PORTDOCS%%lib/rustlib/manifest-rust-docs
-lib/rustlib/manifest-rust-std-%%RUST_TARGET%%
-lib/rustlib/manifest-rustc
-lib/rustlib/rust-installer-version
-lib/rustlib/uninstall.sh
-lib/rustlib/%%RUST_TARGET%%/lib/liballoc-a16da6fd7e8ddd56.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/liballoc_jemalloc-9c834651c476c20c.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/liballoc_system-8c7ed5c105a2d49c.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libarena-ff1b7a84bcfdf760.so
-lib/rustlib/%%RUST_TARGET%%/lib/libcollections-37f2a19c7c5ff141.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libcompiler_builtins-ed22b885db526530.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libcore-f24536e370a195a6.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libflate-593505a091887d87.so
-lib/rustlib/%%RUST_TARGET%%/lib/libfmt_macros-3b37f50c62e6879b.so
-lib/rustlib/%%RUST_TARGET%%/lib/libgetopts-76aca13fa3c5ab82.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libgetopts-76aca13fa3c5ab82.so
-lib/rustlib/%%RUST_TARGET%%/lib/libgraphviz-c246a6038857cc02.so
-lib/rustlib/%%RUST_TARGET%%/lib/liblibc-422a8f7af3c61a81.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/liblog-b025f6f08041d5ae.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/liblog-b025f6f08041d5ae.so
-lib/rustlib/%%RUST_TARGET%%/lib/libpanic_abort-d58097d72328afe0.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libpanic_unwind-1951cb7c97d883d9.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libproc_macro-61265b57ac238074.so
-lib/rustlib/%%RUST_TARGET%%/lib/libproc_macro_plugin-3f881dfbbe60023f.so
-lib/rustlib/%%RUST_TARGET%%/lib/libproc_macro_tokens-d4c016c5d91f26d3.so
-lib/rustlib/%%RUST_TARGET%%/lib/librand-fd4f15a07d76026a.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/librustc-3be965331bee4385.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_back-d2aaddf0636c6b47.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_bitflags-505d809102284de5.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_borrowck-5360c3c94abd1039.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_const_eval-890d78250c35270e.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_const_math-e84456ed7e440c62.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_data_structures-41f19b174f869c45.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_driver-06f2b6dd1bcc4892.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_errors-da184ffe215e7e54.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_incremental-50d96f380ba89180.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_lint-6f9e571feb339ec3.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_llvm-92e7137623905fa8.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_metadata-c94950116e85a3a0.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_mir-b22a6896fdf0b64e.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_passes-eb0b4d3624709e93.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_platform_intrinsics-78262421afd85968.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_plugin-57e2f5d43c674558.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_privacy-b95d58910b29b7ee.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_resolve-e611aaa3d7f399a0.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_save_analysis-263a19155a17ca7d.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_trans-0b6c26ae33fcf4c8.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_typeck-5539f5895b1f44d6.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustdoc-4209e3d6ae14c061.so
-lib/rustlib/%%RUST_TARGET%%/lib/libserialize-2b52638bfc0f80e7.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libserialize-2b52638bfc0f80e7.so
-lib/rustlib/%%RUST_TARGET%%/lib/libstd-574531589af3c21e.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libstd-574531589af3c21e.so
-lib/rustlib/%%RUST_TARGET%%/lib/libstd_shim-2d8f031ada4a6211.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libstd_unicode-d367db81941ad466.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libsyntax-bbf5e8a99bfb4e8e.so
-lib/rustlib/%%RUST_TARGET%%/lib/libsyntax_ext-39d6e52a8379a63d.so
-lib/rustlib/%%RUST_TARGET%%/lib/libsyntax_pos-4d2925de87172be9.so
-lib/rustlib/%%RUST_TARGET%%/lib/libterm-6d57aeb80cfa0ae6.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libterm-6d57aeb80cfa0ae6.so
-lib/rustlib/%%RUST_TARGET%%/lib/libtest-8c54fc4bb6e4c286.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libtest-8c54fc4bb6e4c286.so
-lib/rustlib/%%RUST_TARGET%%/lib/libtest_shim-c9eea788e3cffe13.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libunwind-4a71218e512785be.rlib
-man/man1/rustc.1.gz
-man/man1/rustdoc.1.gz