lang/rust broken Makefile

[tech-lists]

Hello ports@

system: FreeBSD 11.1-STABLE #0 r323195 amd64
ports: r450000

lang/rust with latest ports has a broken Makefile:

root at desktop:/usr/ports/lang/rust# make distclean clean config
make: "/storage/usr/ports/lang/rust/Makefile" line 330: Need an operator
make: "/storage/usr/ports/lang/rust/Makefile" line 340: Unassociated
shell command "${STAGEDIR}${PREFIX}/bin/cargo
${STAGEDIR}${PREFIX}/bin/rustc  ${STAGEDIR}${PREFIX}/bin/rustdoc
${STAGEDIR}${PREFIX}/lib/*.so
${STAGEDIR}${PREFIX}/lib/rustlib/*/lib/*.so"
make: "/storage/usr/ports/lang/rust/Makefile" line 341: Need an operator
make: Fatal errors encountered -- cannot continue
make: stopped in /storage/usr/ports/lang/rust

my "fix" was to change this:

# FIXME: Static libraries in lib/rustlib/*/lib/*.rlib are not stripped,
# but they contain non-object files which make strip(1) unhappy.
        @${STRIP_CMD} \
<<<<<<< .mine
	${STAGEDIR}${PREFIX}/bin/rustc \
	${STAGEDIR}${PREFIX}/bin/rustdoc \
	${STAGEDIR}${PREFIX}/lib/*.so \
        ${STAGEDIR}${PREFIX}/lib/rustlib/*/lib/*.so
||||||| .r449906
	${STAGEDIR}${PREFIX}/bin/rustc \
	${STAGEDIR}${PREFIX}/bin/rustdoc \
        ${STAGEDIR}${PREFIX}/lib/*.so \
        ${STAGEDIR}${PREFIX}/lib/rustlib/*/lib/*.so
=======
	${STAGEDIR}${PREFIX}/bin/cargo \
        ${STAGEDIR}${PREFIX}/bin/rustc \
	${STAGEDIR}${PREFIX}/bin/rustdoc \
	${STAGEDIR}${PREFIX}/lib/*.so \
        ${STAGEDIR}${PREFIX}/lib/rustlib/*/lib/*.so
>>>>>>> .r449964

to this:

# FIXME: Static libraries in lib/rustlib/*/lib/*.rlib are not stripped,
# but they contain non-object files which make strip(1) unhappy.
        @${STRIP_CMD} \
#<<<<<<< .mine
	${STAGEDIR}${PREFIX}/bin/rustc \
	${STAGEDIR}${PREFIX}/bin/rustdoc \
	${STAGEDIR}${PREFIX}/lib/*.so \
        ${STAGEDIR}${PREFIX}/lib/rustlib/*/lib/*.so
#||||||| .r449906
#               ${STAGEDIR}${PREFIX}/bin/rustc \
#               ${STAGEDIR}${PREFIX}/bin/rustdoc \
#               ${STAGEDIR}${PREFIX}/lib/*.so \
#               ${STAGEDIR}${PREFIX}/lib/rustlib/*/lib/*.so
#=======
#               ${STAGEDIR}${PREFIX}/bin/cargo \
#               ${STAGEDIR}${PREFIX}/bin/rustc \
#               ${STAGEDIR}${PREFIX}/bin/rustdoc \
#               ${STAGEDIR}${PREFIX}/lib/*.so \
#               ${STAGEDIR}${PREFIX}/lib/rustlib/*/lib/*.so
#>>>>>>> .r449964
	    
thanks,
-- 
J.