From ac2875fa16f0a3747b0e3f249814c4297605be61 Mon Sep 17 00:00:00 2001 From: Glen Barber Date: Tue, 9 Feb 2016 16:58:50 +0000 Subject: [PATCH] Explicitly add unmarked bin/ binaries to the runtime package. Note: tcsh(1) has a MK_TCSH=no test, so this should be a separate package, which requires pre-install/post-install scripts, to be added later. Sponsored by: The FreeBSD Foundation --- bin/cat/Makefile | 1 + bin/chflags/Makefile | 1 + bin/chio/Makefile | 1 + bin/chmod/Makefile | 1 + bin/cp/Makefile | 1 + bin/csh/Makefile | 1 + bin/date/Makefile | 1 + bin/dd/Makefile | 1 + bin/df/Makefile | 1 + bin/domainname/Makefile | 1 + bin/echo/Makefile | 1 + bin/ed/Makefile | 1 + bin/expr/Makefile | 1 + bin/freebsd-version/Makefile | 1 + bin/getfacl/Makefile | 1 + bin/hostname/Makefile | 1 + bin/kenv/Makefile | 1 + bin/kill/Makefile | 1 + bin/ln/Makefile | 1 + bin/ls/Makefile | 1 + bin/mkdir/Makefile | 1 + bin/mv/Makefile | 1 + bin/pax/Makefile | 1 + bin/pkill/Makefile | 1 + bin/ps/Makefile | 1 + bin/pwait/Makefile | 1 + bin/pwd/Makefile | 1 + bin/realpath/Makefile | 1 + bin/rm/Makefile | 1 + bin/rmdir/Makefile | 1 + bin/setfacl/Makefile | 1 + bin/sh/Makefile | 1 + bin/sleep/Makefile | 1 + bin/stty/Makefile | 1 + bin/sync/Makefile | 1 + bin/test/Makefile | 1 + bin/uuidgen/Makefile | 1 + 37 files changed, 37 insertions(+) diff --git a/bin/cat/Makefile b/bin/cat/Makefile index 97e5812e4bf..39aaeeb4a50 100644 --- a/bin/cat/Makefile +++ b/bin/cat/Makefile @@ -3,6 +3,7 @@ .include +PACKAGE=runtime PROG= cat .if ${MK_TESTS} != "no" diff --git a/bin/chflags/Makefile b/bin/chflags/Makefile index 4457505380f..db9defdcded 100644 --- a/bin/chflags/Makefile +++ b/bin/chflags/Makefile @@ -1,6 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ +PACKAGE=runtime PROG= chflags .include diff --git a/bin/chio/Makefile b/bin/chio/Makefile index 5157f6568a6..ddb07d96812 100644 --- a/bin/chio/Makefile +++ b/bin/chio/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +PACKAGE=runtime PROG= chio .include diff --git a/bin/chmod/Makefile b/bin/chmod/Makefile index 71006d00a52..58b1afc0aff 100644 --- a/bin/chmod/Makefile +++ b/bin/chmod/Makefile @@ -1,6 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ +PACKAGE=runtime PROG= chmod .include diff --git a/bin/cp/Makefile b/bin/cp/Makefile index 5a5e1a457d1..d20f60e537d 100644 --- a/bin/cp/Makefile +++ b/bin/cp/Makefile @@ -1,6 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ +PACKAGE=runtime PROG= cp SRCS= cp.c utils.c CFLAGS+= -DVM_AND_BUFFER_CACHE_SYNCHRONIZED -D_ACL_PRIVATE diff --git a/bin/csh/Makefile b/bin/csh/Makefile index deb63478727..0c364c176f6 100644 --- a/bin/csh/Makefile +++ b/bin/csh/Makefile @@ -8,6 +8,7 @@ .include +PACKAGE=runtime TCSHDIR= ${.CURDIR}/../../contrib/tcsh .PATH: ${TCSHDIR} diff --git a/bin/date/Makefile b/bin/date/Makefile index 56ce33afb45..fd7e401aeb5 100644 --- a/bin/date/Makefile +++ b/bin/date/Makefile @@ -3,6 +3,7 @@ .include +PACKAGE=runtime PROG= date SRCS= date.c netdate.c vary.c diff --git a/bin/dd/Makefile b/bin/dd/Makefile index 5f07dbc248a..07c2a674106 100644 --- a/bin/dd/Makefile +++ b/bin/dd/Makefile @@ -3,6 +3,7 @@ .include +PACKAGE=runtime PROG= dd SRCS= args.c conv.c conv_tab.c dd.c misc.c position.c diff --git a/bin/df/Makefile b/bin/df/Makefile index 5cdae9ed7d2..8f9f5284d94 100644 --- a/bin/df/Makefile +++ b/bin/df/Makefile @@ -1,6 +1,7 @@ # @(#)Makefile 8.3 (Berkeley) 5/8/95 # $FreeBSD$ +PACKAGE=runtime MOUNT= ${.CURDIR}/../../sbin/mount .PATH: ${MOUNT} diff --git a/bin/domainname/Makefile b/bin/domainname/Makefile index 724bd06f6a3..d3bace8feef 100644 --- a/bin/domainname/Makefile +++ b/bin/domainname/Makefile @@ -1,5 +1,6 @@ # $FreeBSD$ +PACKAGE=runtime PROG= domainname .include diff --git a/bin/echo/Makefile b/bin/echo/Makefile index d00d4679d7a..5d48e2146d9 100644 --- a/bin/echo/Makefile +++ b/bin/echo/Makefile @@ -1,6 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ +PACKAGE=runtime PROG= echo .include diff --git a/bin/ed/Makefile b/bin/ed/Makefile index bef3ff1ad5e..40e06134e87 100644 --- a/bin/ed/Makefile +++ b/bin/ed/Makefile @@ -2,6 +2,7 @@ .include +PACKAGE=runtime PROG= ed SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c LINKS= ${BINDIR}/ed ${BINDIR}/red diff --git a/bin/expr/Makefile b/bin/expr/Makefile index 1d741b7e0b6..471c1c09947 100644 --- a/bin/expr/Makefile +++ b/bin/expr/Makefile @@ -2,6 +2,7 @@ .include +PACKAGE=runtime PROG= expr SRCS= expr.y YFLAGS= diff --git a/bin/freebsd-version/Makefile b/bin/freebsd-version/Makefile index 91945acc894..c49f66143b4 100644 --- a/bin/freebsd-version/Makefile +++ b/bin/freebsd-version/Makefile @@ -1,5 +1,6 @@ # $FreeBSD$ +PACKAGE=runtime SCRIPTS = freebsd-version MAN = freebsd-version.1 CLEANFILES = freebsd-version freebsd-version.sh diff --git a/bin/getfacl/Makefile b/bin/getfacl/Makefile index b7b5e983a53..7b3f057fecc 100644 --- a/bin/getfacl/Makefile +++ b/bin/getfacl/Makefile @@ -1,5 +1,6 @@ # $FreeBSD$ +PACKAGE=runtime PROG= getfacl .include diff --git a/bin/hostname/Makefile b/bin/hostname/Makefile index 3c7997f862f..9b0ecd7e4c4 100644 --- a/bin/hostname/Makefile +++ b/bin/hostname/Makefile @@ -1,6 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ +PACKAGE=runtime PROG= hostname .include diff --git a/bin/kenv/Makefile b/bin/kenv/Makefile index 33a6dfc3bff..9c1924ad4b3 100644 --- a/bin/kenv/Makefile +++ b/bin/kenv/Makefile @@ -1,5 +1,6 @@ # $FreeBSD$ +PACKAGE=runtime PROG= kenv .include diff --git a/bin/kill/Makefile b/bin/kill/Makefile index 55ef16dfce2..4c9cddacd9a 100644 --- a/bin/kill/Makefile +++ b/bin/kill/Makefile @@ -1,6 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ +PACKAGE=runtime PROG= kill .include diff --git a/bin/ln/Makefile b/bin/ln/Makefile index b541f8bd3be..d7c8b46fb0a 100644 --- a/bin/ln/Makefile +++ b/bin/ln/Makefile @@ -1,6 +1,7 @@ # @(#)Makefile 8.2 (Berkeley) 5/31/93 # $FreeBSD$ +PACKAGE=runtime PROG= ln MAN= ln.1 symlink.7 diff --git a/bin/ls/Makefile b/bin/ls/Makefile index e57bf35a165..db3fae7eb23 100644 --- a/bin/ls/Makefile +++ b/bin/ls/Makefile @@ -3,6 +3,7 @@ .include +PACKAGE=runtime PROG= ls SRCS= cmp.c ls.c print.c util.c LIBADD= xo util diff --git a/bin/mkdir/Makefile b/bin/mkdir/Makefile index fadc6b294ef..45876288fc4 100644 --- a/bin/mkdir/Makefile +++ b/bin/mkdir/Makefile @@ -1,6 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ +PACKAGE=runtime PROG= mkdir .include diff --git a/bin/mv/Makefile b/bin/mv/Makefile index 02a5a480580..e82466be296 100644 --- a/bin/mv/Makefile +++ b/bin/mv/Makefile @@ -3,6 +3,7 @@ .include +PACKAGE=runtime PROG= mv .if ${MK_TESTS} != "no" diff --git a/bin/pax/Makefile b/bin/pax/Makefile index c00d52c7081..210137ba1ab 100644 --- a/bin/pax/Makefile +++ b/bin/pax/Makefile @@ -27,6 +27,7 @@ # regex routines and must define NET2_REGEX. # Pax may not compile if this not (un)defined properly. +PACKAGE=runtime PROG= pax SRCS= ar_io.c ar_subs.c buf_subs.c cache.c cpio.c file_subs.c ftree.c \ gen_subs.c getoldopt.c options.c pat_rep.c pax.c sel_subs.c \ diff --git a/bin/pkill/Makefile b/bin/pkill/Makefile index 2985b37dbff..2eb3edea4cb 100644 --- a/bin/pkill/Makefile +++ b/bin/pkill/Makefile @@ -3,6 +3,7 @@ .include +PACKAGE=runtime PROG= pkill LIBADD= kvm jail diff --git a/bin/ps/Makefile b/bin/ps/Makefile index 79e9fc6cf0e..596aa57fd2d 100644 --- a/bin/ps/Makefile +++ b/bin/ps/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ # @(#)Makefile 8.1 (Berkeley) 6/2/93 +PACKAGE=runtime PROG= ps SRCS= fmt.c keyword.c nlist.c print.c ps.c diff --git a/bin/pwait/Makefile b/bin/pwait/Makefile index cdf322e27a8..a282c18a4f3 100644 --- a/bin/pwait/Makefile +++ b/bin/pwait/Makefile @@ -1,5 +1,6 @@ # $FreeBSD$ +PACKAGE=runtime PROG= pwait .include diff --git a/bin/pwd/Makefile b/bin/pwd/Makefile index 4a8e66ac832..2a623a16b3a 100644 --- a/bin/pwd/Makefile +++ b/bin/pwd/Makefile @@ -1,6 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ +PACKAGE=runtime PROG= pwd .include diff --git a/bin/realpath/Makefile b/bin/realpath/Makefile index acf62c76cb3..71381f3359d 100644 --- a/bin/realpath/Makefile +++ b/bin/realpath/Makefile @@ -1,5 +1,6 @@ # $FreeBSD$ +PACKAGE=runtime PROG= realpath .include diff --git a/bin/rm/Makefile b/bin/rm/Makefile index 7058fa06c98..e0d27134825 100644 --- a/bin/rm/Makefile +++ b/bin/rm/Makefile @@ -1,6 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ +PACKAGE=runtime PROG= rm LINKS= ${BINDIR}/rm ${BINDIR}/unlink diff --git a/bin/rmdir/Makefile b/bin/rmdir/Makefile index c2c7f301ce4..a40686dba51 100644 --- a/bin/rmdir/Makefile +++ b/bin/rmdir/Makefile @@ -1,6 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ +PACKAGE=runtime PROG= rmdir .include diff --git a/bin/setfacl/Makefile b/bin/setfacl/Makefile index 3f6b78e54e1..378541398e5 100644 --- a/bin/setfacl/Makefile +++ b/bin/setfacl/Makefile @@ -1,5 +1,6 @@ # $FreeBSD$ +PACKAGE=runtime PROG= setfacl SRCS= file.c mask.c merge.c remove.c setfacl.c util.c diff --git a/bin/sh/Makefile b/bin/sh/Makefile index 3f28a1231fd..419ff7915bf 100644 --- a/bin/sh/Makefile +++ b/bin/sh/Makefile @@ -3,6 +3,7 @@ .include +PACKAGE=runtime PROG= sh INSTALLFLAGS= -S SHSRCS= alias.c arith_yacc.c arith_yylex.c cd.c echo.c error.c eval.c \ diff --git a/bin/sleep/Makefile b/bin/sleep/Makefile index 0ec3080476a..9575adf62a7 100644 --- a/bin/sleep/Makefile +++ b/bin/sleep/Makefile @@ -3,6 +3,7 @@ .include +PACKAGE=runtime PROG= sleep .if ${MK_TESTS} != "no" diff --git a/bin/stty/Makefile b/bin/stty/Makefile index 82b15eb7fca..b10b8951b48 100644 --- a/bin/stty/Makefile +++ b/bin/stty/Makefile @@ -1,6 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ +PACKAGE=runtime PROG= stty SRCS= cchar.c gfmt.c key.c modes.c print.c stty.c util.c diff --git a/bin/sync/Makefile b/bin/sync/Makefile index 72c664f4afd..8b56d6af4b8 100644 --- a/bin/sync/Makefile +++ b/bin/sync/Makefile @@ -1,6 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ +PACKAGE=runtime PROG= sync MAN= sync.8 diff --git a/bin/test/Makefile b/bin/test/Makefile index 8e3121b3167..5cd91ebb288 100644 --- a/bin/test/Makefile +++ b/bin/test/Makefile @@ -3,6 +3,7 @@ .include +PACKAGE=runtime PROG= test LINKS= ${BINDIR}/test ${BINDIR}/[ MLINKS= test.1 [.1 diff --git a/bin/uuidgen/Makefile b/bin/uuidgen/Makefile index 0b27d20e980..8cd15982405 100644 --- a/bin/uuidgen/Makefile +++ b/bin/uuidgen/Makefile @@ -1,5 +1,6 @@ # $FreeBSD$ +PACKAGE=runtime PROG= uuidgen .include