4815 Want rm support for -v option
4816 rm does not print error messages when -f is used

@@ -21,10 +21,11 @@
 
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2012 Nexenta Systems, Inc. All rights reserved.
 # Copyright (c) 2013 Gary Mills
+# Copyright 2014 Andrew Stormont.
 #
 
 <include SUNWcs.man1.inc>
 <include SUNWcs.man1m.inc>
 <include SUNWcs.man4.inc>

@@ -138,15 +139,10 @@
 dir path=usr/bin/$(ARCH64)
 dir path=usr/ccs
 dir path=usr/ccs/bin
 dir path=usr/demo
 dir path=usr/games
-dir path=usr/has
-dir path=usr/has/bin
-dir path=usr/has/lib
-dir path=usr/has/man
-dir path=usr/has/man/man1has
 dir path=usr/kernel group=sys
 dir path=usr/kernel/drv group=sys
 dir path=usr/kernel/drv/$(ARCH64) group=sys
 dir path=usr/kernel/exec group=sys
 dir path=usr/kernel/exec/$(ARCH64) group=sys

@@ -862,16 +858,10 @@
 file path=usr/bin/who mode=0555
 file path=usr/bin/wracct mode=0555
 file path=usr/bin/write group=tty mode=2555
 file path=usr/bin/xargs mode=0555
 file path=usr/bin/xstr mode=0555
-file path=usr/has/bin/edit mode=0555
-file path=usr/has/bin/sh mode=0555
-file path=usr/has/man/man1has/edit.1has
-file path=usr/has/man/man1has/ex.1has
-file path=usr/has/man/man1has/sh.1has
-file path=usr/has/man/man1has/vi.1has
 file path=usr/kernel/drv/$(ARCH64)/dump group=sys
 file path=usr/kernel/drv/$(ARCH64)/fssnap group=sys
 file path=usr/kernel/drv/$(ARCH64)/kstat group=sys
 file path=usr/kernel/drv/$(ARCH64)/ksyms group=sys
 file path=usr/kernel/drv/$(ARCH64)/logindmux group=sys

@@ -1593,15 +1583,10 @@
 hardlink path=usr/bin/vax target=../../usr/bin/i286
 hardlink path=usr/bin/vedit target=../has/bin/edit
 hardlink path=usr/bin/w target=../../usr/lib/isaexec
 hardlink path=usr/bin/wait target=../../usr/bin/alias
 hardlink path=usr/bin/wc target=../../usr/bin/alias
-hardlink path=usr/has/bin/ex target=edit
-hardlink path=usr/has/bin/pfsh target=../../bin/pfexec
-hardlink path=usr/has/bin/vedit target=edit
-hardlink path=usr/has/bin/vi target=edit
-hardlink path=usr/has/bin/view target=edit
 hardlink path=usr/lib/fs/hsfs/fstyp target=../../../sbin/fstyp
 hardlink path=usr/lib/fs/ufs/dcopy target=../../../../usr/lib/fs/ufs/clri
 hardlink path=usr/lib/fs/ufs/fstyp target=../../../sbin/fstyp
 hardlink path=usr/lib/fs/ufs/quotaon \
     target=../../../../usr/lib/fs/ufs/quotaoff

@@ -1801,12 +1786,10 @@
 link path=usr/bin/strerr target=../sbin/strerr
 link path=usr/bin/sync target=../../sbin/sync
 link path=usr/bin/tar target=../sbin/tar
 link path=usr/bin/uname target=../../sbin/uname
 link path=usr/ccs/bin/m4 target=../../bin/m4
-link path=usr/has/bin/jsh target=sh
-link path=usr/has/lib/rsh target=../bin/sh
 link path=usr/lib/$(ARCH64)/ld.so.1 target=../../../lib/$(ARCH64)/ld.so.1
 link path=usr/lib/cron target=../../etc/cron.d
 link path=usr/lib/devfsadm/devfsadmd target=../../sbin/devfsadm
 link path=usr/lib/embedded_su target=../bin/su
 link path=usr/lib/fs/dev/mount target=../../../../etc/fs/dev/mount

@@ -1895,5 +1878,9 @@
 depend fmri=system/data/terminfo type=require
 #
 # Depend on zoneinfo data.
 #
 depend fmri=system/data/zoneinfo type=require
+#
+# The /usr/has stuff used to be in this package
+#
+depend fmri=compatibility/sus