document change of standard => std and complete => set

Ravenports · Aug 8, 2024 · dfd4997 · dfd4997
1 parent c6d7f40
commit dfd4997
Show file tree

Hide file tree

Showing 57 changed files with 155 additions and 139 deletions.
diff --git a/Scripts/Ravenports_Mk/Scripts/qa.sh b/Scripts/Ravenports_Mk/Scripts/qa.sh
@@ -511,9 +511,24 @@ py_conflicts() {
 	return 0
 }
 
+completeset() {
+	if [ "${VARIANT}" = "standard" ]; then
+		err "Standard variant detected (instead of 'std')"
+		return 1
+	fi
+	for spkg in ${SPKGS}; do
+		if [ "${spkg}" = "complete" ]; then
+			err "complete subpackage detected (instead of 'set')"
+			return 1
+		fi
+	done
+	return 0
+}
+
 checks="shebang symlinks paths desktopfileutils sharedmimeinfo"
 checks="$checks suidfiles libtool prefixvar terminfo"
 checks="$checks sonames nls_files doc_files uses_fbsd10fix uses_mbsdfix"
+checks="$checks completeset"
 # don't add to this line
 checks="$checks missing_license licterms showlic py_conflicts"
 

diff --git a/Scripts/Ravenports_Mk/Uses/ada.mk b/Scripts/Ravenports_Mk/Uses/ada.mk
@@ -11,7 +11,7 @@ _INCLUDE_USES_ADA_MK=	yes
 # -----------------------------------------------
 # Incorporated in ravenadm
 # -----------------------------------------------
-# EXRUN[subpackage]=	ravensys-gcc:ada_run:standard
+# EXRUN[subpackage]=	ravensys-gcc:ada_run:std
 # -----------------------------------------------
 
 .endif
diff --git a/Scripts/Ravenports_Mk/Uses/autoreconf.mk b/Scripts/Ravenports_Mk/Uses/autoreconf.mk
@@ -72,10 +72,10 @@ _USES_POST+=	autoreconf
 # -----------------------------------------------
 # Incorporated in ravenadm
 # -----------------------------------------------
-# BUILD_DEPENDS+=	autoconf:primary:standard
-#			automake:primary:standard
+# BUILD_DEPENDS+=	autoconf:primary:std
+#			automake:primary:std
 # if ARGS does not contain "build", then
-# BUILD_DEPENDS+=	libtool:single:standard
+# BUILD_DEPENDS+=	libtool:single:std
 # -----------------------------------------------
 
 _AUTORECONF?=	2.72

diff --git a/Scripts/Ravenports_Mk/Uses/bdb.mk b/Scripts/Ravenports_Mk/Uses/bdb.mk
@@ -16,10 +16,10 @@
 # Incorporated in ravenadm
 # -----------------------------------------------
 #.if ${bdb_ARGS:Mbuild}
-# BUILD_DEPENDS+=	db{X}:dev:standard
+# BUILD_DEPENDS+=	db{X}:dev:std
 #.else
-# BUILD_DEPENDS+=	db{X}:dev:standard
-# BUILDRUN_DEPENDS+=	db{X}:primary:standard
+# BUILD_DEPENDS+=	db{X}:dev:std
+# BUILDRUN_DEPENDS+=	db{X}:primary:std
 #.endif
 # -----------------------------------------------
 

diff --git a/Scripts/Ravenports_Mk/Uses/bison.mk b/Scripts/Ravenports_Mk/Uses/bison.mk
@@ -12,13 +12,13 @@ _INCLUDE_USES_BISON_MK=	yes
 # Incorporated in ravenadm
 # -----------------------------------------------------
 # if ARGS are none or :build (but not :run, :buildrun)
-# BUILD_DEPENDS+=	bison:primary:standard
+# BUILD_DEPENDS+=	bison:primary:std
 # -----------------------------------------------------
 # if ARGS contain :buildrun (or :build and :run)
-# BUILDRUN_DEPENDS+=   bison:primary:standard
+# BUILDRUN_DEPENDS+=   bison:primary:std
 # -----------------------------------------------------
 # if ARGS contains :run (and not :build, :buildrun)
-# RUN_DEPENDS+=        bison:primary:standard
+# RUN_DEPENDS+=        bison:primary:std
 # -----------------------------------------------------
 
 .endif
diff --git a/Scripts/Ravenports_Mk/Uses/bz2.mk b/Scripts/Ravenports_Mk/Uses/bz2.mk
@@ -12,10 +12,10 @@ _INCLUDE_USES_BZ2_MK=	yes
 # Incorporated in ravenadm
 # -----------------------------------------------
 #.if {bz2_ARGS:Mbuild}
-# BUILD_DEPENDS+=	bzip2:dev:standard
+# BUILD_DEPENDS+=	bzip2:dev:std
 #.else
-# BUILD_DEPENDS+=	bzip2:dev:standard
-# BUILDRUN_DEPENDS+=	bzip2:primary:standard
+# BUILD_DEPENDS+=	bzip2:dev:std
+# BUILDRUN_DEPENDS+=	bzip2:primary:std
 #.endif
 # -----------------------------------------------
 

diff --git a/Scripts/Ravenports_Mk/Uses/c++.mk b/Scripts/Ravenports_Mk/Uses/c++.mk
@@ -11,7 +11,7 @@ _INCLUDE_USES_CXX_MK=	yes
 # -----------------------------------------------
 # Incorporated in ravenadm
 # -----------------------------------------------
-# EXRUN[subpackage]=	ravensys-gcc:cxx_run:standard
+# EXRUN[subpackage]=	ravensys-gcc:cxx_run:std
 # -----------------------------------------------
 
 .endif
diff --git a/Scripts/Ravenports_Mk/Uses/cargo.mk b/Scripts/Ravenports_Mk/Uses/cargo.mk
@@ -48,7 +48,7 @@ CARGO_CONFIG_ARGS?=
 # -----------------------------------------------
 # Incorporated in ravenadm
 # -----------------------------------------------
-# BUILD_DEPENDS+=	rust:single:standard
+# BUILD_DEPENDS+=	rust:single:std
 # -----------------------------------------------
 
 # Augments CARGO_ENV (taking care not to override)

diff --git a/Scripts/Ravenports_Mk/Uses/cclibs.mk b/Scripts/Ravenports_Mk/Uses/cclibs.mk
@@ -18,7 +18,7 @@ _INCLUDE_USES_CCLIBS_MK=	yes
 # -----------------------------------------------
 # Incorporated in ravenadm
 # -----------------------------------------------
-# EXRUN[subpackage]=	ravensys-gcc:libs:standard
+# EXRUN[subpackage]=	ravensys-gcc:libs:std
 # -----------------------------------------------
 
 .endif
diff --git a/Scripts/Ravenports_Mk/Uses/clang.mk b/Scripts/Ravenports_Mk/Uses/clang.mk
@@ -11,7 +11,7 @@ _INCLUDE_USES_CLANG_MK=	yes
 # -----------------------------------------------------
 # Incorporated in ravenadm
 # -----------------------------------------------------
-# BUILD_DEPENDS+=	clang:complete:standard
+# BUILD_DEPENDS+=	clang:complete:std
 # -----------------------------------------------------
 
 .if ${clang_ARGS:Mkeepcc}

diff --git a/Scripts/Ravenports_Mk/Uses/compiler.mk b/Scripts/Ravenports_Mk/Uses/compiler.mk
@@ -11,7 +11,7 @@ _INCLUDE_USES_COMPILER_MK=	yes
 # -----------------------------------------------
 # Incorporated in ravenadm
 # -----------------------------------------------
-# EXRUN[subpackage]=	gcc6:complete:standard
+# EXRUN[subpackage]=	ravensys-gcc:set:std
 # -----------------------------------------------
 
 .endif
diff --git a/Scripts/Ravenports_Mk/Uses/cran.mk b/Scripts/Ravenports_Mk/Uses/cran.mk
@@ -11,13 +11,13 @@ _INCLUDE_USES_CRAN_MK=	yes
 # -----------------------------------------------
 # Incorporated in ravenadm
 # -----------------------------------------------
-# BUILD_DEPENDS+=	R:primary:standard
-#                       icu:dev:standard
-# RUN_DEPENDS+=		R:primary:standard
-#                       R:nls:standard
+# BUILD_DEPENDS+=	R:primary:std
+#                       icu:dev:std
+# RUN_DEPENDS+=		R:primary:std
+#                       R:nls:std
 # Not in RUN_DEPENDS:
-#                       R:docs:standard
-#                       R:man:standard
+#                       R:docs:std
+#                       R:man:std
 # -----------------------------------------------
 
 RNAMEBASE=		${NAMEBASE:C/^R-//}

diff --git a/Scripts/Ravenports_Mk/Uses/curl.mk b/Scripts/Ravenports_Mk/Uses/curl.mk
@@ -12,10 +12,10 @@ _INCLUDE_USES_ZSTD_MK=	yes
 # Incorporated in ravenadm
 # -----------------------------------------------
 #.if ${curl_ARGS:Mbuild}
-# BUILD_DEPENDS+=	curl:dev:standard
+# BUILD_DEPENDS+=	curl:dev:std
 #.else
-# BUILD_DEPENDS+=	curl:dev:standard
-# BUILDRUN_DEPENDS+=	curl:primary:standard
+# BUILD_DEPENDS+=	curl:dev:std
+# BUILDRUN_DEPENDS+=	curl:primary:std
 #.endif
 # -----------------------------------------------
 

diff --git a/Scripts/Ravenports_Mk/Uses/desktop-utils.mk b/Scripts/Ravenports_Mk/Uses/desktop-utils.mk
@@ -5,7 +5,7 @@
 # Usage:	USES=desktop-utils
 # Valid ARGS:	subpackage
 #
-# ravenadm add desktop-file-utils:primary:standard to BUILDRUN_DEPENDS
+# ravenadm add desktop-file-utils:primary:std to BUILDRUN_DEPENDS
 #
 
 .if !defined(_INCLUDE_USES_DESKTOP_UTILS_MK)

diff --git a/Scripts/Ravenports_Mk/Uses/display.mk b/Scripts/Ravenports_Mk/Uses/display.mk
@@ -12,9 +12,9 @@ display_ARGS=	install
 
 # Ravenadm will set these BUILD_DEPENDS:
 #   xorg-server:single:virtual
-#   xorg-misc-bitmap-fonts:single:standard
-#   xorg-font-alias:single:standard
-#   daemonize:single:standard
+#   xorg-misc-bitmap-fonts:single:std
+#   xorg-font-alias:single:std
+#   daemonize:single:std
 
 .  if !defined(DISPLAY)
 

diff --git a/Scripts/Ravenports_Mk/Uses/execinfo.mk b/Scripts/Ravenports_Mk/Uses/execinfo.mk
@@ -11,10 +11,10 @@ _INCLUDE_USES_EXECINFO_MK=	yes
 # Incorporated in ravenadm
 # -----------------------------------------------
 #.if ${zstd_ARGS:Mbuild}
-# BUILD_DEPENDS+=	libexecinfo:dev:standard
+# BUILD_DEPENDS+=	libexecinfo:dev:std
 #.else
-# BUILD_DEPENDS+=	libexecinfo:dev:standard
-# BUILDRUN_DEPENDS+=	libexecinfo:primary:standard
+# BUILD_DEPENDS+=	libexecinfo:dev:std
+# BUILDRUN_DEPENDS+=	libexecinfo:primary:std
 #.endif
 #
 # NOTE: On Darwin, this module is a no-op.

diff --git a/Scripts/Ravenports_Mk/Uses/expat.mk b/Scripts/Ravenports_Mk/Uses/expat.mk
@@ -12,10 +12,10 @@ _INCLUDE_USES_EXPAT_MK=	yes
 # Incorporated in ravenadm
 # -----------------------------------------------
 #.if {expat_ARGS:Mbuild}
-# BUILD_DEPENDS+=	expat:dev:standard
+# BUILD_DEPENDS+=	expat:dev:std
 #.else
-# BUILD_DEPENDS+=	expat:dev:standard
-# BUILDRUN_DEPENDS+=	expat:primary:standard
+# BUILD_DEPENDS+=	expat:dev:std
+# BUILDRUN_DEPENDS+=	expat:primary:std
 #.endif
 # -----------------------------------------------
 

diff --git a/Scripts/Ravenports_Mk/Uses/fontconfig.mk b/Scripts/Ravenports_Mk/Uses/fontconfig.mk
@@ -12,10 +12,10 @@ _INCLUDE_USES_FONTCONFIG_MK=	yes
 # Incorporated in ravenadm
 # -----------------------------------------------
 #.if {fontconfig_ARGS:Mbuild}
-# BUILD_DEPENDS+=	fontconfig:dev:standard
+# BUILD_DEPENDS+=	fontconfig:dev:std
 #.else
-# BUILD_DEPENDS+=	fontconfig:dev:standard
-# BUILDRUN_DEPENDS+=	fontconfig:primary:standard
+# BUILD_DEPENDS+=	fontconfig:dev:std
+# BUILDRUN_DEPENDS+=	fontconfig:primary:std
 #.endif
 # -----------------------------------------------
 

diff --git a/Scripts/Ravenports_Mk/Uses/fonts.mk b/Scripts/Ravenports_Mk/Uses/fonts.mk
@@ -39,13 +39,13 @@ fonts_ARGS=	fontsdir
 # Incorporated in ravenadm
 # -----------------------------------------------
 # if argument = fc:
-# BUILD_DEPENDS+=	fontconfig:dev:standard
-# BUILDRUN_DEPENDS+=	fontconfig:primary:standard
+# BUILD_DEPENDS+=	fontconfig:dev:std
+# BUILDRUN_DEPENDS+=	fontconfig:primary:std
 # -----------------------------------------------
 # if argument = fontsdir:
-# BUILD_DEPENDS+=	fontconfig:dev:standard
-# BUILDRUN_DEPENDS+=	fontconfig:primary:standard
-# BUILDRUN_DEPENDS+=	xorg-mkfontscale:primary:standard
+# BUILD_DEPENDS+=	fontconfig:dev:std
+# BUILDRUN_DEPENDS+=	fontconfig:primary:std
+# BUILDRUN_DEPENDS+=	xorg-mkfontscale:primary:std
 # -----------------------------------------------
 # Unrecognized arguments are removed from buildsheet
 # If multiple recognized arguments are provided, all after

diff --git a/Scripts/Ravenports_Mk/Uses/fortran.mk b/Scripts/Ravenports_Mk/Uses/fortran.mk
@@ -11,7 +11,7 @@ _INCLUDE_USES_FORTRAN_MK=	yes
 # -----------------------------------------------
 # Incorporated in ravenadm
 # -----------------------------------------------
-# EXRUN[subpackage]=  ravensys-gcc:fortran_run:standard
+# EXRUN[subpackage]=  ravensys-gcc:fortran_run:std
 # -----------------------------------------------
 
 .endif
diff --git a/Scripts/Ravenports_Mk/Uses/freetype.mk b/Scripts/Ravenports_Mk/Uses/freetype.mk
@@ -12,10 +12,10 @@ _INCLUDE_USES_ZSTD_MK=	yes
 # Incorporated in ravenadm
 # -----------------------------------------------
 #.if ${freetype_ARGS:Mbuild}
-# BUILD_DEPENDS+=	freetype:dev:standard
+# BUILD_DEPENDS+=	freetype:dev:std
 #.else
-# BUILD_DEPENDS+=	freetype:dev:standard
-# BUILDRUN_DEPENDS+=	freetype:primary:standard
+# BUILD_DEPENDS+=	freetype:dev:std
+# BUILDRUN_DEPENDS+=	freetype:primary:std
 #.endif
 # -----------------------------------------------
 

diff --git a/Scripts/Ravenports_Mk/Uses/gettext.mk b/Scripts/Ravenports_Mk/Uses/gettext.mk
@@ -11,15 +11,15 @@ _INCLUDE_USES_GETTEXT_MK=	yes
 # -----------------------------------------------------
 # Incorporated in ravenadm
 # -----------------------------------------------------
-# BUILD_DEPENDS+=	gettext:dev:standard
-# BUILD_DEPENDS+=	gettext:bldtools:standard
-# BUILD_DEPENDS+=	gettext:tools:standard
+# BUILD_DEPENDS+=	gettext:dev:std
+# BUILD_DEPENDS+=	gettext:bldtools:std
+# BUILD_DEPENDS+=	gettext:tools:std
 #
 #.if ! ${gettext_ARGS:Mbuild}
-# BUILD_DEPENDS+=	gettext:solinks:standard
-# BUILDRUN_DEPENDS+=	gettext:primary:standard
+# BUILD_DEPENDS+=	gettext:solinks:std
+# BUILDRUN_DEPENDS+=	gettext:primary:std
 #.  if ${gettext_ARGS:Masprintf}
-# BUILDRUN_DEPENDS+=    gettext:asprintf:standard
+# BUILDRUN_DEPENDS+=    gettext:asprintf:std
 #.  endif
 #. endif
 # -----------------------------------------------------

diff --git a/Scripts/Ravenports_Mk/Uses/gif.mk b/Scripts/Ravenports_Mk/Uses/gif.mk
@@ -12,10 +12,10 @@ _INCLUDE_USES_GIF_MK=	yes
 # Incorporated in ravenadm
 # -----------------------------------------------------
 #.if ${gif_ARGS:Mbuild}
-# BUILD_DEPENDS+=	giflib:dev:standard
+# BUILD_DEPENDS+=	giflib:dev:std
 #.else
-# BUILD_DEPENDS+=	giflib:dev:standard
-# BUILDRUN_DEPENDS+=	giflib:primary:standard
+# BUILD_DEPENDS+=	giflib:dev:std
+# BUILDRUN_DEPENDS+=	giflib:primary:std
 #.endif
 # -----------------------------------------------------
 

diff --git a/Scripts/Ravenports_Mk/Uses/gmake.mk b/Scripts/Ravenports_Mk/Uses/gmake.mk
@@ -11,7 +11,7 @@ _INCLUDE_USES_GMAKE_MK=	yes
 # -----------------------------------------------
 # Incorporated in ravenadm
 # -----------------------------------------------
-# BUILD_DEPENDS+=	gmake:single:standard
+# BUILD_DEPENDS+=	gmake:single:std
 # -----------------------------------------------
 CONFIGURE_ENV+=		MAKE=gmake
 MAKE_CMD=		gmake

diff --git a/Scripts/Ravenports_Mk/Uses/gnome-icons.mk b/Scripts/Ravenports_Mk/Uses/gnome-icons.mk
@@ -20,7 +20,7 @@ _INCLUDE_USES_GNOMEICONS_MK=	yes
 # Incorporated in ravenadm
 # -----------------------------------------------
 #.if ${gnome-icons_ARGS:Mbuild}
-# RUN_DEPENDS+=	gtk3:gnome-icons:standard
+# RUN_DEPENDS+=	gtk3:gnome-icons:std
 #.endif
 # -----------------------------------------------
 

diff --git a/Scripts/Ravenports_Mk/Uses/gprbuild.mk b/Scripts/Ravenports_Mk/Uses/gprbuild.mk
@@ -10,6 +10,6 @@ _INCLUDE_USES_GPRBUILD_MK=	yes
 
 # The logic is contained in ravenadm.
 # The presence of USES=gprbuild turns it on.
-# gprbuild:primary:standard
+# gprbuild:primary:std
 
 .endif
diff --git a/Scripts/Ravenports_Mk/Uses/gtk-doc.mk b/Scripts/Ravenports_Mk/Uses/gtk-doc.mk
@@ -12,7 +12,7 @@ _INCLUDE_USES_GTKDOC_MK=	yes
 # -----------------------------------------------
 # Incorporated in ravenadm
 # -----------------------------------------------
-# BUILD_DEPENDS+=	gtk-doc:single:standard
+# BUILD_DEPENDS+=	gtk-doc:single:std
 # -----------------------------------------------
 
 GTKDOC_OUTPUT_BASEDIR?=	${NAMEBASE}

diff --git a/Scripts/Ravenports_Mk/Uses/iconv.mk b/Scripts/Ravenports_Mk/Uses/iconv.mk
@@ -21,10 +21,10 @@ ICONV_LIBRARY=		${LOCALBASE}/lib/libiconv.so
 # Incorporated in ravenadm
 # -----------------------------------------------
 #.if {iconv_ARGS:Mbuild}
-# BUILD_DEPENDS+=	libiconv:dev:standard
+# BUILD_DEPENDS+=	libiconv:dev:std
 #.else
-# BUILD_DEPENDS+=	libiconv:dev:standard
-# BUILDRUN_DEPENDS+=	libiconv:primary:standard
+# BUILD_DEPENDS+=	libiconv:dev:std
+# BUILDRUN_DEPENDS+=	libiconv:primary:std
 #.endif
 # -----------------------------------------------
 

diff --git a/Scripts/Ravenports_Mk/Uses/jpeg.mk b/Scripts/Ravenports_Mk/Uses/jpeg.mk
@@ -12,10 +12,10 @@ _INCLUDE_USES_JPEG_MK=	yes
 # Incorporated in ravenadm
 # -----------------------------------------------------
 #.if {jpeg_ARGS:Mbuild}
-# BUILD_DEPENDS+=	jpeg-turbo:dev:standard
+# BUILD_DEPENDS+=	jpeg-turbo:dev:std
 #.else
-# BUILD_DEPENDS+=	jpeg-turbo:dev:standard
-# BUILDRUN_DEPENDS+=	jpeg-turbo:primary:standard
+# BUILD_DEPENDS+=	jpeg-turbo:dev:std
+# BUILDRUN_DEPENDS+=	jpeg-turbo:primary:std
 #.endif
 # -----------------------------------------------------
 

diff --git a/Scripts/Ravenports_Mk/Uses/libtool.mk b/Scripts/Ravenports_Mk/Uses/libtool.mk
@@ -18,7 +18,7 @@ _USES_POST+=	libtool
 # Incorporated in ravenadm
 # -----------------------------------------------
 #.if ${libtool_ARGS:Mbuild}
-# BUILD_DEPENDS+=	libtool:single:standard
+# BUILD_DEPENDS+=	libtool:single:std
 #.endif
 # -----------------------------------------------