CVS commit: pkgsrc/lang/rust

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Jun 14 15:38:18 UTC 2020

Modified Files:
        pkgsrc/lang/rust: buildlink3.mk rust.mk

Log Message:
rust: More rust.mk explanation.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/rust/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/rust/rust.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/rust/buildlink3.mk
diff -u pkgsrc/lang/rust/buildlink3.mk:1.4 pkgsrc/lang/rust/buildlink3.mk:1.5
--- pkgsrc/lang/rust/buildlink3.mk:1.4  Mon May 18 16:17:20 2020
+++ pkgsrc/lang/rust/buildlink3.mk      Sun Jun 14 15:38:18 2020
@@ -1,4 +1,8 @@
-# $NetBSD: buildlink3.mk,v 1.4 2020/05/18 16:17:20 nia Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2020/06/14 15:38:18 nia Exp $
+
+#
+# DO NOT include this directly! Use rust.mk instead.
+#
 
 BUILDLINK_TREE+=       rust
 
@@ -6,14 +10,7 @@ BUILDLINK_TREE+=      rust
 RUST_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.rust+=   rust>=1.20.0
-
-.include "../../lang/rust/type.mk"
-.if ${RUST_TYPE} != "bin"
 BUILDLINK_PKGSRCDIR.rust?=     ../../lang/rust
-.else
-BUILDLINK_PKGSRCDIR.rust?=     ../../lang/rust-bin
-.endif
-
 BUILDLINK_PASSTHRU_DIRS+=      ${PREFIX}/lib/rustlib
 .endif
 

Index: pkgsrc/lang/rust/rust.mk
diff -u pkgsrc/lang/rust/rust.mk:1.1 pkgsrc/lang/rust/rust.mk:1.2
--- pkgsrc/lang/rust/rust.mk:1.1        Sun Jun 14 15:33:27 2020
+++ pkgsrc/lang/rust/rust.mk    Sun Jun 14 15:38:18 2020
@@ -1,7 +1,10 @@
-# $NetBSD: rust.mk,v 1.1 2020/06/14 15:33:27 nia Exp $
+# $NetBSD: rust.mk,v 1.2 2020/06/14 15:38:18 nia Exp $
 # 
 # This file determines the type of rust package to use.
 #
+# It should be included by rust-dependent packages that don't use
+# cargo.mk.
+#
 # === User-settable variables ===
 #
 # RUST_TYPE