Rename rust-bin's PKGNAME to rust-bin. Add rust.mk for rust packages.

This allows rust-bin and rust to coexist in bulk builds (for testing, etc),
but the packages still may not be installed at the same time.

rust.mk as a solution for picking the correct rust variant was suggested
by gdt@. It is intended to be included directly by packages that do not
use cargo.mk, and indirectly by packages that do use cargo.mk.

rust.mk provides one user-settable variable:

RUST_TYPE
	as before, whether to bootstrap rust from source or use
	official binaries. may be "src" or "bin"

And two package-settable variables:

RUST_REQ
	the minimum version of Rust required by the package.
	defaults to "1.20.0"

RUST_RUNTIME
	whether Rust is a runtime dependency, may be "yes" or "no"

6 files changed, 14 insertions, 20 deletions

diff --git a/www/cliqz/Makefile b/www/cliqz/Makefile
index 6e3749b7d7b..5cf7b6c1af6 100644
--- a/www/cliqz/Makefile
+++ b/www/cliqz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2020/06/02 08:24:56 adam Exp $
+# $NetBSD: Makefile,v 1.43 2020/06/14 15:33:28 nia Exp $
 
 DISTNAME=	cliqz-1.36.0
 PKGREVISION=	1
@@ -175,8 +175,7 @@ PKG_CC=		${PREFIX}/bin/clang
 PKG_CXX=	${PREFIX}/bin/clang++
 BUILDLINK_DEPMETHOD.clang=     build
 .include "../../lang/clang/buildlink3.mk"
-BUILDLINK_DEPMETHOD.rust=      build
-BUILDLINK_API_DEPENDS.rust+=   rust>=1.41.0
-.include "../../lang/rust/buildlink3.mk"
+RUST_REQ=	1.41.0
+.include "../../lang/rust/rust.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/firefox/mozilla-common.mk b/www/firefox/mozilla-common.mk
index e24df2460ef..62a41e820cd 100644
--- a/www/firefox/mozilla-common.mk
+++ b/www/firefox/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.169 2020/06/03 09:04:36 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.170 2020/06/14 15:33:28 nia Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -261,9 +261,8 @@ CWRAPPERS_PREPEND.cxx+= \
 	-stdlib++-isystem \
 	${BUILDLINK_PREFIX.gcc8}/gcc8/include/c++/backward
 .endif
-BUILDLINK_DEPMETHOD.rust=	build
-BUILDLINK_API_DEPENDS.rust+=	rust>=1.41.0
-.include "../../lang/rust/buildlink3.mk"
+RUST_REQ=	1.41.0
+.include "../../lang/rust/rust.mk"
 # webrtc option requires internal libvpx
 #BUILDLINK_API_DEPENDS.libvpx+=	libvpx>=1.3.0
 #.include "../../multimedia/libvpx/buildlink3.mk"
diff --git a/www/firefox68/mozilla-common.mk b/www/firefox68/mozilla-common.mk
index bfdcb3dc3ff..bb7adaf86c5 100644
--- a/www/firefox68/mozilla-common.mk
+++ b/www/firefox68/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.10 2020/04/28 06:56:48 riastradh Exp $
+# $NetBSD: mozilla-common.mk,v 1.11 2020/06/14 15:33:28 nia Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -227,9 +227,8 @@ BUILDLINK_API_DEPENDS.libwebp+=	libwebp>=1.0.2
 .include "../../graphics/libwebp/buildlink3.mk"
 BUILDLINK_DEPMETHOD.clang=	build
 .include "../../lang/clang/buildlink3.mk"
-BUILDLINK_DEPMETHOD.rust=	build
-BUILDLINK_API_DEPENDS.rust+=	rust>=1.34.0
-.include "../../lang/rust/buildlink3.mk"
+RUST_REQ=	1.34.0
+.include "../../lang/rust/rust.mk"
 # webrtc option requires internal libvpx
 #BUILDLINK_API_DEPENDS.libvpx+=	libvpx>=1.3.0
 #.include "../../multimedia/libvpx/buildlink3.mk"
diff --git a/www/geckodriver/Makefile b/www/geckodriver/Makefile
index 9b006841e5d..0af2c653d72 100644
--- a/www/geckodriver/Makefile
+++ b/www/geckodriver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2020/01/19 18:20:46 maya Exp $
+# $NetBSD: Makefile,v 1.11 2020/06/14 15:33:29 nia Exp $
 
 DISTNAME=	geckodriver-0.24.0
 CATEGORIES=	www
@@ -175,6 +175,5 @@ do-build:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/target/release/geckodriver ${DESTDIR}${PREFIX}/bin
 
-.include "../../lang/rust/buildlink3.mk"
 .include "../../lang/rust/cargo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/seamonkey/mozilla-common.mk b/www/seamonkey/mozilla-common.mk
index 937baf537e0..6371b0b1921 100644
--- a/www/seamonkey/mozilla-common.mk
+++ b/www/seamonkey/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.2 2020/06/08 12:39:19 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.3 2020/06/14 15:33:28 nia Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -201,9 +201,8 @@ BUILDLINK_API_DEPENDS.nss+=	nss>=3.35
 #.include "../../graphics/cairo/buildlink3.mk"
 BUILDLINK_DEPMETHOD.clang=	build
 .include "../../lang/clang/buildlink3.mk"
-BUILDLINK_API_DEPENDS.rust+=	rust>=1.23.0
-BUILDLINK_DEPMETHOD.rust=	build
-.include "../../lang/rust/buildlink3.mk"
+RUST_REQ=	1.23.0
+.include "../../lang/rust/rust.mk"
 #BUILDLINK_API_DEPENDS.libvpx+=	libvpx>=1.3.0
 #.include "../../multimedia/libvpx/buildlink3.mk"
 .include "../../net/libIDL/buildlink3.mk"
diff --git a/www/zola/Makefile b/www/zola/Makefile
index 0cebe265b87..923158ffb49 100644
--- a/www/zola/Makefile
+++ b/www/zola/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/06/08 17:28:05 nikita Exp $
+# $NetBSD: Makefile,v 1.3 2020/06/14 15:33:29 nia Exp $
 
 DISTNAME=	zola-0.11.0
 CATEGORIES=	www
@@ -328,6 +328,5 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/target/release/zola ${DESTDIR}${PREFIX}/bin
 
 .include "../../lang/rust/cargo.mk"
-.include "../../lang/rust/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"