diff --git a/UPDATING b/UPDATING --- a/UPDATING +++ b/UPDATING @@ -28,9 +28,15 @@ at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) 20250527: - ctld(8), ctladm(8) and ctlstat(8) have moved to the new FreeBSD-ctl - package. If you use pkgbase and you need the CAM Target Layer, you - should install the new package. + The CAM target layer userland, i.e. ctld(8), ctladm(8) and ctlstat(8), + has moved to the new FreeBSD-ctl package. If you use pkgbase and you + need the CAM Target Layer, you should install the new package. + + Development-related tools (e.g. ar and nm) have moved to the new + "FreeBSD-toolchain" package, which subsumes and obsoletes the + existing "FreeBSD-elftoolchain" package. If you use pkgbase and + need to compile software, you should install the new package and + ensure the old FreeBSD-elftoolchain* packages are completely removed. 20250521: Commit e64fe5ad3a23 removed in6_maxmtu and its setter in6_setmaxmtu(). diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package --- a/release/packages/Makefile.package +++ b/release/packages/Makefile.package @@ -63,8 +63,6 @@ ee_DESC= Easy Editor Utilities efi-tools_COMMENT= UEFI Utilities efi-tools_DESC= UEFI Utilities -elftoolchain_COMMENT= ElfToolchain programs and libraries -elftoolchain_DESC= ElfToolchain programs and libraries examples_COMMENT= Examples in /usr/share/examples examples_DESC= Examples in /usr/share/examples fd_COMMENT= Floppy disk support @@ -175,6 +173,8 @@ telnet_DESC= Telnet client tests_COMMENT= Test Suite tests_DESC= Test Suite +toolchain_COMMENT= Utilities for program development +toolchain_DESC= Utilities for program development ufs_COMMENT= UFS Libraries and Utilities ufs_DESC= UFS Libraries and Utilities unbound_COMMENT= Unbound DNS Resolver diff --git a/usr.bin/addr2line/Makefile b/usr.bin/addr2line/Makefile --- a/usr.bin/addr2line/Makefile +++ b/usr.bin/addr2line/Makefile @@ -1,6 +1,6 @@ .include -PACKAGE= elftoolchain +PACKAGE= toolchain ELFTCDIR= ${SRCTOP}/contrib/elftoolchain ADDR2LINEDIR= ${ELFTCDIR}/addr2line diff --git a/usr.bin/ar/Makefile b/usr.bin/ar/Makefile --- a/usr.bin/ar/Makefile +++ b/usr.bin/ar/Makefile @@ -1,5 +1,6 @@ .include +PACKAGE= toolchain PROG= ar SRCS= ar.c acplex.l acpyacc.y read.c util.c write.c y.tab.h diff --git a/usr.bin/c89/Makefile b/usr.bin/c89/Makefile --- a/usr.bin/c89/Makefile +++ b/usr.bin/c89/Makefile @@ -1,3 +1,4 @@ +PACKAGE= toolchain PROG= c89 .include diff --git a/usr.bin/c99/Makefile b/usr.bin/c99/Makefile --- a/usr.bin/c99/Makefile +++ b/usr.bin/c99/Makefile @@ -1,3 +1,4 @@ +PACKAGE= toolchain PROG= c99 .include diff --git a/usr.bin/ctags/Makefile b/usr.bin/ctags/Makefile --- a/usr.bin/ctags/Makefile +++ b/usr.bin/ctags/Makefile @@ -1,3 +1,4 @@ +PACKAGE= toolchain PROG= ctags SRCS= C.c ctags.c fortran.c lisp.c print.c tree.c yacc.c CFLAGS+=-I${.CURDIR} diff --git a/usr.bin/cxxfilt/Makefile b/usr.bin/cxxfilt/Makefile --- a/usr.bin/cxxfilt/Makefile +++ b/usr.bin/cxxfilt/Makefile @@ -1,6 +1,6 @@ .include -PACKAGE= elftoolchain +PACKAGE= toolchain ELFTCDIR= ${SRCTOP}/contrib/elftoolchain SRCDIR= ${ELFTCDIR}/cxxfilt diff --git a/usr.bin/elfcopy/Makefile b/usr.bin/elfcopy/Makefile --- a/usr.bin/elfcopy/Makefile +++ b/usr.bin/elfcopy/Makefile @@ -1,6 +1,6 @@ .include -PACKAGE= elftoolchain +PACKAGE= toolchain ELFTCDIR= ${SRCTOP}/contrib/elftoolchain ELFCOPYDIR= ${ELFTCDIR}/elfcopy diff --git a/usr.bin/file2c/Makefile b/usr.bin/file2c/Makefile --- a/usr.bin/file2c/Makefile +++ b/usr.bin/file2c/Makefile @@ -1,5 +1,6 @@ .include +PACKAGE= toolchain PROG= file2c HAS_TESTS= diff --git a/usr.bin/gprof/Makefile b/usr.bin/gprof/Makefile --- a/usr.bin/gprof/Makefile +++ b/usr.bin/gprof/Makefile @@ -1,3 +1,4 @@ +PACKAGE= toolchain PROG= gprof SRCS= gprof.c arcs.c dfn.c elf.c lookup.c hertz.c \ printgprof.c printlist.c kernel.c diff --git a/usr.bin/indent/Makefile b/usr.bin/indent/Makefile --- a/usr.bin/indent/Makefile +++ b/usr.bin/indent/Makefile @@ -1,5 +1,6 @@ .include +PACKAGE= toolchain PROG= indent SRCS= indent.c io.c lexi.c parse.c pr_comment.c args.c diff --git a/usr.bin/lex/Makefile b/usr.bin/lex/Makefile --- a/usr.bin/lex/Makefile +++ b/usr.bin/lex/Makefile @@ -8,6 +8,7 @@ # Also note that flex.skel no longer gets installed. # +PACKAGE= toolchain PROG= lex LINKS+= ${BINDIR}/lex ${BINDIR}/lex++ LINKS+= ${BINDIR}/lex ${BINDIR}/flex diff --git a/usr.bin/lorder/Makefile b/usr.bin/lorder/Makefile --- a/usr.bin/lorder/Makefile +++ b/usr.bin/lorder/Makefile @@ -1,5 +1,6 @@ .include +PACKAGE=toolchain SCRIPTS=lorder.sh MAN= lorder.1 diff --git a/usr.bin/mkstr/Makefile b/usr.bin/mkstr/Makefile --- a/usr.bin/mkstr/Makefile +++ b/usr.bin/mkstr/Makefile @@ -1,3 +1,4 @@ +PACKAGE= toolchain PROG= mkstr WARNS?= 2 diff --git a/usr.bin/nm/Makefile b/usr.bin/nm/Makefile --- a/usr.bin/nm/Makefile +++ b/usr.bin/nm/Makefile @@ -1,6 +1,6 @@ .include -PACKAGE= elftoolchain +PACKAGE= toolchain ELFTCDIR= ${SRCTOP}/contrib/elftoolchain NMDIR= ${ELFTCDIR}/nm diff --git a/usr.bin/readelf/Makefile b/usr.bin/readelf/Makefile --- a/usr.bin/readelf/Makefile +++ b/usr.bin/readelf/Makefile @@ -1,6 +1,6 @@ .include -PACKAGE= elftoolchain +PACKAGE= toolchain ELFTCDIR= ${SRCTOP}/contrib/elftoolchain READELFDIR= ${ELFTCDIR}/readelf diff --git a/usr.bin/rpcgen/Makefile b/usr.bin/rpcgen/Makefile --- a/usr.bin/rpcgen/Makefile +++ b/usr.bin/rpcgen/Makefile @@ -1,3 +1,4 @@ +PACKAGE= toolchain PROG= rpcgen SRCS= rpc_main.c rpc_clntout.c rpc_cout.c rpc_hout.c rpc_parse.c \ rpc_sample.c rpc_scan.c rpc_svcout.c rpc_tblout.c rpc_util.c diff --git a/usr.bin/size/Makefile b/usr.bin/size/Makefile --- a/usr.bin/size/Makefile +++ b/usr.bin/size/Makefile @@ -1,6 +1,6 @@ .include -PACKAGE= elftoolchain +PACKAGE= toolchain ELFTCDIR= ${SRCTOP}/contrib/elftoolchain SIZEDIR= ${ELFTCDIR}/size diff --git a/usr.bin/unifdef/Makefile b/usr.bin/unifdef/Makefile --- a/usr.bin/unifdef/Makefile +++ b/usr.bin/unifdef/Makefile @@ -1,5 +1,6 @@ .PATH: ${SRCTOP}/contrib/unifdef +PACKAGE= toolchain PROG= unifdef SCRIPTS=unifdefall.sh MLINKS= unifdef.1 unifdefall.1 diff --git a/usr.bin/xstr/Makefile b/usr.bin/xstr/Makefile --- a/usr.bin/xstr/Makefile +++ b/usr.bin/xstr/Makefile @@ -1,3 +1,4 @@ +PACKAGE= toolchain PROG= xstr .include diff --git a/usr.bin/yacc/Makefile b/usr.bin/yacc/Makefile --- a/usr.bin/yacc/Makefile +++ b/usr.bin/yacc/Makefile @@ -3,6 +3,7 @@ BYACC_SRC= ${SRCTOP}/contrib/byacc .PATH: ${BYACC_SRC} +PACKAGE= toolchain PROG= yacc SRCS= closure.c error.c graph.c lalr.c lr0.c main.c mkpar.c mstring.c output.c \ reader.c yaccpar.c symtab.c verbose.c warshall.c diff --git a/usr.sbin/config/Makefile b/usr.sbin/config/Makefile --- a/usr.sbin/config/Makefile +++ b/usr.sbin/config/Makefile @@ -1,5 +1,6 @@ SRCDIR:=${.PARSEDIR:tA} +PACKAGE= toolchain PROG_CXX= config MAN= config.5 config.8 SRCS= config.y main.cc lang.l mkmakefile.cc mkheaders.c \ diff --git a/usr.sbin/crunch/Makefile.inc b/usr.sbin/crunch/Makefile.inc --- a/usr.sbin/crunch/Makefile.inc +++ b/usr.sbin/crunch/Makefile.inc @@ -1,2 +1,4 @@ +PACKAGE= toolchain + # modify to taste BINDIR?= /usr/bin