Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 1 Apr 2016 01:16:08 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r412305 - in head/lang: rust rust-nightly
Message-ID:  <201604010116.u311G84A021696@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Fri Apr  1 01:16:08 2016
New Revision: 412305
URL: https://svnweb.freebsd.org/changeset/ports/412305

Log:
  lang/rust: apply minor style
  
  - Fix MIT view for LICENSES_ASK=1
  - Convert BROKEN to new syntax
  - Concatenate find(1) arguments and drop unnecessary `cd`

Modified:
  head/lang/rust-nightly/Makefile   (contents, props changed)
  head/lang/rust/Makefile   (contents, props changed)

Modified: head/lang/rust-nightly/Makefile
==============================================================================
--- head/lang/rust-nightly/Makefile	Thu Mar 31 22:25:27 2016	(r412304)
+++ head/lang/rust-nightly/Makefile	Fri Apr  1 01:16:08 2016	(r412305)
@@ -19,12 +19,14 @@ COMMENT=	Language with a focus on memory
 LICENSE=	APACHE20 \
 		MIT
 LICENSE_COMB=	dual
-LICENSE_FILE=	${WRKSRC}/LICENSE-APACHE \
-		${WRKSRC}/LICENSE-MIT
+# APACHE20 license is standard, see Templates/Licenses/APACHE20
+LICENSE_FILE_MIT=	${WRKSRC}/LICENSE-MIT
 
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	requires prebuilt bootstrap compiler
 
+BROKEN_FreeBSD_9=	Only compiles on FreeBSD 10 and 11
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	rust-lang
 GH_PROJECT=	rust \
@@ -93,12 +95,6 @@ PORT_LLVM_VARS_OFF=		NOPRECIOUSMAKEVARS=
 LLVM_VER?=			36 # XXX Move to DEFAULT_VERSIONS
 LLVM_PREFIX=			${LOCALBASE}/llvm${LLVM_VER}
 
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
-BROKEN=		Only compiles on FreeBSD 10 and 11
-.endif
-
 pre-fetch:
 	# FIXME: This is the same check for CONFLICTS as the standard
 	# one, except port origins are not compared. This allows
@@ -136,7 +132,7 @@ post-extract:
 	  ${MV} ${WRKSRC_rust_installer} ${WRKSRC}/src/rust-installer)
 	@${MKDIR} ${WRKSRC}/dl
 	${LN} -sf ${DISTDIR}/${RUST_BOOT} ${WRKSRC}/dl
-	(cd ${WRKSRC} && ${FIND} . -type d -exec ${CHMOD} 0755 {} \;)
+	${FIND} ${WRKSRC} -type d -exec ${CHMOD} 0755 {} +
 
 post-extract-PORT_LLVM-off:
 	@(${RMDIR} ${WRKSRC}/src/llvm && \

Modified: head/lang/rust/Makefile
==============================================================================
--- head/lang/rust/Makefile	Thu Mar 31 22:25:27 2016	(r412304)
+++ head/lang/rust/Makefile	Fri Apr  1 01:16:08 2016	(r412305)
@@ -17,12 +17,14 @@ COMMENT=	Language with a focus on memory
 LICENSE=	APACHE20 \
 		MIT
 LICENSE_COMB=	dual
-LICENSE_FILE=	${WRKSRC}/LICENSE-APACHE \
-		${WRKSRC}/LICENSE-MIT
+# APACHE20 license is standard, see Templates/Licenses/APACHE20
+LICENSE_FILE_MIT=	${WRKSRC}/LICENSE-MIT
 
 ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	requires prebuilt bootstrap compiler
 
+BROKEN_FreeBSD_9=	Only compiles on FreeBSD 10 and 11
+
 DISTINFO_FILE=	${MASTERDIR}/distinfo.${ARCH}
 
 # FIXME: The bootstrapped rustc adds -L/usr/local/lib in front of
@@ -82,12 +84,6 @@ LLVM_PREFIX=			${LOCALBASE}/llvm${LLVM_V
 TEST_TARGET=	check
 TEST_ENV+=	ALLOW_NONZERO_RLIMIT_CORE=1
 
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
-BROKEN=		Only compiles on FreeBSD 10 and 11
-.endif
-
 pre-fetch:
 	# FIXME: This is the same check for CONFLICTS as the standard
 	# one, except port origins are not compared. This allows
@@ -115,7 +111,7 @@ pre-fetch:
 post-extract:
 	@${MKDIR} ${WRKSRC}/dl
 	${LN} -sf ${DISTDIR}/${RUST_BOOT} ${WRKSRC}/dl
-	(cd ${WRKSRC} && ${FIND} . -type d -exec ${CHMOD} 0755 {} \;)
+	${FIND} ${WRKSRC} -type d -exec ${CHMOD} 0755 {} +
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604010116.u311G84A021696>