D53162.id164403.diff
No OneTemporary
Actions

Size

14 KB

Referenced Files

None

Subscribers

None

D53162.id164403.diff
View Options

	diff --git a/bin/cat/Makefile b/bin/cat/Makefile
	--- a/bin/cat/Makefile
	+++ b/bin/cat/Makefile
	@@ -1,6 +1,6 @@
	.include <src.opts.mk>

	-PACKAGE=runtime
	+PACKAGE=shell
	PROG= cat

	.ifdef BOOTSTRAPPING
	diff --git a/bin/chflags/Makefile b/bin/chflags/Makefile
	--- a/bin/chflags/Makefile
	+++ b/bin/chflags/Makefile
	@@ -1,6 +1,6 @@
	.include <src.opts.mk>

	-PACKAGE=runtime
	+PACKAGE=shell
	PROG= chflags

	HAS_TESTS=
	diff --git a/bin/chmod/Makefile b/bin/chmod/Makefile
	--- a/bin/chmod/Makefile
	+++ b/bin/chmod/Makefile
	@@ -1,6 +1,6 @@
	.include <src.opts.mk>

	-PACKAGE=runtime
	+PACKAGE=shell
	PROG= chmod

	HAS_TESTS=
	diff --git a/bin/cp/Makefile b/bin/cp/Makefile
	--- a/bin/cp/Makefile
	+++ b/bin/cp/Makefile
	@@ -1,6 +1,6 @@
	.include <src.opts.mk>

	-PACKAGE=runtime
	+PACKAGE=shell
	PROG= cp
	SRCS= cp.c utils.c
	CFLAGS+= -D_ACL_PRIVATE
	diff --git a/bin/date/Makefile b/bin/date/Makefile
	--- a/bin/date/Makefile
	+++ b/bin/date/Makefile
	@@ -1,6 +1,6 @@
	.include <src.opts.mk>

	-PACKAGE=runtime
	+PACKAGE=shell
	PROG= date
	SRCS= date.c vary.c

	diff --git a/bin/dd/Makefile b/bin/dd/Makefile
	--- a/bin/dd/Makefile
	+++ b/bin/dd/Makefile
	@@ -1,6 +1,6 @@
	.include <src.opts.mk>

	-PACKAGE=runtime
	+PACKAGE=shell
	PROG= dd
	SRCS= args.c conv.c conv_tab.c dd.c misc.c position.c
	LIBADD= util
	diff --git a/bin/df/Makefile b/bin/df/Makefile
	--- a/bin/df/Makefile
	+++ b/bin/df/Makefile
	@@ -1,4 +1,4 @@
	-PACKAGE=runtime
	+PACKAGE=shell

	PROG= df
	SRCS= df.c
	diff --git a/bin/echo/Makefile b/bin/echo/Makefile
	--- a/bin/echo/Makefile
	+++ b/bin/echo/Makefile
	@@ -1,6 +1,6 @@
	.include <src.opts.mk>

	-PACKAGE=runtime
	+PACKAGE=shell
	PROG= echo

	HAS_TESTS=
	diff --git a/bin/ed/Makefile b/bin/ed/Makefile
	--- a/bin/ed/Makefile
	+++ b/bin/ed/Makefile
	@@ -1,6 +1,6 @@
	.include <src.opts.mk>

	-PACKAGE=runtime
	+PACKAGE=shell
	PROG= ed
	SRCS= buf.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
	--- a/bin/expr/Makefile
	+++ b/bin/expr/Makefile
	@@ -1,6 +1,6 @@
	.include <src.opts.mk>

	-PACKAGE=runtime
	+PACKAGE=shell
	PROG= expr
	SRCS= expr.y
	YFLAGS=
	diff --git a/bin/freebsd-version/Makefile b/bin/freebsd-version/Makefile
	--- a/bin/freebsd-version/Makefile
	+++ b/bin/freebsd-version/Makefile
	@@ -1,8 +1,9 @@
	-PACKAGE=runtime
	-SCRIPTS = freebsd-version
	-MAN = freebsd-version.1
	-CLEANFILES = freebsd-version freebsd-version.sh
	-NEWVERS = ${SRCTOP}/sys/conf/newvers.sh
	+PACKAGE= shell
	+
	+SCRIPTS= freebsd-version
	+MAN= freebsd-version.1
	+CLEANFILES= freebsd-version freebsd-version.sh
	+NEWVERS= ${SRCTOP}/sys/conf/newvers.sh

	freebsd-version.sh: ${.CURDIR}/freebsd-version.sh.in ${NEWVERS}
	eval $$(sh ${NEWVERS} -v); \
	diff --git a/bin/getfacl/Makefile b/bin/getfacl/Makefile
	--- a/bin/getfacl/Makefile
	+++ b/bin/getfacl/Makefile
	@@ -1,4 +1,4 @@
	-PACKAGE=runtime
	+PACKAGE=shell
	PROG= getfacl

	.include <bsd.prog.mk>
	diff --git a/bin/hostname/Makefile b/bin/hostname/Makefile
	--- a/bin/hostname/Makefile
	+++ b/bin/hostname/Makefile
	@@ -1,6 +1,6 @@
	.include <src.opts.mk>

	-PACKAGE=runtime
	+PACKAGE=shell
	PROG= hostname

	HAS_TESTS=
	diff --git a/bin/kenv/Makefile b/bin/kenv/Makefile
	--- a/bin/kenv/Makefile
	+++ b/bin/kenv/Makefile
	@@ -1,4 +1,4 @@
	-PACKAGE=runtime
	+PACKAGE=shell
	PROG= kenv

	.include <bsd.prog.mk>
	diff --git a/bin/kill/Makefile b/bin/kill/Makefile
	--- a/bin/kill/Makefile
	+++ b/bin/kill/Makefile
	@@ -1,4 +1,4 @@
	-PACKAGE=runtime
	+PACKAGE=shell
	PROG= kill

	.include <bsd.prog.mk>
	diff --git a/bin/ln/Makefile b/bin/ln/Makefile
	--- a/bin/ln/Makefile
	+++ b/bin/ln/Makefile
	@@ -1,6 +1,6 @@
	.include <src.opts.mk>

	-PACKAGE=runtime
	+PACKAGE=shell
	PROG= ln
	MAN= ln.1 symlink.7

	diff --git a/bin/ls/Makefile b/bin/ls/Makefile
	--- a/bin/ls/Makefile
	+++ b/bin/ls/Makefile
	@@ -1,6 +1,6 @@
	.include <src.opts.mk>

	-PACKAGE=runtime
	+PACKAGE=shell
	PROG= ls
	SRCS= cmp.c ls.c print.c util.c
	LIBADD= util
	diff --git a/bin/mkdir/Makefile b/bin/mkdir/Makefile
	--- a/bin/mkdir/Makefile
	+++ b/bin/mkdir/Makefile
	@@ -1,6 +1,6 @@
	.include <src.opts.mk>

	-PACKAGE=runtime
	+PACKAGE=shell
	PROG= mkdir

	HAS_TESTS=
	diff --git a/bin/mv/Makefile b/bin/mv/Makefile
	--- a/bin/mv/Makefile
	+++ b/bin/mv/Makefile
	@@ -1,6 +1,6 @@
	.include <src.opts.mk>

	-PACKAGE=runtime
	+PACKAGE=shell
	PROG= mv

	HAS_TESTS=
	diff --git a/bin/nproc/Makefile b/bin/nproc/Makefile
	--- a/bin/nproc/Makefile
	+++ b/bin/nproc/Makefile
	@@ -1,4 +1,4 @@
	-PACKAGE=runtime
	+PACKAGE=shell
	PROG= nproc

	.include <bsd.prog.mk>
	diff --git a/bin/pax/Makefile b/bin/pax/Makefile
	--- a/bin/pax/Makefile
	+++ b/bin/pax/Makefile
	@@ -1,6 +1,6 @@
	.include <src.opts.mk>

	-PACKAGE=runtime
	+PACKAGE=shell
	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
	--- a/bin/pkill/Makefile
	+++ b/bin/pkill/Makefile
	@@ -2,7 +2,7 @@

	.include <src.opts.mk>

	-PACKAGE=runtime
	+PACKAGE=shell
	PROG= pkill

	LIBADD= kvm jail
	diff --git a/bin/ps/Makefile b/bin/ps/Makefile
	--- a/bin/ps/Makefile
	+++ b/bin/ps/Makefile
	@@ -1,4 +1,4 @@
	-PACKAGE=runtime
	+PACKAGE=shell
	PROG= ps
	SRCS= fmt.c keyword.c nlist.c print.c ps.c

	diff --git a/bin/pwait/Makefile b/bin/pwait/Makefile
	--- a/bin/pwait/Makefile
	+++ b/bin/pwait/Makefile
	@@ -1,6 +1,6 @@
	.include <src.opts.mk>

	-PACKAGE=runtime
	+PACKAGE=shell
	PROG= pwait

	HAS_TESTS=
	diff --git a/bin/pwd/Makefile b/bin/pwd/Makefile
	--- a/bin/pwd/Makefile
	+++ b/bin/pwd/Makefile
	@@ -1,4 +1,4 @@
	-PACKAGE=runtime
	+PACKAGE=shell
	PROG= pwd

	.include <bsd.prog.mk>
	diff --git a/bin/realpath/Makefile b/bin/realpath/Makefile
	--- a/bin/realpath/Makefile
	+++ b/bin/realpath/Makefile
	@@ -1,4 +1,4 @@
	-PACKAGE=runtime
	+PACKAGE=shell
	PROG= realpath

	.include <bsd.prog.mk>
	diff --git a/bin/rm/Makefile b/bin/rm/Makefile
	--- a/bin/rm/Makefile
	+++ b/bin/rm/Makefile
	@@ -1,6 +1,6 @@
	.include <src.opts.mk>

	-PACKAGE=runtime
	+PACKAGE=shell
	PROG= rm

	LINKS= ${BINDIR}/rm ${BINDIR}/unlink
	diff --git a/bin/rmdir/Makefile b/bin/rmdir/Makefile
	--- a/bin/rmdir/Makefile
	+++ b/bin/rmdir/Makefile
	@@ -1,6 +1,6 @@
	.include <src.opts.mk>

	-PACKAGE=runtime
	+PACKAGE=shell
	PROG= rmdir
	HAS_TESTS=
	SUBDIR.${MK_TESTS}+= tests
	diff --git a/bin/setfacl/Makefile b/bin/setfacl/Makefile
	--- a/bin/setfacl/Makefile
	+++ b/bin/setfacl/Makefile
	@@ -1,4 +1,4 @@
	-PACKAGE=runtime
	+PACKAGE=shell
	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
	--- a/bin/sh/Makefile
	+++ b/bin/sh/Makefile
	@@ -1,13 +1,17 @@
	.include <src.opts.mk>

	+PACKAGE=shell
	+
	CONFGROUPS= ETC ROOT
	-ETC= profile
	-ROOT= dot.shrc dot.profile
	+
	+ETC= profile
	+
	+ROOT= dot.shrc dot.profile
	ROOTDIR= /root
	ROOTDIR_MODE= 0750
	ROOTNAME_dot.shrc= .shrc
	ROOTNAME_dot.profile= .profile
	-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
	--- a/bin/sleep/Makefile
	+++ b/bin/sleep/Makefile
	@@ -1,6 +1,6 @@
	.include <src.opts.mk>

	-PACKAGE=runtime
	+PACKAGE=shell
	PROG= sleep

	HAS_TESTS=
	diff --git a/bin/stty/Makefile b/bin/stty/Makefile
	--- a/bin/stty/Makefile
	+++ b/bin/stty/Makefile
	@@ -1,4 +1,4 @@
	-PACKAGE=runtime
	+PACKAGE=shell
	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
	--- a/bin/sync/Makefile
	+++ b/bin/sync/Makefile
	@@ -1,4 +1,4 @@
	-PACKAGE=runtime
	+PACKAGE=shell
	PROG= sync
	MAN= sync.8

	diff --git a/bin/test/Makefile b/bin/test/Makefile
	--- a/bin/test/Makefile
	+++ b/bin/test/Makefile
	@@ -1,6 +1,6 @@
	.include <src.opts.mk>

	-PACKAGE=runtime
	+PACKAGE=shell
	PROG= test
	LINKS= ${BINDIR}/test ${BINDIR}/[
	MLINKS= test.1 [.1
	diff --git a/bin/uuidgen/Makefile b/bin/uuidgen/Makefile
	--- a/bin/uuidgen/Makefile
	+++ b/bin/uuidgen/Makefile
	@@ -1,4 +1,4 @@
	-PACKAGE= runtime
	+PACKAGE=shell
	PROG= uuidgen

	.include <bsd.prog.mk>
	diff --git a/release/packages/ucl/README b/release/packages/ucl/README
	--- a/release/packages/ucl/README
	+++ b/release/packages/ucl/README
	@@ -42,7 +42,7 @@

	* If a package contains shell scripts, and the script is not one of the
	previously mentioned examples (rc, devd, etc.), add a dependency on
	- "runtime" for /bin/sh.
	+ "shell" for /bin/sh.

	* Otherwise, if one component of a package requires another package to work,
	add a dependency on the other package even if not everything in the package
	diff --git a/release/packages/ucl/at.ucl b/release/packages/ucl/at.ucl
	--- a/release/packages/ucl/at.ucl
	+++ b/release/packages/ucl/at.ucl
	@@ -23,7 +23,7 @@
	},

	# at(1) passes the command to /bin/sh
	- "runtime" {
	+ "shell" {
	version = "${VERSION}"
	},
	}
	diff --git a/release/packages/ucl/bsdconfig.ucl b/release/packages/ucl/bsdconfig.ucl
	--- a/release/packages/ucl/bsdconfig.ucl
	+++ b/release/packages/ucl/bsdconfig.ucl
	@@ -18,7 +18,7 @@

	deps {
	# bsdconfig is written in shell script, so it needs /bin/sh
	- "runtime" {
	+ "shell" {
	version = "${VERSION}"
	},
	}
	diff --git a/release/packages/ucl/bsdinstall.ucl b/release/packages/ucl/bsdinstall.ucl
	--- a/release/packages/ucl/bsdinstall.ucl
	+++ b/release/packages/ucl/bsdinstall.ucl
	@@ -18,7 +18,7 @@

	deps {
	# bsdinstall is written in shell script, so it needs /bin/sh
	- "runtime" {
	+ "shell" {
	version = "${VERSION}"
	},
	}
	diff --git a/release/packages/ucl/devd.ucl b/release/packages/ucl/devd.ucl
	--- a/release/packages/ucl/devd.ucl
	+++ b/release/packages/ucl/devd.ucl
	@@ -18,7 +18,7 @@

	deps {
	# devd uses /bin/sh to invoke hooks.
	- "runtime" {
	+ "shell" {
	version = "${VERSION}"
	},
	}
	diff --git a/release/packages/ucl/rc.ucl b/release/packages/ucl/rc.ucl
	--- a/release/packages/ucl/rc.ucl
	+++ b/release/packages/ucl/rc.ucl
	@@ -17,8 +17,15 @@
	*/

	deps {
	+ # Practically, anything that uses rc requires runtime,
	+ # e.g. for /etc/passwd.
	"runtime": {
	version = "${VERSION}"
	}
	+
	+ # All rc scripts are written in /bin/sh.
	+ "shell": {
	+ version = "${VERSION}"
	+ }
	}

	diff --git a/release/packages/ucl/at.ucl b/release/packages/ucl/shell-all.ucl
	copy from release/packages/ucl/at.ucl
	copy to release/packages/ucl/shell-all.ucl
	--- a/release/packages/ucl/at.ucl
	+++ b/release/packages/ucl/shell-all.ucl
	@@ -16,16 +16,13 @@
	* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
	*/

	-deps {
	- # atrun relies on cron to work.
	- "cron" {
	- version = "${VERSION}"
	- },
	-
	- # at(1) passes the command to /bin/sh
	- "runtime" {
	- version = "${VERSION}"
	- },
	-}
	+comment = "Bourne shell and utilities"

	+desc = <<EOD
	+This package provides the Bourne shell, sh(1), along with common utilities
	+used for shell scripting and interactive shell use.
	+EOD

	+annotations {
	+ set = "minimal,minimal-jail"
	+}
	diff --git a/usr.bin/du/Makefile b/usr.bin/du/Makefile
	--- a/usr.bin/du/Makefile
	+++ b/usr.bin/du/Makefile
	@@ -1,6 +1,6 @@
	.include <src.opts.mk>

	-PACKAGE= runtime
	+PACKAGE=shell
	PROG= du
	LIBADD= xo util

	diff --git a/usr.bin/env/Makefile b/usr.bin/env/Makefile
	--- a/usr.bin/env/Makefile
	+++ b/usr.bin/env/Makefile
	@@ -1,6 +1,6 @@
	.include <src.opts.mk>

	-PACKAGE= runtime
	+PACKAGE=shell
	PROG= env
	SRCS= env.c envopts.c

	diff --git a/usr.bin/find/Makefile b/usr.bin/find/Makefile
	--- a/usr.bin/find/Makefile
	+++ b/usr.bin/find/Makefile
	@@ -1,6 +1,6 @@
	.include <src.opts.mk>

	-PACKAGE= runtime
	+PACKAGE=shell

	PROG= find
	SRCS= find.c function.c ls.c main.c misc.c operator.c option.c printf.c \
	diff --git a/usr.bin/fsync/Makefile b/usr.bin/fsync/Makefile
	--- a/usr.bin/fsync/Makefile
	+++ b/usr.bin/fsync/Makefile
	@@ -1,4 +1,4 @@
	-PACKAGE= runtime
	+PACKAGE=shell
	PROG= fsync

	.include <bsd.prog.mk>
	diff --git a/usr.bin/grep/Makefile b/usr.bin/grep/Makefile
	--- a/usr.bin/grep/Makefile
	+++ b/usr.bin/grep/Makefile
	@@ -3,7 +3,7 @@

	.include <src.opts.mk>

	-PACKAGE= runtime
	+PACKAGE=shell

	PROG= grep
	MAN= grep.1 zgrep.1
	diff --git a/usr.bin/id/Makefile b/usr.bin/id/Makefile
	--- a/usr.bin/id/Makefile
	+++ b/usr.bin/id/Makefile
	@@ -1,6 +1,6 @@
	.include <src.opts.mk>

	-PACKAGE= runtime
	+PACKAGE=shell

	PROG= id
	LINKS= ${BINDIR}/id ${BINDIR}/groups
	diff --git a/usr.bin/less/Makefile b/usr.bin/less/Makefile
	--- a/usr.bin/less/Makefile
	+++ b/usr.bin/less/Makefile
	@@ -1,4 +1,4 @@
	-PACKAGE= runtime
	+PACKAGE=shell
	PROG= less
	SRCS= main.c screen.c brac.c ch.c charset.c cmdbuf.c command.c cvt.c \
	decode.c evar.c edit.c filename.c forwback.c help.c ifile.c input.c \
	diff --git a/usr.bin/limits/Makefile b/usr.bin/limits/Makefile
	--- a/usr.bin/limits/Makefile
	+++ b/usr.bin/limits/Makefile
	@@ -1,6 +1,6 @@
	.include <src.opts.mk>

	-PACKAGE= runtime
	+PACKAGE=shell

	PROG= limits
	LIBADD= util
	diff --git a/usr.bin/logger/Makefile b/usr.bin/logger/Makefile
	--- a/usr.bin/logger/Makefile
	+++ b/usr.bin/logger/Makefile
	@@ -1,6 +1,6 @@
	.include <src.opts.mk>

	-PACKAGE= runtime
	+PACKAGE=shell

	PROG= logger

	diff --git a/usr.bin/mktemp/Makefile b/usr.bin/mktemp/Makefile
	--- a/usr.bin/mktemp/Makefile
	+++ b/usr.bin/mktemp/Makefile
	@@ -1,6 +1,6 @@
	.include <src.opts.mk>

	-PACKAGE= runtime
	+PACKAGE=shell

	PROG= mktemp

	diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
	--- a/usr.bin/passwd/Makefile
	+++ b/usr.bin/passwd/Makefile
	@@ -1,6 +1,6 @@
	.include <src.opts.mk>

	-PACKAGE = runtime
	+PACKAGE = shell
	PROG = passwd
	BINOWN = root
	BINMODE = 4555
	diff --git a/usr.bin/sed/Makefile b/usr.bin/sed/Makefile
	--- a/usr.bin/sed/Makefile
	+++ b/usr.bin/sed/Makefile
	@@ -1,6 +1,6 @@
	.include <src.opts.mk>

	-PACKAGE= runtime
	+PACKAGE=shell
	PROG= sed
	SRCS= compile.c main.c misc.c process.c

	diff --git a/usr.bin/sort/Makefile b/usr.bin/sort/Makefile
	--- a/usr.bin/sort/Makefile
	+++ b/usr.bin/sort/Makefile
	@@ -1,6 +1,6 @@
	.include <src.opts.mk>

	-PACKAGE= runtime
	+PACKAGE=shell
	PROG= sort
	SRCS= bwstring.c coll.c file.c mem.c radixsort.c sort.c vsort.c

	diff --git a/usr.bin/tabs/Makefile b/usr.bin/tabs/Makefile
	--- a/usr.bin/tabs/Makefile
	+++ b/usr.bin/tabs/Makefile
	@@ -1,3 +1,4 @@
	+PACKAGE=shell
	PROG= tabs

	LIBADD= tinfow
	diff --git a/usr.bin/tee/Makefile b/usr.bin/tee/Makefile
	--- a/usr.bin/tee/Makefile
	+++ b/usr.bin/tee/Makefile
	@@ -1,6 +1,6 @@
	.include <src.opts.mk>

	-PACKAGE= runtime
	+PACKAGE=shell
	PROG= tee

	HAS_TESTS=
	diff --git a/usr.bin/tr/Makefile b/usr.bin/tr/Makefile
	--- a/usr.bin/tr/Makefile
	+++ b/usr.bin/tr/Makefile
	@@ -1,6 +1,6 @@
	.include <src.opts.mk>

	-PACKAGE= runtime
	+PACKAGE=shell
	PROG= tr
	SRCS= cmap.c cset.c str.c tr.c

	diff --git a/usr.bin/uname/Makefile b/usr.bin/uname/Makefile
	--- a/usr.bin/uname/Makefile
	+++ b/usr.bin/uname/Makefile
	@@ -1,4 +1,4 @@
	-PACKAGE= runtime
	+PACKAGE=shell
	PROG= uname

	.include <bsd.prog.mk>
	diff --git a/usr.bin/what/Makefile b/usr.bin/what/Makefile
	--- a/usr.bin/what/Makefile
	+++ b/usr.bin/what/Makefile
	@@ -1,4 +1,4 @@
	-PACKAGE= runtime
	+PACKAGE=shell
	PROG= what

	.include <bsd.prog.mk>
	diff --git a/usr.bin/xargs/Makefile b/usr.bin/xargs/Makefile
	--- a/usr.bin/xargs/Makefile
	+++ b/usr.bin/xargs/Makefile
	@@ -1,6 +1,6 @@
	.include <src.opts.mk>

	-PACKAGE= runtime
	+PACKAGE=shell

	PROG= xargs
	SRCS= xargs.c strnsubst.c

File Metadata

Mime Type: text/plain
Expires: Fri, Feb 6, 2:25 AM (16 h, 37 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 28445732
Default Alt Text: D53162.id164403.diff (14 KB)

D53162.id164403.diffNo OneTemporaryActions

D53162.id164403.diffView Options

File Metadata

Event Timeline

D53162.id164403.diff
No OneTemporary
Actions

D53162.id164403.diff
View Options