aboutsummaryrefslogtreecommitdiffstats
path: root/lang
diff options
context:
space:
mode:
authorjbeich <jbeich@FreeBSD.org>2016-04-01 09:16:08 +0800
committerjbeich <jbeich@FreeBSD.org>2016-04-01 09:16:08 +0800
commit484832ee098e7c1d23e11b30c5c9df69cc7f6891 (patch)
tree766dd5c98a75a312e1875de92c1bd6d0326d121f /lang
parent4446b954261e448012ad270a8c182bbd54e92966 (diff)
downloadfreebsd-ports-gnome-484832ee098e7c1d23e11b30c5c9df69cc7f6891.tar.gz
freebsd-ports-gnome-484832ee098e7c1d23e11b30c5c9df69cc7f6891.tar.zst
freebsd-ports-gnome-484832ee098e7c1d23e11b30c5c9df69cc7f6891.zip
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`
Diffstat (limited to 'lang')
-rw-r--r--lang/rust-nightly/Makefile14
-rw-r--r--lang/rust/Makefile14
2 files changed, 10 insertions, 18 deletions
diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile
index a54d5f299803..e222020ee4ae 100644
--- a/lang/rust-nightly/Makefile
+++ b/lang/rust-nightly/Makefile
@@ -19,12 +19,14 @@ COMMENT= Language with a focus on memory safety and concurrency
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=1 # ARCH
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 && \
diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index b91aeb2b4bbd..8936470d1a53 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -17,12 +17,14 @@ COMMENT= Language with a focus on memory safety and concurrency
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_VER}
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}|' \