diff --git a/lib/geom/cache/Makefile b/lib/geom/cache/Makefile index e1ba031c9ffe..2aee7212dfda 100644 --- a/lib/geom/cache/Makefile +++ b/lib/geom/cache/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ -PACKAGE=runtime +PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= cache .include diff --git a/lib/geom/concat/Makefile b/lib/geom/concat/Makefile index 3c370520a624..9d5cfb8b3893 100644 --- a/lib/geom/concat/Makefile +++ b/lib/geom/concat/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ -PACKAGE=runtime +PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= concat .include diff --git a/lib/geom/eli/Makefile b/lib/geom/eli/Makefile index e36eece7a6e2..49f34908f917 100644 --- a/lib/geom/eli/Makefile +++ b/lib/geom/eli/Makefile @@ -1,18 +1,18 @@ # $FreeBSD$ -PACKAGE=runtime +PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc ${SRCTOP}/sys/geom/eli ${SRCTOP}/sys/crypto/sha2 GEOM_CLASS= eli SRCS= g_eli_crypto.c SRCS+= g_eli_hmac.c SRCS+= g_eli_key.c SRCS+= pkcs5v2.c SRCS+= sha256c.c SRCS+= sha512c.c LIBADD= md crypto CFLAGS+=-I${SRCTOP}/sys .include diff --git a/lib/geom/journal/Makefile b/lib/geom/journal/Makefile index 3be15a13a81e..e789793a68b8 100644 --- a/lib/geom/journal/Makefile +++ b/lib/geom/journal/Makefile @@ -1,13 +1,13 @@ # $FreeBSD$ -PACKAGE=runtime +PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= journal SRCS+= geom_journal_ufs.c LIBADD= ufs md CFLAGS+=-I${SRCTOP}/sys .include diff --git a/lib/geom/label/Makefile b/lib/geom/label/Makefile index 767924b78b61..9f2b9c5e24f8 100644 --- a/lib/geom/label/Makefile +++ b/lib/geom/label/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ -PACKAGE=runtime +PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= label .include diff --git a/lib/geom/mirror/Makefile b/lib/geom/mirror/Makefile index 553e44787d8b..0fd7a7bcd13b 100644 --- a/lib/geom/mirror/Makefile +++ b/lib/geom/mirror/Makefile @@ -1,10 +1,10 @@ # $FreeBSD$ -PACKAGE=runtime +PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= mirror LIBADD= md .include diff --git a/lib/geom/mountver/Makefile b/lib/geom/mountver/Makefile index 36c1e01e112a..7924df1a074d 100644 --- a/lib/geom/mountver/Makefile +++ b/lib/geom/mountver/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ -PACKAGE=runtime +PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= mountver .include diff --git a/lib/geom/multipath/Makefile b/lib/geom/multipath/Makefile index 5a753e42d76d..4364e382ba75 100644 --- a/lib/geom/multipath/Makefile +++ b/lib/geom/multipath/Makefile @@ -1,10 +1,10 @@ # $FreeBSD$ -PACKAGE=runtime +PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= multipath CFLAGS+= -I${SRCTOP}/sys .include diff --git a/lib/geom/nop/Makefile b/lib/geom/nop/Makefile index 9d8b69117466..51a535a3b9e1 100644 --- a/lib/geom/nop/Makefile +++ b/lib/geom/nop/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ -PACKAGE=runtime +PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= nop .include diff --git a/lib/geom/part/Makefile b/lib/geom/part/Makefile index e9631caf4d84..077bc6c64b1d 100644 --- a/lib/geom/part/Makefile +++ b/lib/geom/part/Makefile @@ -1,10 +1,10 @@ # $FreeBSD$ -PACKAGE=runtime +PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= part LIBADD= util .include diff --git a/lib/geom/raid/Makefile b/lib/geom/raid/Makefile index 75d2ac7e25b7..2e3d4083492a 100644 --- a/lib/geom/raid/Makefile +++ b/lib/geom/raid/Makefile @@ -1,10 +1,10 @@ # $FreeBSD$ -PACKAGE=runtime +PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= raid LIBADD= md .include diff --git a/lib/geom/raid3/Makefile b/lib/geom/raid3/Makefile index 2fdf4e8f8167..29aeb9d595b5 100644 --- a/lib/geom/raid3/Makefile +++ b/lib/geom/raid3/Makefile @@ -1,10 +1,10 @@ # $FreeBSD$ -PACKAGE=runtime +PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= raid3 LIBADD= md .include diff --git a/lib/geom/shsec/Makefile b/lib/geom/shsec/Makefile index f86df6c9af42..e6acbf24577c 100644 --- a/lib/geom/shsec/Makefile +++ b/lib/geom/shsec/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ -PACKAGE=runtime +PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= shsec .include diff --git a/lib/geom/stripe/Makefile b/lib/geom/stripe/Makefile index bbea1901749e..9fc24db55d65 100644 --- a/lib/geom/stripe/Makefile +++ b/lib/geom/stripe/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ -PACKAGE=runtime +PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= stripe .include diff --git a/lib/geom/union/Makefile b/lib/geom/union/Makefile index cb8b09dc7eca..384d1fbf8ca5 100644 --- a/lib/geom/union/Makefile +++ b/lib/geom/union/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ -PACKAGE=runtime +PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= union .include diff --git a/lib/geom/virstor/Makefile b/lib/geom/virstor/Makefile index dfbe0aeddc47..24b4e508af18 100644 --- a/lib/geom/virstor/Makefile +++ b/lib/geom/virstor/Makefile @@ -1,11 +1,11 @@ # $FreeBSD$ -PACKAGE=runtime +PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc ${SRCTOP}/sys/geom/virstor GEOM_CLASS= virstor SRCS+= binstream.c SRCS+= g_virstor_md.c .include diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package index 99a06ec727bf..ccaba970489c 100644 --- a/release/packages/Makefile.package +++ b/release/packages/Makefile.package @@ -1,148 +1,150 @@ # # $FreeBSD$ # acct_COMMENT= System Accounting Utilities acct_DESC= System Accounting Utilities acpi_COMMENT= ACPI Utilities acpi_DESC= ACPI Utilities amd_COMMENT= AMD Utilities amd_DESC= AMD Utilities apm_COMMENT= APM Utilities apm_DESC= APM Utilities at_COMMENT= AT Utilities at_DESC= AT Utilities autofs_COMMENT= Autofs Utilities autofs_DESC= Autofs Utilities bhyve_COMMENT= Bhyve Utilities bhyve_DESC= Bhyve Utilities binutils_COMMENT= Binutils binutils_DESC= Binutils bluetooth_COMMENT= Bluetooth Utilities bluetooth_DESC= Bluetooth Utilities bootloader_COMMENT= Bootloader bootloader_DESC= Bootloader and configuration files bsdinstall_COMMENT= BSDInstall Utilities bsdinstall_DESC= BSDInstall Utilities bsnmp_COMMENT= BSNMP Utilities bsnmp_DESC= BSNMP Utilities clang_COMMENT= Clang Utilities clang_DESC= Clang Utilities clibs_COMMENT= Core C Libraries clibs_DESC= Core C Libraries csh_COMMENT= C Shell csh_DESC= C Shell cxgbe-tools_COMMENT= Chelsio cxbge Utilities cxgbe-tools_DESC= Chelsio cxbge Utilities dhclient_COMMENT= DHCP Client dhclient_DESC= DHCP Client dma_COMMENT= DMA Mail Agent Utilities dma_DESC= DMA Mail Agent Utilities docs_COMMENT= Documentation docs_DESC= Documentation dtrace_COMMENT= Dtrace Utilities dtrace_DESC= Dtrace Utilities dwatch_COMMENT= Dwatch Utilities dwatch_DESC= Dwatch Utilities ee_COMMENT= Easy Editor Utilities ee_DESC= Easy Editor Utilities efi-tools_COMMENT= UEFI Utilities efi-tools_DESC= UEFI Utilities fetch_COMMENT= Fetch Utility fetch_DESC= Fetch Utility ftp_COMMENT= FTP Utilities ftp_DESC= FTP Utilities ftpd_COMMENT= FTP Daemon ftpd_DESC= FTP Daemon gdb_COMMENT= GDB Utilities gdb_DESC= GDB Utilities +geom_COMMENT= GEOM Utilitites +geom_DESC= GEOM Utilitites ggate_COMMENT= GEOM Gate Utilities ggate_DESC= GEOM Gate Utilities groff_COMMENT= Groff Utilities groff_DESC= Groff Utilities hast_COMMENT= Highly Available Storage daemon hast_DESC= Highly Available Storage daemon hostapd_COMMENT= 802.11 Access Point Daemon an Utilities hostapd_DESC= 802.11 Access Point Daemon an Utilities hyperv-tools_COMMENT= Microsoft HyperV Utilities hyperv-tools_DESC= Microsoft HyperV Utilities jail_COMMENT= Jail Utilities jail_DESC= Jail Utilities jail-debug_DESCR= Debugging Symbols jail-development_DESCR=Development Files jail-profile_DESCR= Profiling Libraries jail-lib32_DESCR= 32-bit Libraries jail-lib32-debug_DESCR=32-bit Debugging Symbols jail-lib32-development_DESCR=32-bit Development Files jail-lib32-profile_DESCR=32-bit Profiling Libraries kerberos_COMMENT= Kerberos Utilities kerberos_DESC= Kerberos Utilities kerberos-lib_COMMENT= Kerberos Libraries kerberos-lib_DESC= Kerberos Libraries kernel_COMMENT= FreeBSD Kernel kernel_DESC= FreeBSD Kernel manuals_COMMENT= Manual Pages manuals_DESC= Manual Pages mlx-tools_COMMENT= Mellanox Utilities mlx-tools_DESC= Mellanox Utilities mtree_COMMENT= MTREE Files mtree_DESC= MTREE Files newsyslog_COMMENT= Newsyslog Utility newsyslog_DESC= Newsyslog Utility nfs_COMMENT= NFS Utilities nfs_DESC= NFS Utilities nvme-tools_COMMENT= NVME Utilities nvme-tools_DESC= NVME Utilities openssl_COMMENT= OpenSSL Library and Utility openssl_DESC= OpenSSL Library and Utility pkg-bootstrap_COMMENT= pkg bootstrap Utility pkg-bootstrap_DESC= pkg bootstrap Utility periodic_COMMENT= Periodic Utility periodic_DESC= Periodic Utility rc_COMMENT= RC Scripts rc_DESC= RC Scripts rcmds_COMMENT= Remote Command Utilities rcmds_DESC= Remote Command Utilities rdma_COMMENT= RDMA Utilities rdma_DESC= RDMA Utilities rescue_COMMENT= Rescue Utilities rescue_DESC= Rescue Utilities resolvconf_COMMENT= Resolvconf Utility and scripts resolvconf_DESC= Resolvconf Utility and scripts runtime_COMMENT= FreeBSD Base System runtime_DESC= FreeBSD Base System runtime-debug_DESCR= Debugging Symbols runtime-development_DESCR=Development Files runtime-profile_DESCR= Profiling Libraries runtime-lib32_DESCR= 32-bit Libraries runtime-lib32-debug_DESCR=32-bit Debugging Symbols runtime-lib32-development_DESCR=32-bit Development Files runtime-lib32-profile_DESCR=32-bit Profiling Libraries sendmail_COMMENT= Sendmail Utilities sendmail_DESC= Sendmail Utilities ssh_COMMENT= Secure Shell Utilities ssh_DESC= Secure Shell Utilities svn_COMMENT= Subversion Version Control System svn_DESC= Subversion Version Control System syscons_COMMENT= Syscons Console syscons_DESC= Syscons Console syslogd_COMMENT= Syslog Daemon syslogd_DESC= Syslog Daemon tcpd_COMMENT= TCP Wrapper utilities tcpd_DESC= TCP Wrapper utilities telnet_COMMENT= Telnet client telnet_DESC= Telnet client tests_COMMENT= Test Suite tests_DESC= Test Suite unbound_COMMENT= Unbound DNS Resolver unbound_DESC= Unbound DNS Resolver utilities_COMMENT= Non-vital programs and libraries utilities_DESC= Non-vital programs and libraries vi_COMMENT= Vi Editor vi_DESC= Vi Editor vt_COMMENT= VT fonts and keyboard files vt_DESC= VT fonts and keyboard files wpa_COMMENT= 802.11 Supplicant wpa_DESC= 802.11 Supplicant yp_COMMENT= Yellow Pages programs yp_DESC= Yellow Pages programs diff --git a/sbin/gbde/Makefile b/sbin/gbde/Makefile index dcc034fd7564..867a7f8e9b55 100644 --- a/sbin/gbde/Makefile +++ b/sbin/gbde/Makefile @@ -1,33 +1,33 @@ # $FreeBSD$ -PACKAGE=runtime +PACKAGE=geom PROG= gbde SRCS= gbde.c template.c SRCS+= rijndael-alg-fst.c SRCS+= rijndael-api-fst.c SRCS+= sha512c.c SRCS+= g_bde_lock.c # rijndael-fst.c does evil casting things which can results in warnings, # the test-vectors check out however, so it works right. NO_WCAST_ALIGN= NO_WMISSING_VARIABLE_DECLARATIONS= CFLAGS+= -I${SRCTOP}/sys .PATH: ${SRCTOP}/sys/geom/bde \ ${SRCTOP}/sys/crypto/rijndael \ ${SRCTOP}/sys/crypto/sha2 CLEANFILES+= template.c MAN= gbde.8 LIBADD= md util geom template.c: template.txt file2c 'const char template[] = {' ',0};' \ < ${.CURDIR}/template.txt > template.c test: ${PROG} sh ${.CURDIR}/test.sh ${.CURDIR} .include diff --git a/sbin/geom/Makefile b/sbin/geom/Makefile index 0c6e6e2b95c8..4424c757371f 100644 --- a/sbin/geom/Makefile +++ b/sbin/geom/Makefile @@ -1,30 +1,30 @@ # $FreeBSD$ .include .PATH: ${.CURDIR}/core ${.CURDIR}/misc -PACKAGE=runtime +PACKAGE=geom PROG= geom SRCS= geom.c subr.c MAN= geom.8 CFLAGS+= -I${.CURDIR} -I${.CURDIR}/core CFLAGS+= -DGEOM_CLASS_DIR=\"${GEOM_CLASS_DIR}\" LIBADD= geom util .if defined(RESCUE) .PATH: ${SRCTOP}/lib/geom/part \ ${SRCTOP}/lib/geom/label SRCS+= geom_label.c geom_part.c MAN= WARNS?= 2 CFLAGS+=-DSTATIC_GEOM_CLASSES .else .include "${SRCTOP}/lib/geom/Makefile.classes" LINKS= ${GEOM_CLASSES:S|^|${BINDIR}/geom ${BINDIR}/g|} .endif .include diff --git a/sbin/gvinum/Makefile b/sbin/gvinum/Makefile index 18550053228a..88d6b7242580 100644 --- a/sbin/gvinum/Makefile +++ b/sbin/gvinum/Makefile @@ -1,15 +1,15 @@ # $FreeBSD$ -PACKAGE=runtime +PACKAGE=geom PROG= gvinum SRCS= gvinum.c gvinum.h geom_vinum_share.c MAN= gvinum.8 WARNS?= 2 CFLAGS+= -I${SRCTOP}/sys -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/edit LIBADD= edit geom .PATH: ${SRCTOP}/sys/geom/vinum .include