diff --git a/lib/libufs/Makefile b/lib/libufs/Makefile index 623d5ae541a0..265b072068e2 100644 --- a/lib/libufs/Makefile +++ b/lib/libufs/Makefile @@ -1,40 +1,40 @@ # $FreeBSD$ -PACKAGE= runtime +PACKAGE= ufs LIB= ufs SHLIBDIR?= /lib SHLIB_MAJOR= 7 SRCS= block.c cgroup.c gsb_crc32.c inode.c sblock.c type.c ffs_subr.c SRCS+= ffs_tables.c INCS= libufs.h MAN= bread.3 cgread.3 getinode.3 libufs.3 sbread.3 ufs_disk_close.3 MLINKS+= bread.3 bwrite.3 MLINKS+= bread.3 berase.3 MLINKS+= cgread.3 cgread1.3 MLINKS+= cgread.3 cgget.3 MLINKS+= cgread.3 cgwrite.3 MLINKS+= cgread.3 cgwrite1.3 MLINKS+= cgread.3 cgput.3 MLINKS+= getinode.3 putinode.3 MLINKS+= sbread.3 sbwrite.3 MLINKS+= sbread.3 sbget.3 MLINKS+= sbread.3 sbsearch.3 MLINKS+= sbread.3 sbfind.3 MLINKS+= sbread.3 sbput.3 MLINKS+= ufs_disk_close.3 ufs_disk_fillout.3 MLINKS+= ufs_disk_close.3 ufs_disk_fillout_blank.3 MLINKS+= ufs_disk_close.3 ufs_disk_write.3 .PATH: ${SRCTOP}/sys/libkern ${SRCTOP}/sys/ufs/ffs WARNS?= 2 CFLAGS+= -D_LIBUFS .if defined(LIBUFS_DEBUG) CFLAGS+= -D_LIBUFS_DEBUGGING .endif CFLAGS+= -I${.CURDIR} .include diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package index dce9ae912786..0203ee32800c 100644 --- a/release/packages/Makefile.package +++ b/release/packages/Makefile.package @@ -1,152 +1,154 @@ # # $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 +ufs_COMMENT= UFS Libraries and Utilities +ufs_DESC= UFS Libraries and Utilities 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 zfs_COMMENT= ZFS Libraries and Utilities zfs_DESC= ZFS Libraries and Utilities diff --git a/sbin/clri/Makefile b/sbin/clri/Makefile index 5f8777f30391..77a7933f8cdd 100644 --- a/sbin/clri/Makefile +++ b/sbin/clri/Makefile @@ -1,10 +1,10 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ -PACKAGE=runtime +PACKAGE=ufs PROG= clri MAN= clri.8 LIBADD= ufs WARNS?= 2 .include diff --git a/sbin/dump/Makefile b/sbin/dump/Makefile index f611d6b1ab47..0977a969609b 100644 --- a/sbin/dump/Makefile +++ b/sbin/dump/Makefile @@ -1,30 +1,30 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ # dump.h header file # itime.c reads /etc/dumpdates # main.c driver # optr.c operator interface # dumprmt.c handles remote tape via rmt(8) # tape.c handles the mag tape and opening/closing # traverse.c traverses the file system # unctime.c undo ctime # # DEBUG use local directory to find ddate and dumpdates # TDEBUG trace out the process forking -PACKAGE=runtime +PACKAGE=ufs PROG= dump CONFS= /dev/null CONFSGRP= operator CONFSMODE= 664 CONFSNAME_/dev/null= dumpdates LINKS= ${BINDIR}/dump ${BINDIR}/rdump CFLAGS+=-DRDUMP SRCS= itime.c main.c optr.c dumprmt.c tape.c traverse.c unctime.c cache.c MAN= dump.8 LIBADD= ufs MLINKS= dump.8 rdump.8 WARNS?= 2 .include diff --git a/sbin/dumpfs/Makefile b/sbin/dumpfs/Makefile index 03e1aae03b87..c90644dd0186 100644 --- a/sbin/dumpfs/Makefile +++ b/sbin/dumpfs/Makefile @@ -1,10 +1,10 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ -PACKAGE=runtime +PACKAGE=ufs PROG= dumpfs WARNS?= 2 LIBADD= ufs MAN= dumpfs.8 .include diff --git a/sbin/ffsinfo/Makefile b/sbin/ffsinfo/Makefile index 19aa71ab89c4..37837d182a91 100644 --- a/sbin/ffsinfo/Makefile +++ b/sbin/ffsinfo/Makefile @@ -1,19 +1,19 @@ # @(#)Makefile 8.8 (Berkeley) 6/21/2000 # # $TSHeader: src/sbin/ffsinfo/Makefile,v 1.3 2000/12/05 19:45:10 tomsoft Exp $ # $FreeBSD$ # GROWFS= ${.CURDIR:H}/growfs .PATH: ${GROWFS} -PACKAGE=runtime +PACKAGE=ufs PROG= ffsinfo SRCS= ffsinfo.c debug.c MAN= ffsinfo.8 WARNS?= 1 CFLAGS+=-DFS_DEBUG -I${GROWFS} LIBADD= ufs .include diff --git a/sbin/fsck_ffs/Makefile b/sbin/fsck_ffs/Makefile index ba8a39a87e1f..351ec432095d 100644 --- a/sbin/fsck_ffs/Makefile +++ b/sbin/fsck_ffs/Makefile @@ -1,19 +1,19 @@ # $FreeBSD$ # @(#)Makefile 8.2 (Berkeley) 4/27/95 -PACKAGE=runtime +PACKAGE=ufs PROG= fsck_ffs LINKS+= ${BINDIR}/fsck_ffs ${BINDIR}/fsck_ufs LINKS+= ${BINDIR}/fsck_ffs ${BINDIR}/fsck_4.2bsd MAN= fsck_ffs.8 MLINKS= fsck_ffs.8 fsck_ufs.8 fsck_ffs.8 fsck_4.2bsd.8 SRCS= dir.c ea.c fsutil.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c \ pass4.c pass5.c setup.c suj.c utilities.c gjournal.c getmntopts.c \ globs.c LIBADD= ufs WARNS?= 2 CFLAGS+= -I${.CURDIR} -I${.CURDIR:H}/mount .PATH: ${SRCTOP}/sys/ufs/ffs ${.CURDIR:H}/mount .include diff --git a/sbin/fsdb/Makefile b/sbin/fsdb/Makefile index a2e280420479..37be6845fa78 100644 --- a/sbin/fsdb/Makefile +++ b/sbin/fsdb/Makefile @@ -1,17 +1,17 @@ # $NetBSD: Makefile,v 1.1.1.1 1995/10/08 23:08:36 thorpej Exp $ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ -PACKAGE=runtime +PACKAGE=ufs PROG= fsdb MAN= fsdb.8 SRCS= fsdb.c fsdbutil.c \ dir.c ea.c fsutil.c inode.c pass1.c pass1b.c pass2.c pass3.c pass4.c \ pass5.c setup.c utilities.c ffs_subr.c ffs_tables.c globs.c prtblknos.c CFLAGS+= -I${.CURDIR:H}/fsck_ffs WARNS?= 2 LIBADD= edit ufs .PATH: ${.CURDIR:H}/fsck_ffs ${SRCTOP}/sys/ufs/ffs \ ${SRCTOP}/tools/diag/prtblknos .include diff --git a/sbin/fsirand/Makefile b/sbin/fsirand/Makefile index 1fc54ff44687..7c9475b95251 100644 --- a/sbin/fsirand/Makefile +++ b/sbin/fsirand/Makefile @@ -1,10 +1,10 @@ # $OpenBSD: Makefile,v 1.1 1997/01/26 02:23:20 millert Exp $ # $FreeBSD$ -PACKAGE=runtime +PACKAGE=ufs PROG= fsirand MAN= fsirand.8 LIBADD= ufs WARNS?= 3 .include diff --git a/sbin/growfs/Makefile b/sbin/growfs/Makefile index 8aeb9d77509e..9c0704193446 100644 --- a/sbin/growfs/Makefile +++ b/sbin/growfs/Makefile @@ -1,28 +1,28 @@ # @(#)Makefile 8.8 (Berkeley) 6/21/2000 # # $TSHeader: src/sbin/growfs/Makefile,v 1.4 2000/12/05 19:45:24 tomsoft Exp $ # $FreeBSD$ # .include .PATH: ${.CURDIR:H}/mount -PACKAGE=runtime +PACKAGE=ufs PROG= growfs SRCS= growfs.c getmntopts.c MAN= growfs.8 CFLAGS+=-I${.CURDIR:H}/mount .if defined(GFSDBG) SRCS+= debug.c CFLAGS+= -DFS_DEBUG NO_WCAST_ALIGN= yes .endif LIBADD= ufs util HAS_TESTS= SUBDIR.${MK_TESTS}+= tests .include diff --git a/sbin/mksnap_ffs/Makefile b/sbin/mksnap_ffs/Makefile index a79ae2f73417..53690a39805f 100644 --- a/sbin/mksnap_ffs/Makefile +++ b/sbin/mksnap_ffs/Makefile @@ -1,21 +1,21 @@ # $FreeBSD$ .PATH: ${.CURDIR:H}/mount -PACKAGE=runtime +PACKAGE=ufs PROG= mksnap_ffs SRCS= mksnap_ffs.c getmntopts.c MAN= mksnap_ffs.8 WARNS?= 2 CFLAGS+=-I${.CURDIR:H}/mount .if defined(NOSUID) BINMODE=554 .else BINMODE=4554 BINOWN= root .endif BINGRP= operator .include diff --git a/sbin/newfs/Makefile b/sbin/newfs/Makefile index 9e3ea13b6e5c..2723c42e575c 100644 --- a/sbin/newfs/Makefile +++ b/sbin/newfs/Makefile @@ -1,19 +1,20 @@ # @(#)Makefile 8.2 (Berkeley) 3/27/94 # $FreeBSD$ .PATH: ${SRCTOP}/sys/geom +PACKAGE= ufs PROG= newfs LIBADD= ufs util SRCS= newfs.c mkfs.c geom_bsd_enc.c WARNS?= 3 MAN= newfs.8 .include test: ${PROG} sh ${.CURDIR}/runtest01.sh sh ${.CURDIR}/runtest00.sh | tee _.test diff --ignore-matching-lines=FreeBSD _.test ${.CURDIR}/ref.test echo All Tests Passed diff --git a/sbin/restore/Makefile b/sbin/restore/Makefile index d6c1e6202693..38134903ee46 100644 --- a/sbin/restore/Makefile +++ b/sbin/restore/Makefile @@ -1,16 +1,16 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ .PATH: ${.CURDIR:H}/dump -PACKAGE=runtime +PACKAGE=ufs PROG= restore LINKS= ${BINDIR}/restore ${BINDIR}/rrestore MAN= restore.8 MLINKS= restore.8 rrestore.8 SRCS= main.c interactive.c restore.c dirs.c symtab.c tape.c utilities.c \ dumprmt.c WARNS?= 2 CFLAGS+= -DRRESTORE -D_ACL_PRIVATE .include diff --git a/sbin/tunefs/Makefile b/sbin/tunefs/Makefile index 9d0754edca89..cdb2f313c5f7 100644 --- a/sbin/tunefs/Makefile +++ b/sbin/tunefs/Makefile @@ -1,16 +1,16 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ -PACKAGE=runtime +PACKAGE=ufs PROG= tunefs SRCS= tunefs.c getmntopts.c LIBADD= ufs MAN= tunefs.8 MOUNT= ${SRCTOP}/sbin/mount CFLAGS+= -I${MOUNT} .PATH: ${MOUNT} WARNS?= 3 .include diff --git a/usr.sbin/snapinfo/Makefile b/usr.sbin/snapinfo/Makefile index 76013744e988..3aded69e2fb7 100644 --- a/usr.sbin/snapinfo/Makefile +++ b/usr.sbin/snapinfo/Makefile @@ -1,9 +1,10 @@ # $FreeBSD$ # +PACKAGE= ufs PROG= snapinfo MAN= snapinfo.8 LIBADD= ufs .include