aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--etc/mtree/BSD.include.dist2
-rw-r--r--etc/mtree/BSD.usr.dist6
-rw-r--r--etc/termcap/Makefile4
-rw-r--r--lib/googletest/Makefile.inc2
-rw-r--r--lib/googletest/tests/Makefile3
-rw-r--r--lib/googletest/tests/Makefile.inc2
-rw-r--r--lib/ofed/Makefile.inc3
-rw-r--r--libexec/makewhatis.local/Makefile1
-rw-r--r--release/packages/ucl/googletest-all.ucl33
-rw-r--r--release/packages/ucl/tests-all.ucl18
-rw-r--r--release/packages/ucl/tests.ucl21
-rw-r--r--share/doc/llvm/Makefile2
-rw-r--r--share/doc/llvm/Makefile.inc1
-rw-r--r--share/tabset/Makefile2
-rw-r--r--share/termcap/Makefile11
-rw-r--r--usr.sbin/mixer/mixer.844
-rw-r--r--usr.sbin/periodic/etc/weekly/Makefile11
17 files changed, 106 insertions, 60 deletions
diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index 97f2194a3fa1..56d3a823a8f2 100644
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -278,7 +278,7 @@
..
lib9p tags=package=lib9p-dev
..
- libipt tags=package=libipt-dev
+ libipt
..
libmilter tags=package=libmilter-dev
..
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 54d408865fa5..79db101e74d9 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -242,8 +242,8 @@
..
legal
..
- llvm
- clang
+ llvm tags=package=clang
+ clang tags=package=clang
..
..
ncurses
@@ -857,7 +857,7 @@
scrnmaps
..
..
- tabset
+ tabset tags=package=ncurses-lib
..
vi
catalog
diff --git a/etc/termcap/Makefile b/etc/termcap/Makefile
index cd5516f3e04b..ea8fab4e839e 100644
--- a/etc/termcap/Makefile
+++ b/etc/termcap/Makefile
@@ -1,6 +1,8 @@
.PATH: ${SRCTOP}/share/termcap
-PACKAGE= runtime
+# Note: This is in ncurses-lib rather than ncurses because without it, ncurses
+# doesn't work, and the base ncurses package is optional.
+PACKAGE= ncurses-lib
CLEANFILES+= termcap.small
CONFS= termcap.small
diff --git a/lib/googletest/Makefile.inc b/lib/googletest/Makefile.inc
index 231d7545f364..43ebace19a15 100644
--- a/lib/googletest/Makefile.inc
+++ b/lib/googletest/Makefile.inc
@@ -1,5 +1,7 @@
.include <googletest.test.inc.mk>
+PACKAGE?= googletest
+
GTEST_DIR= ${SRCTOP}/contrib/googletest
GOOGLEMOCK_SRCROOT= ${GTEST_DIR}/googlemock
GOOGLETEST_SRCROOT= ${GTEST_DIR}/googletest
diff --git a/lib/googletest/tests/Makefile b/lib/googletest/tests/Makefile
index 886b1a2fe49d..350e0fe765fe 100644
--- a/lib/googletest/tests/Makefile
+++ b/lib/googletest/tests/Makefile
@@ -1,4 +1,7 @@
.PATH: ${SRCTOP}/tests
+
+PACKAGE= tests
+
KYUAFILE= yes
# Note: we start the gmock_main and gmock tests first since those take up to
diff --git a/lib/googletest/tests/Makefile.inc b/lib/googletest/tests/Makefile.inc
index 9691aaa93ded..8d19e1fafdea 100644
--- a/lib/googletest/tests/Makefile.inc
+++ b/lib/googletest/tests/Makefile.inc
@@ -3,6 +3,8 @@
# rather than installing all of them to /usr/tests/lib/googletest
TESTSDIR= ${TESTSBASE}/lib/googletest/${.CURDIR:T}
+PACKAGE= tests
+
# Clang's optimizer spends a really long time on these tests at -O2. Changing
# -O2 to -O1 reduces the -j32 time for lib/googletest/test from 131s to 71s.
# Using -O0 further reduces the time to 29s, and also reduces the disk usage
diff --git a/lib/ofed/Makefile.inc b/lib/ofed/Makefile.inc
index 1b911c451c01..5a16e0015c07 100644
--- a/lib/ofed/Makefile.inc
+++ b/lib/ofed/Makefile.inc
@@ -1 +1,4 @@
+PACKAGE?= rdma
+LIB_PACKAGE=
+
WARNS?= 0
diff --git a/libexec/makewhatis.local/Makefile b/libexec/makewhatis.local/Makefile
index 765036623d49..b541dc8e4de1 100644
--- a/libexec/makewhatis.local/Makefile
+++ b/libexec/makewhatis.local/Makefile
@@ -1,3 +1,4 @@
+PACKAGE= mandoc
SCRIPTS= makewhatis.local.sh
MAN= makewhatis.local.8
SCRIPTSDIR= ${LIBEXECDIR}
diff --git a/release/packages/ucl/googletest-all.ucl b/release/packages/ucl/googletest-all.ucl
new file mode 100644
index 000000000000..889e8a65f314
--- /dev/null
+++ b/release/packages/ucl/googletest-all.ucl
@@ -0,0 +1,33 @@
+/*
+ * SPDX-License-Identifier: ISC
+ *
+ * Copyright (c) 2025 Lexi Winter <ivy@FreeBSD.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+comment = "Unit testing framework"
+
+desc = <<EOD
+Google Test (gtest) is an xUnit-based unit testing framework for C++,
+developed by Google LLC.
+
+This version of Google Test is provided for use by unit tests in the
+base system, and is not intended for third-party users. A supported
+version of Google Test may be found in the FreeBSD Ports Collection
+as devel/googletest.
+EOD
+
+annotations {
+ set = "optional,optional-jail"
+}
diff --git a/release/packages/ucl/tests-all.ucl b/release/packages/ucl/tests-all.ucl
index 3ad2d0f50e6b..315ac2e8cce0 100644
--- a/release/packages/ucl/tests-all.ucl
+++ b/release/packages/ucl/tests-all.ucl
@@ -23,24 +23,6 @@ The test suite, installed in /usr/tests, allows the functionality of the
installed system to be verified.
EOD
-deps {
- # Nearly all the tests require atf to run.
- "atf": {
- version = "${VERSION}"
- },
-
- # The test framework requires Kyua.
- "kyua": {
- version = "${VERSION}"
- },
-
- # Since the purpose of the tests is to test the base system, the base
- # system must be installed.
- "set-base": {
- version = "${VERSION}"
- }
-}
-
annotations {
set = tests
}
diff --git a/release/packages/ucl/tests.ucl b/release/packages/ucl/tests.ucl
index bac72f1534d3..da9eb59295bc 100644
--- a/release/packages/ucl/tests.ucl
+++ b/release/packages/ucl/tests.ucl
@@ -18,10 +18,29 @@
deps {
+ # Nearly all the tests require atf to run.
+ "atf": {
+ version = "${VERSION}"
+ },
+
# Quite a few tests require flua.
"flua" {
version = "${VERSION}"
},
-}
+ # Some tests need GoogleTest
+ "googletest": {
+ version = "${VERSION}"
+ },
+ # The test framework requires Kyua.
+ "kyua": {
+ version = "${VERSION}"
+ },
+
+ # Since the purpose of the tests is to test the base system, the base
+ # system must be installed.
+ "set-base": {
+ version = "${VERSION}"
+ }
+}
diff --git a/share/doc/llvm/Makefile b/share/doc/llvm/Makefile
index 8fde27acf117..35398786a9cb 100644
--- a/share/doc/llvm/Makefile
+++ b/share/doc/llvm/Makefile
@@ -1,5 +1,7 @@
SUBDIR= clang
+PACKAGE= clang
+
SRCDIR= ${SRCTOP}/contrib/llvm-project/llvm
.PATH: ${SRCDIR} ${SRCDIR}/lib/Support
diff --git a/share/doc/llvm/Makefile.inc b/share/doc/llvm/Makefile.inc
new file mode 100644
index 000000000000..915410fe46c4
--- /dev/null
+++ b/share/doc/llvm/Makefile.inc
@@ -0,0 +1 @@
+PACKAGE?= clang
diff --git a/share/tabset/Makefile b/share/tabset/Makefile
index fe7519084716..4da1a3650888 100644
--- a/share/tabset/Makefile
+++ b/share/tabset/Makefile
@@ -1,3 +1,5 @@
+PACKAGE= ncurses-lib
+
FILES= 3101 9837 aa aed512 beehive diablo dtc382 hp700-wy ibm3101 std \
stdcrt tandem653 teleray vt100 vt100-w wyse-adds xerox1720 xerox1730 \
xerox1730-lm zenith29
diff --git a/share/termcap/Makefile b/share/termcap/Makefile
index 34ad41fd520a..603b098e4de1 100644
--- a/share/termcap/Makefile
+++ b/share/termcap/Makefile
@@ -1,10 +1,13 @@
# reorder gives an editor command for most common terminals
# (in reverse order from n'th to 1'st most commonly used)
# to move them to the front of termcap
-#
-MAN= termcap.5
-PACKAGE= runtime
+MAN= termcap.5
+MANPACKAGE= ncurses
+
+# Note: This is in ncurses-lib rather than ncurses because without it, ncurses
+# doesn't work, and the base ncurses package is optional.
+PACKAGE= ncurses-lib
FILES= termcap termcap.db
FILESDIR= ${BINDIR}/misc
CLEANFILES+= termcap.db
@@ -16,7 +19,7 @@ termcap.db: termcap
${CAP_MKDB_CMD} ${CAP_MKDB_ENDIAN} -f ${.TARGET:R} ${.ALLSRC}
etc-termcap:
- ${INSTALL_SYMLINK} -T "package=runtime" \
+ ${INSTALL_SYMLINK} -T "package=ncurses-lib" \
${BINDIR}/misc/termcap ${DESTDIR}/etc/termcap
.include <bsd.prog.mk>
diff --git a/usr.sbin/mixer/mixer.8 b/usr.sbin/mixer/mixer.8
index 819d8ae73ab1..d7de675bceee 100644
--- a/usr.sbin/mixer/mixer.8
+++ b/usr.sbin/mixer/mixer.8
@@ -19,7 +19,7 @@
.\" OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
.\" THE SOFTWARE.
.\"
-.Dd August 14, 2024
+.Dd October 31, 2025
.Dt MIXER 8
.Os
.Sh NAME
@@ -28,7 +28,7 @@
.Sh SYNOPSIS
.Nm
.Op Fl f Ar device
-.Op Fl d Ar pcmN | N Op Fl V Ar voss_device:mode
+.Op Fl d Ar pcmX | X Op Fl V Ar voss_device:mode
.Op Fl os
.Op Ar dev Ns Op Cm \&. Ns Ar control Ns Op Cm \&= Ns Ar value
.Ar ...
@@ -47,10 +47,10 @@ The options are as follows:
.It Fl a
Print the values for all mixer devices available in the system
.Pq see Sx FILES .
-.It Fl d Ar pcmN | N
+.It Fl d Ar pcmX | X
Change the default audio card to
-.Ar pcmN ,
-where N is the unit number (e.g for pcm0, the unit number is 0).
+.Ar pcmX ,
+where X is the device's unit number (e.g for pcm0, the unit number is 0).
See
.Sx EXAMPLES
on how to list all available audio devices in the system.
@@ -246,30 +246,22 @@ makes
the only recording device.
.El
.Sh FILES
-.Bl -tag -width /dev/mixerN -compact
-.It Pa /dev/mixerN
-The mixer device, where
-.Ar N
-is the number of that device, for example
-.Ar /dev/mixer0 .
-PCM cards and mixers have a 1:1 relationship, which means that
+.Bl -tag -width "/dev/mixerX" -compact
+.It Pa /dev/mixerX
+The mixer device, where X is the unit number of that device,
+.Pa /dev/dsp*
+devices and
+.Pa /dev/mixer*
+devices have a 1:1 relationship, which means that, for instance,
.Pa /dev/mixer0
-is the mixer for
-.Pa /dev/pcm0
-and so on.
-By default,
+is the mixer device for
+.Pa /dev/dsp0 .
+.It /dev/mixer
+Alias to the default device's mixer device.
.Nm
-prints both the audio card's number and the mixer associated with it
-in the form of
-.Ar pcmN:mixer .
-The
-.Pa /dev/mixer
-file, although it does not exist in the filesystem, points to the default
-mixer device and is the file
-.Nm
-opens when the
+opens this when the
.Fl f Ar device
-option has not been specified.
+option is not specified.
.El
.Sh EXAMPLES
List all available audio devices in the system:
diff --git a/usr.sbin/periodic/etc/weekly/Makefile b/usr.sbin/periodic/etc/weekly/Makefile
index d194a988acf0..a5483534c029 100644
--- a/usr.sbin/periodic/etc/weekly/Makefile
+++ b/usr.sbin/periodic/etc/weekly/Makefile
@@ -8,12 +8,11 @@ CONFS= 340.noid \
# NB: keep these sorted by MK_* knobs
-.if ${MK_LOCATE} != "no"
-CONFS+= 310.locate
-.endif
+CONFGROUPS.${MK_LOCATE}+= LOCATE
+LOCATE= 310.locate
-.if ${MK_MAN_UTILS} != "no"
-CONFS+= 320.whatis
-.endif
+CONFGROUPS.${MK_MAN_UTILS}+= WHATIS
+WHATISPACKAGE= mandoc
+WHATIS= 320.whatis
.include <bsd.prog.mk>
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-06 16:51:05 +0000